Merge pull request #444 from fodinabor/ExampleUpdates

C++ Example Rebase

Examples/C++/Build/Linux/Makefile

@@ -2,7 +2,7 @@ CC=g++
 CFLAGS=-I../../Core/Dependencies/include -I../../Core/Dependencies/include/AL -I../../Core/include -I../../Modules/include -I../../Modules/Dependencies/include -I../../Modules/Dependencies/include/bullet
 LDFLAGS=-lrt -ldl -lpthread ../../Core/lib/libPolycore.a ../../Core/Dependencies/lib/libfreetype.a ../../Core/Dependencies/lib/liblibvorbisfile.a ../../Core/Dependencies/lib/liblibvorbis.a ../../Core/Dependencies/lib/liblibogg.a ../../Core/Dependencies/lib/libopenal.so ../../Core/Dependencies/lib/libphysfs.a ../../Core/Dependencies/lib/libpng15.a ../../Core/Dependencies/lib/libz.a -lGL -lGLU -lSDL ../../Modules/lib/libPolycode2DPhysics.a ../../Modules/Dependencies/lib/libBox2D.a ../../Modules/lib/libPolycode3DPhysics.a ../../Modules/Dependencies/lib/libBulletDynamics.a ../../Modules/Dependencies/lib/libBulletCollision.a ../../Modules/Dependencies/lib/libLinearMath.a
 
-default: 2DAudio 2DParticles 2DPhysics_Basic 2DPhysics_CollisionOnly 2DPhysics_Contacts 2DPhysics_Joints 2DPhysics_PointCollision 2DShapes 2DTransforms 3DAudio 3DBasics 3DMeshParticles 3DParticles 3DPhysics_Basic 3DPhysics_Character 3DPhysics_CollisionOnly 3DPhysics_Contacts 3DPhysics_RayTest 3DPhysics_Vehicle AdvancedLighting BasicImage BasicLighting BasicText EventHandling KeyboardInput MouseInput Networking_Client Networking_Server PlayingSounds ScreenEntities ScreenSprites SkeletalAnimation UpdateLoop  
+default: 2DAudio 2DParticles 2DPhysics_Basic 2DPhysics_CollisionOnly 2DPhysics_Contacts 2DPhysics_Joints 2DPhysics_PointCollision 2DShapes 2DTransforms 3DAudio 3DBasics 3DMeshParticles 3DParticles 3DPhysics_Basic 3DPhysics_Character 3DPhysics_CollisionOnly 3DPhysics_Contacts 3DPhysics_RayTest 3DPhysics_Vehicle AdvancedLighting BasicImage BasicLighting BasicText EventHandling KeyboardInput MouseInput Networking_Client Networking_Server PlayingSounds SceneEntities SceneSprites SkeletalAnimation UpdateLoop  
 
 clean:
 	rm 2DAudio
@@ -34,8 +34,8 @@ clean:
 	rm Networking_Client
 	rm Networking_Server
 	rm PlayingSounds
-	rm ScreenEntities
-	rm ScreenSprites
+	rm SceneEntities
+	rm SceneSprites
 	rm SkeletalAnimation
 	rm UpdateLoop
 
@@ -97,10 +97,10 @@ Networking_Server:
 	$(CC) $(CFLAGS) -I./Contents/Networking_Server main.cpp Contents/Networking_Server/HelloPolycodeApp.cpp -o Networking_Server $(LDFLAGS)
 PlayingSounds:
 	$(CC) $(CFLAGS) -I./Contents/PlayingSounds main.cpp Contents/PlayingSounds/HelloPolycodeApp.cpp -o PlayingSounds $(LDFLAGS)
-ScreenEntities:
-	$(CC) $(CFLAGS) -I./Contents/ScreenEntities main.cpp Contents/ScreenEntities/HelloPolycodeApp.cpp -o ScreenEntities $(LDFLAGS)
-ScreenSprites:
-	$(CC) $(CFLAGS) -I./Contents/ScreenSprites main.cpp Contents/ScreenSprites/HelloPolycodeApp.cpp -o ScreenSprites $(LDFLAGS)
+SceneEntities:
+	$(CC) $(CFLAGS) -I./Contents/SceneEntities main.cpp Contents/SceneEntities/HelloPolycodeApp.cpp -o SceneEntities $(LDFLAGS)
+SceneSprites:
+	$(CC) $(CFLAGS) -I./Contents/SceneSprites main.cpp Contents/SceneSprites/HelloPolycodeApp.cpp -o SceneSprites $(LDFLAGS)
 SkeletalAnimation:
 	$(CC) $(CFLAGS) -I./Contents/SkeletalAnimation main.cpp Contents/SkeletalAnimation/HelloPolycodeApp.cpp -o SkeletalAnimation $(LDFLAGS)
 UpdateLoop:

Examples/C++/Build/Windows/PolycodeExamples/PolycodeExamples.sln

@@ -49,9 +49,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MouseInput", "MouseInput\Mo
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlayingSounds", "PlayingSounds\PlayingSounds.vcxproj", "{E15F77B2-9AEE-49E7-8B8C-D44FD4461FCC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScreenEntities", "ScreenEntities\ScreenEntities.vcxproj", "{F2E3C438-3BCA-4E78-B3BC-2A7E930A6848}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SceneEntities", "SceneEntities\SceneEntities.vcxproj", "{F2E3C438-3BCA-4E78-B3BC-2A7E930A6848}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ScreenSprites", "ScreenSprites\ScreenSprites.vcxproj", "{6822657B-F9F3-44C4-B2E6-C51A8F1815C7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SceneSprites", "SceneSprites\SceneSprites.vcxproj", "{6822657B-F9F3-44C4-B2E6-C51A8F1815C7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkeletalAnimation", "SkeletalAnimation\SkeletalAnimation.vcxproj", "{BFA6C0C6-15A9-4A92-857E-01566CFB293E}"
 EndProject

Examples/C++/Build/Windows/PolycodeExamples/ScreenEntities/ScreenEntities.vcxproj → Examples/C++/Build/Windows/PolycodeExamples/SceneEntities/SceneEntities.vcxproj

@@ -11,16 +11,16 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Contents\ScreenEntities\HelloPolycodeApp.cpp" />
+    <ClCompile Include="..\..\Contents\SceneEntities\HelloPolycodeApp.cpp" />
     <ClCompile Include="..\PolycodeExample.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Contents\ScreenEntities\HelloPolycodeApp.h" />
+    <ClInclude Include="..\..\Contents\SceneEntities\HelloPolycodeApp.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F2E3C438-3BCA-4E78-B3BC-2A7E930A6848}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MyScreenEntities</RootNamespace>
+    <RootNamespace>MySceneEntities</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -46,12 +46,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\ScreenEntities;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\SceneEntities;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\ScreenEntities;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\SceneEntities;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Examples/C++/Build/Windows/PolycodeExamples/ScreenSprites/ScreenSprites.vcxproj → Examples/C++/Build/Windows/PolycodeExamples/SceneSprites/SceneSprites.vcxproj

@@ -11,16 +11,16 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\Contents\ScreenSprites\HelloPolycodeApp.cpp" />
+    <ClCompile Include="..\..\Contents\SceneSprites\HelloPolycodeApp.cpp" />
     <ClCompile Include="..\PolycodeExample.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\Contents\ScreenSprites\HelloPolycodeApp.h" />
+    <ClInclude Include="..\..\Contents\SceneSprites\HelloPolycodeApp.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6822657B-F9F3-44C4-B2E6-C51A8F1815C7}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>MyScreenSprites</RootNamespace>
+    <RootNamespace>MySceneSprites</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -46,12 +46,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\ScreenSprites;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\SceneSprites;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\ScreenSprites;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)..\..\..\Core\include;$(SolutionDir)..\..\..\Core\Dependencies\include;$(SolutionDir)..\..\..\Core\PolycodeView;$(SolutionDir)..\..\..\Core\Dependencies\include\AL;$(SolutionDir)..\Contents\SceneSprites;$(IncludePath)</IncludePath>
     <LibraryPath>$(SolutionDir)..\..\..\Core\lib;$(SolutionDir)..\..\..\Core\Dependencies\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

Examples/C++/Contents/2DAudio/HelloPolycodeApp.cpp

@@ -7,23 +7,23 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);	
 
-	Screen *screen = new Screen();
+	Scene *scene = new Scene(Scene::SCENE_2D_TOPLEFT);
 	
-	sourceEntity = new ScreenEntity();
-	ScreenSound *testSound = new ScreenSound("Resources/test.wav", 200, 600);
+	sourceEntity = new SceneEntity();
+	SceneSound *testSound = new SceneSound("Resources/test.wav", 200, 600);
 	testSound->getSound()->Play(true);
 	sourceEntity->addChild(testSound);
-	ScreenShape *soundShape = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 20,20,10);
+	ScenePrimitive *soundShape = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 20,20,10);
 	sourceEntity->addChild(soundShape);	
