|
From: julien r. <jul...@us...> - 2004-11-02 15:41:53
|
Update of /cvsroot/epfl/tggame In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27438 Modified Files: Makefile aicontroller.cc game.cc pawn.cc Log Message: md5 animation Index: Makefile =================================================================== RCS file: /cvsroot/epfl/tggame/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile 10 Oct 2004 20:54:47 -0000 1.7 --- Makefile 2 Nov 2004 15:41:43 -0000 1.8 *************** *** 11,15 **** linux: ! make -f Makefile.Linux linuxDebug: --- 11,15 ---- linux: ! make -f Makefile.Linux "CFLAGS = -O3 -DTGLINUX" linuxDebug: Index: game.cc =================================================================== RCS file: /cvsroot/epfl/tggame/game.cc,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** game.cc 1 Nov 2004 18:01:47 -0000 1.24 --- game.cc 2 Nov 2004 15:41:43 -0000 1.25 *************** *** 104,108 **** //préchargement des meshes ! pEngine->pMeshManager->Load("pinky", "data/models/pinky/pinky.md5mesh"); Pawn* p = new Pawn(); --- 104,109 ---- //préchargement des meshes ! pEngine->pMeshManager->Load("pinky", "data/models/guardian/guardian.md5mesh"); ! pEngine->pMeshManager->LoadAnim("pinky", "data/models/guardian/death.md5anim"); Pawn* p = new Pawn(); *************** *** 129,133 **** p->SetMoveSpeed(CAM_SPEED); p->SetVelocity(Vector3(0,0,0)); ! p->SetPosition(Vector3(50,70,0)); //p->SetRotationVelocity(Quaternion(10,Vector3(0,1,1))); --- 130,135 ---- p->SetMoveSpeed(CAM_SPEED); p->SetVelocity(Vector3(0,0,0)); ! p->SetRotation(Quaternion(-90, Vector3(1,0,0))); ! p->SetPosition(Vector3(-550,100,250)); //p->SetRotationVelocity(Quaternion(10,Vector3(0,1,1))); Index: aicontroller.cc =================================================================== RCS file: /cvsroot/epfl/tggame/aicontroller.cc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** aicontroller.cc 31 Oct 2004 11:40:44 -0000 1.6 --- aicontroller.cc 2 Nov 2004 15:41:43 -0000 1.7 *************** *** 40,44 **** //pPawn->SetRotation(Quaternion(rot++, Vector3::UNIT_Y)); //rot=rot%360; ! bDir[STRAFELEFT]=1; } --- 40,44 ---- //pPawn->SetRotation(Quaternion(rot++, Vector3::UNIT_Y)); //rot=rot%360; ! //bDir[STRAFELEFT]=1; } Index: pawn.cc =================================================================== RCS file: /cvsroot/epfl/tggame/pawn.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pawn.cc 1 Nov 2004 18:01:47 -0000 1.7 --- pawn.cc 2 Nov 2004 15:41:43 -0000 1.8 *************** *** 8,12 **** --- 8,14 ---- //pCamera = c; pModel = Engine::pMeshManager->LoadInstance("pinky"); + pModel->SetAnimation("death"); pPhysic = new PhysicNode(pModel); + pPhysic->SetClip(false); fMoveSpeed = 0.0f; } |