- Timestamp:
- Feb 2, 2006, 1:57:21 PM (19 years ago)
- Location:
- trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/effects/fog_effect.cc
r6977 r6980 37 37 FogEffect::FogEffect(const TiXmlElement* root) 38 38 { 39 PRINTF(0)("Fog Effect Created\n");40 39 this->setClassID(CL_FOG_EFFECT, "FogEffect"); 41 40 … … 44 43 this->fogStart = 10.0f; 45 44 this->fogEnd = 1000.0f; 46 47 45 48 46 if (root != NULL) … … 55 53 */ 56 54 FogEffect::~FogEffect() 57 {} 55 { 56 this->deactivate(); 57 } 58 58 59 59 … … 63 63 void FogEffect::loadParams(const TiXmlElement* root) 64 64 { 65 PRINTF(0)(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.loadParms\n\n");66 67 65 GraphicsEffect::loadParams(root); 68 66 69 LoadParam(root, "fog-mode", this, FogEffect, setFogMode)70 .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}");71 67 72 LoadParam(root, "fog-density", this, FogEffect, setFogDensity)73 .describe("sets the the fog density of the exponentionl functions");68 LoadParam(root, "fog-mode", this, FogEffect, setFogMode) 69 .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}"); 74 70 75 LoadParam(root, "fog-range", this, FogEffect, setFogRange) 76 .describe("sets the the range of the linear functions"); 71 LoadParam(root, "fog-density", this, FogEffect, setFogDensity) 72 .describe("sets the the fog density of the exponentionl functions"); 73 74 LoadParam(root, "fog-range", this, FogEffect, setFogRange) 75 .describe("sets the the range of the linear functions"); 77 76 } 78 77 … … 90 89 bool FogEffect::activate() 91 90 { 92 printf("fog==============================================>>>>>>>>>>>>>>>>>>>>>>>>...\n\n");93 91 PRINTF(4)( "Enabling Fog Effect, mode: %i, density: %f, start: %f, end: %f\n", this->fogMode, this->fogDensity, 94 92 this->fogStart, this->fogEnd); -
trunk/src/lib/graphics/effects/lense_flare.cc
r6976 r6980 46 46 LenseFlare::LenseFlare(const TiXmlElement* root) 47 47 { 48 if (root != NULL) 49 this->loadParams(root); 48 this->setClassID(CL_LENSE_FLARE, "LenseFlare"); 50 49 51 50 this->flareMatrix = new float[14]; … … 60 59 61 60 this->lightSource = (LightManager::getInstance())->getLight(0); 61 PRINTF(0)("light is: %p\n", this->lightSource); 62 63 if (root != NULL) 64 { 65 this->loadParams(root); 66 this->activate(); 67 } 62 68 } 63 69 … … 81 87 GraphicsEffect::loadParams(root); 82 88 83 LoadParam(root, "add-flare-texture", this, LenseFlare, addFlare) 89 LOAD_PARAM_START_CYCLE(root, element); 90 { 91 LoadParam_CYCLE(element, "add-flare-texture", this, LenseFlare, addFlare) 84 92 .describe("adds a lensflare texture to the engine"); 85 } 86 93 } 94 LOAD_PARAM_END_CYCLE(element); 95 } 87 96 88 97 /** … … 151 160 bb->setVisibility(true); 152 161 } 162 PRINTF(0)("Finished adding\n", textureName); 153 163 } 154 164 -
trunk/src/lib/graphics/graphics_engine.cc
r6979 r6980 133 133 .describe("loads a graphics effect"); 134 134 } 135 136 137 138 139 /** 140 * @param root The XML-element to load GraphicsEffects from 141 */ 142 void GraphicsEngine::loadGraphicsEffects(const TiXmlElement* root) 143 { 144 LOAD_PARAM_START_CYCLE(root, element); 145 { 146 PRINTF(0)("element is: %s\n", element->Value()); 147 Factory::fabricate(element); 148 } 149 LOAD_PARAM_END_CYCLE(element); 150 } 151 135 152 136 153 … … 711 728 } 712 729 } 713 714 715 /**716 * @param root The XML-element to load GraphicsEffects from717 */718 void GraphicsEngine::loadGraphicsEffects(const TiXmlElement* root)719 {720 LOAD_PARAM_START_CYCLE(root, element);721 {722 PRINTF(0)("element is: %s\n", element->Value());723 Factory::fabricate(element);724 }725 LOAD_PARAM_END_CYCLE(element);726 } -
trunk/src/story_entities/simple_game_menu.cc
r6884 r6980 199 199 } 200 200 } 201 this->menuSelected->getNullElement()->update2D(0. 0f);201 this->menuSelected->getNullElement()->update2D(0.1f); 202 202 this->menuSelectedIndex = 0; 203 203 this->menuSelected = this->menuLayer[0]->menuList[this->menuSelectedIndex];
Note: See TracChangeset
for help on using the changeset viewer.