[Epfl-cvs] tggame Makefile.OSX,1.8,1.9 Makefile.OSXVideo,1.2,1.3 rocket.cc,1.4,1.5

[Seb <whi...@us...>]

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

Modified Files:
	Makefile.OSX Makefile.OSXVideo rocket.cc 
Log Message:
Ajout d'un SoundNode aux rocket
Nouveau Makefile OSX pour optimiser le code pour le processeur 750(G3)


Index: Makefile.OSXVideo
===================================================================
RCS file: /cvsroot/epfl/tggame/Makefile.OSXVideo,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.OSXVideo	17 Nov 2004 23:12:55 -0000	1.2
--- Makefile.OSXVideo	20 Nov 2004 08:41:37 -0000	1.3
***************
*** 1,4 ****
  # TG Makefile
! CFLAGS = -O3 -DDEBUG -DTGOSX -DTGVIDEO
  INCLUDEPATH = -I/sw/include/SDL -I/sw/include/ffmpeg -I./ -I../tgengine-0.1
  LINKPATH = -L../tgengine-0.1/out
--- 1,4 ----
  # TG Makefile
! CFLAGS = -O3 -mcpu=750 -mtune=750 -DDEBUG -DTGOSX -DTGVIDEO
  INCLUDEPATH = -I/sw/include/SDL -I/sw/include/ffmpeg -I./ -I../tgengine-0.1
  LINKPATH = -L../tgengine-0.1/out

Index: rocket.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/rocket.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rocket.cc	19 Nov 2004 18:54:45 -0000	1.4
--- rocket.cc	20 Nov 2004 08:41:37 -0000	1.5
***************
*** 2,5 ****
--- 2,7 ----
  #include "game.h"
  #include <vector3.h>
+ #include <soundmanager.h>
+ #include <soundnode.h>
  
  const float Rocket::fSpeed = 900.0f;
***************
*** 22,25 ****
--- 24,29 ----
  	Game::pSelf->GetSceneManager()->AddParticlesEmitter(pEmit);
  	pModel->Attach("HEAD", pEmit);
+ 	
+ 	pModel->Attach("", SoundManager::pSoundManager->GetSoundNode("gun"));
  
  	//pPhysic->SetSpeed

Index: Makefile.OSX
===================================================================
RCS file: /cvsroot/epfl/tggame/Makefile.OSX,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.OSX	17 Nov 2004 23:12:55 -0000	1.8
--- Makefile.OSX	20 Nov 2004 08:41:37 -0000	1.9
***************
*** 1,4 ****
  # TG Makefile
! CFLAGS = -O3 -DDEBUG -DTGOSX
  INCLUDEPATH = -I/sw/include/SDL -I./ -I../tgengine-0.1
  LINKPATH = -L../tgengine-0.1/out
--- 1,4 ----
  # TG Makefile
! CFLAGS = -O3 -mcpu=750 -mtune=750 -DDEBUG -DTGOSX
  INCLUDEPATH = -I/sw/include/SDL -I./ -I../tgengine-0.1
  LINKPATH = -L../tgengine-0.1/out