Changeset ae09808

Timestamp:

Dec 13, 2019, 7:54:05 PM (5 years ago)

Author:

Dmitry Kobets <dkobets@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

0f4527d

Parents:

7799f79

Message:

Add vector division and multiplication to vec3 + tests

Files:

• libcfa/src/vec/vec3.hfa (modified) (2 diffs)
• tests/vector/.expect/vec3_float.txt (modified) (1 diff)
• tests/vector/vec3_float.cfa (modified) (2 diffs)

libcfa/src/vec/vec3.hfa

@@ -71 +71 @@
     }
 
-    // Scalar Multiplication
+    // Multiplication
     forall(| multiply(T)) {
     vec3(T) ?*?(vec3(T) v, T scalar) with (v) { // TODO (can't make this const ref)
@@ -79 +79 @@
         return v * scalar;
     }
+    vec3(T) ?*?(vec3(T) u, vec3(T) v) {
+        return [u.x * v.x, u.y * v.y, u.z * v.z];
+    }
     vec3(T)& ?*=?(vec3(T)& v, T scalar) {
         v = v * scalar;
         return v;
     }
+    vec3(T)& ?*=?(vec3(T)& u, vec3(T) v) {
+        u = u * v;
+        return u;
+    }
     }
 
-    // Scalar Division
+    // Division
     forall(| divide(T)) {
     vec3(T) ?/?(vec3(T) v, T scalar) with (v) {
         return [x / scalar, y / scalar, z / scalar];
     }
+    vec3(T) ?/?(vec3(T) u, vec3(T) v) {
+        return [u.x / v.x, u.y / v.y, u.z / v.z];
+    }
     vec3(T)& ?/=?(vec3(T)& v, T scalar) with (v) {
         v = v / scalar;
         return v;
+    }
+    vec3(T)& ?/=?(vec3(T)& u, vec3(T) v) {
+        u = u / v;
+        return u;
     }
     }

tests/vector/.expect/vec3_float.txt

@@ -14 +14 @@
 s*v:<4.5,8.25,300.9>
 ?*=?:<4.5,8.25,300.9>
+?*?(vec):<2.,6.,13.5>
+?*=?(vec):<2.,6.,13.5>
 ?/?:<0.666667,-0.0333333,15.>
 ?/=?:<0.666667,-0.0333333,15.>
+?/?(vec):<1.,-0.0333333,0.666667>
+?/=?(vec):<1.,-0.0333333,0.666667>
 dot_1:0.
 dot_2:37.8

tests/vector/vec3_float.cfa

@@ -47 +47 @@
     sout | "?*=?:" | v1;
 
+    {
+        vec3(float) u = {1, 2, 3};
+        vec3(float) v = {2, 3, 4.5f};
+        sout | "?*?(vec):" | (u * v);
+        sout | "?*=?(vec):" | (u *= v);
+    }
+
     v1 = (vec3(float)){2, -0.1f, 45};
     sout | "?/?:" | (v1 / 3.f);
@@ -52 +59 @@
     v1 /= 3.f;
     sout | "?/=?:" | v1;
+
+    {
+        vec3(float) u = {2, -0.1f, 3};
+        vec3(float) v = {2, 3, 4.5f};
+        sout | "?/?(vec):" | (u / v);
+        sout | "?/=?(vec):" | (u /= v);
+    }
 
     v1 = (vec3(float)){4,2,3};