Changeset 11583 for code/branches/ScriptableController_HS17/src/orxonox/worldentities

Timestamp:

Nov 20, 2017, 4:48:03 PM (7 years ago)

Author:

kohlia

Message:

Near object, near point and at area work!

Location:

code/branches/ScriptableController_HS17/src/orxonox/worldentities

Files:

• ControllableEntity.cc (modified) (4 diffs)
• ControllableEntity.h (modified) (1 diff)
• MobileEntity.cc (modified) (1 diff)
• WorldEntity.cc (modified) (3 diffs)
• WorldEntity.h (modified) (2 diffs)

code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.cc

@@ -39 +39 @@
 
 #include "Scene.h"
+#include "Level.h"
 #include "infos/PlayerInfo.h"
 #include "controllers/NewHumanController.h"
@@ -68 +69 @@
         this->camera_ = nullptr;
         this->xmlcontroller_ = nullptr;
-        //this->controller_ = nullptr;
         this->reverseCamera_ = nullptr;
         this->bDestroyWhenPlayerLeft_ = false;
@@ -127 +127 @@
         XMLPortObject(ControllableEntity, CameraPosition, "camerapositions", addCameraPosition, getCameraPosition, xmlelement, mode);
         XMLPortObject(ControllableEntity, Controller,     "controller",      setXMLController,  getXMLController,  xmlelement, mode);
+
+        if(!this->id_.empty() && this->getLevel() != nullptr)
+            this->getLevel()->getScriptableController()->registerControllableEntity(this->id_, this);
     }
 
@@ -338 +341 @@
     }
 
-    void ControllableEntity::registerToScriptableController(ScriptableController *controller)
-    {
-        controller->registerControllableEntity(this->id_, this);
-    }
-
     void ControllableEntity::setPlayer(PlayerInfo* player)
     {

code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.h

@@ -176 +176 @@
                 { return this->team_; }
 
-            virtual void registerToScriptableController(ScriptableController *controller) override;
 
         protected:

code/branches/ScriptableController_HS17/src/orxonox/worldentities/MobileEntity.cc

@@ -115 +115 @@
 
         this->node_->setPosition(position);
-        this->getLevel()->getScriptableController()->objectMoved(this);
     }
 

code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.cc

@@ -44 +44 @@
 #include "core/XMLPort.h"
 #include "Scene.h"
+#include "Level.h"
 #include "collisionshapes/WorldEntityCollisionShape.h"
 #include "scriptablecontroller/scriptable_controller.h"
@@ -185 +186 @@
         XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode);
 
-        orxout(user_info) << "ID loaded" << std::endl;
+        if(!this->id_.empty() && this->getLevel() != nullptr)
+            this->getLevel()->getScriptableController()->registerWorldEntity(this->id_, this);
     }
 
@@ -280 +282 @@
     }
 
-    void WorldEntity::registerToScriptableController(ScriptableController *controller)
-    {
-        orxout(user_info) << "Registering object to SC (" << this->id_ << ")" << std::endl;
-        controller->registerWorldEntity(this->id_, this);
-    }
-
     /**
     @brief

code/branches/ScriptableController_HS17/src/orxonox/worldentities/WorldEntity.h

@@ -111 +111 @@
             virtual void changedVisibility(void) override;
 
-            inline int getID(void)
+            inline std::string getID(void)
                 { return this->id_; }
 
-            inline void setID(int id)
+            inline void setID(std::string id)
                 { this->id_ = id; }
-
-            virtual void registerToScriptableController(ScriptableController *controller) override;
 
             virtual void setPosition(const Vector3& position) = 0;
@@ -450 +448 @@
 
             btRigidBody*  physicalBody_; //!< Bullet rigid body. Everything physical is applied to this instance.
-            int           id_;           //!< Used by the ScriptableController to identify objects
+            std::string   id_;           //!< Used by the ScriptableController to identify objects
 
         private: