Merge branch 'master' of https://github.com/KrakenEngine/kraken

kraken/KREngine-common.h

@@ -11,9 +11,9 @@
 #ifndef KRENGINE_COMMON_H
 #define KRENGINE_COMMON_H
 
-float const PI = 3.141592653589793f;
-float const D2R = PI * 2 / 360;
-
+#include "public/kraken.h"
+#include "KRHelpers.h"
+using namespace kraken;
 
 #include <stdint.h>
 #include <vector>
@@ -31,21 +31,18 @@ float const D2R = PI * 2 / 360;
 #include <stdint.h>
 #include <stdio.h>
 
-#if defined(_WIN32) || defined(_WIN64)
 #include "../3rdparty/tinyxml2/tinyxml2.h"
-#else
+#if defined(__APPLE__)
 
 #include <sys/mman.h>
 #include <unistd.h>
 #include <pthread.h>
 
-#include <Accelerate/Accelerate.h>
 #include <AudioToolbox/AudioToolbox.h>
 #include <AudioToolbox/AudioFile.h>
 #include <AudioToolbox/ExtendedAudioFile.h>
 #include <AudioToolbox/AUGraph.h>
 
-#include "tinyxml2.h"
 #endif
 
 #include <boost/tokenizer.hpp>
@@ -218,20 +215,14 @@ fprintf(stderr, "Error at line number %d, in file %s. Returned %d for call %s\n"
 
 #endif
 
-#define KRMIN(x,y) ((x) < (y) ? (x) : (y))
-#define KRMAX(x,y) ((x) > (y) ? (x) : (y))
-#define KRCLAMP(x, min, max) (KRMAX(KRMIN(x, max), min))
-#define KRALIGN(x) ((x + 3) & ~0x03)
-
 typedef enum {
     STREAM_LEVEL_OUT,
     STREAM_LEVEL_IN_LQ,
     STREAM_LEVEL_IN_HQ
 } kraken_stream_level;
 
-#include "KRVector4.h"
-#include "KRVector3.h"
-#include "KRVector2.h"
 #include "KRBehavior.h"
 
 #endif
+
+using namespace kraken;