blob: 7bc4073ef623d8297ea161e102ef1e40741ec07a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
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;
}
/**
|