fix a bug in matrix multiplication

KaoCC · KaoCC · commit b83d307d3a5d · 2017-08-17T15:11:09.000+08:00
diff --git a/RadeonRays/include/math/matrix.h b/RadeonRays/include/math/matrix.h
@@ -179,14 +179,13 @@ namespace RadeonRays
         return res*=c;
     }
 
-    inline float3 operator * (matrix const& m, float3 const& v)
+    inline float4 operator * (matrix const& m, float4 const& v)
     {
-        float3 res;
+        float4 res {0, 0, 0, 0};
 
-        for (int i=0;i<3;++i)
-        {
-            res[i] = 0.f;
-            for (int j=0;j<3;++j)
+        for (int i = 0; i < 4; ++i) {
+            //res[i] = 0.f;
+            for (int j = 0; j < 4; ++j)
                 res[i] += m.m[i][j] * v[j];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -179,14 +179,13 @@ namespace RadeonRays`
`179`	`179`	`return res*=c;`
`180`	`180`	`}`
`181`	`181`
`182`		`- inline float3 operator * (matrix const& m, float3 const& v)`
	`182`	`+ inline float4 operator * (matrix const& m, float4 const& v)`
`183`	`183`	`{`
`184`		`- float3 res;`
	`184`	`+ float4 res {0, 0, 0, 0};`
`185`	`185`
`186`		`- for (int i=0;i<3;++i)`
`187`		`- {`
`188`		`- res[i] = 0.f;`
`189`		`- for (int j=0;j<3;++j)`
	`186`	`+ for (int i = 0; i < 4; ++i) {`
	`187`	`+ //res[i] = 0.f;`
	`188`	`+ for (int j = 0; j < 4; ++j)`
`190`	`189`	`res[i] += m.m[i][j] * v[j];`
`191`	`190`	`}`
`192`	`191`