From 655dea3a4146107864b70667c28c14c57e60481e Mon Sep 17 00:00:00 2001
From: chsieh <chester.developer@hotmail.com>
Date: Tue, 26 Apr 2011 21:10:03 -0700
Subject: [PATCH] More reorg.

---
 Littlest/AppDelegate.mm               |    1 +
 Littlest/Engine/Render/GLES-Render.h  |   68 +++++++++++++
 Littlest/Engine/Render/GLES-Render.mm |  179 +++++++++++++++++++++++++++++++++
 Littlest/GLES-Render.h                |   68 -------------
 Littlest/GLES-Render.mm               |  179 ---------------------------------
 Littlest/HelloWorldLayer.h            |    3 +-
 6 files changed, 250 insertions(+), 248 deletions(-)
 create mode 100644 Littlest/Engine/Render/GLES-Render.h
 create mode 100644 Littlest/Engine/Render/GLES-Render.mm
 delete mode 100644 Littlest/GLES-Render.h
 delete mode 100644 Littlest/GLES-Render.mm

diff --git a/Littlest/AppDelegate.mm b/Littlest/AppDelegate.mm
index 319df43..c36c5f8 100644
--- a/Littlest/AppDelegate.mm
+++ b/Littlest/AppDelegate.mm
@@ -11,6 +11,7 @@
 #import "AppDelegate.h"
 #import "GameConfig.h"
 #import "HelloWorldLayer.h"
+
 #import "OS/RootViewController.h"
 
 @implementation AppDelegate
