[Epfl-cvs] tggame game.cc,1.31,1.32 playercontroller.cc,1.17,1.18 playercontroller.h,1.8,1.9

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

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

Modified Files:
	game.cc playercontroller.cc playercontroller.h 
Log Message:

physic


Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** game.cc	13 Nov 2004 23:38:08 -0000	1.31
--- game.cc	15 Nov 2004 21:41:52 -0000	1.32
***************
*** 29,33 ****
  	std::string mapname = "data/maps/";
  	if (argc < 2)
! 		mapname += "test1.bsp";
  	else
  		mapname += argv[1];
--- 29,33 ----
  	std::string mapname = "data/maps/";
  	if (argc < 2)
! 		mapname += "test.bsp";
  	else
  		mapname += argv[1];

Index: playercontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/playercontroller.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** playercontroller.cc	14 Nov 2004 13:34:44 -0000	1.17
--- playercontroller.cc	15 Nov 2004 21:41:52 -0000	1.18
***************
*** 13,18 ****
  {
  	Game::pSelf->GetConsole()->Register("clip", this, CLIP);	
! 	/*pSphere = new DebugSphere ();
! 	Game::pSelf->GetSceneManager()->AddDebugSphere(pSphere);*/
  	pWeapon = new Weapon ();
  	bFire = false;
--- 13,18 ----
  {
  	Game::pSelf->GetConsole()->Register("clip", this, CLIP);	
! 	pSphere = new DebugSphere ();
! 	Game::pSelf->GetSceneManager()->AddDebugSphere(pSphere);
  	pWeapon = new Weapon ();
  	bFire = false;
***************
*** 29,38 ****
  		pWeapon->Fire (vPosition, vTarget, pPawn);
  		
! 	/*	vTarget = vPosition - vTarget*1000000;
  
  		CollisionResult cR = Game::pSelf->Trace(vPosition, vTarget, pPawn);
  		pSphere->vPosition = cR.EndPoint;
  
! 		if (cR.pNode == NULL) //on a touche la map
  			Game::pSelf->GetSceneManager()->GetDecalManager()->AddDecal(cR.EndPoint, cR.Normal, 1.0f, 1.0f, Engine::pTextureManager->LoadTexture("data/textures/decals/mgun.bmp", TG_TEXTURE_2D), 10.0f);
  
--- 29,38 ----
  		pWeapon->Fire (vPosition, vTarget, pPawn);
  		
! 		vTarget = vPosition - vTarget*1000000;
  
  		CollisionResult cR = Game::pSelf->Trace(vPosition, vTarget, pPawn);
  		pSphere->vPosition = cR.EndPoint;
  
! 	/*	if (cR.pNode == NULL) //on a touche la map
  			Game::pSelf->GetSceneManager()->GetDecalManager()->AddDecal(cR.EndPoint, cR.Normal, 1.0f, 1.0f, Engine::pTextureManager->LoadTexture("data/textures/decals/mgun.bmp", TG_TEXTURE_2D), 10.0f);
  

Index: playercontroller.h
===================================================================
RCS file: /cvsroot/epfl/tggame/playercontroller.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** playercontroller.h	13 Nov 2004 23:38:08 -0000	1.8
--- playercontroller.h	15 Nov 2004 21:41:52 -0000	1.9
***************
*** 22,26 ****
  	Weapon* pWeapon;
  	bool bFire;
! 	//DebugSphere* pSphere;
   public:
  	PlayerController (Pawn*);
--- 22,26 ----
  	Weapon* pWeapon;
  	bool bFire;
! 	DebugSphere* pSphere;
   public:
  	PlayerController (Pawn*);