Changeset 6417 for code/trunk/src/orxonox/Scene.cc
- Timestamp:
- Dec 25, 2009, 10:23:58 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/Scene.cc
r6064 r6417 58 58 this->setScene(SmartPtr<Scene>(this, false), OBJECTID_UNKNOWN); 59 59 this->bShadows_ = true; 60 this->soundReferenceDistance_ = 20.0; 60 61 61 62 if (GameMode::showsGraphics()) … … 113 114 XMLPortParam(Scene, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2f, 0.2f, 0.2f, 1.0f)); 114 115 XMLPortParam(Scene, "shadow", setShadow, getShadow, xmlelement, mode).defaultValues(true); 116 XMLPortParam(Scene, "soundReferenceDistance", setSoundReferenceDistance, getSoundReferenceDistance, xmlelement, mode); 115 117 116 118 XMLPortParam(Scene, "gravity", setGravity, getGravity, xmlelement, mode); … … 334 336 { 335 337 // get the WorldEntity pointers 336 WorldEntity* object0 = static_cast<WorldEntity*>(colObj0->getUserPointer()); 337 assert(orxonox_cast<WorldEntity*>(object0)); 338 WorldEntity* object1 = static_cast<WorldEntity*>(colObj1->getUserPointer()); 339 assert(orxonox_cast<WorldEntity*>(object1)); 338 SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer()); 339 SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer()); 340 340 341 341 // false means that bullet will assume we didn't modify the contact
Note: See TracChangeset
for help on using the changeset viewer.