Changeset 6777 in orxonox.OLD for branches/network
- Timestamp:
- Jan 26, 2006, 4:46:39 PM (19 years ago)
- Location:
- branches/network/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/graphics/effects/fog_effect.cc
r6772 r6777 62 62 void FogEffect::loadParams(const TiXmlElement* root) 63 63 { 64 printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.loadParms\n\n"); 64 65 GraphicsEffect::loadParams(root); 65 66 66 LoadParam(root, "fog- effect", this, FogEffect, setFogMode)67 LoadParam(root, "fog-mode", this, FogEffect, setFogMode) 67 68 .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}"); 68 69 … … 87 88 bool FogEffect::activate() 88 89 { 90 printf("fog==============================================>>>>>>>>>>>>>>>>>>>>>>>>...\n\n"); 89 91 PRINTF(4)( "Enabling Fog Effect, mode: %i, density: %f, start: %f, end: %f\n", this->fogMode, this->fogDensity, 90 92 this->fogStart, this->fogEnd); … … 92 94 glEnable(GL_FOG); 93 95 { 94 GLfloat fogColor[4] = {0. 5, 0.5, 0.5, 1.0};96 GLfloat fogColor[4] = {0.6, 0.6, 0.6, 1.0}; 95 97 96 98 glFogi(GL_FOG_MODE, this->fogMode); -
branches/network/src/lib/graphics/effects/graphics_effect.h
r6776 r6777 25 25 virtual bool deactivate() = 0; 26 26 27 virtual booldraw() const;27 virtual void draw() const; 28 28 29 29 inline bool isActivated() const { return this->bActivated; } -
branches/network/src/lib/graphics/graphics_engine.cc
r6772 r6777 41 41 #include "shell_command.h" 42 42 43 44 #include "parser/tinyxml/tinyxml.h" 45 #include "load_param.h" 46 #include "factory.h" 47 43 48 #ifdef __WIN32__ 44 49 #include "class_list.h" … … 113 118 GraphicsEngine::singletonRef = NULL; 114 119 } 120 121 122 /** 123 * loads the GraphicsEngine Specific Parameters. 124 * @param root: the XML-Element to load the Data From 125 */ 126 void GraphicsEngine::loadParams(const TiXmlElement* root) 127 { 128 LoadParamXML(root, "load-effect", this, GraphicsEngine, loadGraphicsEffectXML) 129 .describe("loads a graphics effect"); 130 } 131 115 132 116 133 /** … … 150 167 this->initVideo(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16); 151 168 152 GraphicsEffect* fe = new FogEffect(NULL);153 this->loadGraphicsEffect(fe);154 fe->activate();155 PRINTF(0)("--------------------------------------------------------------\n");169 // GraphicsEffect* fe = new FogEffect(NULL); 170 // this->loadGraphicsEffect(fe); 171 // fe->activate(); 172 // PRINTF(0)("--------------------------------------------------------------\n"); 156 173 } 157 174 … … 665 682 666 683 /** 684 * @param root The XML-element to load GraphicsEffects from 685 */ 686 void GraphicsEngine::loadGraphicsEffectXML(const TiXmlElement* root) 687 { 688 const TiXmlElement* element = root->FirstChildElement(); 689 690 while (element != NULL) 691 { 692 Factory::fabricate(element); 693 694 element = element->NextSiblingElement(); 695 } 696 } 697 698 699 /** 667 700 * loads a GraphicsEffect into the engine 668 701 * @param effect the GraphicsEffect to add -
branches/network/src/lib/graphics/graphics_engine.h
r6753 r6777 23 23 class WorldEntity; 24 24 class GraphicsEffect; 25 class TiXmlElement; 25 26 26 27 //! class to handle graphics … … 34 35 /** @returns a Pointer to the only object of this Class */ 35 36 inline static GraphicsEngine* getInstance() { if (!GraphicsEngine::singletonRef) GraphicsEngine::singletonRef = new GraphicsEngine(); return GraphicsEngine::singletonRef; }; 37 38 virtual void loadParams(const TiXmlElement* root); 36 39 37 40 int init(); … … 83 86 void process(const Event &event); 84 87 88 void loadGraphicsEffectXML(const TiXmlElement* root); 85 89 bool loadGraphicsEffect(GraphicsEffect* effect); 86 90 bool unloadGraphicsEffect(GraphicsEffect* effect); -
branches/network/src/story_entities/game_world_data.cc
r6771 r6777 278 278 { 279 279 LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams); 280 LoadParamXML(root, "GraphicsEngine", GraphicsEngine::getInstance(), GraphicsEngine, loadParams); 280 281 281 282 // LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
Note: See TracChangeset
for help on using the changeset viewer.