Changeset 11129 for code/branches/ogre1.9/src/orxonox/worldentities/WorldEntity.cc

Timestamp:

Mar 6, 2016, 3:32:26 PM (8 years ago)

Author:

landauf

Message:

orxonox now compiles with ogre 1.9 (but still needs some other changes)

File:

• code/branches/ogre1.9/src/orxonox/worldentities/WorldEntity.cc (modified) (2 diffs)

code/branches/ogre1.9/src/orxonox/worldentities/WorldEntity.cc

@@ -548 +548 @@
     {
         this->node_->attachObject(object);
+#if OGRE_VERSION >= 0x010900
+        object->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
+#else
         object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
+#endif
     }
 
@@ -563 +567 @@
     void WorldEntity::detachOgreObject(Ogre::MovableObject* object)
     {
+#if OGRE_VERSION >= 0x010900
+        object->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(nullptr)));
+#else
         object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(nullptr)));
+#endif
         this->node_->detachObject(object);
     }