mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-22 02:04:52 +01:00
119c372dff
(cherry picked from commit22653c99f8) (cherry picked from commitcce7f1adf2) (cherry picked from commitd2795c98dd)
29 lines
745 B
Diff
29 lines
745 B
Diff
diff --git a/dep/g3dlite/include/G3D/Quat.h b/dep/g3dlite/include/G3D/Quat.h
|
|
index 04e11e0..b26708a 100644
|
|
--- a/dep/g3dlite/include/G3D/Quat.h
|
|
+++ b/dep/g3dlite/include/G3D/Quat.h
|
|
@@ -335,8 +335,8 @@ public:
|
|
Note that q.pow(a).pow(b) == q.pow(a + b)
|
|
@cite Dam98 pg 21
|
|
*/
|
|
- inline Quat pow(float x) const {
|
|
- return (log() * x).exp();
|
|
+ inline Quat pow(float r) const {
|
|
+ return (log() * r).exp();
|
|
}
|
|
|
|
/** Make unit length in place */
|
|
@@ -349,9 +349,9 @@ public:
|
|
the magnitude.
|
|
*/
|
|
Quat toUnit() const {
|
|
- Quat x = *this;
|
|
- x.unitize();
|
|
- return x;
|
|
+ Quat copyOfThis = *this;
|
|
+ copyOfThis.unitize();
|
|
+ return copyOfThis;
|
|
}
|
|
|
|
/**
|