diff --git a/Littlest/Engine/Render/GLES-Render.h b/Littlest/Engine/Render/GLES-Render.h
new file mode 100644
index 0000000..f7785d6
--- /dev/null
+++ b/Littlest/Engine/Render/GLES-Render.h
@@ -0,0 +1,68 @@
+/*
+* Copyright (c) 2006-2007 Erin Catto http://www.gphysics.com
+*
+* iPhone port by Simon Oliver - http://www.simonoliver.com - http://www.handcircus.com
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 1. The origin of this software must not be misrepresented; you must not
+* claim that you wrote the original software. If you use this software
+* in a product, an acknowledgment in the product documentation would be
+* appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+*/
+
+//
+// File modified for cocos2d integration
+// http://www.cocos2d-iphone.org
+//
+
+#ifndef GLES_RENDER_H
+#define GLES_RENDER_H
+
+#import <OpenGLES/EAGL.h>
+#import <OpenGLES/ES1/gl.h>
+#import <OpenGLES/ES1/glext.h>
+
+#include "Box2D.h"
+
+struct b2AABB;
+
+// This class implements debug drawing callbacks that are invoked
+// inside b2World::Step.
+class GLESDebugDraw : public b2DebugDraw
+{
+  float32 mRatio;
+  
+public:
+  GLESDebugDraw();
+
+  GLESDebugDraw( float32 ratio );
+
+  void DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color);
+
+  void DrawSolidPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color);
+
+  void DrawCircle(const b2Vec2& center, float32 radius, const b2Color& color);
+
+  void DrawSolidCircle(const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color);
+
+  void DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Color& color);
+
+  void DrawTransform(const b2Transform& xf);
+
+  void DrawPoint(const b2Vec2& p, float32 size, const b2Color& color);
+
+  void DrawString(int x, int y, const char* string, ...); 
+
+  void DrawAABB(b2AABB* aabb, const b2Color& color);
+};
+
+
+#endif // GLES_RENDER_H
diff --git a/Littlest/Engine/Render/GLES-Render.mm b/Littlest/Engine/Render/GLES-Render.mm
new file mode 100644
index 0000000..9cc1f47
--- /dev/null
+++ b/Littlest/Engine/Render/GLES-Render.mm
@@ -0,0 +1,179 @@
+/*
+* Copyright (c) 2006-2007 Erin Catto http://www.gphysics.com
+*
+* iPhone port by Simon Oliver - http://www.simonoliver.com - http://www.handcircus.com
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 1. The origin of this software must not be misrepresented; you must not
+* claim that you wrote the original software. If you use this software
+* in a product, an acknowledgment in the product documentation would be
+* appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+*/
+
+//
+// File modified for cocos2d integration
+// http://www.cocos2d-iphone.org
+//
+
+#include "GLES-Render.h"
+
+
+#include <cstdio>
+#include <cstdarg>
+
+#include <cstring>
+
+GLESDebugDraw::GLESDebugDraw()
+	: mRatio( 1.0f )
+{
+}
+GLESDebugDraw::GLESDebugDraw( float32 ratio )
+	: mRatio( ratio )
+{
+}
+
+
+void GLESDebugDraw::DrawPolygon(const b2Vec2* old_vertices, int32 vertexCount, const b2Color& color)
+{
+	b2Vec2 vertices[vertexCount];
+	for( int i=0;i<vertexCount;i++) {
+		vertices[i] = old_vertices[i];
+		vertices[i] *= mRatio;
+	}
+
+	glColor4f(color.r, color.g, color.b,1);
+	glVertexPointer(2, GL_FLOAT, 0, vertices);
+	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);	
+}
+
+void GLESDebugDraw::DrawSolidPolygon(const b2Vec2* old_vertices, int32 vertexCount, const b2Color& color)
+{
+	b2Vec2 vertices[vertexCount];
+	for( int i=0;i<vertexCount;i++) {
+		vertices[i] = old_vertices[i];
+		vertices[i] *= mRatio;
+	}
+	
+	glVertexPointer(2, GL_FLOAT, 0, vertices);
+	
+	glColor4f(color.r*0.5f, color.g*0.5f, color.b*0.5f,0.5f);
+	glDrawArrays(GL_TRIANGLE_FAN, 0, vertexCount);
+	
+	glColor4f(color.r, color.g, color.b,1);
+	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
+}
+
+void GLESDebugDraw::DrawCircle(const b2Vec2& center, float32 radius, const b2Color& color)
+{
+		
+	const float32 k_segments = 16.0f;
+	int vertexCount=16;
+	const float32 k_increment = 2.0f * b2_pi / k_segments;
+	float32 theta = 0.0f;
+	
+	GLfloat				glVertices[vertexCount*2];
+	for (int32 i = 0; i < k_segments; ++i)
+	{
+		b2Vec2 v = center + radius * b2Vec2(cosf(theta), sinf(theta));
+		glVertices[i*2]=v.x * mRatio;
+		glVertices[i*2+1]=v.y * mRatio;
+		theta += k_increment;
+	}
+	
+	glColor4f(color.r, color.g, color.b,1);
+	glVertexPointer(2, GL_FLOAT, 0, glVertices);
+	
+	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
+}
+
+void GLESDebugDraw::DrawSolidCircle(const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color)
+{
+		
+	const float32 k_segments = 16.0f;
+	int vertexCount=16;
+	const float32 k_increment = 2.0f * b2_pi / k_segments;
+	float32 theta = 0.0f;
+	
+	GLfloat				glVertices[vertexCount*2];
+	for (int32 i = 0; i < k_segments; ++i)
+	{
+		b2Vec2 v = center + radius * b2Vec2(cosf(theta), sinf(theta));
+		glVertices[i*2]=v.x * mRatio;
+		glVertices[i*2+1]=v.y * mRatio;
+		theta += k_increment;
+	}
+	
+	glColor4f(color.r *0.5f, color.g*0.5f, color.b*0.5f,0.5f);
+	glVertexPointer(2, GL_FLOAT, 0, glVertices);
+	glDrawArrays(GL_TRIANGLE_FAN, 0, vertexCount);
+	glColor4f(color.r, color.g, color.b,1);
+	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
+	
+	// Draw the axis line
+	DrawSegment(center,center+radius*axis,color);
+}
+
+void GLESDebugDraw::DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Color& color)
+{
+	glColor4f(color.r, color.g, color.b,1);
+	GLfloat				glVertices[] = {
+		p1.x * mRatio, p1.y * mRatio,
+		p2.x * mRatio, p2.y * mRatio
+	};
+	glVertexPointer(2, GL_FLOAT, 0, glVertices);
+	glDrawArrays(GL_LINES, 0, 2);
+}
+
+void GLESDebugDraw::DrawTransform(const b2Transform& xf)
+{
+	b2Vec2 p1 = xf.position, p2;
+	const float32 k_axisScale = 0.4f;
+
+	p2 = p1 + k_axisScale * xf.R.col1;
+	DrawSegment(p1,p2,b2Color(1,0,0));
+	
+	p2 = p1 + k_axisScale * xf.R.col2;
+	DrawSegment(p1,p2,b2Color(0,1,0));
+}
+
+void GLESDebugDraw::DrawPoint(const b2Vec2& p, float32 size, const b2Color& color)
+{
+	glColor4f(color.r, color.g, color.b,1);
+	glPointSize(size);
+	GLfloat				glVertices[] = {
+		p.x * mRatio, p.y * mRatio
+	};
+	glVertexPointer(2, GL_FLOAT, 0, glVertices);
+	glDrawArrays(GL_POINTS, 0, 1);
+	glPointSize(1.0f);
+}
+
+void GLESDebugDraw::DrawString(int x, int y, const char *string, ...)
+{
+//	NSLog(@"DrawString: unsupported: %s", string);
+	//printf(string);
+	/* Unsupported as yet. Could replace with bitmap font renderer at a later date */
+}
+
+void GLESDebugDraw::DrawAABB(b2AABB* aabb, const b2Color& c)
+{
+	glColor4f(c.r, c.g, c.b,1);
+
+	GLfloat				glVertices[] = {
+		aabb->lowerBound.x * mRatio, aabb->lowerBound.y * mRatio,
+		aabb->upperBound.x * mRatio, aabb->lowerBound.y * mRatio,
+		aabb->upperBound.x * mRatio, aabb->upperBound.y * mRatio,
+		aabb->lowerBound.x * mRatio, aabb->upperBound.y * mRatio
+	};
+	glVertexPointer(2, GL_FLOAT, 0, glVertices);
+	glDrawArrays(GL_LINE_LOOP, 0, 8);
+	
+}
diff --git a/Littlest/GLES-Render.h b/Littlest/GLES-Render.h
deleted file mode 100644
index f7785d6..0000000
--- a/Littlest/GLES-Render.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2006-2007 Erin Catto http://www.gphysics.com
-*
-* iPhone port by Simon Oliver - http://www.simonoliver.com - http://www.handcircus.com
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 1. The origin of this software must not be misrepresented; you must not
-* claim that you wrote the original software. If you use this software
-* in a product, an acknowledgment in the product documentation would be
-* appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-* misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-*/
-
-//
-// File modified for cocos2d integration
-// http://www.cocos2d-iphone.org
-//
-
-#ifndef GLES_RENDER_H
-#define GLES_RENDER_H
-
-#import <OpenGLES/EAGL.h>
-#import <OpenGLES/ES1/gl.h>
-#import <OpenGLES/ES1/glext.h>
-
-#include "Box2D.h"
-
-struct b2AABB;
-
-// This class implements debug drawing callbacks that are invoked
-// inside b2World::Step.
-class GLESDebugDraw : public b2DebugDraw
-{
-  float32 mRatio;
-  
-public:
-  GLESDebugDraw();
-
-  GLESDebugDraw( float32 ratio );
-
-  void DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color);
-
-  void DrawSolidPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color);
-
-  void DrawCircle(const b2Vec2& center, float32 radius, const b2Color& color);
-
-  void DrawSolidCircle(const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color);
-
-  void DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Color& color);
-
-  void DrawTransform(const b2Transform& xf);
-
-  void DrawPoint(const b2Vec2& p, float32 size, const b2Color& color);
-
-  void DrawString(int x, int y, const char* string, ...); 
-
-  void DrawAABB(b2AABB* aabb, const b2Color& color);
-};
-
-
-#endif // GLES_RENDER_H
diff --git a/Littlest/GLES-Render.mm b/Littlest/GLES-Render.mm
deleted file mode 100644
index 9cc1f47..0000000
--- a/Littlest/GLES-Render.mm
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-* Copyright (c) 2006-2007 Erin Catto http://www.gphysics.com
-*
-* iPhone port by Simon Oliver - http://www.simonoliver.com - http://www.handcircus.com
-*
-* This software is provided 'as-is', without any express or implied
-* warranty.  In no event will the authors be held liable for any damages
-* arising from the use of this software.
-* Permission is granted to anyone to use this software for any purpose,
-* including commercial applications, and to alter it and redistribute it
-* freely, subject to the following restrictions:
-* 1. The origin of this software must not be misrepresented; you must not
-* claim that you wrote the original software. If you use this software
-* in a product, an acknowledgment in the product documentation would be
-* appreciated but is not required.
-* 2. Altered source versions must be plainly marked as such, and must not be
-* misrepresented as being the original software.
-* 3. This notice may not be removed or altered from any source distribution.
-*/
-
-//
-// File modified for cocos2d integration
-// http://www.cocos2d-iphone.org
-//
-
-#include "GLES-Render.h"
-
-
-#include <cstdio>
-#include <cstdarg>
-
-#include <cstring>
-
-GLESDebugDraw::GLESDebugDraw()
-	: mRatio( 1.0f )
-{
-}
-GLESDebugDraw::GLESDebugDraw( float32 ratio )
-	: mRatio( ratio )
-{
-}
-
-
-void GLESDebugDraw::DrawPolygon(const b2Vec2* old_vertices, int32 vertexCount, const b2Color& color)
-{
-	b2Vec2 vertices[vertexCount];
-	for( int i=0;i<vertexCount;i++) {
-		vertices[i] = old_vertices[i];
-		vertices[i] *= mRatio;
-	}
-
-	glColor4f(color.r, color.g, color.b,1);
-	glVertexPointer(2, GL_FLOAT, 0, vertices);
-	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);	
-}
-
-void GLESDebugDraw::DrawSolidPolygon(const b2Vec2* old_vertices, int32 vertexCount, const b2Color& color)
-{
-	b2Vec2 vertices[vertexCount];
-	for( int i=0;i<vertexCount;i++) {
-		vertices[i] = old_vertices[i];
-		vertices[i] *= mRatio;
-	}
-	
-	glVertexPointer(2, GL_FLOAT, 0, vertices);
-	
-	glColor4f(color.r*0.5f, color.g*0.5f, color.b*0.5f,0.5f);
-	glDrawArrays(GL_TRIANGLE_FAN, 0, vertexCount);
-	
-	glColor4f(color.r, color.g, color.b,1);
-	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
-}
-
-void GLESDebugDraw::DrawCircle(const b2Vec2& center, float32 radius, const b2Color& color)
-{
-		
-	const float32 k_segments = 16.0f;
-	int vertexCount=16;
-	const float32 k_increment = 2.0f * b2_pi / k_segments;
-	float32 theta = 0.0f;
-	
-	GLfloat				glVertices[vertexCount*2];
-	for (int32 i = 0; i < k_segments; ++i)
-	{
-		b2Vec2 v = center + radius * b2Vec2(cosf(theta), sinf(theta));
-		glVertices[i*2]=v.x * mRatio;
-		glVertices[i*2+1]=v.y * mRatio;
-		theta += k_increment;
-	}
-	
-	glColor4f(color.r, color.g, color.b,1);
-	glVertexPointer(2, GL_FLOAT, 0, glVertices);
-	
-	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
-}
-
-void GLESDebugDraw::DrawSolidCircle(const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color)
-{
-		
-	const float32 k_segments = 16.0f;
-	int vertexCount=16;
-	const float32 k_increment = 2.0f * b2_pi / k_segments;
-	float32 theta = 0.0f;
-	
-	GLfloat				glVertices[vertexCount*2];
-	for (int32 i = 0; i < k_segments; ++i)
-	{
-		b2Vec2 v = center + radius * b2Vec2(cosf(theta), sinf(theta));
-		glVertices[i*2]=v.x * mRatio;
-		glVertices[i*2+1]=v.y * mRatio;
-		theta += k_increment;
-	}
-	
-	glColor4f(color.r *0.5f, color.g*0.5f, color.b*0.5f,0.5f);
-	glVertexPointer(2, GL_FLOAT, 0, glVertices);
-	glDrawArrays(GL_TRIANGLE_FAN, 0, vertexCount);
-	glColor4f(color.r, color.g, color.b,1);
-	glDrawArrays(GL_LINE_LOOP, 0, vertexCount);
-	
-	// Draw the axis line
-	DrawSegment(center,center+radius*axis,color);
-}
-
-void GLESDebugDraw::DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Color& color)
-{
-	glColor4f(color.r, color.g, color.b,1);
-	GLfloat				glVertices[] = {
-		p1.x * mRatio, p1.y * mRatio,
-		p2.x * mRatio, p2.y * mRatio
-	};
-	glVertexPointer(2, GL_FLOAT, 0, glVertices);
-	glDrawArrays(GL_LINES, 0, 2);
-}
-
-void GLESDebugDraw::DrawTransform(const b2Transform& xf)
-{
-	b2Vec2 p1 = xf.position, p2;
-	const float32 k_axisScale = 0.4f;
-
-	p2 = p1 + k_axisScale * xf.R.col1;
-	DrawSegment(p1,p2,b2Color(1,0,0));
-	
-	p2 = p1 + k_axisScale * xf.R.col2;
-	DrawSegment(p1,p2,b2Color(0,1,0));
-}
-
-void GLESDebugDraw::DrawPoint(const b2Vec2& p, float32 size, const b2Color& color)
-{
-	glColor4f(color.r, color.g, color.b,1);
-	glPointSize(size);
-	GLfloat				glVertices[] = {
-		p.x * mRatio, p.y * mRatio
-	};
-	glVertexPointer(2, GL_FLOAT, 0, glVertices);
-	glDrawArrays(GL_POINTS, 0, 1);
-	glPointSize(1.0f);
-}
-
-void GLESDebugDraw::DrawString(int x, int y, const char *string, ...)
-{
-//	NSLog(@"DrawString: unsupported: %s", string);
-	//printf(string);
-	/* Unsupported as yet. Could replace with bitmap font renderer at a later date */
-}
-
-void GLESDebugDraw::DrawAABB(b2AABB* aabb, const b2Color& c)
-{
-	glColor4f(c.r, c.g, c.b,1);
-
-	GLfloat				glVertices[] = {
-		aabb->lowerBound.x * mRatio, aabb->lowerBound.y * mRatio,
-		aabb->upperBound.x * mRatio, aabb->lowerBound.y * mRatio,
-		aabb->upperBound.x * mRatio, aabb->upperBound.y * mRatio,
-		aabb->lowerBound.x * mRatio, aabb->upperBound.y * mRatio
-	};
-	glVertexPointer(2, GL_FLOAT, 0, glVertices);
-	glDrawArrays(GL_LINE_LOOP, 0, 8);
-	
-}
diff --git a/Littlest/HelloWorldLayer.h b/Littlest/HelloWorldLayer.h
index 1eb1fc8..d3327e8 100644
--- a/Littlest/HelloWorldLayer.h
+++ b/Littlest/HelloWorldLayer.h
@@ -10,7 +10,8 @@
 // When you import this file, you import all the cocos2d classes
 #import "cocos2d.h"
 #import "Box2D.h"
-#import "GLES-Render.h"
+
+#import "Engine/Render/GLES-Render.h"
 
 // HelloWorldLayer
 @interface HelloWorldLayer : CCLayer
-- 
1.7.0.4