(no commit message)

[atyndall/cits2231.git] / helper.c

diff --git a/helper.c b/helper.c
index f6ecc8c..9cfb1fb 100644 (file)
--- a/helper.c
+++ b/helper.c
@@ -298,16 +298,20 @@ int addSceneObject(int id) {
 
   curObject = nObjects;
 
-  sceneObjs[nObjects].mesh = -1;
-  sceneObjs[nObjects].texture = -1;
+  sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh
+  sceneObjs[nObjects].texture = -1; // No texture
   sceneObjs[nObjects].x = 0;
   sceneObjs[nObjects].y = 0;
   sceneObjs[nObjects].z = 0;
 
-  sceneObjs[nObjects].scale = (vector*)calloc( 3, sizeof(vector[0]) );
+  sceneObjs[nObjects].scale[0] = 1;
+  sceneObjs[nObjects].scale[1] = 1;
+  sceneObjs[nObjects].scale[2] = 1;
 
-  sceneObjs[nObjects].rotation.parameter = 0;
-  sceneObjs[nObjects].rotation.vect = (vector*)calloc( 3, sizeof(vector[0]) );
+  sceneObjs[nObjects].rotation.amount = 0;
+  sceneObjs[nObjects].rotation.vector[0] = 0;
+  sceneObjs[nObjects].rotation.vector[1] = 0;
+  sceneObjs[nObjects].rotation.vector[2] = 0;
 
   nObjects += 1; // New object in scene