[Epfl-cvs] tggame game.cc,1.26,1.27 pawn.cc,1.9,1.10

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6531

Modified Files:
	game.cc pawn.cc 
Log Message:

fixe


Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** game.cc	6 Nov 2004 17:05:51 -0000	1.26
--- game.cc	7 Nov 2004 19:44:59 -0000	1.27
***************
*** 99,105 ****
  	#endif
  	Camera* cam = new Camera (0.025f,CAM_SPEED, Vector3 (0, 100,0));
! 	//TODO: on devrait plutot se base sur la bounding box du model
! 	//cam->pBBox->vMin = Vector3(-10, -70, -10);
! 	//cam->pBBox->vMax = Vector3(10, 10, 10);
  
  	//préchargement des meshes
--- 99,103 ----
  	#endif
  	Camera* cam = new Camera (0.025f,CAM_SPEED, Vector3 (0, 100,0));
! 	cam->SetViewOffset(Vector3(0,70,0));
  
  	//préchargement des meshes
***************
*** 110,115 ****
  
  	pEngine->pMeshManager->LoadAnim("machinegun", "data/models/machinegun/fire4.md5anim");
! 	pEngine->pMeshManager->Load("pinky", "data/models/zct/zct.md5mesh");
! 	pEngine->pMeshManager->LoadAnim("pinky", "data/models/zct/zctidle.md5anim");
  
  		
--- 108,113 ----
  
  	pEngine->pMeshManager->LoadAnim("machinegun", "data/models/machinegun/fire4.md5anim");
! 	pEngine->pMeshManager->Load("pinky", "data/models/player/hazmat.md5mesh");
! 	pEngine->pMeshManager->LoadAnim("pinky", "data/models/player/stand.md5anim");
  
  		
***************
*** 132,136 ****
  	//p->SetPosition(pWorld->GetRandomStartPosition()+Vector3(20,80,20));
  	p->Attach (cam);
! 	p->SetPosition (Vector3(100,100,100));
  	p->SetMoveSpeed (CAM_SPEED);
  	p->SetVisible(false);
--- 130,134 ----
  	//p->SetPosition(pWorld->GetRandomStartPosition()+Vector3(20,80,20));
  	p->Attach (cam);
! 	p->SetPosition (Vector3(100,80,100));
  	p->SetMoveSpeed (CAM_SPEED);
  	p->SetVisible(false);
***************
*** 145,150 ****
  	p->SetMoveSpeed(CAM_SPEED);
  	p->SetVelocity(Vector3(0,0,0));
! 	//p->SetRotation(Quaternion(-90, Vector3(1,0,0)));
! 	//p->SetPosition(Vector3(-550,0,250));
  	
  	//p->SetRotationVelocity(Quaternion(10,Vector3(0,1,1)));
--- 143,148 ----
  	p->SetMoveSpeed(CAM_SPEED);
  	p->SetVelocity(Vector3(0,0,0));
! 	p->SetRotation(Quaternion(-90, Vector3(1,0,0)));
! 	p->SetPosition(Vector3(0,70,0));
  	
  	//p->SetRotationVelocity(Quaternion(10,Vector3(0,1,1)));

Index: pawn.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/pawn.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pawn.cc	6 Nov 2004 17:05:51 -0000	1.9
--- pawn.cc	7 Nov 2004 19:44:59 -0000	1.10
***************
*** 6,12 ****
  {
  	pModel = Engine::pMeshManager->LoadInstance("pinky");
! 	pModel->SetAnimation("zctidle");
  	pPhysic = new PhysicNode(pModel);
! 	pPhysic->SetClip(false);
  	fMoveSpeed =  0.0f;
  }
--- 6,14 ----
  {
  	pModel = Engine::pMeshManager->LoadInstance("pinky");
! 	pModel->SetAnimation("stand");
  	pPhysic = new PhysicNode(pModel);
! 	pModel->GetBBox()->vMin.Set(-10,0,-10);
! 	pModel->GetBBox()->vMax.Set(10,80,10);
! 	//pPhysic->SetClip(false);
  	fMoveSpeed =  0.0f;
  }