-	screen->addChild(sourceEntity);
+	scene->addChild(sourceEntity);
 	
-	listenerEntity = new ScreenEntity();
-	ScreenSoundListener *soundListener = new ScreenSoundListener();
+	listenerEntity = new SceneEntity();
+	SceneSoundListener *soundListener = new SceneSoundListener();
 	listenerEntity->addChild(soundListener);
-	soundShape = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 20,20,10);
+	soundShape = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 20,20,10);
 	soundShape->setColor(0.0, 1.0, 0.0, 1.0);
 	listenerEntity->addChild(soundShape);	
-	screen->addChild(listenerEntity);
+	scene->addChild(listenerEntity);
 
 	listenerPositionValue = 0;
 	positionValue = 0;	

Examples/C++/Contents/2DParticles/HelloPolycodeApp.cpp

@@ -7,13 +7,10 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 	
-	Screen *screen = new Screen();	
-	ScreenParticleEmitter *emitter = new ScreenParticleEmitter("Resources/particle.png", 
-		Particle::BILLBOARD_PARTICLE, ParticleEmitter::CONTINUOUS_EMITTER, 4, 200, 
-		Vector3(0.0,-50.0,0.0), Vector3(0.0,0.0,0.0), Vector3(20.5, 40.0, 0.0), 
-		Vector3(1.5,1.5,1.5));
+	Scene *scene = new Scene();	
+	SceneParticleEmitter *emitter = new SceneParticleEmitter(100,50,3);
 	
-	emitter->useScaleCurves = true;
+	emitter->useScaleCurve = true;
 	emitter->scaleCurve.clearControlPoints();
 	emitter->scaleCurve.addControlPoint2d(0, 0.3);
 	emitter->scaleCurve.addControlPoint2d(0.5, 1);
@@ -47,7 +44,7 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	emitter->colorCurveA.addControlPoint2d(1, 0);
 
 	emitter->setPosition(640/2, 400);
-	screen->addChild(emitter);
+	scene->addChild(emitter);
 }
 
 HelloPolycodeApp::~HelloPolycodeApp() {

Examples/C++/Contents/2DPhysics_Basic/HelloPolycodeApp.cpp

@@ -4,18 +4,18 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 
 	core = new POLYCODE_CORE(view, 640,480,false,false,0,0,90);
 
-	PhysicsScreen *screen = new PhysicsScreen(10, 60);	
+	PhysicsScene2D *scene = new PhysicsScene2D(10, 60);
 	
-	ScreenShape *shape = new ScreenShape(ScreenShape::SHAPE_RECT, 600,30);
-	shape->setColor(0.0,0.0,0.0,1.0);
-	shape->setPosition(640/2, 400);
-	screen->addPhysicsChild(shape, PhysicsScreenEntity::ENTITY_RECT, true);	
+	ScenePrimitive *shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 600,30);
+	shape->setColor(0.0,0.0,0.1,1.0);
+	shape->setPosition(0, -480/2+40);
+	scene->addPhysicsChild(shape, PhysicsScene2DEntity::ENTITY_RECT, true);	
 	
 	for(int i=0; i < 200; i++) {
-		shape = new ScreenShape(ScreenShape::SHAPE_RECT, 20,5);
-		shape->setRotation(rand() % 360);
-		shape->setPosition(rand() % 640, rand() % 300);
-		screen->addPhysicsChild(shape, PhysicsScreenEntity::ENTITY_RECT, false);		
+		shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 20,5);
+		shape->setRoll(rand() % 360);
+		shape->setPosition(-640/2 + rand() % 640, 480/2 - rand() % 300);
+		scene->addPhysicsChild(shape, PhysicsScene2DEntity::ENTITY_RECT, false);		
 	}
 
 }

Examples/C++/Contents/2DPhysics_CollisionOnly/HelloPolycodeApp.cpp

@@ -7,34 +7,34 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);	
 
-	screen = new PhysicsScreen(10, 50);
+	scene = new PhysicsScene2D(10, 50);
 	
-	checkShape = new ScreenShape(ScreenShape::SHAPE_RECT, 90,10);
-	screen->addCollisionChild(checkShape, PhysicsScreenEntity::ENTITY_RECT);
+	checkShape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 90,10);
+	scene->addCollisionChild(checkShape, PhysicsScene2DEntity::ENTITY_RECT);
 
 	
 	for(int i=0; i < 50; i++) {
-		ScreenShape *shape = new ScreenShape(ScreenShape::SHAPE_RECT, 30,15);
-		shape->setRotation(rand() % 360);
-		shape->setPosition(rand() % 640, rand() % 480);
-		screen->addCollisionChild(shape, PhysicsScreenEntity::ENTITY_RECT);
+		ScenePrimitive *shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 30,15);
+		shape->setRoll(rand() % 360);
+		shape->setPosition(640/2 - rand() % 640, 480/2 - rand() % 480);
+		scene->addCollisionChild(shape, PhysicsScene2DEntity::ENTITY_RECT);
 	}
 	
