[Epfl-cvs] tggame controller.h,1.3,1.4 game.cc,1.8,1.9 game.h,1.5,1.6 world.h,1.2,1.3

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

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

Modified Files:
	controller.h game.cc game.h world.h 
Log Message:

ai


Index: world.h
===================================================================
RCS file: /cvsroot/epfl/tggame/world.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** world.h	1 Oct 2004 21:31:06 -0000	1.2
--- world.h	10 Oct 2004 21:18:41 -0000	1.3
***************
*** 27,30 ****
--- 27,37 ----
  	* @param char* le nom du bsp a charger
  	*/
+ 
+ 	/**
+ 	 * IsPointIn : retourne true si le point est dans la map ou false s'il est en dehors (ou dans un mur)
+ 	 * @param pos la position du point
+ 	 */
+ 	inline bool IsPointIn (const Vector3& pos) { return (pMap->FindCluster(pos)>= 0); }
+ 	
  	void ChangeMap (char*);
  	/**

Index: game.h
===================================================================
RCS file: /cvsroot/epfl/tggame/game.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** game.h	10 Oct 2004 20:54:47 -0000	1.5
--- game.h	10 Oct 2004 21:18:41 -0000	1.6
***************
*** 54,57 ****
--- 54,58 ----
  
  	inline SceneManager* GetSceneManager () { return pSceneManager; }
+ 	inline World* GetWorld () { return pWorld; }
  
  	/**

Index: controller.h
===================================================================
RCS file: /cvsroot/epfl/tggame/controller.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** controller.h	10 Oct 2004 20:54:47 -0000	1.3
--- controller.h	10 Oct 2004 21:18:41 -0000	1.4
***************
*** 23,26 ****
--- 23,28 ----
  	
  	virtual void Collide(SceneNode* other, const Vector3& vPoint, const Vector3& vCollisionNormal) = 0;
+ 
+ 	inline Pawn* GetPawn () { return pPawn; }
   protected:
  	Pawn* pPawn;

Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** game.cc	10 Oct 2004 20:54:47 -0000	1.8
--- game.cc	10 Oct 2004 21:18:41 -0000	1.9
***************
*** 116,120 ****
  	pSoundManager->SetListenerPosition(position.x,position.y,position.z);
  	pSoundManager->SetListenerOrientation(forward.x,forward.y,forward.z,up.x,up.y,up.z);*/
- 	
  	float t = pTimer->GetFrameInterval ();
  	for (unsigned int i=0; i<vControllers.size(); i++)
--- 116,119 ----