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

diff --git a/helper.c b/helper.c
index ea80294..bd5f37b 100644
--- a/helper.c
+++ b/helper.c
@@ -293,10 +293,10 @@ 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;
@@ -308,4 +308,13 @@ void addSceneObject(int id) {
 
   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);
+  }
+
+  nObjects += 1; // New object in scene
+
+  return nObjects;
 }
\ No newline at end of file