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

diff --git a/helper.c b/helper.c
index ea80294..ab96c88 100644
--- a/helper.c
+++ b/helper.c
@@ -293,19 +293,27 @@ void drawAxisLines() {
   glEnable(GL_TEXTURE_2D);
 }
 
-void addSceneObject(int id) {
+int addSceneObject(int id) {
   // **NOTE: Currently only adds the teapot
 
-  nObjects += 1; // New object in scene
+  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.x = 0;
+  sceneObjs[nObjects].rotation.y = 0;
+  sceneObjs[nObjects].rotation.z = 0;
+
+  nObjects += 1; // New object in scene
 
-  sceneObjs[nObjects].rotation.parameter = 0;
-  sceneObjs[nObjects].rotation.vect = (vector*)calloc( 3, sizeof(vector[0]) );
+  return nObjects;
 }
\ No newline at end of file