X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=3bc100706f56b19dd470de63153391b7453caeae;hp=f6ecc8c13dc3445b388ab55963553d65eef22060;hb=43f828e85c0789fe860634ac0944d96f94c5c69c;hpb=f1c86cda52b306cdfbe62e1776eb38cff811f47b diff --git a/helper.c b/helper.c index f6ecc8c..3bc1007 100644 --- a/helper.c +++ b/helper.c @@ -298,16 +298,20 @@ int addSceneObject(int id) { curObject = nObjects; - sceneObjs[nObjects].mesh = -1; + sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh sceneObjs[nObjects].texture = -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]) ); + 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