Changeset 11518 for code

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

Files:

• libraries/core/BaseObject.h (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/Level.cc (modified) (3 diffs)
• orxonox/Level.h (modified) (3 diffs)
• orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)
• orxonox/worldentities/ControllableEntity.h (modified) (1 diff)
• orxonox/worldentities/WorldEntity.cc (modified) (4 diffs)
• orxonox/worldentities/WorldEntity.h (modified) (2 diffs)

code/branches/ScriptableController_HS17/src/libraries/core/BaseObject.h

@@ -58 +58 @@
     class Gametype;
     class Level;
+    class ScriptableController;
 
     /// The BaseObject is the parent of all classes representing an instance in the game.
@@ -191 +192 @@
 
             static void loadAllEventStates(Element& xmlelement, XMLPort::Mode mode, BaseObject* object, Identifier* identifier);
+
+            virtual void registerToScriptableController(ScriptableController *controller) {}
 
         protected:

code/branches/ScriptableController_HS17/src/orxonox/CMakeLists.txt

@@ -52 +52 @@
 ADD_SUBDIRECTORY(items)
 ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(scriptablecontroller)
 ADD_SUBDIRECTORY(sound)
 ADD_SUBDIRECTORY(weaponsystem)

code/branches/ScriptableController_HS17/src/orxonox/Level.cc

@@ -42 +42 @@
 #include "overlays/OverlayGroup.h"
 #include "LevelManager.h"
+#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -79 +80 @@
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
 
+        XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode);
+
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
+
+        if(this->level_script_ != "")
+        {
+            this->controller_.reset(new ScriptableController());
+            this->controller_->runScript(this->level_script_);
+        }
     }
 
@@ -168 +177 @@
     {
         this->objects_.push_back(object);
+        if(this->controller_.get() != nullptr)
+            object->registerToScriptableController(this->controller_.get());
     }
 

code/branches/ScriptableController_HS17/src/orxonox/Level.h

@@ -42 +42 @@
 namespace orxonox
 {
+    class ScriptableController;
+
     class _OrxonoxExport Level : public BaseObject, public Synchronisable, public Context
     {
@@ -78 +80 @@
             void networkcallback_applyXMLFile();
 
+            inline void setScript(const std::string &script)
+                { this->level_script_ = script; }
+
+
             std::string                    pluginsString_;
             std::list<PluginReference*>    plugins_;
-
             std::string                    gametype_;
             std::string                    xmlfilename_;
@@ -86 +91 @@
             std::list<BaseObject*>         objects_;
             std::map<std::string,MeshLodInformation*>  lodInformation_;
+
+            std::unique_ptr<ScriptableController> controller_;
+            std::string                           level_script_;
     };
 }

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: