From: Andrew C. <ac...@us...> - 2004-04-30 03:28:42
|
Update of /cvsroot/planeshift/planeshift/src/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31684/src/client Modified Files: pscamera.h pscelclient.cpp pscelclient.h psengine.cpp zonehandler.cpp Log Message: Added support for 3D sounds inside map files using <key>s attached to meshes Index: pscamera.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscamera.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** pscamera.h 22 Mar 2004 17:28:09 -0000 1.22 --- pscamera.h 30 Apr 2004 03:28:22 -0000 1.23 *************** *** 371,375 **** */ void SetSwingCoef(float swingCoef, int mode = -1); ! private: --- 371,376 ---- */ void SetSwingCoef(float swingCoef, int mode = -1); ! ! iView* View() { return view; } private: Index: pscelclient.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** pscelclient.cpp 29 Apr 2004 00:48:03 -0000 1.143 --- pscelclient.cpp 30 Apr 2004 03:28:22 -0000 1.144 *************** *** 511,515 **** } ! bool GEMClientActor::AttachToSocket( const char* socketName, const char* meshName ) { --- 511,533 ---- } ! ! csVector3 GEMClientActor::Pos() ! { ! csVector3 pos; ! iSector* sector; ! float yrot; ! pcmove->GetLastPosition (pos,yrot, sector); ! return pos; ! } ! ! csVector3 GEMClientActor::Rot() ! { ! csVector3 pos; ! csVector3 rot(0,0,0); ! iSector* sector; ! pcmove->GetLastPosition (pos,rot.y, sector); ! return rot; ! } ! bool GEMClientActor::AttachToSocket( const char* socketName, const char* meshName ) { Index: pscelclient.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** pscelclient.h 7 Apr 2004 01:55:39 -0000 1.45 --- pscelclient.h 30 Apr 2004 03:28:22 -0000 1.46 *************** *** 179,182 **** --- 179,185 ---- bool RemoveMaterial( csString& partName ); + csVector3 Pos(); + csVector3 Rot(); + const char* GetGuildName() { return guildName; } csRef<iPcLinearMovement> pcmove; Index: psengine.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.cpp,v retrieving revision 1.368 retrieving revision 1.369 diff -C2 -d -r1.368 -r1.369 *** psengine.cpp 24 Apr 2004 23:17:53 -0000 1.368 --- psengine.cpp 30 Apr 2004 03:28:22 -0000 1.369 *************** *** 536,539 **** --- 536,547 ---- if (charmanager) charmanager->PreProcess(); + + + // Update the sound system + if ( loadstate == DONE && celclient && celclient->GetMainPlayer() ) + { + soundmanager->Update( camera->View() ); + soundmanager->Update( celclient->GetMainPlayer()->Pos(),csGetTicks()); + } break; Index: zonehandler.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/zonehandler.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** zonehandler.cpp 4 Apr 2004 17:14:36 -0000 1.15 --- zonehandler.cpp 30 Apr 2004 03:28:22 -0000 1.16 *************** *** 40,43 **** --- 40,44 ---- #include "physicallayer/propclas.h" + #include "globals.h" #include "psbehave/psworld.h" #include "zonehandler.h" *************** *** 171,176 **** { ExecuteFlaggedRegions(sectorToLoad); ! needsToCrossSectors = false; ! } } --- 172,177 ---- { ExecuteFlaggedRegions(sectorToLoad); ! needsToCrossSectors = false; ! } } *************** *** 218,221 **** --- 219,225 ---- } } + + printf("Building Emitters\n"); + psengine->GetSoundManager()->BuildSoundEmitterList(); return true; } |