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

Timestamp:

Oct 30, 2017, 4:05:01 PM (7 years ago)

Author:

kohlia

Message:

Nothing to see yet, really.

Location:

code/branches/ScriptableController_HS17/src/orxonox/worldentities

Files:

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

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

@@ -44 +44 @@
 #include "worldentities/CameraPosition.h"
 #include "overlays/OverlayGroup.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -337 +338 @@
     }
 
+    void ControllableEntity::registerToScriptableController(ScriptableController *controller)
+    {
+        controller->registerControllableEntity(this->id_, this);
+    }
+
     void ControllableEntity::setPlayer(PlayerInfo* player)
     {

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

@@ -175 +175 @@
             inline int getTeam() const
                 { return this->team_; }
+
+            virtual void registerToScriptableController(ScriptableController *controller) override;
 
         protected:

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

@@ -45 +45 @@
 #include "Scene.h"
 #include "collisionshapes/WorldEntityCollisionShape.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -79 +80 @@
         this->parentID_ = OBJECTID_UNKNOWN;
         this->bDeleteWithParent_ = true;
+        this->id_ = -1;
 
         this->node_->setPosition(Vector3::ZERO);
@@ -160 +162 @@
         XMLPortParamTemplate(WorldEntity, "scale3D",     setScale3D,     getScale3D,     xmlelement, mode, const Vector3&);
         XMLPortParam        (WorldEntity, "scale",       setScale,       getScale,       xmlelement, mode);
+        XMLPortParamLoadOnly(WorldEntity, "id",          setID,                xmlelement, mode);
         XMLPortParamLoadOnly(WorldEntity, "lookat",      lookAt_xmlport,       xmlelement, mode);
         XMLPortParamLoadOnly(WorldEntity, "direction",   setDirection_xmlport, xmlelement, mode);
@@ -275 +278 @@
     }
 
+    void WorldEntity::registerToScriptableController(ScriptableController *controller)
+    {
+        controller->registerWorldEntity(this->id_, this);
+    }
+
     /**
     @brief

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

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