X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=ab96c884b582b1995ef2e2bfcd1e9af3e33d018e;hp=bd5f37b7f1f6a97d8396a69e1e3f2c2c846c635c;hb=f62aef4de83dd13677a8e436597abbc139d06ea3;hpb=c0ede11eba8b0b5ebfd1a177a630a5d33cc0842b

diff --git a/helper.c b/helper.c
index bd5f37b..ab96c88 100644
--- a/helper.c
+++ b/helper.c
@@ -298,21 +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.id = -1; // No texture
+  sceneObjs[nObjects].texture.scale = 1;
   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]) );
-
-  if ( sceneObjs[nObjects].scale == NULL || sceneObjs[nObjects].rotation.vect == NULL ) {
-    fprintf(stderr, "Could not allocate memory for Scene Object! Shutting down!\n");
-    exit(EXIT_FAILURE);
-  }
+  sceneObjs[nObjects].rotation.x = 0;
+  sceneObjs[nObjects].rotation.y = 0;
+  sceneObjs[nObjects].rotation.z = 0;
 
   nObjects += 1; // New object in scene