Changeset 6501 for code/trunk/src/orxonox/worldentities
- Timestamp:
- Mar 11, 2010, 11:32:01 AM (15 years ago)
- Location:
- code/trunk/src/orxonox/worldentities
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/worldentities/WorldEntity.cc
r6417 r6501 474 474 { 475 475 this->node_->attachObject(object); 476 object->setUser Object(this);476 object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this))); 477 477 } 478 478 … … 489 489 void WorldEntity::detachOgreObject(Ogre::MovableObject* object) 490 490 { 491 object->setUser Object(NULL);491 object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(NULL))); 492 492 this->node_->detachObject(object); 493 493 } -
code/trunk/src/orxonox/worldentities/WorldEntity.h
r6417 r6501 33 33 #include "OrxonoxPrereqs.h" 34 34 35 #include <OgreUserDefinedObject.h>36 35 #ifdef ORXONOX_RELEASE 37 36 # include <OgreSceneNode.h> … … 70 69 Collision shapes: These are controlled by the internal WorldEntityCollisionShape. @see WorldEntityCollisionShape. 71 70 */ 72 class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState , public Ogre::UserDefinedObject71 class _OrxonoxExport WorldEntity : public BaseObject, public Synchronisable, public btMotionState 73 72 { 74 73 friend class Scene;
Note: See TracChangeset
for help on using the changeset viewer.