Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21461
Modified Files:
Makefile Makefile.Linux Makefile.LinuxVideo Makefile.OSX
Makefile.OSXVideo actor.h aicontroller.cc aicontroller.h
config.cfg controller.cc controller.h dox_config game.cc
game.h gamedefs.h model.cc model.h pawn.cc pawn.h
playercontroller.cc playercontroller.h projectile.cc
projectile.h rocket.cc rocket.h rocketlauncher.cc
rocketlauncher.h tg.cc weapon.cc weapon.h world.cc world.h
Log Message:
force commit
Index: projectile.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/projectile.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** projectile.cc 17 Nov 2004 22:56:27 -0000 1.1
--- projectile.cc 17 Nov 2004 23:12:56 -0000 1.2
***************
*** 1,5 ****
#include "projectile.h"
! Projectile::Projectile() : Actor ()
{
--- 1,5 ----
#include "projectile.h"
! Projectile::Projectile() : Pawn ()
{
Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** game.cc 17 Nov 2004 22:56:27 -0000 1.33
--- game.cc 17 Nov 2004 23:12:56 -0000 1.34
***************
*** 116,119 ****
--- 116,121 ----
pEngine->pMeshManager->LoadAnim("pinky", "data/models/player/stand.md5anim");
pEngine->pMeshManager->LoadAnim("pinky", "data/models/player/death.md5anim");
+
+ pEngine->pMeshManager->Load("rocket", "data/models/player/hazmat.md5mesh");
//creation de l'arme
Index: rocket.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/rocket.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rocket.cc 17 Nov 2004 22:56:27 -0000 1.1
--- rocket.cc 17 Nov 2004 23:12:56 -0000 1.2
***************
*** 3,9 ****
Rocket::Rocket () : Projectile ()
{
! pModel = Engine::pMeshManager->LoadInstance("rocket");
pPhysic = new PhysicNode(pModel);
pModel->GetBBox()->vMin.Set(-5,-5,-5);
! pModel->GetBBox()->vMax.Set(5,5,5);
}
\ No newline at end of file
--- 3,9 ----
Rocket::Rocket () : Projectile ()
{
! /*pModel = Engine::pMeshManager->LoadInstance("rocket");
pPhysic = new PhysicNode(pModel);
pModel->GetBBox()->vMin.Set(-5,-5,-5);
! pModel->GetBBox()->vMax.Set(5,5,5);*/
}
\ No newline at end of file
Index: rocketlauncher.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/rocketlauncher.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rocketlauncher.cc 17 Nov 2004 22:56:27 -0000 1.1
--- rocketlauncher.cc 17 Nov 2004 23:12:56 -0000 1.2
***************
*** 20,23 ****
--- 20,27 ----
fCoolDown = fFireRate;
+ Rocket* pRocket = new Rocket ();
+ pRocket->Add(Game::pSelf->GetSceneManager());
+ pRocket->Add(Game::pSelf->GetPhysicEngine());
+
Vector3 target = vPosition - vTarget*10000;
Index: rocketlauncher.h
===================================================================
RCS file: /cvsroot/epfl/tggame/rocketlauncher.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rocketlauncher.h 17 Nov 2004 22:56:27 -0000 1.1
--- rocketlauncher.h 17 Nov 2004 23:12:56 -0000 1.2
***************
*** 3,6 ****
--- 3,7 ----
#include "weapon.h"
+ #include "rocket.h"
class RocketLauncher : public Weapon
Index: projectile.h
===================================================================
RCS file: /cvsroot/epfl/tggame/projectile.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** projectile.h 17 Nov 2004 22:56:27 -0000 1.1
--- projectile.h 17 Nov 2004 23:12:56 -0000 1.2
***************
*** 2,6 ****
#define _TGPROJECTILE_H
! #include "game.h"
#include "actor.h"
#include <md5instance.h>
--- 2,6 ----
#define _TGPROJECTILE_H
! #include "pawn.h"
#include "actor.h"
#include <md5instance.h>
***************
*** 9,13 ****
using namespace tg;
! class Projectile : public Actor
{
public:
--- 9,13 ----
using namespace tg;
! class Projectile : public Pawn
{
public:
***************
*** 16,21 ****
protected:
- MD5Instance* pModel;
- PhysicNode* pPhysic;
};
--- 16,19 ----
|
