X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=helper.c;h=ab96c884b582b1995ef2e2bfcd1e9af3e33d018e;hp=b4dbc9a530c489b6b4fa5d914c80710abaad8319;hb=c04cf2176fc88d341416c24667ba66dc3600c4d0;hpb=4907cd758a8f2d227b76fb82e557487b1197d0be diff --git a/helper.c b/helper.c index b4dbc9a..ab96c88 100644 --- a/helper.c +++ b/helper.c @@ -299,19 +299,19 @@ 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; - sceneObjs[nObjects].scale[0] = 0; - sceneObjs[nObjects].scale[1] = 0; - sceneObjs[nObjects].scale[2] = 0; + sceneObjs[nObjects].scale[0] = 1; + 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