- Timestamp:
- Dec 2, 2009, 10:20:37 PM (15 years ago)
- Location:
- code/branches/presentation2/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/libraries/core/ConfigValueContainer.h
r5738 r6218 146 146 if ((this->callback_ && object) || this->bContainerIsNew_) 147 147 { 148 if (this->bContainerIsNew_)149 this->bContainerIsNew_ = false;150 151 148 T temp = *value; 152 149 this->value_.getValue(value); 153 if ( (*value) != temp)150 if (this->bContainerIsNew_ || (*value) != temp) 154 151 { 155 152 if (this->callback_ && object) … … 158 155 this->bDoInitialCallback_ = true; 159 156 } 157 158 if (this->bContainerIsNew_) 159 this->bContainerIsNew_ = false; 160 160 } 161 161 else -
code/branches/presentation2/src/libraries/tools/ParticleInterface.cc
r6213 r6218 64 64 this->bAllowedByLOD_ = true; 65 65 this->speedFactor_ = 1.0f; 66 67 this->setDetailLevel(static_cast<unsigned int>(detaillevel)); 66 68 67 69 this->setConfigValues(); … … 80 82 } 81 83 } 82 83 this->setDetailLevel(static_cast<unsigned int>(detaillevel));84 84 } 85 85 -
code/branches/presentation2/src/libraries/tools/Shader.cc
r5781 r6218 79 79 Shader::~Shader() 80 80 { 81 82 if (this->bLoadCompositor_ && this->compositorInstance_) 81 if (this->compositorInstance_ && this->bLoadCompositor_) 83 82 { 84 83 Ogre::Viewport* viewport = GraphicsManager::getInstance().getViewport(); -
code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc
r5929 r6218 85 85 86 86 this->value_ = 1.0f; // initielize with 1.0f to trigger a change when calling setValue(0.0f) on the line below 87 this->setAutoColour(true); 87 88 this->setValue(0.0f); // <-- 88 89 this->setRightToLeft(false); 89 this->setAutoColour(true);90 90 this->currentColour_ = ColourValue::White; 91 91 -
code/branches/presentation2/src/orxonox/interfaces/RadarViewable.cc
r5929 r6218 51 51 , line_(NULL) 52 52 , LineNode_(NULL) 53 , isHumanShip_(false) 54 , bVisibility_(false) 53 55 , radarObjectCamouflage_(0.0f) 54 56 , radarObjectShape_(Dot) … … 56 58 { 57 59 RegisterRootObject(RadarViewable); 58 59 this->bVisibility_ = true;60 this->isHumanShip_ = false;61 60 62 61 this->uniqueId_=getUniqueNumberString(); -
code/branches/presentation2/src/orxonox/overlays/Map.cc
r5929 r6218 94 94 95 95 //Getting Scene Manager (Hack) 96 if( !sManager_ ) 97 { 98 ObjectList<Scene>::iterator it = ObjectList<Scene>::begin(); 99 this->sManager_ = it->getSceneManager(); 100 } 96 ObjectList<Scene>::iterator it = ObjectList<Scene>::begin(); 97 this->sManager_ = it->getSceneManager(); 101 98 if( !Map::getMapSceneManager() ) 102 99 { -
code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.cc
r6057 r6218 83 83 // Get aspect ratio from the render window. Later on, we get informed automatically 84 84 this->windowAspectRatio_ = static_cast<float>(this->getWindowWidth()) / this->getWindowHeight(); 85 this->sizeCorrectionChanged(); 86 87 this-> changedVisibility();88 89 setSize(Vector2(1.0f, 1.0f));90 setPickPoint(Vector2(0.0f, 0.0f));91 setPosition(Vector2(0.0f, 0.0f));92 setRotation(Degree(0.0));93 setAspectCorrection(false); 85 86 this->size_ = Vector2(1.0f, 1.0f); 87 this->pickPoint_= Vector2(0.0f, 0.0f); 88 this->position_ = Vector2(0.0f, 0.0f); 89 this->angle_ = Degree(0.0); 90 this->bCorrectAspect_ = false; 91 this->rotState_ = Horizontal; 92 this->angleChanged(); // updates all other values as well 93 94 94 setBackgroundMaterial(""); 95 95 }
Note: See TracChangeset
for help on using the changeset viewer.