Merge pull request godotengine#289 from 2shady4u/master

karroffel · web-flow · commit 5bdcecfc2067 · 2019-06-04T08:01:12.000+02:00
Fixed wrong implementation of Quat multiplication
diff --git a/src/core/Quat.cpp b/src/core/Quat.cpp
@@ -247,10 +247,10 @@ void Quat::operator-=(const Quat &q) {
 }
 
 void Quat::operator*=(const Quat &q) {
-	x *= q.x;
-	y *= q.y;
-	z *= q.z;
-	w *= q.w;
+	set(w * q.x + x * q.w + y * q.z - z * q.y,
+			w * q.y + y * q.w + z * q.x - x * q.z,
+			w * q.z + z * q.w + x * q.y - y * q.x,
+			w * q.w - x * q.x - y * q.y - z * q.z);
 }
 
 void Quat::operator*=(const real_t &s) {

Original file line number	Diff line number	Diff line change
`@@ -247,10 +247,10 @@ void Quat::operator-=(const Quat &q) {`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`void Quat::operator*=(const Quat &q) {`
`250`		`- x *= q.x;`
`251`		`- y *= q.y;`
`252`		`- z *= q.z;`
`253`		`- w *= q.w;`
	`250`	`+ set(w * q.x + x * q.w + y * q.z - z * q.y,`
	`251`	`+ w * q.y + y * q.w + z * q.x - x * q.z,`
	`252`	`+ w * q.z + z * q.w + x * q.y - y * q.x,`
	`253`	`+ w * q.w - x * q.x - y * q.y - z * q.z);`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`void Quat::operator*=(const real_t &s) {`