-	screen->addEventListener(this, PhysicsScreenEvent::EVENT_NEW_SHAPE_COLLISION);	
-	screen->addEventListener(this, PhysicsScreenEvent::EVENT_END_SHAPE_COLLISION);	
+	scene->addEventListener(this, PhysicsScene2DEvent::EVENT_NEW_SHAPE_COLLISION);	
+	scene->addEventListener(this, PhysicsScene2DEvent::EVENT_END_SHAPE_COLLISION);	
 }
 
 void HelloPolycodeApp::handleEvent(Event *e) {
-	if(e->getDispatcher() == screen) {
-		PhysicsScreenEvent *pe = (PhysicsScreenEvent*)e;	
+	if(e->getDispatcher() == scene) {
+		PhysicsScene2DEvent *pe = (PhysicsScene2DEvent*)e;	
 		switch(e->getEventCode()) {
-			case PhysicsScreenEvent::EVENT_NEW_SHAPE_COLLISION:
+			case PhysicsScene2DEvent::EVENT_NEW_SHAPE_COLLISION:
 				if(pe->entity1 == checkShape || pe->entity2 == checkShape) {
 					pe->entity1->setColor(1.0f, 0.0f, 0.0f, 1.0f);
-					pe->entity2->setColor(1.0f, 0.0f, 0.0f, 1.0f);				
+					pe->entity2->setColor(1.0f, 0.0f, 0.0f, 1.0f);
 				}
 			break;
-			case PhysicsScreenEvent::EVENT_END_SHAPE_COLLISION:
+			case PhysicsScene2DEvent::EVENT_END_SHAPE_COLLISION:
 				pe->entity1->setColor(1.0f, 1.0f, 1.0f, 1.0f);
 				pe->entity2->setColor(1.0f, 1.0f, 1.0f, 1.0f);				
 			break;
@@ -49,7 +49,7 @@ HelloPolycodeApp::~HelloPolycodeApp() {
 
 bool HelloPolycodeApp::Update() {
 	Vector2 mouse = core->getInput()->getMousePosition();
-	checkShape->setPosition(mouse.x, mouse.y);
-	checkShape->setRotation(checkShape->getRotation() + (core->getElapsed() * 100));
+	checkShape->setPosition(mouse.x-680/2+20, -mouse.y+480/2);
+	checkShape->setRoll(checkShape->getRoll() + (core->getElapsed() * 100));
     return core->updateAndRender();
 }

Examples/C++/Contents/2DPhysics_CollisionOnly/HelloPolycodeApp.h

@@ -13,6 +13,6 @@ public:
 	
 private:
     Core *core;	
-	PhysicsScreen *screen;
-	ScreenShape *checkShape;
+	PhysicsScene2D *scene;
+	ScenePrimitive *checkShape;
 };

Examples/C++/Contents/2DPhysics_Contacts/HelloPolycodeApp.cpp

@@ -7,27 +7,27 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);	
 
-	screen = new PhysicsScreen(10, 60);		
-	ScreenShape *shape = new ScreenShape(ScreenShape::SHAPE_RECT, 600,30);
+	scene = new PhysicsScene2D(10, 60);		
+	ScenePrimitive *shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 600,30);
 	shape->setColor(0.0,0.0,0.0,1.0);
-	shape->setPosition(640/2, 400);
-	screen->addPhysicsChild(shape, PhysicsScreenEntity::ENTITY_RECT, true);	
+	shape->setPosition(0, -480/2+40);
+	scene->addPhysicsChild(shape, PhysicsScene2DEntity::ENTITY_RECT, true);	
 	
 	for(int i=0; i < 50; i++) {
-		shape = new ScreenShape(ScreenShape::SHAPE_RECT, 20,5);
-		shape->setRotation(rand() % 360);
-		shape->setPosition(rand() % 640, rand() % 300);
-		screen->addPhysicsChild(shape, PhysicsScreenEntity::ENTITY_RECT, false);		
+		shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 20,5);
+		shape->setRoll(rand() % 360);
+		shape->setPosition(-640/2 + rand() % 640, 480/2 - rand() % 300);
+		scene->addPhysicsChild(shape, PhysicsScene2DEntity::ENTITY_RECT, false);		
 	}
 	collisionSound = new Sound("Resources/hit.wav");
-	screen->addEventListener(this, PhysicsScreenEvent::EVENT_SOLVE_SHAPE_COLLISION);
+	scene->addEventListener(this, PhysicsScene2DEvent::EVENT_SOLVE_SHAPE_COLLISION);
 }
 
 void HelloPolycodeApp::handleEvent(Event *e) {
-	if(e->getDispatcher() == screen) {
+	if(e->getDispatcher() == scene) {
 		switch(e->getEventCode()) {
-			case PhysicsScreenEvent::EVENT_SOLVE_SHAPE_COLLISION:
-				PhysicsScreenEvent *pe = (PhysicsScreenEvent*)e;
+			case PhysicsScene2DEvent::EVENT_SOLVE_SHAPE_COLLISION:
+				PhysicsScene2DEvent *pe = (PhysicsScene2DEvent*)e;
 				if(pe->impactStrength > 5)
 					collisionSound->Play();
 			break;

Examples/C++/Contents/2DPhysics_Contacts/HelloPolycodeApp.h

@@ -15,5 +15,5 @@ public:
 private:
     Core *core;	
 	Sound *collisionSound;
-	PhysicsScreen *screen;	
+	PhysicsScene2D *scene;	
 };

Examples/C++/Contents/2DPhysics_Joints/HelloPolycodeApp.cpp

@@ -4,42 +4,42 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 
 	core = new POLYCODE_CORE(view, 640,480,false,false,0,0,90);
 
-	PhysicsScreen *screen = new PhysicsScreen(10, 50);
+	PhysicsScene2D *scene = new PhysicsScene2D(10, 50);
 
-	ScreenShape *ceiling = new ScreenShape(ScreenShape::SHAPE_RECT, 640, 20);
+	ScenePrimitive *ceiling = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 640, 20);
 	ceiling->setColor(0.0, 0.0, 0.0, 1.0);
-	ceiling->setPosition(640/2, 10);
-	screen->addPhysicsChild(ceiling, PhysicsScreenEntity::ENTITY_RECT, true);
+	ceiling->setPosition(0, 480/2-10);
+	scene->addPhysicsChild(ceiling, PhysicsScene2DEntity::ENTITY_RECT, true);
 	
 	// Revolute Joint	
-	ScreenShape *shape = new ScreenShape(ScreenShape::SHAPE_RECT, 10, 30);
-	shape->setPosition(150, 20+15);
-	screen->addPhysicsChild(shape, PhysicsScreenEntity::ENTITY_RECT, false);
-	screen->createRevoluteJoint(shape, ceiling, 0, -15);
-	screen->applyImpulse(shape, 10, 0);
+	ScenePrimitive *shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 10, 30);
+	shape->setPosition(-170, 205);
+	scene->addPhysicsChild(shape, PhysicsScene2DEntity::ENTITY_RECT, false);
+	scene->createRevoluteJoint(shape, ceiling, -640/2, 255);
+	scene->applyImpulse(shape, 10, 0);
 	
 	// Distance Joint	
-	shape = new ScreenShape(ScreenShape::SHAPE_RECT, 10, 30);
-	shape->setPosition(250, 20+25);
-	screen->addPhysicsChild(shape, PhysicsScreenEntity::ENTITY_RECT, false);
-	screen->createDistanceJoint(shape, ceiling, false);
-	screen->applyImpulse(shape, 200, 0);
+	shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 10, 30);
+	shape->setPosition(-70, 195);
+	scene->addPhysicsChild(shape, PhysicsScene2DEntity::ENTITY_RECT, false);
+	scene->createDistanceJoint(shape, ceiling, false);
+	scene->applyImpulse(shape, 200, 0);
 	
