From: Ash Tyndall Date: Fri, 21 Oct 2011 13:18:34 +0000 (+0800) Subject: Implement Scene Objects; their drawing and parameters. Implement base code for Soluti... X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=commitdiff_plain;h=55bfed85b24a4fe5471d3fca580e3b86cd74e21d Implement Scene Objects; their drawing and parameters. Implement base code for Solution's mouse operations. Add texture support for objects. --- diff --git a/helper.c b/helper.c index 3bc1007..9cfb1fb 100644 --- a/helper.c +++ b/helper.c @@ -299,7 +299,7 @@ int addSceneObject(int id) { curObject = nObjects; sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh - sceneObjs[nObjects].texture = -1; + sceneObjs[nObjects].texture = -1; // No texture sceneObjs[nObjects].x = 0; sceneObjs[nObjects].y = 0; sceneObjs[nObjects].z = 0; diff --git a/scene.c b/scene.c index 4514e79..c650c05 100644 --- a/scene.c +++ b/scene.c @@ -110,7 +110,6 @@ void processLightEvents(int id) { * @param id ID of object selected */ void processObjectEvents(int id) { - // **NOTE: For the testing phase, only have the teapot addSceneObject(id); glutPostRedisplay(); }