X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=ab96c884b582b1995ef2e2bfcd1e9af3e33d018e;hp=3bc100706f56b19dd470de63153391b7453caeae;hb=78ee002d22bec0b0084d791e6f5146be4400bac0;hpb=51d8df428ef9188ec1b00656a3e691da8cd0bbe5 diff --git a/helper.c b/helper.c index 3bc1007..ab96c88 100644 --- a/helper.c +++ b/helper.c @@ -299,7 +299,8 @@ int addSceneObject(int id) { curObject = nObjects; sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh - sceneObjs[nObjects].texture = -1; + sceneObjs[nObjects].texture.id = -1; // No texture + sceneObjs[nObjects].texture.scale = 1; sceneObjs[nObjects].x = 0; sceneObjs[nObjects].y = 0; sceneObjs[nObjects].z = 0; @@ -308,10 +309,9 @@ int addSceneObject(int id) { sceneObjs[nObjects].scale[1] = 1; sceneObjs[nObjects].scale[2] = 1; - sceneObjs[nObjects].rotation.amount = 0; - sceneObjs[nObjects].rotation.vector[0] = 0; - sceneObjs[nObjects].rotation.vector[1] = 0; - sceneObjs[nObjects].rotation.vector[2] = 0; + sceneObjs[nObjects].rotation.x = 0; + sceneObjs[nObjects].rotation.y = 0; + sceneObjs[nObjects].rotation.z = 0; nObjects += 1; // New object in scene