-	ScreenLine *line = new ScreenLine(shape, ceiling);
+	SceneLine *line = new SceneLine(shape, ceiling);
 	line->setColor(1.0, 0.0, 0.0, 1.0);
-	screen->addChild(line);
+	scene->addChild(line);
 
 	// Prismatic Joint	
-	shape = new ScreenShape(ScreenShape::SHAPE_RECT, 10, 30);
-	shape->setPosition(450, 20+25);
-	screen->addPhysicsChild(shape, PhysicsScreenEntity::ENTITY_RECT, false);
-	screen->createPrismaticJoint(ceiling, shape, Vector2(0,1), 0,0, false, 100, 0, true);
-
-	ScreenEntity *lineAnchor = new ScreenEntity();
-	lineAnchor->setPosition(450,10);
-	line = new ScreenLine(shape, lineAnchor);
+	shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 10, 30);
+	shape->setPosition(130, 45);
+	scene->addPhysicsChild(shape, PhysicsScene2DEntity::ENTITY_RECT, false);
+	scene->createPrismaticJoint(ceiling, shape, Vector2(0,1), 0,0, false, 100, 0, true);
+
+	SceneEntity *lineAnchor = new SceneEntity();
+	lineAnchor->setPosition(130,480/2-10);
+	line = new SceneLine(shape, lineAnchor);
 	line->setColor(0.0, 1.0, 0.0, 1.0);
-	screen->addChild(line);
+	scene->addChild(line);
 }
 
 HelloPolycodeApp::~HelloPolycodeApp() {

Examples/C++/Contents/2DPhysics_PointCollision/HelloPolycodeApp.cpp

@@ -7,14 +7,14 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);	
 
-	screen = new PhysicsScreen(0.5, 50);
+	scene = new PhysicsScene2D(0.5, 50);
 	lastEntity = NULL;
 	
 	for(int i=0; i < 50; i++) {
-		ScreenShape *shape = new ScreenShape(ScreenShape::SHAPE_RECT, 30,15);
-		shape->setRotation(rand() % 360);
-		shape->setPosition(rand() % 640, rand() % 480);
-		screen->addCollisionChild(shape, PhysicsScreenEntity::ENTITY_RECT);
+		ScenePrimitive *shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 30,15);
+		shape->setRoll(rand() % 360);
+		shape->setPosition(-640/2 + rand() % 640, 480/2 - rand() % 480);
+		scene->addCollisionChild(shape, PhysicsScene2DEntity::ENTITY_RECT);
 	}
 	
 }
@@ -28,7 +28,7 @@ bool HelloPolycodeApp::Update() {
 	if(lastEntity)
 		lastEntity->setColor(1.0, 1.0, 1.0, 1.0);	
 	Vector2 mouse = core->getInput()->getMousePosition();
-	ScreenEntity * entity = screen->getEntityAtPosition(mouse.x, mouse.y);
+	SceneEntity * entity = scene->getEntityAtPosition(mouse.x-680/2+20, -mouse.y+480/2);
 	if(entity) {
 		entity->setColor(1.0, 0.0, 0.0, 1.0);
 		lastEntity = entity;

Examples/C++/Contents/2DPhysics_PointCollision/HelloPolycodeApp.h

@@ -12,6 +12,6 @@ public:
 	
 private:
 	Core *core;	
-	PhysicsScreen *screen;
-	ScreenEntity *lastEntity;
+	PhysicsScene2D *scene;
+	SceneEntity *lastEntity;
 };

Examples/C++/Contents/2DShapes/HelloPolycodeApp.cpp

@@ -7,27 +7,27 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 	
-	Screen *screen = new Screen();
+	Scene *scene = new Scene(Scene::SCENE_2D_TOPLEFT);
 
-	ScreenShape *shape = new ScreenShape(ScreenShape::SHAPE_RECT, 100,100);
+	ScenePrimitive *shape = new ScenePrimitive(ScenePrimitive::TYPE_VPLANE, 100,100);
 	shape->setColor(1.0, 0.0, 0.0, 1.0);
 	shape->setPosition(150,240);
-	screen->addChild(shape);
+	scene->addChild(shape);
 
-	shape = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 100,100);
+	shape = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 100,100,100);
 	shape->setColor(0.0, 1.0, 0.0, 1.0);
 	shape->setPosition(260,240);
-	screen->addChild(shape);
+	scene->addChild(shape);
 
-	shape = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 100,100,3);
+	shape = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 100,100,3);
 	shape->setColor(1.0, 0.0, 1.0, 1.0);
 	shape->setPosition(350,240);
-	screen->addChild(shape);
+	scene->addChild(shape);
 
-	shape = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 100,100,6);
+	shape = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 100,100,6);
 	shape->setColor(0.0, 1.0, 1.0, 1.0);
 	shape->setPosition(460,240);
-	screen->addChild(shape);
+	scene->addChild(shape);
 }
 
 bool HelloPolycodeApp::Update() {

Examples/C++/Contents/2DTransforms/HelloPolycodeApp.cpp

@@ -7,13 +7,12 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *screen = new Screen();			
+	Scene *scene = new Scene(Scene::SCENE_2D_TOPLEFT);			
 	for(Number i=0; i < 10; i++) {
-		ScreenImage *image = new ScreenImage("Resources/polycode_logo.png");
-		screen->addChild(image);	
+		SceneImage *image = new SceneImage("Resources/polycode_logo.png");
+		scene->addChild(image);	
 		image->setPosition(160+(42*i), 230);
-		image->setPositionMode(ScreenEntity::POSITION_CENTER);
-		image->setRotation(45*i);
+		image->setRoll(45*i);
 		image->setScale(1.0-(0.1*i),1.0-(0.1*i));
 	}
 }

Examples/C++/Contents/3DAudio/HelloPolycodeApp.cpp

@@ -18,7 +18,7 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	sourceEntity->addChild(soundShape);	
 	scene->addEntity(sourceEntity);
 	
-	SceneLight *light = new SceneLight(SceneLight::AREA_LIGHT, scene, 1000);
+	SceneLight *light = new SceneLight(SceneLight::POINT_LIGHT, scene, 1000);
 	scene->addLight(light);
 
 	SceneSoundListener *soundListener = new SceneSoundListener();

Examples/C++/Contents/3DMeshParticles/HelloPolycodeApp.cpp

@@ -21,34 +21,31 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	mesh->createTorus(0.3,0.2,10,10);
 
 	
-	SceneParticleEmitter *emitter = new SceneParticleEmitter("Default", 
-		Particle::MESH_PARTICLE, ParticleEmitter::CONTINUOUS_EMITTER, 4, 100,
-		Vector3(0.0,1.0,0.0), Vector3(0.0,0.0,0.0), Vector3(0.3, 0.0, 0.3),
-		Vector3(1.5,1.5,1.5), mesh);
+	SceneParticleEmitter *emitter = new SceneParticleEmitter(100,50,2);
 			
