Cleaned up code, replaced unnecessary dynamic instances with static classes.

Core/Contents/Include/PolyAGLCore.h

@@ -1,6 +1,6 @@
 /*
  *  PolyAGLCore.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyBasics.h

@@ -1,6 +1,6 @@
 /*
  *  PolyBasics.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyColor.h

@@ -1,6 +1,6 @@
 /*
  *  PolyColor.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyCore.h

@@ -1,6 +1,6 @@
 /*
  *  PolyCore.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyCoreServices.h

@@ -1,6 +1,6 @@
 /*
  *  CoreServices.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyEntity.h

@@ -49,7 +49,7 @@ namespace Polycode {
 			void updateEntityMatrix();
 			void renderChildren();		
 
-			Vector3 *getPosition();
+			Vector3 getPosition();
 			void setPosition(Number x, Number y, Number z);
 			
 			void setPositionX(Number x);

Core/Contents/Include/PolyFont.h

@@ -1,6 +1,6 @@
 /*
  *  PolyFont.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyGLRenderer.h

@@ -1,6 +1,6 @@
 /*
  *  PolyGLRenderer.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyGLTexture.h

@@ -1,6 +1,6 @@
 /*
  *  PolyGLTexture.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyGenericScene.h

@@ -1,6 +1,6 @@
 /*
  *  PolyGenericScene.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyGlobals.h

@@ -1,7 +1,7 @@
  
 #pragma once
 
-// TAU CORE LIBRARY CONFIGURATION SECTION
+// Polycode CORE LIBRARY CONFIGURATION SECTION
 
 // Compile support for lua bindings.
 //#define _COMPILE_LUA

Core/Contents/Include/PolyImage.h

@@ -1,6 +1,6 @@
 /*
  *  PolyImage.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 Ivan Safrin. All rights reserved.

Core/Contents/Include/PolyLabel.h

@@ -1,6 +1,6 @@
 /*
  *  PolyLabel.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyMaterialManager.h

@@ -1,6 +1,6 @@
 /*
  *  PolyMaterialManager.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyMatrix4.h

@@ -1,6 +1,6 @@
 /*
  *  PolyMatrix4.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/26/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyMesh.h

@@ -1,6 +1,6 @@
 /*
  *  PolyMesh.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyPolygon.h

@@ -1,6 +1,6 @@
 /*
  *  PolyPolygon.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -40,8 +40,8 @@ namespace Polycode {
 		
 			void addTexCoord(Number u, Number v);
 			void addTexCoord2(Number u, Number v);
-			Vector2 *getTexCoord(int index);
-			Vector2 *getTexCoord2(int index);
+			Vector2 getTexCoord(int index);
+			Vector2 getTexCoord2(int index);
 			void addVertex(Vertex *vertex);
 			Vertex *addVertex(Number x, Number y, Number z, Number u, Number v);
 			void calculateNormal();
@@ -65,9 +65,9 @@ namespace Polycode {
 			bool useFaceUV;
 			unsigned int vertexCount;
 			vector<Vertex*> vertices;
-			vector<Vector2*> texCoords;
-			vector<Vector2*> texCoords2;
-			Vector3			*normal;
+			vector<Vector2> texCoords;
+			vector<Vector2> texCoords2;
+			Vector3			normal;
 	};
 
 }

Core/Contents/Include/PolyQuaternion.h

@@ -1,6 +1,6 @@
 /*
  *  PolyQuaternion.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/26/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyRenderer.h

@@ -1,6 +1,6 @@
 /*
  *  PolyRenderer.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolySDLCore.h

@@ -1,6 +1,6 @@
 /*
  *  PolySDLCore.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyScene.h

@@ -1,6 +1,6 @@
 /*
  *  PolyScene.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolySceneEntity.h

@@ -1,6 +1,6 @@
 /*
  *  PolySceneEntity.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -30,8 +30,6 @@ namespace Polycode {
 			virtual ~SceneEntity();
 		
 			virtual bool testMouseCollision(Number x, Number y) { return false;}
-
-			void ok() { Logger::log("ok!!1\n"); }
 			
 		protected:
 

Core/Contents/Include/PolySceneManager.h

@@ -1,6 +1,6 @@
 /*
  *  PolySceneManager.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolySceneMesh.h

@@ -1,6 +1,6 @@
 /*
  *  PolySceneMesh.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyScreen.h

@@ -1,6 +1,6 @@
 /*
  *  PolyScreen.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 Ivan Safrin. All rights reserved.

Core/Contents/Include/PolyScreenEntity.h

@@ -1,6 +1,6 @@
 /*
  *  PolyScreenEntity.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyScreenImage.h

@@ -1,6 +1,6 @@
 /*
  *  PolyScreenImage.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyScreenLabel.h

@@ -1,6 +1,6 @@
 /*
  *  PolyScreenLabel.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyScreenManager.h

@@ -1,6 +1,6 @@
 /*
  *  ScreenManager.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/15/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyTexture.h

@@ -1,6 +1,6 @@
 /*
  *  PolyTexture.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyVector2.h

@@ -1,6 +1,6 @@
 /*
  *  PolyVector2.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyVector3.h

@@ -1,6 +1,6 @@
 /*
  *  PolyVector3.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Include/PolyVertex.h

@@ -1,6 +1,6 @@
 /*
  *  PolyVertex.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -47,12 +47,12 @@ namespace Polycode {
 			
 			void normalizeWeights();
 			
-			Vector2 *getTexCoord();
+			Vector2 getTexCoord();
 			void setTexCoord(Number u, Number v);
 			void setNormal(Number x, Number y, Number z);
 
 			Vector3 restNormal;
-			Vector3 *normal;
+			Vector3 normal;
 			Vector3 restPosition;
 
 			Color vertexColor;		
@@ -61,7 +61,7 @@ namespace Polycode {
 		private:
 		
 			vector <BoneAssignment*> boneAssignments;
-			Vector2 *texCoord;
+			Vector2 texCoord;
 		
 	};
 }

Core/Contents/Include/Polycode.h

@@ -1,6 +1,6 @@
 /*
  *  Polycode.h
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyAGLCore.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyAGLCore.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyCamera.cpp

@@ -211,7 +211,7 @@ void Camera::buildFrustrumPlanes() {
 }
 
 bool Camera::canSee(SceneEntity *entity) {
-	return isSphereInFrustrum(*entity->getPosition(), entity->getBBoxRadius());
+	return isSphereInFrustrum(entity->getPosition(), entity->getBBoxRadius());
 }
 
 void Camera::setParentScene(Scene *parentScene) {

Core/Contents/Source/PolyColor.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyColor.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyCore.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyCore.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyCoreServices.cpp

@@ -1,6 +1,6 @@
 /*
  *  CoreServices.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyEntity.cpp

@@ -88,9 +88,9 @@ void Entity::lookAt(const Vector3 &loc, const Vector3 &upVector) {
 
 void Entity::lookAtEntity(Entity *entity,  const Vector3 &upVector) {
 	if(entity->getParentEntity())
-		lookAt(entity->getParentEntity()->getConcatenatedMatrix() * (*entity->getPosition()), upVector);		
+		lookAt(entity->getParentEntity()->getConcatenatedMatrix() * (entity->getPosition()), upVector);		
 	else
-		lookAt(*entity->getPosition(), upVector);
+		lookAt(entity->getPosition(), upVector);
 }
 
 void Entity::removeChild(Entity *entityToRemove) {
@@ -290,10 +290,10 @@ void Entity::transformAndRender() {
 		}
 	}
 
-	if(hasMask) {
-		renderer->enableDepthWrite(false);
-		renderer->enableDepthTest(true);		
-	} else {
+//	if(hasMask) {
+//		renderer->enableDepthWrite(false);
+//		renderer->enableDepthTest(true);		
+//	} else {
 	if(!depthWrite)
 		renderer->enableDepthWrite(false);
 	else
@@ -303,7 +303,7 @@ void Entity::transformAndRender() {
 		renderer->enableDepthTest(false);
 	else
 		renderer->enableDepthTest(true);
-	}
+//	}
 		 
 	renderer->enableAlphaTest(alphaTest);
 	
@@ -335,8 +335,8 @@ void Entity::transformAndRender() {
 		renderer->clearBuffer(false, true);
 	}
 	
-//	if(!depthWrite)
-//		renderer->enableDepthWrite(true);
+	if(!depthWrite)
+		renderer->enableDepthWrite(true);
 	
 	
 	if(hasMask) {
@@ -564,8 +564,8 @@ void Entity::setScale(Number x, Number y, Number z) {
 	matrixDirty = true;
 }
 
-Vector3 *Entity::getPosition() {
-	return &position;
+Vector3 Entity::getPosition() {
+	return position;
 }
 
 Number Entity::getCombinedPitch() {

Core/Contents/Source/PolyFont.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyFont.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyGLRenderer.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyGLRenderer.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 Ivan Safrin. All rights reserved.
@@ -774,9 +774,9 @@ RenderDataArray *OpenGLRenderer::createRenderDataArrayForMesh(Mesh *mesh, int ar
 					newBufferSize = bufferSize + 3;			
 					buffer = (GLfloat*)realloc(buffer, newBufferSize * sizeof(GLfloat));		
 					if(mesh->getPolygon(i)->useVertexNormals) {
-						buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->normal->x;
-						buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->normal->y;
-						buffer[bufferSize+2] = mesh->getPolygon(i)->getVertex(j)->normal->z;				
+						buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->normal.x;
+						buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->normal.y;
+						buffer[bufferSize+2] = mesh->getPolygon(i)->getVertex(j)->normal.z;				
 					} else {
 						buffer[bufferSize+0] = mesh->getPolygon(i)->getFaceNormal().x;
 						buffer[bufferSize+1] = mesh->getPolygon(i)->getFaceNormal().y;
@@ -795,11 +795,11 @@ RenderDataArray *OpenGLRenderer::createRenderDataArrayForMesh(Mesh *mesh, int ar
 					newBufferSize = bufferSize + 2;			
 					buffer = (GLfloat*)realloc(buffer, newBufferSize * sizeof(GLfloat));		
 					if(mesh->getPolygon(i)->usesFaceUV()) {															
-						buffer[bufferSize+0] = mesh->getPolygon(i)->getTexCoord(j)->x;							
-						buffer[bufferSize+1] = mesh->getPolygon(i)->getTexCoord(j)->y;											
+						buffer[bufferSize+0] = mesh->getPolygon(i)->getTexCoord(j).x;							
+						buffer[bufferSize+1] = mesh->getPolygon(i)->getTexCoord(j).y;											
 					} else {
-						buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->getTexCoord()->x;											
-						buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->getTexCoord()->y;							
+						buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->getTexCoord().x;											
+						buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->getTexCoord().y;							
 					}
 					bufferSize = newBufferSize;					
 				}		   

Core/Contents/Source/PolyGLTexture.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyGLTexture.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyGLVertexBuffer.cpp

@@ -54,11 +54,11 @@ OpenGLVertexBuffer::OpenGLVertexBuffer(Mesh *mesh) : VertexBuffer() {
 			newBufferSize = bufferSize + 2;			
 			buffer = (GLfloat*)realloc(buffer, newBufferSize * sizeof(GLfloat));		
 			if(mesh->getPolygon(i)->usesFaceUV()) {
-				buffer[bufferSize+0] = mesh->getPolygon(i)->getTexCoord(j)->x;
-				buffer[bufferSize+1] = mesh->getPolygon(i)->getTexCoord(j)->y;
+				buffer[bufferSize+0] = mesh->getPolygon(i)->getTexCoord(j).x;
+				buffer[bufferSize+1] = mesh->getPolygon(i)->getTexCoord(j).y;
 			} else {
-				buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->getTexCoord()->x;
-				buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->getTexCoord()->y;
+				buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->getTexCoord().x;
+				buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->getTexCoord().y;
 			}
 			bufferSize = newBufferSize;					
 		}		   
@@ -80,9 +80,9 @@ OpenGLVertexBuffer::OpenGLVertexBuffer(Mesh *mesh) : VertexBuffer() {
 			newBufferSize = bufferSize + 3;			
 			buffer = (GLfloat*)realloc(buffer, newBufferSize * sizeof(GLfloat));		
 			if(mesh->getPolygon(i)->useVertexNormals) {
-				buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->normal->x;
-				buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->normal->y;
-				buffer[bufferSize+2] = mesh->getPolygon(i)->getVertex(j)->normal->z;				
+				buffer[bufferSize+0] = mesh->getPolygon(i)->getVertex(j)->normal.x;
+				buffer[bufferSize+1] = mesh->getPolygon(i)->getVertex(j)->normal.y;
+				buffer[bufferSize+2] = mesh->getPolygon(i)->getVertex(j)->normal.z;				
 			} else {
 				buffer[bufferSize+0] = mesh->getPolygon(i)->getFaceNormal().x;
 				buffer[bufferSize+1] = mesh->getPolygon(i)->getFaceNormal().y;

Core/Contents/Source/PolyGenericScene.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyGenericScene.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -85,7 +85,7 @@ void GenericScene::Render() {
 			}
 		}
 
-		position = *light->getPosition();
+		position = light->getPosition();
 		if(light->getParentEntity() != NULL) {
 			position = light->getParentEntity()->getConcatenatedMatrix() * position;			
 		}
@@ -101,7 +101,7 @@ void GenericScene::Render() {
 	
 	for(int i=0; i<entities.size();i++) {
 		if(entities[i]->getBBoxRadius() > 0) {
-			if(defaultCamera->isSphereInFrustrum((*entities[i]->getPosition()), entities[i]->getBBoxRadius()))
+			if(defaultCamera->isSphereInFrustrum((entities[i]->getPosition()), entities[i]->getBBoxRadius()))
 				entities[i]->transformAndRender();
 		} else {
 			entities[i]->transformAndRender();		
@@ -133,7 +133,7 @@ void GenericScene::RenderDepthOnly(Camera *targetCamera) {
 	CoreServices::getInstance()->getRenderer()->enableShaders(false);
 	for(int i=0; i<entities.size();i++) {
 		if(entities[i]->getBBoxRadius() > 0) {
-			if(targetCamera->isSphereInFrustrum((*entities[i]->getPosition()), entities[i]->getBBoxRadius()))
+			if(targetCamera->isSphereInFrustrum((entities[i]->getPosition()), entities[i]->getBBoxRadius()))
 				entities[i]->transformAndRender();
 		} else {
 			entities[i]->transformAndRender();		
@@ -390,9 +390,10 @@ SceneEntity *GenericScene::getCustomEntityByType(String type) {
 
 void GenericScene::writeEntityMatrix(SceneEntity *entity, OSFILE *outFile) {
 	Number t[3],rq[4];
-	t[0] = entity->getPosition()->x;
-	t[1] = entity->getPosition()->y;
-	t[2] = entity->getPosition()->z;
+	Vector3 pos = entity->getPosition();
+	t[0] = pos.x;
+	t[1] = pos.y;
+	t[2] = pos.z;
 	
 	rq[0] = entity->getRotationQuat().w;
 	rq[1] = entity->getRotationQuat().x;

Core/Contents/Source/PolyImage.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyImage.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 Ivan Safrin. All rights reserved.

Core/Contents/Source/PolyLabel.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyLabel.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 Ivan Safrin. All rights reserved.

Core/Contents/Source/PolyMaterialManager.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyMaterialManager.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyMatrix4.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyMatrix4.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/26/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyMesh.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyMesh.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -98,17 +98,17 @@ namespace Polycode {
 				pos.y =  polygons[i]->getVertex(j)->y;
 				pos.z =  polygons[i]->getVertex(j)->z;
 
-				nor.x =  polygons[i]->getVertex(j)->normal->x;
-				nor.y =  polygons[i]->getVertex(j)->normal->y;
-				nor.z =  polygons[i]->getVertex(j)->normal->z;
+				nor.x =  polygons[i]->getVertex(j)->normal.x;
+				nor.y =  polygons[i]->getVertex(j)->normal.y;
+				nor.z =  polygons[i]->getVertex(j)->normal.z;
 
 				col.x =  polygons[i]->getVertex(j)->vertexColor.r;
 				col.y =  polygons[i]->getVertex(j)->vertexColor.g;
 				col.z =  polygons[i]->getVertex(j)->vertexColor.b;
 				col.w =  polygons[i]->getVertex(j)->vertexColor.a;
 				
-				tex.x = polygons[i]->getVertex(j)->getTexCoord()->x;
-				tex.y = polygons[i]->getVertex(j)->getTexCoord()->y;
+				tex.x = polygons[i]->getVertex(j)->getTexCoord().x;
+				tex.y = polygons[i]->getVertex(j)->getTexCoord().y;
 				
 				OSBasics::write(&pos, sizeof(Vector3_struct), 1, outFile);
 				OSBasics::write(&nor, sizeof(Vector3_struct), 1, outFile);

Core/Contents/Source/PolyParticleEmitter.cpp

@@ -327,7 +327,7 @@ void ParticleEmitter::updateEmitter() {
 		particle->particleBody->Translate(translationVector);
 		
 		if(rotationFollowsPath)  {
-			particle->particleBody->lookAt(*particle->particleBody->getPosition() + translationVector, Vector3(1,0,0));			
+			particle->particleBody->lookAt(particle->particleBody->getPosition() + translationVector, Vector3(1,0,0));			
 		} else {
 			if(isScreenEmitter) {
 				particle->particleBody->Roll(rotationSpeed*elapsed);

Core/Contents/Source/PolyPolygon.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyPolygon.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -12,30 +12,22 @@
 namespace Polycode {
 
 Polygon::Polygon()  : useVertexNormals(false), vertexCount(0), useFaceUV(false) {
-	normal = new Vector3();
 	hasSecUVs = false;
 	useVertexNormals = true;
 	
 	for(int i=0; i < 3; i++) {
-		Vector2 *newCoord = new Vector2(0,0);
+		Vector2 newCoord;
 		texCoords.push_back(newCoord);
 	}
 	
 	for(int i=0; i < 3; i++) {	
-		Vector2 *newCoord2 = new Vector2(0,0);
+		Vector2 newCoord2;
 		texCoords2.push_back(newCoord2);
 	}
 }
 
 Polygon::~Polygon() {
-	for(int i=0; i < texCoords.size(); i++) {	
-		delete texCoords[i];
-	}
 	texCoords.clear();
-
-	for(int i=0; i < texCoords2.size(); i++) {	
-		delete texCoords2[i];
-	}
 	texCoords2.clear();
 	
 	for(int i=0; i < vertices.size(); i++) {	
@@ -46,8 +38,8 @@ Polygon::~Polygon() {
 	
 void Polygon::flipUVY() {
 	for(int i=0; i < vertices.size(); i++) {
-		Vector2 *coord = vertices[i]->getTexCoord();
-		vertices[i]->setTexCoord(coord->x, 1-coord->y);
+		Vector2 coord = vertices[i]->getTexCoord();
+		vertices[i]->setTexCoord(coord.x, 1-coord.y);
 	}
 }
 
@@ -59,11 +51,11 @@ bool Polygon::usesFaceUV() {
 	return useFaceUV;
 }
 
-Vector2 *Polygon::getTexCoord(int index) {
+Vector2 Polygon::getTexCoord(int index) {
 	return texCoords[index];
 }
 
-Vector2 *Polygon::getTexCoord2(int index) {
+Vector2 Polygon::getTexCoord2(int index) {
 	return texCoords2[index];
 }
 
@@ -84,7 +76,7 @@ Vector3 Polygon::getFaceNormal() {
 	fNormal.Normalize();	
 	return fNormal;
 	*/
