Changeset 11855 for code/branches/ScriptableController_FS18/src/orxonox/Level.h

Timestamp:

Apr 12, 2018, 2:07:03 PM (7 years ago)

Author:

adamc

Message:

merged HS17 into FS18

Location:

code/branches/ScriptableController_FS18

Files:

• . (modified) (1 prop)
• src/orxonox/Level.h (modified) (4 diffs)

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

@@ -42 +42 @@
 namespace orxonox
 {
+    class ScriptableController;
+
     class _OrxonoxExport Level : public BaseObject, public Synchronisable, public Context
     {
@@ -54 +56 @@
 
             MeshLodInformation* getLodInfo(std::string meshName) const;
+
+            inline ScriptableController *getScriptableController(void)
+                { return this->controller_.get(); }
+
+            inline const std::string &getScript(void)
+                { return this->level_script_; }
 
 
@@ -78 +86 @@
             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 +97 @@
             std::list<BaseObject*>         objects_;
             std::map<std::string,MeshLodInformation*>  lodInformation_;
+
+            std::unique_ptr<ScriptableController> controller_;
+            std::string           level_script_;
     };
 }