-	emitter->useScaleCurves = true;
+	emitter->useScaleCurve = true;
 	emitter->scaleCurve.addControlPoint2d(0, 0.1);
 	emitter->scaleCurve.addControlPoint2d(0.5, 0.3);
 	emitter->scaleCurve.addControlPoint2d(1, 0);	
 	
 	scene->addEntity(emitter);	
 
-	SceneLight *light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	SceneLight *light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(3,2,3);
 	light->setLightColor(1,0,0);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(-3,2,3);
 	light->setLightColor(0,1,0);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(-3,2,-3);
 	light->setLightColor(0,0,1);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(3,2,-3);
 	light->setLightColor(1,0,1);
 	scene->addLight(light);

Examples/C++/Contents/3DParticles/HelloPolycodeApp.cpp

@@ -16,35 +16,32 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	scene->getDefaultCamera()->setPosition(7,7,7);
 	scene->getDefaultCamera()->lookAt(Vector3(0,0,0));	
 	
-	SceneParticleEmitter *emitter = new SceneParticleEmitter("TestParticle", 
-		Particle::BILLBOARD_PARTICLE, ParticleEmitter::CONTINUOUS_EMITTER, 4, 200,
-		Vector3(0.0,1.0,0.0), Vector3(0.0,0.0,0.0), Vector3(0.3, 0.0, 0.3),
-		Vector3(1.5,1.5,1.5));		
+	SceneParticleEmitter *emitter = new SceneParticleEmitter(100,10,3);		
 
 	
-	emitter->useScaleCurves = true;
+	emitter->useScaleCurve = true;
 	emitter->scaleCurve.addControlPoint2d(0, 0.1);
 	emitter->scaleCurve.addControlPoint2d(0.5, 0.3);
 	emitter->scaleCurve.addControlPoint2d(1, 0);	
 	
 	scene->addEntity(emitter);	
 
-	SceneLight *light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	SceneLight *light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(3,2,3);
 	light->setLightColor(1,0,0);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(-3,2,3);
 	light->setLightColor(0,1,0);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(-3,2,-3);
 	light->setLightColor(0,0,1);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(3,2,-3);
 	light->setLightColor(1,0,1);
 	scene->addLight(light);

Examples/C++/Contents/3DPhysics_Character/HelloPolycodeApp.cpp

@@ -7,11 +7,12 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *hud = new Screen();
-	onGroundLabel = new ScreenLabel("Arrow keys to control, spacebar to jump, press R to reset", 16);
+	Scene *hud = new Scene(Scene::SCENE_2D);
+	onGroundLabel = new SceneLabel("Arrow keys to control, spacebar to jump, press R to reset", 16);
+	onGroundLabel->setPosition(-85,230);
 	hud->addChild(onGroundLabel);	
-	onGroundLabel = new ScreenLabel("On Ground:", 16);
-	onGroundLabel->setPosition(0,20);
+	onGroundLabel = new SceneLabel("On Ground:", 16);
+	onGroundLabel->setPosition(-280,215);
 	hud->addChild(onGroundLabel);
 	
 

Examples/C++/Contents/3DPhysics_Character/HelloPolycodeApp.h

@@ -16,7 +16,7 @@ private:
 	PhysicsScene *scene;	
 	PhysicsCharacter *playerController;
 	ScenePrimitive *player;
-	ScreenLabel *onGroundLabel;	
+	SceneLabel *onGroundLabel;	
 	Number walkSpeed;
 	Number rotateSpeed;
 	Number playerDirection;

Examples/C++/Contents/3DPhysics_CollisionOnly/HelloPolycodeApp.cpp

@@ -16,13 +16,13 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	box = new ScenePrimitive(ScenePrimitive::TYPE_BOX, 0.5,0.5,0.5);
 	box->loadTexture("Resources/pink_texture.png");
 	box->setPosition(0,1,0);
-	scene->addCollisionChild(box, CollisionSceneEntity::SHAPE_BOX);
+	scene->addCollisionChild(box, CollisionEntity::SHAPE_BOX);
 
 	bigBox = new ScenePrimitive(ScenePrimitive::TYPE_BOX, 2,2,2);
 	bigBox->loadTexture("Resources/pink_texture.png");
 	bigBox->setColor(0.0,1.0,1.0,0.5);
 	bigBox->setPosition(0,1,0);
-	scene->addCollisionChild(bigBox, CollisionSceneEntity::SHAPE_BOX);
+	scene->addCollisionChild(bigBox, CollisionEntity::SHAPE_BOX);
 
 	
 	scene->getDefaultCamera()->setPosition(7,7,7);

Examples/C++/Contents/3DPhysics_RayTest/HelloPolycodeApp.cpp

@@ -7,8 +7,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *hud = new Screen();
-	ScreenLabel *label = new ScreenLabel("Click on a shape to select it.", 16);
+	Scene *hud = new Scene(Scene::SCENE_2D);
+	SceneLabel *label = new SceneLabel("Click on a shape to select it.", 16);
+	label->setPosition(-640/2+120,480/2-10);
 	hud->addChild(label);	
 
 	scene = new CollisionScene();
@@ -20,17 +21,17 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	box = new ScenePrimitive(ScenePrimitive::TYPE_BOX, 1,1,1);
 	box->loadTexture("Resources/pink_texture.png");
 	box->setPosition(0,1,0);
-	scene->addCollisionChild(box, CollisionSceneEntity::SHAPE_MESH);
+	scene->addCollisionChild(box, CollisionEntity::SHAPE_MESH);
 
 	box = new ScenePrimitive(ScenePrimitive::TYPE_CONE, 1,1,10);
 	box->loadTexture("Resources/pink_texture.png");
 	box->setPosition(1,1,2);
-	scene->addCollisionChild(box, CollisionSceneEntity::SHAPE_CONE);
+	scene->addCollisionChild(box, CollisionEntity::SHAPE_CONE);
 
 	box = new ScenePrimitive(ScenePrimitive::TYPE_CYLINDER, 2,0.5,10);
 	box->loadTexture("Resources/pink_texture.png");
 	box->setPosition(2,1,-1);
-	scene->addCollisionChild(box, CollisionSceneEntity::SHAPE_CYLINDER);
+	scene->addCollisionChild(box, CollisionEntity::SHAPE_CYLINDER);
 
 	
 	scene->getDefaultCamera()->setPosition(7,7,7);
