diff options
| author | madmaxoft <github@xoft.cz> | 2014-05-02 23:50:22 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-05-02 23:50:22 +0200 |
| commit | cbf4a17e0594ebd408d207bb689fedd70f1419e2 (patch) | |
| tree | a25aef31c6b860cf6e239d0cc316599d33a3fef1 | |
| parent | Fixed vanilla fluid simulator. (diff) | |
| download | cuberite-cbf4a17e0594ebd408d207bb689fedd70f1419e2.tar cuberite-cbf4a17e0594ebd408d207bb689fedd70f1419e2.tar.gz cuberite-cbf4a17e0594ebd408d207bb689fedd70f1419e2.tar.bz2 cuberite-cbf4a17e0594ebd408d207bb689fedd70f1419e2.tar.lz cuberite-cbf4a17e0594ebd408d207bb689fedd70f1419e2.tar.xz cuberite-cbf4a17e0594ebd408d207bb689fedd70f1419e2.tar.zst cuberite-cbf4a17e0594ebd408d207bb689fedd70f1419e2.zip | |
| -rw-r--r-- | src/Vector3.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Vector3.h b/src/Vector3.h index 2c79f9ff1..4a1440b32 100644 --- a/src/Vector3.h +++ b/src/Vector3.h @@ -163,8 +163,16 @@ public: z *= a_v; } - // tolua_begin + template <typename T2> inline Vector3<T> & operator =(const Vector3<T2> & a_Rhs) + { + x = (T)a_Rhs.x; + y = (T)a_Rhs.y; + z = (T)a_Rhs.z; + return *this; + } + // tolua_begin + inline Vector3<T> operator + (const Vector3<T>& a_Rhs) const { return Vector3<T>( |