AxioDL/zeus
2
0
Fork 0
mirror of https://github.com/AxioDL/zeus.git synced 2025-12-14 23:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build Fixes

Browse Source
This commit is contained in:
Phillip Stephens
2015-11-25 18:38:43 -08:00
parent a073e690cd
commit 24886ff8c7
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/CColor.hpp
View File

@@ -1,12 +1,16 @@
#ifndef CCOLOR_HPP
#define CCOLOR_HPP
#include "Global.hpp"
#include "Math.hpp"
#include "TVectorUnion.hpp"
#if ZE_ATHENA_TYPES
#include <Athena/FileReader.hpp>
#endif
#include <iostream>
#if BYTE_ORDER == __ORDER_LITTLE_ENDIAN__
#define COLOR(rgba) ( ( (rgba) & 0x000000FF ) << 24 | ( (rgba) & 0x0000FF00 ) << 8 \
#define COLOR(rgba) (unsigned)( ( (rgba) & 0x000000FF ) << 24 | ( (rgba) & 0x0000FF00 ) << 8 \
| ( (rgba) & 0x00FF0000 ) >> 8 | ( (rgba) & 0xFF000000 ) >> 24 )
#else
#define COLOR(rgba) rgba
@@ -188,17 +192,16 @@ public:
inline void normalize()
{
float mag = magnitude();
assert(mag != 0.0);
mag = 1.0 / mag;
*this *= mag;
}
inline CColor normalized()
inline CColor normalized() const
{
float mag = magnitude();
assert(mag != 0.0);
mag = 1.0 / mag;
return *this * mag;
}
inline float magSquared() const
{
#if __SSE__