@@ -49,7 +50,7 @@ void HelloPolycodeApp::handleEvent(Event *e) {
 		InputEvent *inputEvent = (InputEvent*)e;
 		switch(e->getEventCode()) {
 			case InputEvent::EVENT_MOUSEDOWN:
-				Vector3 dir = CoreServices::getInstance()->getRenderer()->projectRayFrom2DCoordinate(inputEvent->mousePosition.x, inputEvent->mousePosition.y);
+				Vector3 dir = CoreServices::getInstance()->getRenderer()->projectRayFrom2DCoordinate(inputEvent->mousePosition.x, inputEvent->mousePosition.y, CoreServices::getInstance()->getRenderer()->getCameraMatrix(), CoreServices::getInstance()->getRenderer()->getProjectionMatrix(),CoreServices::getInstance()->getRenderer()->getViewport());
 				RayTestResult res = scene->getFirstEntityInRay(scene->getDefaultCamera()->getPosition(), dir * 1000);				
 
 				if(lastEntity) {

Examples/C++/Contents/3DPhysics_Vehicle/HelloPolycodeApp.cpp

@@ -7,9 +7,10 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *hud = new Screen();
+	Scene *hud = new Scene(Scene::SCENE_2D);
 	
-	onGroundLabel = new ScreenLabel("Arrow keys to control, spacebar to brake, press R to reset car", 16);
+	onGroundLabel = new SceneLabel("Arrow keys to control, spacebar to brake, press R to reset car", 16);
+	onGroundLabel->setPosition(-70,230);
 	hud->addChild(onGroundLabel);	
 	
 	scene = new PhysicsScene();

Examples/C++/Contents/3DPhysics_Vehicle/HelloPolycodeApp.h

@@ -17,7 +17,7 @@ private:
 	PhysicsVehicle *vehicleController;
 	ScenePrimitive *testBox;
 	ScenePrimitive *vehicle;	
-	ScreenLabel *onGroundLabel;	
+	SceneLabel *onGroundLabel;	
 	Number steeringValue;
 	Number engineForce;
 	bool breaking;

Examples/C++/Contents/AdvancedLighting/HelloPolycodeApp.cpp

@@ -18,22 +18,22 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	box->setPosition(0.0, 0.5, 0.0);
 	scene->addEntity(box);
 	
-	SceneLight *light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	SceneLight *light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(3,2,3);
 	light->setLightColor(1,0,0);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(-3,2,3);
 	light->setLightColor(0,1,0);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(-3,2,-3);
 	light->setLightColor(0,0,1);
 	scene->addLight(light);
 
-	light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(3,2,-3);
 	light->setLightColor(1,0,1);
 	scene->addLight(light);

Examples/C++/Contents/BasicImage/HelloPolycodeApp.cpp

@@ -7,9 +7,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *screen = new Screen();			
-	ScreenImage *image = new ScreenImage("Resources/polycode_logo.png");
-	screen->addChild(image);	
+	Scene *scene = new Scene(Scene::SCENE_2D);			
+	SceneImage *image = new SceneImage("Resources/polycode_logo.png");
+	scene->addChild(image);	
 }
 
 HelloPolycodeApp::~HelloPolycodeApp() {

Examples/C++/Contents/BasicLighting/HelloPolycodeApp.cpp

@@ -18,7 +18,7 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	box->setPosition(0.0, 0.5, 0.0);
 	scene->addEntity(box);
 	
-	SceneLight *light = new SceneLight(SceneLight::AREA_LIGHT, scene, 5);
+	SceneLight *light = new SceneLight(SceneLight::POINT_LIGHT, scene, 5);
 	light->setPosition(1,2,1);
 	scene->addLight(light);
 

Examples/C++/Contents/BasicText/HelloPolycodeApp.cpp

@@ -7,9 +7,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *screen = new Screen();
-	ScreenLabel *label = new ScreenLabel("Hello, Polycode!", 32);
-	screen->addChild(label);
+	Scene *scene = new Scene(Scene::SCENE_2D);
+	SceneLabel *label = new SceneLabel("Hello, Polycode!", 32);
+	scene->addChild(label);
 }
 
 HelloPolycodeApp::~HelloPolycodeApp() {

Examples/C++/Contents/EventHandling/HelloPolycodeApp.cpp

@@ -10,9 +10,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	rotateTimer = new Timer(true, 1000);
 	rotateTimer->addEventListener(this, Timer::EVENT_TRIGGER);
 
-	Screen *screen = new Screen();			
-	image = new ScreenImage("Resources/polycode_logo.png");
-	screen->addChild(image);	
+	Scene *scene = new Scene(Scene::SCENE_2D);			
+	image = new SceneImage("Resources/polycode_logo.png");
+	scene->addChild(image);	
 }
 
 HelloPolycodeApp::~HelloPolycodeApp() {
@@ -20,7 +20,7 @@ HelloPolycodeApp::~HelloPolycodeApp() {
 
 void HelloPolycodeApp::handleEvent(Event *e) {
 	if(e->getDispatcher() == rotateTimer && e->getEventCode() == Timer::EVENT_TRIGGER) {
-		image->setRotation(image->getRotation() + 90);
+		image->setRoll(image->getRoll() + 90);
 	}
 }
 

Examples/C++/Contents/EventHandling/HelloPolycodeApp.h

@@ -14,7 +14,7 @@ public:
     
 private:
 
-	ScreenImage *image;
+	SceneImage *image;
 	Core *core;
 	Timer *rotateTimer;	
 };

Examples/C++/Contents/KeyboardInput/HelloPolycodeApp.cpp

@@ -7,11 +7,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *screen = new Screen();			
-	image = new ScreenImage("Resources/polycode_logo.png");
-	image->setPositionMode(ScreenEntity::POSITION_CENTER);
-	image->setPosition(640/2, 480/2);
-	screen->addChild(image);	
+	Scene *scene = new Scene(Scene::SCENE_2D);			
+	image = new SceneImage("Resources/polycode_logo.png");
+	scene->addChild(image);	
 	
 	rotationSpeed = 0;
 	core->getInput()->addEventListener(this, InputEvent::EVENT_KEYDOWN);
@@ -30,10 +28,10 @@ void HelloPolycodeApp::handleEvent(Event *e) {
 			case InputEvent::EVENT_KEYDOWN:
 				switch (inputEvent->keyCode()) {
 					case KEY_LEFT:
-						rotationSpeed = -200;
+						rotationSpeed = 200;
 					break;
 					case KEY_RIGHT:
-						rotationSpeed = 200;					
+						rotationSpeed = -200;					
 					break;
 				}
 			break;
@@ -53,7 +51,7 @@ void HelloPolycodeApp::handleEvent(Event *e) {
 bool HelloPolycodeApp::Update() {
 	
 	Number elapsed = core->getElapsed();
-	image->setRotation(image->getRotation() + elapsed * rotationSpeed);
+	image->setRoll(image->getRoll() + elapsed * rotationSpeed);
 	
     return core->updateAndRender();
 }

Examples/C++/Contents/KeyboardInput/HelloPolycodeApp.h

@@ -14,6 +14,6 @@ public:
 private:
 	
 	Number rotationSpeed;
-	ScreenImage *image;
+	SceneImage *image;
     Core *core;
 };

Examples/C++/Contents/MouseInput/HelloPolycodeApp.cpp

@@ -7,10 +7,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *screen = new Screen();			
-	image = new ScreenImage("Resources/polycode_logo.png");
-	image->setPositionMode(ScreenEntity::POSITION_CENTER);
-	screen->addChild(image);	
+	Scene *scene = new Scene(Scene::SCENE_2D);			
+	image = new SceneImage("Resources/polycode_logo.png");
+	scene->addChild(image);	
 	
 	core->getInput()->addEventListener(this, InputEvent::EVENT_MOUSEMOVE);
 	core->getInput()->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
@@ -26,8 +25,8 @@ void HelloPolycodeApp::handleEvent(Event *e) {
 		InputEvent *inputEvent = (InputEvent*)e;
 		switch(e->getEventCode()) {
 			case InputEvent::EVENT_MOUSEMOVE:
-				image->setPosition(inputEvent->mousePosition.x,
-						   inputEvent->mousePosition.y);
+				image->setPosition(inputEvent->mousePosition.x-680/2+20,
+						-inputEvent->mousePosition.y+480/2);
 			break;
 			case InputEvent::EVENT_MOUSEDOWN:
 				image->setColor(1,0,0,1);

Examples/C++/Contents/MouseInput/HelloPolycodeApp.h

@@ -13,6 +13,6 @@ public:
     
 private:
 
-	ScreenImage *image;
+	SceneImage *image;
     Core *core;
 };

Examples/C++/Contents/Networking_Client/HelloPolycodeApp.cpp

@@ -7,15 +7,15 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	gameScreen = new Screen();	
+	gameScene = new Scene(Scene::SCENE_2D);	
 
-	Screen *hudScreen = new Screen();
-	ScreenLabel *label = new ScreenLabel("Example client.  Press escape to exit.", 16);
-	hudScreen->addChild(label);
+	Scene *hudScene = new Scene(Scene::SCENE_2D);
+	SceneLabel *label = new SceneLabel("Example client.  Press escape to exit.", 16);
+	hudScene->addChild(label);
 	
-	motdLabel =  new ScreenLabel("", 16);
-	motdLabel->setPosition(0, 20);
-	hudScreen->addChild(motdLabel);
+	motdLabel =  new SceneLabel("", 16);
+	motdLabel->setPosition(0, -480/2+20);
+	hudScene->addChild(motdLabel);
 		
 	client = new Client(6543, 50);
 	client->setPersistentData(&clientData, sizeof(ClientData));
@@ -38,13 +38,11 @@ void HelloPolycodeApp::createClientPlayer(int clientID) {
 	ClientPlayer *player = new ClientPlayer();
 	player->clientID = clientID;
 	
-	ScreenEntity *playerEntity = new ScreenEntity();				
-	playerEntity->setPositionMode(ScreenEntity::POSITION_CENTER);
-	ScreenShape *playerBody = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 30,30,3);				
-	playerBody->setRotation(-90.0);	
+	SceneEntity *playerEntity = new SceneEntity();				
+	ScenePrimitive *playerBody = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 30,30,3);				
+	playerBody->setRoll(-90.0);	
 	playerEntity->addChild(playerBody);
-	playerEntity->setPosition(640/2,480/2);
-	gameScreen->addChild(playerEntity);
+	gameScene->addChild(playerEntity);
 	player->playerEntity = playerEntity;												
 	
 	player->state = 0;
@@ -108,7 +106,7 @@ void HelloPolycodeApp::handleEvent(Event *event) {
 							for(int j=0; j < MAX_PLAYERS; j++) {
 								if(clientPlayer->clientID == serverState->players[j].clientID && serverState->players[j].state != 0) {
 									clientPlayer->playerEntity->setPosition(serverState->players[j].posX, serverState->players[j].posY);
-									clientPlayer->playerEntity->setRotation(serverState->players[j].angle);								
+									clientPlayer->playerEntity->setRoll(serverState->players[j].angle);								
 								}
 							}							
 						}

Examples/C++/Contents/Networking_Client/HelloPolycodeApp.h

@@ -8,7 +8,7 @@ class ClientPlayer {
 	public:
 		int clientID;
 		char state;
-		ScreenEntity *playerEntity;
+		SceneEntity *playerEntity;
 };
 
 class HelloPolycodeApp : public EventHandler {
@@ -22,12 +22,12 @@ public:
     
 private:
 	Core *core;
-	Screen *gameScreen;
+	Scene *gameScene;
 	Client *client;
 	ClientData clientData;
 	char state;
 	
-	ScreenLabel *motdLabel;	
+	SceneLabel *motdLabel;	
 	
 	vector<ClientPlayer*> players;
 };

Examples/C++/Contents/Networking_Server/HelloPolycodeApp.cpp

@@ -10,11 +10,11 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : ServerWorld(), EventHan
 	memset(serverInfo.motd, 0, 256);
 	strcat(serverInfo.motd, "MOTD : ** Welcome to the Network Example server! **");
 
-	gameScreen = new Screen();	
+	gameScene = new Scene(Scene::SCENE_2D);	
 
-	Screen *hudScreen = new Screen();
-	infoLabel = new ScreenLabel("Example server. [0 Players]", 32);
-	hudScreen->addChild(infoLabel);
+	Scene *hudScene = new Scene(Scene::SCENE_2D);
+	infoLabel = new SceneLabel("Example server. [0 Players]", 32);
+	hudScene->addChild(infoLabel);
 	
 	server = new Server(52345, 50, this);
 	
@@ -42,10 +42,10 @@ void HelloPolycodeApp::updateWorld(Number elapsed) {
 				player->rotateSpeed = 0;
 			break;			
 			case TURNING_LEFT:
-				player->rotateSpeed = -100;			
+				player->rotateSpeed = 100;			
 			break;
 			case TURNING_RIGHT:
-				player->rotateSpeed = 100;			
+				player->rotateSpeed = -100;			
 			break;
 			
 		}
@@ -57,7 +57,7 @@ void HelloPolycodeApp::updateWorld(Number elapsed) {
 	
 		// update the server display
 		player->playerEntity->setPosition(player->position.x, player->position.y);
-		player->playerEntity->setRotation(player->angle);
+		player->playerEntity->setRoll(player->angle);
 
 										
 	}
@@ -119,7 +119,7 @@ void HelloPolycodeApp::handleEvent(Event *event) {
 						Player *player = players[i];
 						players.erase(players.begin()+i);						
 						
-						gameScreen->removeChild(player->playerEntity);
+						gameScene->removeEntity(player->playerEntity);
 						delete player->playerEntity;
 						delete player;
 					}
@@ -134,13 +134,11 @@ void HelloPolycodeApp::handleEvent(Event *event) {
 				newPlayer->position.y = 480/2;				
 				newPlayer->client = serverEvent->client;												
 				newPlayer->client->addEventListener(this, ServerClientEvent::EVENT_CLIENT_DATA);					
-				ScreenEntity *playerEntity = new ScreenEntity();				
-				playerEntity->setPositionMode(ScreenEntity::POSITION_CENTER);
-				ScreenShape *playerBody = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 30,30,3);				
-				playerBody->setRotation(-90.0);
+				SceneEntity *playerEntity = new SceneEntity();				
+				ScenePrimitive *playerBody = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 30,30,3);				
+				playerBody->setRoll(-90.0);
 				playerEntity->addChild(playerBody);
-				playerEntity->setPosition(640/2,480/2);
-				gameScreen->addChild(playerEntity);
+				gameScene->addChild(playerEntity);
 				newPlayer->playerEntity = playerEntity;												
 				players.push_back(newPlayer);
 				printf("Player connected\n");

Examples/C++/Contents/Networking_Server/HelloPolycodeApp.h

@@ -8,7 +8,7 @@ class Player {
 	public:		
 		Vector2 position;
 		Number angle;
-		ScreenEntity *playerEntity;
+		SceneEntity *playerEntity;
 		ServerClient *client;
 		char turning_state;
 		char thrusting;
@@ -41,8 +41,8 @@ public:
     
 private:
 	Core *core;
-	Screen *gameScreen;
-	ScreenLabel *infoLabel;
+	Scene *gameScene;
+	SceneLabel *infoLabel;
 	Server *server;
 	vector<Player*> players;
 	ServerState serverState;

Examples/C++/Contents/PlayingSounds/HelloPolycodeApp.cpp

@@ -7,9 +7,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 	
-	Screen *screen = new Screen();
-	ScreenLabel *label = new ScreenLabel("Click anywhere to play a sound!", 32);
-	screen->addChild(label);
+	Scene *scene = new Scene();
+	SceneLabel *label = new SceneLabel("Click anywhere to play a sound!", 32);
+	scene->addChild(label);
 		
 	core->getInput()->addEventListener(this, InputEvent::EVENT_MOUSEDOWN);
 	testSound = new Sound("Resources/test.wav");

Examples/C++/Contents/ScreenEntities/HelloPolycodeApp.cpp → Examples/C++/Contents/SceneEntities/HelloPolycodeApp.cpp

@@ -7,26 +7,25 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *screen = new Screen();			
-	sun = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 100,100, 30);
-	sun->setPosition(640/2, 480/2);
+	Scene *scene = new Scene(Scene::SCENE_2D);			
+	sun = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 100,100, 30);
 	sun->setColor(0.9, 0.8, 0, 1); 
 	sun->colorAffectsChildren = false;		
-	screen->addChild(sun);		
+	scene->addChild(sun);
 	
-	planet = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 50,50, 30);
+	planet = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 50,50, 30);
 	planet->setPosition(150,0);
 	planet->setColor(0.2, 0.8, 0, 1); 
 	planet->colorAffectsChildren = false;
