|
From: julien r. <jul...@us...> - 2004-10-24 14:52:05
|
Update of /cvsroot/epfl/tgengine-0.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22645 Modified Files: camera.cc engine.h event.h glrenderer.cc Log Message: changements pour les mouvements Index: glrenderer.cc =================================================================== RCS file: /cvsroot/epfl/tgengine-0.1/glrenderer.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** glrenderer.cc 24 Oct 2004 13:36:59 -0000 1.9 --- glrenderer.cc 24 Oct 2004 14:51:54 -0000 1.10 *************** *** 1085,1089 **** _RotateNode(mesh); ! glScalef(mesh->fScale, mesh->fScale, mesh->fScale); --- 1085,1105 ---- _RotateNode(mesh); ! ! glLineWidth(3.0f); ! glBegin (GL_LINES); ! glColor3f(1,0,0); ! glVertex3f (0,0,0); ! glVertex3f (10,0,0); ! ! glColor3f(0,0,1); ! glVertex3f(0,0,0); ! glVertex3f(0,0,10); ! ! glColor3f(0,1,0); ! glVertex3f(0,0,0); ! glVertex3f(0,10,0); ! glEnd (); ! glLineWidth(1.0f); ! glScalef(mesh->fScale, mesh->fScale, mesh->fScale); Index: camera.cc =================================================================== RCS file: /cvsroot/epfl/tgengine-0.1/camera.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** camera.cc 24 Oct 2004 13:36:59 -0000 1.4 --- camera.cc 24 Oct 2004 14:51:54 -0000 1.5 *************** *** 30,34 **** int mX, mY; int middleX, middleY; ! SDL_GetMouseState (&mX, &mY); middleX = 320; middleY = 240; --- 30,35 ---- int mX, mY; int middleX, middleY; ! //SDL_GetMouseState (&mX, &mY); ! Engine::pEngine->GetMouseState(&mX,&mY); middleX = 320; middleY = 240; *************** *** 38,42 **** vRot.x += ((float)mY-middleY)*fSensivity/*time*/*6; ! SDL_WarpMouse (middleX, middleY); /* float factor; --- 39,44 ---- vRot.x += ((float)mY-middleY)*fSensivity/*time*/*6; ! //SDL_WarpMouse (middleX, middleY); ! Engine::pEngine->WarpMouse(middleX, middleY); /* float factor; *************** *** 134,139 **** { glMatrixMode (GL_MODELVIEW); ! glRotatef(vRot.x, 1.0f, 0.0f, 0.0f); ! glRotatef(vRot.y, 0.0f, 1.0f, 0.0f); glTranslatef(-vPosition.x, -vPosition.y, -vPosition.z); frustum.Update(); --- 136,141 ---- { glMatrixMode (GL_MODELVIEW); ! glRotatef(vEuler.x, 1.0f, 0.0f, 0.0f); ! glRotatef(vEuler.y, 0.0f, 1.0f, 0.0f); glTranslatef(-vPosition.x, -vPosition.y, -vPosition.z); frustum.Update(); Index: engine.h =================================================================== RCS file: /cvsroot/epfl/tgengine-0.1/engine.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** engine.h 21 Oct 2004 21:18:28 -0000 1.4 --- engine.h 24 Oct 2004 14:51:54 -0000 1.5 *************** *** 69,73 **** //static TextureManager* pTextureManager; ! void OpenApplication (); void DefaultRunLoop (); --- 69,76 ---- //static TextureManager* pTextureManager; ! ! inline void GetMouseState (int* x, int* y) { SDL_GetMouseState(x,y); } ! inline void WarpMouse (int x, int y) { SDL_WarpMouse (x,y); } ! void OpenApplication (); void DefaultRunLoop (); Index: event.h =================================================================== RCS file: /cvsroot/epfl/tgengine-0.1/event.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** event.h 28 Sep 2004 09:44:26 -0000 1.2 --- event.h 24 Oct 2004 14:51:54 -0000 1.3 *************** *** 26,38 **** namespace tg { - /** @defgroup eventstructs AE event structs and definitions. - * AE event structures and definitions. - * @{ - */ - /// Key definition table. /*! ! This is essentially the same as SDLKEY_*, the only ! change is in the name (AEKEY_*). */ enum tgKey { --- 26,33 ---- namespace tg { /// Key definition table. /*! ! * C'est la même chose que SDLKey, c'est juste le préfixe qui change (TGKEY) ! * Repris de AEEngine */ enum tgKey { |