AxioDL
/
zeus
mirror of https://github.com/AxioDL/zeus.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fix CColor subscript operator 

* Fix CVector2f derps
This commit is contained in:
Phillip Stephens 2015-05-03 23:08:00 -07:00
parent 8fa4959dbb
commit 70aae5b648
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CColor.hpp
View File

@ -33,7 +33,7 @@ public:
a = reader.readFloat(); a = reader.readFloat();
} }
inline float operator[](const int& idx) { return (&r)[idx]; } inline const float& operator[](const int& idx) { return (&r)[idx]; }
union union
{ {

14
CVector2f.hpp
View File

@ -1,5 +1,5 @@
#ifndef CVector2f_HPP #ifndef CVECTOR2f_HPP
#define CVector2f_HPP #define CVECTOR2f_HPP
#include "Global.hpp" #include "Global.hpp"
#include <Athena/IStreamReader.hpp> #include <Athena/IStreamReader.hpp>
@ -17,7 +17,7 @@ public:
#if __SSE__ #if __SSE__
CVector2f(const __m128& mVec128) : mVec128(mVec128) {v[2] = 0.0f; v[3] = 0.0f;} CVector2f(const __m128& mVec128) : mVec128(mVec128) {v[2] = 0.0f; v[3] = 0.0f;}
#endif #endif
CVector2f(float xyz) {splat(xyz);} CVector2f(float xy) {splat(xy);}
CVector2f(float x, float y) {v[0] = x; v[1] = y; v[2] = 0; v[3] = 0.0;} CVector2f(float x, float y) {v[0] = x; v[1] = y; v[2] = 0; v[3] = 0.0;}
CVector2f(Athena::io::IStreamReader& input) CVector2f(Athena::io::IStreamReader& input)
{ {
@ -30,7 +30,7 @@ public:
inline bool operator ==(const CVector2f& rhs) const inline bool operator ==(const CVector2f& rhs) const
{return (x == rhs.x && y == rhs.y);} {return (x == rhs.x && y == rhs.y);}
inline bool operator !=(const CVector2f& rhs) const inline bool operator !=(const CVector2f& rhs) const
{return !(x == rhs.x && y == rhs.y);} {return !(*this == rhs);}
inline CVector2f operator+(const CVector2f& rhs) const inline CVector2f operator+(const CVector2f& rhs) const
{ {
#if __SSE__ #if __SSE__
@ -203,13 +203,13 @@ public:
#endif #endif
} }
inline void splat(float xyz) inline void splat(float xy)
{ {
#if __SSE__ #if __SSE__
TVectorUnion splat = {{xyz, xyz, 0.0f, 0.0f}}; TVectorUnion splat = {{xy, xy, 0.0f, 0.0f}};
mVec128 = splat.mVec128; mVec128 = splat.mVec128;
#else #else
v[0] = xyz; v[1] = xyz; v[2] = 0.0f; v[3] = 0.0f; v[0] = xy; v[1] = xy; v[2] = 0.0f; v[3] = 0.0f;
#endif #endif
} }

2
CVector3f.hpp
View File

@ -36,7 +36,7 @@ public:
inline bool operator ==(const CVector3f& rhs) const inline bool operator ==(const CVector3f& rhs) const
{return (x == rhs.x && y == rhs.y && z == rhs.z);} {return (x == rhs.x && y == rhs.y && z == rhs.z);}
inline bool operator !=(const CVector3f& rhs) const inline bool operator !=(const CVector3f& rhs) const
{return !(x == rhs.x && y == rhs.y && z == rhs.z);} {return !(*this == rhs);}
inline CVector3f operator+(const CVector3f& rhs) const inline CVector3f operator+(const CVector3f& rhs) const
{ {
#if __SSE__ #if __SSE__