-	sun->addChild(planet);		
+	sun->addChild(planet);
 
-	moon = new ScreenShape(ScreenShape::SHAPE_CIRCLE, 20,20, 30);
+	moon = new ScenePrimitive(ScenePrimitive::TYPE_CIRCLE, 20,20, 30);
 	moon->setPosition(50,0);
-	moon->setColor(1, 1, 0.6, 1); 
-	planet->addChild(moon);		
+	moon->setColor(1, 1, 0.6, 1);
+	planet->addChild(moon);
 	
-	planetRotation = 0;
-	moonRotation = 0;	
+	planetRoll = 0;
+	moonRoll = 0;	
 	
 }
 
@@ -35,10 +34,10 @@ HelloPolycodeApp::~HelloPolycodeApp() {
 
 bool HelloPolycodeApp::Update() {
 	Number elapsed = core->getElapsed();
-	planetRotation += elapsed ;
-	moonRotation += elapsed * 6;	
-	planet->setPosition(cosf(planetRotation)*150, sinf(planetRotation)*150);
-	moon->setPosition(cosf(moonRotation)*50, sinf(moonRotation)*50);
+	planetRoll += elapsed ;
+	moonRoll += elapsed * 6;	
+	planet->setPosition(cosf(planetRoll)*150, sinf(planetRoll)*150);
+	moon->setPosition(cosf(moonRoll)*50, sinf(moonRoll)*50);
 		
     return core->updateAndRender();
 }

Examples/C++/Contents/ScreenEntities/HelloPolycodeApp.h → Examples/C++/Contents/SceneEntities/HelloPolycodeApp.h

@@ -12,12 +12,12 @@ public:
     
 private:
 
-	ScreenShape *sun;
-	ScreenShape *planet;
-	ScreenShape *moon;	
+	ScenePrimitive *sun;
+	ScenePrimitive *planet;
+	ScenePrimitive *moon;	
 	
-	Number planetRotation;
-	Number moonRotation;
+	Number planetRoll;
+	Number moonRoll;
 			
     Core *core;
 };

