- Timestamp:
- May 24, 2006, 3:57:04 PM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 2 deleted
- 15 edited
- 20 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.am
r7661 r7810 41 41 lib/particles/plane_emitter.cc \ 42 42 lib/graphics/effects/fog_effect.cc \ 43 lib/graphics/effects/volfog_effect.cc \ 44 lib/graphics/effects/rain_effect.cc \ 45 lib/graphics/effects/snow_effect.cc \ 46 lib/graphics/effects/cloud_effect.cc \ 47 lib/graphics/effects/lightening_effect.cc \ 43 48 lib/graphics/effects/lense_flare.cc \ 44 49 \ -
trunk/src/defs/class_id.h
r7785 r7810 127 127 CL_NETWORK_MANAGER = 0x00000050, 128 128 CL_SHARED_NETWORK_DATA = 0x00000051, 129 129 CL_ATMOSPHERIC_ENGINE = 0x00000061, 130 130 131 131 /// StoryEntities (range from 0x00000100 to 0x000001ff) … … 224 224 225 225 CL_IMAGE_ENTITY = 0x00000513, 226 CL_ BILLBOARD= 0x00000514,226 CL_IMAGE_PLANE = 0x00000514, 227 227 CL_MODEL_ENTITY = 0x00000515, 228 228 CL_TEXT_ELEMENT = 0x00000516, /// TODO MOVE … … 286 286 CL_LIGHT = 0x00000821, 287 287 288 CL_BILLBOARD = 0x00000a01, 289 288 290 CL_GRAPHICS_EFFECT = 0x00a01000, 289 291 CL_SUN_EFFECT = 0x00a02000, 292 CL_WEATHER_EFFECT = 0x00a04000, 290 293 CL_FOG_EFFECT = 0x00000a10, 294 CL_VOLFOG_EFFECT = 0x00000a11, 291 295 CL_LENSE_FLARE = 0x00000a12, 296 CL_RAIN_EFFECT = 0x00000a13, 297 CL_SNOW_EFFECT = 0x00000a14, 298 CL_CLOUD_EFFECT = 0x00000a15, 299 CL_LIGHTENING_EFFECT = 0x00000a16, 292 300 CL_EXPLOSION = 0x00000a20, 293 301 CL_LIGHTNING_BOLT = 0x00000a21, 302 294 303 295 304 -
trunk/src/lib/graphics/Makefile.am
r7450 r7810 4 4 noinst_LIBRARIES = libORXgraphics.a 5 5 6 libORXgraphics_a_SOURCES = \ 7 graphics_engine.cc \ 8 light.cc \ 9 shader.cc \ 10 \ 11 render2D/render_2d.cc \ 12 render2D/element_2d.cc \ 13 render2D/billboard.cc \ 14 \ 15 text_engine/text_engine.cc \ 16 text_engine/text.cc \ 17 text_engine/multi_line_text.cc \ 18 text_engine/font.cc \ 19 \ 20 effects/graphics_effect.cc \ 21 effects/fog_effect.cc \ 22 effects/lense_flare.cc 6 libORXgraphics_a_SOURCES = graphics_engine.cc \ 7 light.cc \ 8 shader.cc \ 9 \ 10 render2D/render_2d.cc \ 11 render2D/element_2d.cc \ 12 render2D/image_plane.cc \ 13 \ 14 text_engine/text_engine.cc \ 15 text_engine/text.cc \ 16 text_engine/multi_line_text.cc \ 17 text_engine/font.cc \ 18 \ 19 effects/graphics_effect.cc \ 20 effects/atmospheric_engine.cc \ 21 effects/weather_effect.cc \ 22 effects/sun_effect.cc \ 23 effects/fog_effect.cc \ 24 effects/volfog_effect.cc \ 25 effects/rain_effect.cc \ 26 effects/snow_effect.cc \ 27 effects/cloud_effect.cc \ 28 effects/lightening_effect.cc \ 29 effects/lense_flare.cc 23 30 24 25 noinst_HEADERS = \ 26 graphics_engine.h \ 27 light.h \ 28 shader.h \ 29 \ 30 render2D/render_2d.h \ 31 render2D/element_2d.h \ 32 render2D/billboard.h \ 33 \ 34 text_engine/text_engine.h \ 35 text_engine/text.h \ 36 text_engine/multi_line_text.cc \ 37 text_engine/font.h \ 38 text_engine/default_font.xpm \ 39 \ 40 effects/graphics_effect.h \ 41 effects/fog_effect.h \ 42 effects/lense_flare.h 31 noinst_HEADERS = graphics_engine.h \ 32 light.h \ 33 shader.h \ 34 \ 35 render2D/render_2d.h \ 36 render2D/element_2d.h \ 37 render2D/image_plane.h \ 38 \ 39 text_engine/text_engine.h \ 40 text_engine/text.h \ 41 text_engine/multi_line_text.h \ 42 text_engine/font.h \ 43 text_engine/default_font.xpm \ 44 \ 45 effects/graphics_effect.h \ 46 effects/atmospheric_engine.h \ 47 effects/weather_effect.h \ 48 effects/sun_effect.h \ 49 effects/fog_effect.h \ 50 effects/volfog_effect.h \ 51 effects/rain_effect.h \ 52 effects/snow_effect.h \ 53 effects/cloud_effect.h \ 54 effects/lightening_effect.h \ 55 effects/lense_flare.h 43 56 44 57 -
trunk/src/lib/graphics/effects/fog_effect.cc
r7221 r7810 1 /* 2 orxonox - the future of 3D-vertical-scrollers 1 3 4 Copyright (C) 2004 orx 2 5 3 /* 4 orxonox - the future of 3D-vertical-scrollers 5 6 Copyright (C) 2004 orx 7 8 This program is free software; you can redistribute it and/or modify 9 it under the terms of the GNU General Public License as published by 10 the Free Software Foundation; either version 2, or (at your option) 11 any later version. 6 This program is free software; you can redistribute it and/or modify 7 it under the terms of the GNU General Public License as published by 8 the Free Software Foundation; either version 2, or (at your option) 9 any later version. 12 10 13 11 ### File Specific: 14 main-programmer: Patrick Boenzli 12 main-programmer: hdavid, amaechler 15 13 */ 16 17 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS18 14 19 15 #include "fog_effect.h" … … 24 20 #include "glincl.h" 25 21 26 22 /*#include "shell_command.h" 23 SHELL_COMMAND(activateFog, FogEffect, FogEffect::activate) 24 ->setAlias("aFog"); 25 SHELL_COMMAND(deactivateFog, FogEffect, FogEffect::deactivate) 26 ->setAlias("dFog");*/ 27 27 28 28 using namespace std; … … 30 30 CREATE_FACTORY(FogEffect, CL_FOG_EFFECT); 31 31 32 FogEffect::FogEffect(const TiXmlElement* root) 33 { 34 this->setClassID(CL_FOG_EFFECT, "FogEffect"); 32 35 33 /** 34 * default constructor 35 * @param root The XML-element to load the FogEffect from 36 */ 37 FogEffect::FogEffect(const TiXmlElement* root) 38 { 39 this->setClassID(CL_FOG_EFFECT, "FogEffect"); 36 this->init(); 40 37 41 this->fogMode = GL_LINEAR; 42 this->fogDensity = 0.001f; 43 this->fogStart = 10.0f; 44 this->fogEnd = 1000.0f; 38 if (root != NULL) 39 this->loadParams(root); 45 40 46 if (root != NULL) 47 this->loadParams(root); 48 49 this->activate(); 41 this->activate(); 50 42 } 51 43 52 44 53 /**54 * destroys a FogEffect55 */56 45 FogEffect::~FogEffect() 57 46 { 58 47 this->deactivate(); 59 48 } 60 49 61 50 62 /**63 * @param root The XML-element to load the FogEffect from64 */65 51 void FogEffect::loadParams(const TiXmlElement* root) 66 52 { 67 GraphicsEffect::loadParams(root);53 WeatherEffect::loadParams(root); 68 54 55 LoadParam(root, "mode", this, FogEffect, setFogMode); 56 LoadParam(root, "density", this, FogEffect, setFogDensity); 57 LoadParam(root, "range", this, FogEffect, setFogRange); 58 LoadParam(root, "color", this, FogEffect, setFogColor); 59 } 69 60 70 LoadParam(root, "fog-mode", this, FogEffect, setFogMode) 71 .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}"); 72 73 LoadParam(root, "fog-density", this, FogEffect, setFogDensity) 74 .describe("sets the the fog density of the exponentionl functions"); 75 76 LoadParam(root, "fog-color", this, FogEffect, setFogColor) 77 .describe("sets the fog color"); 78 61 bool FogEffect::init() 62 { 63 //default values 64 this->fogMode = GL_EXP2; 65 this->fogDensity = 0.001; 66 this->fogStart = 0; 67 this->fogEnd = 5000; 68 this->colorVector = Vector(0.7, 0.7, 0.7); 79 69 } 80 70 81 71 82 /**83 * initializes the fog effect84 */85 bool FogEffect::init()86 {}87 72 88 89 /**90 * activates the fog effect91 */92 73 bool FogEffect::activate() 93 74 { 94 PRINTF(0)( "Enabling Fog Effect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->fogMode, this->fogDensity, 95 this->fogStart, this->fogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z); 75 PRINTF(0)( "Enabling FogEffect, mode: %i, density: %f, start: %f, end: %f, color %f, %f, %f\n", this->fogMode, this->fogDensity, this->fogStart, this->fogEnd, this->colorVector.x, this->colorVector.y, this->colorVector.z); 96 76 97 glEnable(GL_FOG); 98 { 99 // GLfloat fogColor[4] = {0.7, 0.6, 0.6, 1.0}; 100 GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0}; 77 glEnable(GL_FOG); 78 { 79 GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0}; 101 80 102 glFogi(GL_FOG_MODE, this->fogMode); 103 glFogfv(GL_FOG_COLOR, fogColor); 104 glFogf(GL_FOG_DENSITY, this->fogDensity); 105 glHint(GL_FOG_HINT, GL_DONT_CARE); 106 glFogf(GL_FOG_START, this->fogStart); 107 glFogf(GL_FOG_END, this->fogEnd); 108 109 //glFogi(GL_FOG_COORDINATE_SOURCE, GL_FOG_COORDINATE); 110 } 111 glClearColor(0.5, 0.5, 0.5, 1.0); 81 glFogi(GL_FOG_MODE, this->fogMode); 82 glFogfv(GL_FOG_COLOR, fogColor); 83 glFogf(GL_FOG_DENSITY, this->fogDensity); 84 glHint(GL_FOG_HINT, GL_DONT_CARE); 85 glFogf(GL_FOG_START, this->fogStart); 86 glFogf(GL_FOG_END, this->fogEnd); 87 } 88 glClearColor(0.5, 0.5, 0.5, 1.0); 112 89 } 113 90 114 91 115 /**116 * deactivates the fog effect117 */118 92 bool FogEffect::deactivate() 119 93 { 120 glDisable(GL_FOG); 94 PRINTF(0)("Deactivating FogEffect\n"); 95 glDisable(GL_FOG); 121 96 } 122 97 123 98 124 /**125 * converts a gl mode char to a GLint126 * @param mode the mode character127 */128 99 GLint FogEffect::stringToFogMode(const std::string& mode) 129 100 { 130 131 132 133 134 135 136 137 101 if(mode == "GL_LINEAR") 102 return GL_LINEAR; 103 else if(mode == "GL_EXP") 104 return GL_EXP; 105 else if(mode == "GL_EXP2" ) 106 return GL_EXP2; 107 else 108 return -1; 138 109 } 139 110 111 -
trunk/src/lib/graphics/effects/fog_effect.h
r7221 r7810 1 1 /** 2 * @file fog_effect.h 3 * atmospheric fog 4 */ 2 * @file fog_effect.h 3 */ 5 4 6 5 #ifndef _FOG_EFFECT … … 8 7 9 8 #include "vector.h" 10 #include "graphics_effect.h"11 9 12 class TiXmlElement; 10 #include "weather_effect.h" 13 11 14 //! A class that handles FogEffects. The FogEffectManager operates on this. 15 class FogEffect : public GraphicsEffect 12 class FogEffect : public WeatherEffect 16 13 { 17 18 19 14 public: 15 FogEffect(const TiXmlElement* root = NULL); 16 virtual ~FogEffect(); 20 17 21 18 virtual void loadParams(const TiXmlElement* root); 22 19 23 20 virtual bool init(); 24 21 25 26 22 virtual bool activate(); 23 virtual bool deactivate(); 27 24 28 29 30 31 25 inline void setFogMode(const std::string& mode) { this->fogMode = this->stringToFogMode(mode); } 26 inline void setFogDensity(float density) { this->fogDensity = density; } 27 inline void setFogRange(float start, float end) { this->fogStart = start; this->fogEnd = end; } 28 inline void setFogColor(float r, float g, float b) { this->colorVector = Vector(r, g, b); } 32 29 30 private: 31 GLint stringToFogMode(const std::string& mode); 33 32 34 private: 35 GLint stringToFogMode(const std::string& mode); 36 37 38 private: 39 GLint fogMode; 40 GLfloat fogDensity; 41 GLfloat fogStart; 42 GLfloat fogEnd; 43 Vector colorVector; 33 private: 34 GLint fogMode; 35 GLfloat fogDensity; 36 GLfloat fogStart; 37 GLfloat fogEnd; 38 Vector colorVector; 44 39 }; 45 40 46 41 47 #endif /* _FOG_EFFECT */42 #endif /* _FOG_EFFECT */ -
trunk/src/lib/graphics/effects/lense_flare.cc
r7316 r7810 28 28 #include "state.h" 29 29 30 #include "render2D/ billboard.h"30 #include "render2D/image_plane.h" 31 31 32 32 #include "light.h" … … 80 80 LenseFlare::~LenseFlare() 81 81 { 82 std::vector< Billboard*>::iterator it;82 std::vector<ImagePlane*>::iterator it; 83 83 for( it = flares.begin(); it != flares.end(); it++) 84 84 delete (*it); … … 155 155 } 156 156 157 Billboard* bb = new Billboard(NULL);157 ImagePlane* bb = new ImagePlane(NULL); 158 158 bb->setTexture(textureName); 159 159 bb->setSize(50, 50); 160 160 this->flares.push_back(bb); 161 PRINTF(4)("Added a Lenseflare Billboardwith texture %s\n", textureName.c_str());161 PRINTF(4)("Added a Lenseflare ImagePlane with texture %s\n", textureName.c_str()); 162 162 163 163 // the first flare belongs to the light source … … 178 178 float dist = this->frustumPlane.distancePoint(this->lightSource->getAbsCoor()); 179 179 PRINTF(0)("dist: %f\n", dist); 180 std::vector< Billboard*>::const_iterator it;180 std::vector<ImagePlane*>::const_iterator it; 181 181 for(it = flares.begin(); it != flares.end(); it++) 182 182 (*it)->setVisibility(visibility); … … 220 220 221 221 // now calculate the new coordinates of the billboards 222 std::vector< Billboard*>::iterator it;222 std::vector<ImagePlane*>::iterator it; 223 223 int i; 224 224 for( it = flares.begin(), i = 0; it != flares.end(); it++, i++) -
trunk/src/lib/graphics/effects/lense_flare.h
r7316 r7810 20 20 class TiXmlElement; 21 21 class Light; 22 class Billboard;22 class ImagePlane; 23 23 24 24 //! A class that handles LenseFlares. The LenseFlareManager operates on this. … … 50 50 float isVisible; //!< Checks visibility 51 51 Light* lightSource; //!< reference to the sun (or primary light source) 52 std::vector< Billboard*> flares; //!< the flares array52 std::vector<ImagePlane*> flares; //!< the flares array 53 53 54 54 Vector2D flareVector; //!< the axis to draw the flares on -
trunk/src/lib/graphics/effects/rain_effect.cc
r7808 r7810 47 47 if (this->rainBuffer != NULL) 48 48 ResourceManager::getInstance()->unload(this->rainBuffer); 49 this->rainBuffer = ( SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);49 this->rainBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV); 50 50 51 51 //load wind sound … … 53 53 if (this->windBuffer != NULL) 54 54 ResourceManager::getInstance()->unload(this->windBuffer); 55 this->windBuffer = ( SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV);55 this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV); 56 56 } 57 57 -
trunk/src/lib/graphics/effects/rain_effect.h
r7808 r7810 61 61 bool rainMove; 62 62 63 SoundSourcesoundSource;64 SoundBuffer*rainBuffer;65 SoundBuffer*windBuffer;63 OrxSound::SoundSource soundSource; 64 OrxSound::SoundBuffer* rainBuffer; 65 OrxSound::SoundBuffer* windBuffer; 66 66 }; 67 67 -
trunk/src/lib/graphics/effects/snow_effect.cc
r7808 r7810 50 50 if (this->windBuffer != NULL) 51 51 ResourceManager::getInstance()->unload(this->windBuffer); 52 this->windBuffer = (SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV);52 this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV); 53 53 } 54 54 -
trunk/src/lib/graphics/effects/snow_effect.h
r7808 r7810 17 17 class PNode; 18 18 19 #include "sound_source.h" 19 20 #include "sound_buffer.h" 20 #include "sound_source.h"21 21 22 22 class SnowEffect : public WeatherEffect … … 70 70 71 71 static SpriteParticles* snowParticles; 72 OrxSound::SoundSource soundSource; 73 OrxSound::SoundBuffer* windBuffer; 72 74 73 SoundSource soundSource;74 SoundBuffer* windBuffer;75 75 }; 76 76 -
trunk/src/lib/sound/sound_source.cc
r7729 r7810 122 122 alSourceStop(this->sourceID); 123 123 alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID()); 124 alSourcePlay(this->sourceID); 124 alSourcei (this->sourceID, AL_LOOPING, AL_FALSE ); 125 alSourcePlay(this->sourceID); 125 126 126 127 if (DEBUG_LEVEL >= 3) … … 143 144 } 144 145 145 alSourceStop(this->sourceID); 146 alSourcei (this->sourceID, AL_BUFFER, buffer->getID()); 147 alSourcePlay(this->sourceID); 146 alSourceStop(this->sourceID); 147 alSourcei (this->sourceID, AL_BUFFER, buffer->getID()); 148 alSourcei (this->sourceID, AL_LOOPING, AL_FALSE ); 149 alSourcePlay(this->sourceID); 148 150 149 151 if (unlikely(this->buffer != NULL)) … … 156 158 157 159 158 /** 159 * @brief Stops playback of a SoundSource 160 */ 161 void SoundSource::stop() 160 /** 161 * @brief Plays and loops buffer on this Source 162 * @param buffer the buffer to play back on this Source 163 */ 164 void SoundSource::loop(const SoundBuffer* buffer) 165 { 166 if (this->buffer && this->retrieveSource()) 167 { 168 if (this->bPlay) 169 alSourceStop(this->sourceID); 170 171 alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID()); 172 alSourcei (this->sourceID, AL_LOOPING, AL_TRUE ); 173 alSourcePlay(this->sourceID); 174 175 if (DEBUG_LEVEL >= 3) 176 SoundEngine::checkError("Play LoopSource", __LINE__); 177 this->bPlay = true; 178 } 179 } 180 181 182 /** 183 * @brief Stops playback of a SoundSource 184 */ 185 void SoundSource::stop() 186 { 187 this->bPlay = false; 188 if (this->sourceID != 0) 162 189 { 163 190 this->bPlay = false; … … 173 200 } 174 201 } 175 202 } 176 203 177 204 /** -
trunk/src/lib/sound/sound_source.h
r7460 r7810 29 29 void play(); 30 30 void play(const SoundBuffer* buffer); 31 void loop(); 32 void loop(const SoundBuffer* buffer); 31 33 void stop(); 32 34 void pause(); -
trunk/src/story_entities/game_world.cc
r7785 r7810 43 43 44 44 #include "graphics_engine.h" 45 #include "effects/atmospheric_engine.h" 45 46 #include "event_handler.h" 46 47 #include "sound_engine.h" … … 384 385 385 386 GraphicsEngine::getInstance()->tick(this->dtS); 387 AtmosphericEngine::getInstance()->tick(this->dtS); 386 388 387 389 if( likely(this->dataTank->gameRule != NULL)) … … 524 526 GraphicsEngine* engine = GraphicsEngine::getInstance(); 525 527 528 AtmosphericEngine::getInstance()->draw(); 529 526 530 // set camera 527 531 this->dataTank->localCamera->apply (); -
trunk/src/story_entities/game_world_data.cc
r7488 r7810 45 45 46 46 #include "graphics_engine.h" 47 #include "effects/atmospheric_engine.h" 47 48 #include "event_handler.h" 48 49 #include "sound_engine.h" … … 322 323 LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams); 323 324 LoadParamXML(root, "GraphicsEngine", GraphicsEngine::getInstance(), GraphicsEngine, loadParams); 325 LoadParamXML(root, "AtmosphericEngine", AtmosphericEngine::getInstance(), AtmosphericEngine, loadParams); 324 326 325 327 LoadParam(root, "Music", this, GameWorldData, setSoundTrack); … … 346 348 /* delete some garphics and scene eingines */ 347 349 delete LightManager::getInstance(); 350 delete AtmosphericEngine::getInstance(); 348 351 349 352 if (this->music != NULL) -
trunk/src/util/multiplayer_team_deathmatch.cc
r7221 r7810 20 20 #include "util/loading/factory.h" 21 21 22 #include "render2D/ billboard.h"22 #include "render2D/image_plane.h" 23 23 #include "state.h" 24 24 #include "class_list.h" … … 53 53 this->timeout = 0.0f; 54 54 55 this->deathScreen = new Billboard();55 this->deathScreen = new ImagePlane(); 56 56 this->deathScreen->setSize(State::getResX()/4.0, State::getResY()/4.0); 57 57 this->deathScreen->setAbsCoor2D(State::getResX()/2.0f, State::getResY()/2.0f); -
trunk/src/util/multiplayer_team_deathmatch.h
r7221 r7810 16 16 class ObjectManager; 17 17 class Player; 18 class Billboard;18 class ImagePlane; 19 19 20 20 … … 52 52 int teamBKills; //!< kills of team B 53 53 54 Billboard* deathScreen; //!< the death screen54 ImagePlane* deathScreen; //!< the death screen 55 55 }; 56 56 -
trunk/src/world_entities/space_ships/helicopter.cc
r7337 r7810 25 25 26 26 #include "util/loading/factory.h" 27 #include "util/loading/resource_manager.h" 28 27 29 #include "key_mapper.h" 28 30 #include "event_handler.h" … … 49 51 { 50 52 this->setPlayer(NULL); 53 54 if (this->chopperBuffer != NULL) 55 ResourceManager::getInstance()->unload(this->chopperBuffer); 51 56 } 52 57 … … 96 101 this->getWeaponManager().changeWeaponConfig(1); 97 102 dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false); 103 104 //load sound 105 if (this->chopperBuffer != NULL) 106 ResourceManager::getInstance()->unload(this->chopperBuffer); 107 this->chopperBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/chopper.wav", WAV); 108 98 109 } 99 110 … … 205 216 State::getCameraNode()->setParentSoft(this->getWeaponManager().getFixedTarget()); 206 217 State::getCameraTargetNode()->setParentSoft(this->getWeaponManager().getFixedTarget()); 218 219 this->soundSource.loop(this->chopperBuffer); 220 // PRINTF(0)( "Playing ChopperSound\n" ); 207 221 } 208 222 … … 211 225 dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false); 212 226 this->detachCamera(); 213 227 this->soundSource.stop(); 214 228 } 215 229 -
trunk/src/world_entities/space_ships/helicopter.h
r7346 r7810 10 10 #include "playable.h" 11 11 12 #include "sound_buffer.h" 13 #include "sound_source.h" 12 14 13 15 class Helicopter : public Playable … … 71 73 float airViscosity; 72 74 75 OrxSound::SoundSource soundSource; 76 OrxSound::SoundBuffer*chopperBuffer; 77 73 78 }; 74 79
Note: See TracChangeset
for help on using the changeset viewer.