Changeset 6388 for code/branches/presentation2/src/modules
- Timestamp:
- Dec 21, 2009, 1:28:10 PM (15 years ago)
- Location:
- code/branches/presentation2/src/modules
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc
r5781 r6388 66 66 XMLPortParam(BoxCollisionShape, "halfExtents", setHalfExtents, getHalfExtents, xmlelement, mode); 67 67 XMLPortParamLoadOnly(BoxCollisionShape, "width", setWidth, xmlelement, mode); 68 XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode); 69 XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode); 68 XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode); 69 XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode); 70 70 } 71 71 -
code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc
r5781 r6388 66 66 67 67 XMLPortParam(ConeCollisionShape, "radius", setRadius, getRadius, xmlelement, mode); 68 XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode); 68 XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode); 69 69 } 70 70 -
code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc
r5781 r6388 67 67 68 68 XMLPortParam(PlaneCollisionShape, "normal", setNormal, getNormal, xmlelement, mode); 69 XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode); 69 XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode); 70 70 } 71 71 -
code/branches/presentation2/src/modules/questsystem/QuestGUI.cc
r6387 r6388 268 268 index = tempIndex; //!< Reset the index to the original level. 269 269 270 return index; 270 return index; 271 271 } 272 272 -
code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc
r6387 r6388 71 71 QuestGUINode::QuestGUINode(QuestGUI* gui, QuestGUINode* parent, QuestItem* item, int depth, int index) 72 72 { 73 this->initialize(); 73 this->initialize(); 74 74 75 75 this->gui_ = gui; … … 154 154 155 155 if(this->details_ == NULL) //!< If the details window was not already created. 156 { 156 { 157 157 std::ostringstream stream; 158 158 … … 297 297 */ 298 298 bool QuestGUINode::closeDetails(const CEGUI::EventArgs& e) 299 { 299 { 300 300 //CEGUI::Window* window = this->gui_->getRootWindow(); 301 301 CEGUI::Window* window = this->gui_->getWindowManager()->getWindow("orxonox/QuestGUI/Background"); -
code/branches/presentation2/src/modules/questsystem/QuestGUINode.h
r6387 r6388 54 54 /** 55 55 @brief Retreive the window of this node. 56 @return The CEGUI Window of this node. 56 @return The CEGUI Window of this node. 57 57 */ 58 58 inline CEGUI::Window* getWindow(void) -
code/branches/presentation2/src/modules/questsystem/QuestListener.cc
r6387 r6388 193 193 Returns the questId of the Quest the QuestListener reacts to. 194 194 */ 195 const std::string & QuestListener::getQuestId(void) 195 const std::string & QuestListener::getQuestId(void) 196 196 { 197 197 return this->quest_->getId(); -
code/branches/presentation2/src/modules/questsystem/QuestManager.h
r5929 r6388 72 72 static QuestManager& getInstance() { return Singleton<QuestManager>::getInstance(); } // tolua_export 73 73 74 //! Retreive the main window for the GUI. 74 //! Retreive the main window for the GUI. 75 75 CEGUI::Window* getQuestGUI(const std::string & guiName); // tolua_export 76 76 -
code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc
r6387 r6388 54 54 void LightningGunProjectile::setMaterial(const std::string& material) 55 55 { 56 this->materialBase_ = material; 56 this->materialBase_ = material; 57 57 58 58 BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_)); -
code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc
r6307 r6388 57 57 58 58 void LightningGun::fire() 59 { 59 { 60 60 LightningGunProjectile* projectile = new LightningGunProjectile(this); 61 61 projectile->setMaterial("Flares/LightningBall_");
Note: See TracChangeset
for help on using the changeset viewer.