Examples/C++/Contents/ScreenSprites/HelloPolycodeApp.cpp → Examples/C++/Contents/SceneSprites/HelloPolycodeApp.cpp

@@ -8,11 +8,10 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
 	CoreServices::getInstance()->getRenderer()->setTextureFilteringMode(Renderer::TEX_FILTERING_NEAREST);
-	Screen *screen = new Screen();
-	ScreenSprite *sprite = new ScreenSprite("Resources/sprite_sheet.png", 93, 78);
-	sprite->setPosition(350,150);
+	Scene *scene = new Scene(Scene::SCENE_2D);
+	SceneSprite *sprite = new SceneSprite("Resources/sprite_sheet.png", 93, 78);
 	sprite->setScale(7,7);
-	screen->addChild(sprite);
+	scene->addChild(sprite);
 	sprite->addAnimation("ExampleAnimation", "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,29,29,29,29,29,29,29,29,29", 0.03);
 	sprite->playAnimation("ExampleAnimation", 0, false);
 }

Examples/C++/Contents/SkeletalAnimation/HelloPolycodeApp.cpp

@@ -15,7 +15,7 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) : EventHandler() {
 	scene->addEntity(mesh);
 	mesh->loadSkeleton("Resources/ninja.skeleton");
 	mesh->getSkeleton()->addAnimation("Run", "Resources/run.anim");
-	mesh->getSkeleton()->playAnimation("Run");
+	mesh->getSkeleton()->playAnimationByName("Run");
 
 	scene->getDefaultCamera()->setPosition(25,25,25);
 	scene->getDefaultCamera()->lookAt(Vector3(0,0,0));	

Examples/C++/Contents/UpdateLoop/HelloPolycodeApp.cpp

@@ -7,9 +7,9 @@ HelloPolycodeApp::HelloPolycodeApp(PolycodeView *view) {
 	CoreServices::getInstance()->getResourceManager()->addArchive("Resources/default.pak");
 	CoreServices::getInstance()->getResourceManager()->addDirResource("default", false);
 
-	Screen *screen = new Screen();			
-	image = new ScreenImage("Resources/polycode_logo.png");
-	screen->addChild(image);	
+	Scene *scene = new Scene(Scene::SCENE_2D);			
+	image = new SceneImage("Resources/polycode_logo.png");
+	scene->addChild(image);	
 }
 
 HelloPolycodeApp::~HelloPolycodeApp() {
@@ -17,6 +17,6 @@ HelloPolycodeApp::~HelloPolycodeApp() {
 
 bool HelloPolycodeApp::Update() {
 	Number elapsed = core->getElapsed();
-	image->setRotation(image->getRotation()+(elapsed*100));
+	image->setRoll(image->getRoll()+(elapsed*100));
     return core->updateAndRender();
 }

Examples/C++/Contents/UpdateLoop/HelloPolycodeApp.h

@@ -12,6 +12,6 @@ public:
     
 private:
 
-	ScreenImage *image;
+	SceneImage *image;
 	Core *core;
 };