|
From: Seb <whi...@us...> - 2004-11-29 17:30:13
|
Update of /cvsroot/epfl/tgengine-0.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8210 Modified Files: soundmanager.cc soundnode.cc soundnode.h Log Message: ifdef en plus Index: soundnode.h =================================================================== RCS file: /cvsroot/epfl/tgengine-0.1/soundnode.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** soundnode.h 20 Nov 2004 08:38:25 -0000 1.1 --- soundnode.h 29 Nov 2004 17:29:50 -0000 1.2 *************** *** 22,26 **** string GetSoundNodeName() { return sNodeName; } ! void PreRender (float x) {}; private: --- 22,26 ---- string GetSoundNodeName() { return sNodeName; } ! void PreRender (float x); private: Index: soundmanager.cc =================================================================== RCS file: /cvsroot/epfl/tgengine-0.1/soundmanager.cc,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** soundmanager.cc 28 Nov 2004 09:18:36 -0000 1.23 --- soundmanager.cc 29 Nov 2004 17:29:49 -0000 1.24 *************** *** 686,692 **** break; ! /* case AL_INVALID_ENUM: return string("AL_INVALID_ENUM"); ! break; */ case AL_INVALID_VALUE: --- 686,694 ---- break; ! #ifdef TGOSX ! case AL_INVALID_ENUM: return string("AL_INVALID_ENUM"); ! break; ! #endif case AL_INVALID_VALUE: *************** *** 694,700 **** break; ! /* case AL_INVALID_OPERATION: return string("AL_INVALID_OPERATION"); ! break;*/ case AL_OUT_OF_MEMORY: --- 696,704 ---- break; ! #ifdef TGOSX ! case AL_INVALID_OPERATION: return string("AL_INVALID_OPERATION"); ! break; ! #endif case AL_OUT_OF_MEMORY: *************** *** 703,708 **** default: ! return string("UNKNOW_AL_ERROR"); ! break; }; } --- 707,712 ---- default: ! return string("UNKNOW_AL_ERROR"); ! break; }; } *************** *** 738,743 **** default: ! return string("UNKNOW_ALC_ERROR"); ! break; }; } --- 742,747 ---- default: ! return string("UNKNOW_ALC_ERROR"); ! break; }; } Index: soundnode.cc =================================================================== RCS file: /cvsroot/epfl/tgengine-0.1/soundnode.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** soundnode.cc 23 Nov 2004 08:03:28 -0000 1.2 --- soundnode.cc 29 Nov 2004 17:29:50 -0000 1.3 *************** *** 16,26 **** pBBox->Move (v); ! vSpeed.x = 0.0; ! vSpeed.y = 0.0; ! vSpeed.z = 0.0; SoundManager::pSoundManager->SetSoundProperties(sNodeName,v,vSpeed); } } //END tg --- 16,30 ---- pBBox->Move (v); ! vSpeed.x = 1.0; ! vSpeed.y = 1.0; ! vSpeed.z = 1.0; SoundManager::pSoundManager->SetSoundProperties(sNodeName,v,vSpeed); } + void SoundNode::PreRender(float x) + { + } + } //END tg |