diff options
Diffstat (limited to 'point.c')
-rw-r--r-- | point.c | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -19,25 +19,25 @@ Vec2(double x, double y) Point2 addpt2(Point2 a, Point2 b) { - return (Point2){a.x+b.x, a.y+b.y, a.w+b.w}; + return Pt2(a.x+b.x, a.y+b.y, a.w+b.w); } Point2 subpt2(Point2 a, Point2 b) { - return (Point2){a.x-b.x, a.y-b.y, a.w-b.w}; + return Pt2(a.x-b.x, a.y-b.y, a.w-b.w); } Point2 mulpt2(Point2 p, double s) { - return (Point2){p.x*s, p.y*s, p.w*s}; + return Pt2(p.x*s, p.y*s, p.w*s); } Point2 divpt2(Point2 p, double s) { - return (Point2){p.x/s, p.y/s, p.w/s}; + return Pt2(p.x/s, p.y/s, p.w/s); } Point2 @@ -45,11 +45,11 @@ lerp2(Point2 a, Point2 b, double t) { if(t < 0) t = 0; if(t > 1) t = 1; - return (Point2){ + return Pt2( (1 - t)*a.x + t*b.x, (1 - t)*a.y + t*b.y, (1 - t)*a.w + t*b.w - }; + ); } double @@ -71,8 +71,8 @@ normvec2(Point2 v) len = vec2len(v); if(len == 0) - return (Point2){0, 0, 0}; - return (Point2){v.x/len, v.y/len, 0}; + return Pt2(0,0,0); + return Pt2(v.x/len, v.y/len, 0); } /* 3D */ @@ -92,25 +92,25 @@ Vec3(double x, double y, double z) Point3 addpt3(Point3 a, Point3 b) { - return (Point3){a.x+b.x, a.y+b.y, a.z+b.z, a.w+b.w}; + return Pt3(a.x+b.x, a.y+b.y, a.z+b.z, a.w+b.w); } Point3 subpt3(Point3 a, Point3 b) { - return (Point3){a.x-b.x, a.y-b.y, a.z-b.z, a.w-b.w}; + return Pt3(a.x-b.x, a.y-b.y, a.z-b.z, a.w-b.w); } Point3 mulpt3(Point3 p, double s) { - return (Point3){p.x*s, p.y*s, p.z*s, p.w*s}; + return Pt3(p.x*s, p.y*s, p.z*s, p.w*s); } Point3 divpt3(Point3 p, double s) { - return (Point3){p.x/s, p.y/s, p.z/s, p.w/s}; + return Pt3(p.x/s, p.y/s, p.z/s, p.w/s); } Point3 @@ -118,12 +118,12 @@ lerp3(Point3 a, Point3 b, double t) { if(t < 0) t = 0; if(t > 1) t = 1; - return (Point3){ + return Pt3( (1 - t)*a.x + t*b.x, (1 - t)*a.y + t*b.y, (1 - t)*a.z + t*b.z, (1 - t)*a.w + t*b.w - }; + ); } double @@ -135,12 +135,12 @@ dotvec3(Point3 a, Point3 b) Point3 crossvec3(Point3 a, Point3 b) { - return (Point3){ + return Pt3( a.y*b.z - a.z*b.y, a.z*b.x - a.x*b.z, a.x*b.y - a.y*b.x, 0 - }; + ); } double @@ -156,6 +156,6 @@ normvec3(Point3 v) len = vec3len(v); if(len == 0) - return (Point3){0, 0, 0, 0}; - return (Point3){v.x/len, v.y/len, v.z/len, 0}; + return Pt3(0,0,0,0); + return Pt3(v.x/len, v.y/len, v.z/len, 0); } |