AxioDL/zeus
2
0
Fork 0
mirror of https://github.com/AxioDL/zeus.git synced 2025-12-21 02:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Decouple Athena usage

Browse Source 
Convert CColor from RGBAf32 to RGBA8
This commit is contained in:
Phillip Stephens
2015-11-01 04:04:29 -08:00
parent e1baf3631b
commit 9965f5846d
7 changed files with 200 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/CQuaternion.hpp
View File

@@ -6,7 +6,9 @@
#include "CVector3f.hpp"
#include "CVector4f.hpp"
#include <math.h>
#if ZE_ATHENA_TYPES
#include <Athena/IStreamReader.hpp>
#endif
namespace Zeus
{
@@ -19,7 +21,9 @@ public:
CQuaternion(float r, float x, float y, float z) : r(r), v(x, y, z){}
CQuaternion(float x, float y, float z) { fromVector3f(CVector3f(x, y, z)); }
CQuaternion(float r, const CVector3f& vec) : r(r), v(vec){}
#if ZE_ATHENA_TYPES
CQuaternion(Athena::io::IStreamReader& input) { r = input.readFloat(); v = CVector3f(input);}
#endif
CQuaternion(const CVector3f& vec) { fromVector3f(vec); }
CQuaternion(const CVector4f& vec)
: r(vec.w)