-	return *normal;
+	return normal;
 }
 
 Rectangle Polygon::getBounds2D() {
@@ -108,7 +100,7 @@ void Polygon::removeVertex(int index) {
 }
 
 void Polygon::setNormal(Vector3 normal) {
-	*this->normal = normal;
+	this->normal = normal;
 }	
 
 void Polygon::calculateNormal() {
@@ -119,14 +111,14 @@ void Polygon::calculateNormal() {
 //	normal->y = (vertices[0]->x-vertices[1]->x)*(vertices[2]->z-vertices[1]->z)-(vertices[0]->z-vertices[1]->z)*(vertices[2]->x-vertices[1]->x);
 //	normal->z = (vertices[0]->y-vertices[1]->y)*(vertices[2]->x-vertices[1]->x)-(vertices[0]->x-vertices[1]->x)*(vertices[2]->y-vertices[1]->y);
 
-	*normal = (*vertices[0] - *vertices[1]).crossProduct((*vertices[1] - *vertices[2]));
+	normal = (*vertices[0] - *vertices[1]).crossProduct((*vertices[1] - *vertices[2]));
 	
-	normal->Normalize();
+	normal.Normalize();
 	
 	for(int i=0; i < vertices.size(); i++) {
-		vertices[i]->normal->x = normal->x;
-		vertices[i]->normal->y = normal->y;
-		vertices[i]->normal->z = normal->z;		
+		vertices[i]->normal.x = normal.x;
+		vertices[i]->normal.y = normal.y;
+		vertices[i]->normal.z = normal.z;		
 	}
 }
 

Core/Contents/Source/PolyQuaternion.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyQuaternion.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/26/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyRenderer.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyRenderer.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolySDLCore.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolySDLCore.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/12/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyScene.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyScene.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolySceneEntity.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolySceneEntity.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolySceneLabel.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolySceneLabel.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolySceneManager.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolySceneManager.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolySceneMesh.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolySceneMesh.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/18/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyScreen.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyScreen.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyScreenEntity.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyScreenEntity.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyScreenImage.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyScreenImage.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 Ivan Safrin. All rights reserved.

Core/Contents/Source/PolyScreenLabel.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyScreenLabel.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/16/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyScreenLine.cpp

@@ -41,9 +41,12 @@ void ScreenLine::setLineWidth(Number width) {
 void ScreenLine::Update() {
 	if(!target1)
 		return;
-	setPosition(target1->getPosition()->x, target1->getPosition()->y);
-	endVertex.x = target2->getPosition()->x-target1->getPosition()->x;
-	endVertex.y = target2->getPosition()->y-target1->getPosition()->y;
+	Vector3 pos1 = target1->getPosition();
+	Vector3 pos2 = target2->getPosition();
+	
+	setPosition(pos1.x, pos1.y);
+	endVertex.x = pos2.x-pos1.x;
+	endVertex.y = pos2.y-pos1.y;
 }
 
 

Core/Contents/Source/PolyScreenManager.cpp

@@ -1,6 +1,6 @@
 /*
  *  ScreenManager.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/15/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyTexture.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyTexture.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/13/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyVector2.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyVector2.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyVector3.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyVector3.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.

Core/Contents/Source/PolyVertex.cpp

@@ -1,6 +1,6 @@
 /*
  *  PolyVertex.cpp
- *  TAU
+ *  Poly
  *
  *  Created by Ivan Safrin on 3/14/08.
  *  Copyright 2008 __MyCompanyName__. All rights reserved.
@@ -12,35 +12,32 @@
 using namespace Polycode;
 
 Vertex::Vertex() : Vector3(0,0,0) {
-	texCoord = new Vector2(0,0);	
-	normal = new Vector3(0,0,0);
+	texCoord = Vector2(0,0);	
+	normal = Vector3(0,0,0);
 	useVertexColor = false;
 }
 
 Vertex::Vertex(Number pos_x, Number pos_y, Number pos_z, Number nor_x, Number nor_y, Number nor_z) : Vector3(pos_x, pos_y, pos_z) {
-	normal = new Vector3(nor_x, nor_y, nor_z);
-	texCoord = new Vector2(0,0);
+	normal = Vector3(nor_x, nor_y, nor_z);
+	texCoord = Vector2(0,0);
 	useVertexColor = false;
 	restPosition.set(pos_x, pos_y, pos_z);
 }
 
 Vertex::Vertex(Number pos_x, Number pos_y, Number pos_z, Number nor_x, Number nor_y, Number nor_z, Number u, Number v): Vector3(pos_x, pos_y, pos_z) {
-	normal = new Vector3(nor_x, nor_y, nor_z);
-	texCoord = new Vector2(u,v);
+	normal = Vector3(nor_x, nor_y, nor_z);
+	texCoord = Vector2(u,v);
 	useVertexColor = false;
 	restPosition.set(pos_x, pos_y, pos_z);	
 }
 
 Vertex::Vertex(Number x, Number y, Number z) : Vector3(x,y,z) {
-	texCoord = new Vector2(0,0);
-	normal = new Vector3(0,0,0);
 	useVertexColor = false;
 	restPosition.set(x, y, z);
 }
 
 Vertex::Vertex(Number x, Number y, Number z, Number u, Number v) : Vector3(x,y,z) {
-	texCoord = new Vector2(u,v);	
-	normal = new Vector3(0,0,0);
+	texCoord = Vector2(u,v);	
 	useVertexColor = false;
 	restPosition.set(x, y, z);
 }
@@ -58,9 +55,9 @@ void Vertex::addBoneAssignment(unsigned int boneID, Number boneWeight) {
 }
 
 void Vertex::setNormal(Number x, Number y, Number z) {
-	normal->x = x;
-	normal->y = y;
-	normal->z = z;	
+	normal.x = x;
+	normal.y = y;
+	normal.z = z;	
 }
 
 void Vertex::normalizeWeights() {
@@ -91,11 +88,11 @@ Vertex::~Vertex() {
 //	delete texCoord;
 }
 
-Vector2 *Vertex::getTexCoord() {
+Vector2 Vertex::getTexCoord() {
 	return texCoord;
 }
 
 void Vertex::setTexCoord(Number u, Number v) {
-	texCoord->x = u;
-	texCoord->y = v;
+	texCoord.x = u;
+	texCoord.y = v;
 }

Modules/Contents/2DPhysics/Source/PolyPhysicsScreen.cpp

@@ -123,7 +123,7 @@ PhysicsJoint *PhysicsScreen::createRevoluteJoint(ScreenEntity *ent1, ScreenEntit
 	if(pEnt1 == NULL || pEnt2 == NULL)
 		return NULL;
 	
-	b2Vec2 anchor((ent1->getPosition()->x+ax)/worldScale, (ent1->getPosition()->y+ay)/worldScale);
+	b2Vec2 anchor((ent1->getPosition().x+ax)/worldScale, (ent1->getPosition().y+ay)/worldScale);
 	b2RevoluteJointDef *jointDef = new b2RevoluteJointDef();
 	jointDef->collideConnected = false;
 	jointDef->lowerAngle = lowerLimit * (PI/180.0f);
@@ -255,8 +255,8 @@ void PhysicsScreen::createDistanceJoint(ScreenEntity *ent1, ScreenEntity *ent2,
 	if(pEnt1 == NULL || pEnt2 == NULL)
 		return;
 	
-	b2Vec2 a1(ent1->getPosition()->x/worldScale, ent1->getPosition()->y/worldScale);
-	b2Vec2 a2(ent2->getPosition()->x/worldScale, ent2->getPosition()->y/worldScale);
+	b2Vec2 a1(ent1->getPosition().x/worldScale, ent1->getPosition().y/worldScale);
+	b2Vec2 a2(ent2->getPosition().x/worldScale, ent2->getPosition().y/worldScale);
 	b2DistanceJointDef *jointDef = new b2DistanceJointDef();
 	jointDef->Initialize(pEnt1->body, pEnt2->body, a1, a2);
 	jointDef->collideConnected = collideConnected;

Modules/Contents/2DPhysics/Source/PolyPhysicsScreenEntity.cpp

@@ -20,7 +20,7 @@ PhysicsScreenEntity::PhysicsScreenEntity(ScreenEntity *entity, b2World *world, f
 	screenEntity = entity;
 	
 	bodyDef = new b2BodyDef();
-	bodyDef->position.Set(screenEntity->getPosition()->x/worldScale, screenEntity->getPosition()->y/worldScale);
+	bodyDef->position.Set(screenEntity->getPosition().x/worldScale, screenEntity->getPosition().y/worldScale);
 	bodyDef->angle = screenEntity->getRotation()*(PI/180.0f);	
 	bodyDef->bullet = isSensor;	
 	bodyDef->fixedRotation = fixedRotation;

Modules/Contents/3DPhysics/Source/PolyCollisionScene.cpp

@@ -50,7 +50,7 @@ void CollisionScene::Update() {
 	
 	for(int i=0; i < collisionChildren.size(); i++) {
 		if(collisionChildren[i]->enabled)		
-			collisionChildren[i]->lastPosition = *collisionChildren[i]->getSceneEntity()->getPosition();
+			collisionChildren[i]->lastPosition = collisionChildren[i]->getSceneEntity()->getPosition();
 	}	
 }
 
@@ -240,7 +240,7 @@ CollisionResult CollisionScene::testCollisionOnCollisionChild_RayTest(CollisionS
 	world->removeCollisionObject(cEnt1->collisionObject);	
 
 	btVector3 fVec(cEnt1->lastPosition.x, cEnt1->lastPosition.y, cEnt1->lastPosition.z);
-	btVector3 toVec(cEnt1->getSceneEntity()->getPosition()->x, cEnt1->getSceneEntity()->getPosition()->y, cEnt1->getSceneEntity()->getPosition()->z);
+	btVector3 toVec(cEnt1->getSceneEntity()->getPosition().x, cEnt1->getSceneEntity()->getPosition().y, cEnt1->getSceneEntity()->getPosition().z);
 	
 	btCollisionWorld::ClosestConvexResultCallback cb(toVec, fVec);
 	btQuaternion qFrom;	
@@ -277,7 +277,7 @@ CollisionResult CollisionScene::testCollisionOnCollisionChild_RayTest(CollisionS
 		Logger::log("dist: %f\n", result.colDist);
 		*/
 		
-//		result.colNormal = cEnt1->getSceneEntity()->getPosition()->(cEnt1->lastPosition);		
+//		result.colNormal = cEnt1->getSceneEntity()->getPosition().(cEnt1->lastPosition);		
 		result.colNormal = Vector3(cb.m_hitNormalWorld.getX(), cb.m_hitNormalWorld.getY(), cb.m_hitNormalWorld.getZ());
 		result.colNormal.Normalize();
 	}

Modules/Contents/3DPhysics/Source/PolyCollisionSceneEntity.cpp

@@ -21,7 +21,7 @@ CollisionSceneEntity::CollisionSceneEntity(SceneEntity *entity, bool autoCollide
 	enabled = true;
 	
 	gravityStrength = 5.0f;
-	lastPosition = *entity->getPosition();	
+	lastPosition = entity->getPosition();	
 	
 	
 	btMatrix3x3 basisA;
@@ -112,7 +112,7 @@ void CollisionSceneEntity::Update() {
 
 	btQuaternion orn;
 //	collisionObject->getCollisionShape()->setLocalScaling
-	collisionObject->getWorldTransform().setFromOpenGLMatrix(sceneEntity->getConcatenatedMatrix().ml);
+	collisionObject->getWorldTransform().setFromOpenGLMatrix((float*)sceneEntity->getConcatenatedMatrix().ml);
 
 /*	
 	float rads = PI/180.0f;

Modules/Contents/3DPhysics/Source/PolyPhysicsSceneEntity.cpp

@@ -15,10 +15,10 @@ using namespace Polycode;
 PhysicsCharacter::PhysicsCharacter(SceneEntity *entity, float mass, float friction, float stepSize) : PhysicsSceneEntity(entity, PhysicsSceneEntity::CHARACTER_CONTROLLER, mass, friction, 1) {	
 	ghostObject = new btPairCachingGhostObject();
 	
-	Vector3 *pos = entity->getPosition();	
+	Vector3 pos = entity->getPosition();	
 	btTransform transform;
 	transform.setIdentity();		
-	transform.setOrigin(btVector3(pos->x,pos->y,pos->z));	
+	transform.setOrigin(btVector3(pos.x,pos.y,pos.z));	
 	
 	ghostObject->setWorldTransform(transform);	
 	ghostObject->setCollisionShape (shape);
@@ -54,10 +54,10 @@ PhysicsSceneEntity::PhysicsSceneEntity(SceneEntity *entity, int type, float mass
 
 	this->mass = mass;
 	btVector3 localInertia(0,0,0);
-	Vector3 *pos = entity->getPosition();	
+	Vector3 pos = entity->getPosition();	
 	btTransform transform;
 	transform.setIdentity();		
-	transform.setOrigin(btVector3(pos->x,pos->y,pos->z));
+	transform.setOrigin(btVector3(pos.x,pos.y,pos.z));
 	
 	if(mass != 0.0f) {
 		shape->calculateLocalInertia(mass,localInertia);

Modules/Contents/CgShading/Source/PolyCGShaderModule.cpp

@@ -164,7 +164,7 @@ void CGShaderModule::setCGSpotLightTextureMatrixParameter(Renderer *renderer, CG
 		vector<LightInfo> spotLights = renderer->getSpotLights();			
 		glMatrixMode(GL_MODELVIEW);
 		glPushMatrix();
-		glLoadMatrixf(spotLights[lightIndex].textureMatrix.ml);				
+		glLoadMatrixf((GLfloat*)spotLights[lightIndex].textureMatrix.ml);				
 		cgGLSetStateMatrixParameter(param.cgParam, CG_GL_MODELVIEW_MATRIX,CG_GL_MATRIX_IDENTITY);
 		glPopMatrix();
 	}					

Modules/Contents/UI/Source/PolyUIBox.cpp

@@ -88,8 +88,8 @@ void UIBox::resizeBox(float newWidth, float newHeight) {
 	bImage->setShapeSize(newWidth-l-r, b);
 	tImage->setShapeSize(newWidth-l-r, t);	
 	
-	bImage->setPosition(bImage->getPosition()->x, newHeight-bImage->getHeight());	
-	rImage->setPosition(newWidth-rImage->getWidth(),rImage->getPosition()->y);
+	bImage->setPosition(bImage->getPosition().x, newHeight-bImage->getHeight());	
+	rImage->setPosition(newWidth-rImage->getWidth(),rImage->getPosition().y);
 	
 	width=newWidth;
 	height = newHeight;

Modules/Contents/UI/Source/PolyUIHScrollBar.cpp

@@ -63,15 +63,15 @@ UIHScrollBar::UIHScrollBar(float width, float height, float initialRatio) : Scre
 	dragRectWidth = width-(padding*2)-scrollHandleWidth;
 	handleBox->setDragLimits(Rectangle(padding,padding,dragRectWidth, height-(padding*2)-(height-(padding*2))));
 	
-	lastPositionX = handleBox->getPosition()->x;
+	lastPositionX = handleBox->getPosition().x;
 	
 	this->height = height;
 	this->width = width;	
 }
 
 void UIHScrollBar::Update() {
-	if(lastPositionX != handleBox->getPosition()->x) {
-		lastPositionX = handleBox->getPosition()->x;
+	if(lastPositionX != handleBox->getPosition().x) {
+		lastPositionX = handleBox->getPosition().x;
 		scrollValue = (lastPositionX-padding)/dragRectWidth;
 		if(scrollValue < 0) scrollValue = 0;
 		if(scrollValue > 1) scrollValue = 1;		
@@ -100,13 +100,13 @@ void UIHScrollBar::handleEvent(Event *event) {
 		InputEvent *inputEvent = (InputEvent*)event;
 		switch(event->getEventCode()) {
 			case InputEvent::EVENT_MOUSEDOWN:
-				if(inputEvent->mousePosition.x < handleBox->getPosition()->x)  {
-					float newPos = handleBox->getPosition()->x - scrollHandleWidth;
+				if(inputEvent->mousePosition.x < handleBox->getPosition().x)  {
+					float newPos = handleBox->getPosition().x - scrollHandleWidth;
 					if(newPos < padding)
 						newPos = padding;
 					handleBox->setPositionX(newPos);
 				} else {
-					float newPos = handleBox->getPosition()->x + scrollHandleWidth;
+					float newPos = handleBox->getPosition().x + scrollHandleWidth;
 					if(newPos > dragRectWidth)
 						newPos = dragRectWidth;
 					handleBox->setPositionX(newPos);					
@@ -123,7 +123,7 @@ void UIHScrollBar::handleEvent(Event *event) {
 				handleBox->stopDrag();
 				break;
 			case InputEvent::EVENT_MOUSEDOWN:
-				handleBox->startDrag(inputEvent->mousePosition.x-handleBox->getPosition()->x,inputEvent->mousePosition.y-handleBox->getPosition()->y);
+				handleBox->startDrag(inputEvent->mousePosition.x-handleBox->getPosition().x,inputEvent->mousePosition.y-handleBox->getPosition().y);
 				break;		
 		}
 	}

Modules/Contents/UI/Source/PolyUIHSlider.cpp

@@ -58,8 +58,8 @@ ScreenShape *UIHSlider::getBgRect() {
 
 void UIHSlider::setSliderValue(float val) {
 	if(val >= startValue && val <= endValue) {
-		gripRect->getPosition()->x = sliderWidth * ((val-startValue)/(endValue-startValue));
-		shadowRect->getPosition()->x = gripRect->getPosition()->x;
+		gripRect->getPosition().x = sliderWidth * ((val-startValue)/(endValue-startValue));
+		shadowRect->getPosition().x = gripRect->getPosition().x;
 	}
 }
 
@@ -72,8 +72,8 @@ void UIHSlider::handleEvent(Event *event) {
 		InputEvent *inputEvent = (InputEvent*)event;
 		switch(event->getEventCode()) {
 			case InputEvent::EVENT_MOUSEDOWN:
-				gripRect->startDrag(inputEvent->mousePosition.x-gripRect->getPosition()->x,inputEvent->mousePosition.y-gripRect->getPosition()->y);
-				shadowRect->startDrag(inputEvent->mousePosition.x-2-gripRect->getPosition()->x,inputEvent->mousePosition.y-3-gripRect->getPosition()->y);		
+				gripRect->startDrag(inputEvent->mousePosition.x-gripRect->getPosition().x,inputEvent->mousePosition.y-gripRect->getPosition().y);
+				shadowRect->startDrag(inputEvent->mousePosition.x-2-gripRect->getPosition().x,inputEvent->mousePosition.y-3-gripRect->getPosition().y);		
 			break;
 			case InputEvent::EVENT_MOUSEUP:
 			case InputEvent::EVENT_MOUSEUP_OUTSIDE:
@@ -86,8 +86,8 @@ void UIHSlider::handleEvent(Event *event) {
 
 
 void UIHSlider::Update() {
-	if(gripRect->getPosition()->x != gripPos) {
-		gripPos = gripRect->getPosition()->x;
+	if(gripRect->getPosition().x != gripPos) {
+		gripPos = gripRect->getPosition().x;
 		sliderValue = startValue+((endValue - startValue) * (gripPos/sliderWidth));
 		dispatchEvent(new UIEvent(), UIEvent::CHANGE_EVENT);
 	}

Modules/Contents/UI/Source/PolyUIVScrollBar.cpp

@@ -62,7 +62,7 @@ UIVScrollBar::UIVScrollBar(float width, float height, float initialRatio) : Scre
 	dragRectHeight = height-(padding*2)-scrollHandleHeight;
 	handleBox->setDragLimits(Rectangle(padding,padding,width-(padding*2)-(width-(padding*2)), dragRectHeight));
 	
-	lastPositionY = handleBox->getPosition()->y;
+	lastPositionY = handleBox->getPosition().y;
 	
 	this->height = height;
 	this->width = width;	
@@ -81,8 +81,8 @@ void UIVScrollBar::Resize(int newHeight) {
 
 void UIVScrollBar::Update() {
 	
-	if(lastPositionY != handleBox->getPosition()->y) {
-		lastPositionY = handleBox->getPosition()->y;
+	if(lastPositionY != handleBox->getPosition().y) {
+		lastPositionY = handleBox->getPosition().y;
 		scrollValue = (lastPositionY-padding)/dragRectHeight;
 		if(scrollValue < 0) scrollValue = 0;
 		if(scrollValue > 1) scrollValue = 1;		
@@ -110,7 +110,7 @@ void UIVScrollBar::onMouseWheelDown(float x, float y) {
 }
 
 void UIVScrollBar::scrollUpOneTick() {
-	float newPos = handleBox->getPosition()->y - 5;
+	float newPos = handleBox->getPosition().y - 5;
 	
 	if(newPos < padding)
 		newPos = padding;
@@ -119,7 +119,7 @@ void UIVScrollBar::scrollUpOneTick() {
 }
 
 void UIVScrollBar::scrollDownOneTick() {
-	float newPos = handleBox->getPosition()->y + 5;	
+	float newPos = handleBox->getPosition().y + 5;	
 	
 	if(newPos > dragRectHeight)
 		newPos = dragRectHeight;
@@ -137,13 +137,13 @@ void UIVScrollBar::handleEvent(Event *event) {
 		InputEvent *inputEvent = (InputEvent*)event;
 		switch(event->getEventCode()) {
 			case InputEvent::EVENT_MOUSEDOWN:
-				if(inputEvent->mousePosition.y < handleBox->getPosition()->y)  {
-					float newPos = handleBox->getPosition()->y - scrollHandleHeight;
+				if(inputEvent->mousePosition.y < handleBox->getPosition().y)  {
+					float newPos = handleBox->getPosition().y - scrollHandleHeight;
 					if(newPos < padding)
 						newPos = padding;
 					handleBox->setPositionY(newPos);
 				} else {
-					float newPos = handleBox->getPosition()->y + scrollHandleHeight;
+					float newPos = handleBox->getPosition().y + scrollHandleHeight;
 					if(newPos > dragRectHeight)
 						newPos = dragRectHeight;
 					handleBox->setPositionY(newPos);					
@@ -160,7 +160,7 @@ void UIVScrollBar::handleEvent(Event *event) {
 				handleBox->stopDrag();
 				break;
 			case InputEvent::EVENT_MOUSEDOWN:
-				handleBox->startDrag(inputEvent->mousePosition.x-handleBox->getPosition()->x,inputEvent->mousePosition.y-handleBox->getPosition()->y);
+				handleBox->startDrag(inputEvent->mousePosition.x-handleBox->getPosition().x,inputEvent->mousePosition.y-handleBox->getPosition().y);
 				break;		
 		}
 	}