Interim code. Integrating cocos2d.

diff --git a/Classes/Foundation/Common/GlobalDefines.h b/Classes/Foundation/Common/GlobalDefines.h
index 7dde617..14712b2 100755 (executable)
--- a/Classes/Foundation/Common/GlobalDefines.h
+++ b/Classes/Foundation/Common/GlobalDefines.h
@@ -70,9 +70,9 @@
 //----------------------------------------------------------------------------------------\r
 // alignment macros\r
 #if defined(__WINDOWS__)\r
-#define ALIGN(N)                  __declspec(align(N))\r
+#define MEM_ALIGN(N)              __declspec(align(N))\r
 #elif defined(__iOS__)\r
-#define ALIGN(N)                  __attribute__((aligned (N)))\r
+#define MEM_ALIGN(N)              __attribute__((aligned (N)))\r
 #endif\r
 \r
 #define IS_POWER_OF_TWO(x)        ( ((x) & -(x)) == (x) )\r

diff --git a/Classes/Foundation/GraphicsServices/Geometry/BasicPrimitives.h b/Classes/Foundation/GraphicsServices/Geometry/BasicPrimitives.h
new file mode 100644 (file)
index 0000000..ba50ba9
--- /dev/null
+++ b/Classes/Foundation/GraphicsServices/Geometry/BasicPrimitives.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "Foundation/Common/GlobalInclude.h"
+#include "Foundation/Math/MathInclude.h"
+
+//#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES2/gl.h>
+
+//----------------------------------------------------------------------------------------
+struct Basic2DPrimitive
+{
+protected:
+  Basic2DPrimitive(); // Only the children classes can call this.
+  ~Basic2DPrimitive();
+
+  GLuint    mVertexBuffer;
+  uint16_t  mX, mY;
+};
+
+//----------------------------------------------------------------------------------------
+struct Rectangle : public Basic2DPrimitive
+{
+public:
+  GLuint    mWidth,&nb