Changeset 11690

Timestamp:

Dec 18, 2017, 12:40:00 PM (6 years ago)

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• data/levels/ArrowLevel.oxw (deleted)
• data/levels/scriptableControllerTest.oxw (deleted)
• data/levels/scripts (deleted)
• data/overlays/HUDPickupTemplate.oxo (modified) (2 diffs)
• data/overlays/HUDTemplate_test.oxo (copied) (copied from code/branches/Waypoints_HS17/data/overlays/HUDTemplate_test.oxo)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/libraries/core/BaseObject.h (modified) (2 diffs)
• src/libraries/tools/Timer.cc (modified) (3 diffs)
• src/libraries/tools/Timer.h (modified) (2 diffs)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDWaypoints.cc (deleted)
• src/modules/overlays/hud/HUDWaypoints.h (deleted)
• src/modules/questsystem/Quest.cc (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/Level.cc (modified) (3 diffs)
• src/orxonox/Level.h (modified) (4 diffs)
• src/orxonox/controllers/ArrowController.cc (deleted)
• src/orxonox/controllers/ArrowController.h (deleted)
• src/orxonox/controllers/AutonomousDroneController.cc (deleted)
• src/orxonox/controllers/AutonomousDroneController.h (deleted)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/WaypointArrow.cc (deleted)
• src/orxonox/controllers/WaypointArrow.h (deleted)
• src/orxonox/graphics/Model.cc (modified) (1 diff)
• src/orxonox/infos/GametypeInfo.cc (modified) (3 diffs)
• src/orxonox/infos/GametypeInfo.h (modified) (2 diffs)
• src/orxonox/infos/HumanPlayer.cc (modified) (1 diff)
• src/orxonox/items/ShipPart.cc (modified) (2 diffs)
• src/orxonox/scriptablecontroller (deleted)
• src/orxonox/worldentities/Arrow.cc (deleted)
• src/orxonox/worldentities/Arrow.h (deleted)
• src/orxonox/worldentities/AutonomousDrone.cc (deleted)
• src/orxonox/worldentities/AutonomousDrone.h (deleted)
• src/orxonox/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)
• src/orxonox/worldentities/ControllableEntity.h (modified) (1 diff)
• src/orxonox/worldentities/MobileEntity.cc (modified) (2 diffs)
• src/orxonox/worldentities/WorldEntity.cc (modified) (4 diffs)
• src/orxonox/worldentities/WorldEntity.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (6 diffs)

code/branches/Presentation_HS17/data/overlays/HUDPickupTemplate.oxo

@@ -92 +92 @@
      correctaspect = true
      iconmaterial  = "Orxonox/BarIconSpeed"
-    >
+     >
       <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
       <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
@@ -193 +193 @@
     />
 
+
     <HUDTimer
      name     = "Timer"

code/branches/Presentation_HS17/data/overlays/HUDTemplates3.oxo

@@ -190 +190 @@
      position               = "0.32, 0.81"
      pickpoint              = "0.0, 0.0"
-     visible                = "true"
+     visible                = "false"
     />
 

code/branches/Presentation_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.
@@ -192 +191 @@
 
             static void loadAllEventStates(Element& xmlelement, XMLPort::Mode mode, BaseObject* object, Identifier* identifier);
-
 
         protected:

code/branches/Presentation_HS17/src/libraries/tools/Timer.cc

@@ -158 +158 @@
     }
 
-    Timer::Timer(float interval, bool bLoop, std::function<void ()> func, bool bKillAfterCall)
-    {
-        this->init();
-        RegisterObject(Timer);
-
-        this->setTimer(interval, bLoop, func, bKillAfterCall);
-    }
-
     /**
         @brief Initializes the Timer
@@ -201 +193 @@
         this->executor_ = executor;
         this->bActive_ = true;
-        this->isStdFunction_ = false;
 
         this->time_ = this->interval_;
         this->bKillAfterCall_ = bKillAfterCall;
 
-        if(executor != nullptr)
-            executor->getFunctor()->setSafeMode(true);
-    }
-
-    void Timer::setTimer(float interval, bool bLoop, std::function<void ()> func, bool bKillAfterCall)
-    {
-        // Without the cast, the call would be ambiguous, because nullptr is castable to
-        // both, ExecutorPtr and std::function.
-        this->setTimer(interval, bLoop, static_cast<ExecutorPtr>(nullptr), bKillAfterCall);
-        this->function_ = func;
-        this->isStdFunction_ = true;
+        executor->getFunctor()->setSafeMode(true);
     }
 
@@ -226 +207 @@
         bool temp = this->bKillAfterCall_; // to avoid errors with bKillAfterCall_=false and an exutors which destroy the timer
 
-        if(this->isStdFunction_)
-            this->function_();
-        else
-            (*this->executor_)();
+        (*this->executor_)();
 
         if (temp)

code/branches/Presentation_HS17/src/libraries/tools/Timer.h

@@ -108 +108 @@
 
             Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
-            Timer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
-            void setTimer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void run();
@@ -155 +153 @@
 
             ExecutorPtr executor_;  //!< The executor of the function that will be called when the time expires
-            std::function<void (void)> function_;
 
-            bool isStdFunction_;
             long long interval_;    //!< The time-interval in micro seconds
             bool bLoop_;            //!< If true, the executor gets called every @a interval seconds

code/branches/Presentation_HS17/src/modules/overlays/hud/CMakeLists.txt

@@ -11 +11 @@
   HUDEnemyHealthBar.cc
   HUDEnemyShieldBar.cc
-  HUDWaypoints.cc
   HUDWeaponMode.cc
   HUDWeapon.cc

code/branches/Presentation_HS17/src/modules/questsystem/Quest.cc

@@ -80 +80 @@
         XMLPortObject(Quest, QuestEffect, "fail-effects", addFailEffect, getFailEffect, xmlelement, mode);
         XMLPortObject(Quest, QuestEffect, "complete-effects", addCompleteEffect, getCompleteEffect, xmlelement, mode);
+        //XMLPortObject(Quest, Worldentity, "arrowtarget", addArrowTarget, getArrowTarget, xmlelement, mode);
 
         QuestManager::getInstance().registerQuest(this); // Registers the Quest with the QuestManager.
     }
+
+
+    /*bool Quest::addArrowTarget(Quest* quest){
+
+        assert(quest);
+
+
+    }*/
+
+
 
     /**

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

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

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

@@ -42 +42 @@
 #include "overlays/OverlayGroup.h"
 #include "LevelManager.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -57 +56 @@
         this->xmlfilename_ = this->getFilename();
         this->xmlfile_ = nullptr;
-        this->controller_.reset(new ScriptableController());
     }
 
@@ -80 +78 @@
         XMLPortParam(Level, "plugins",  setPluginsString,  getPluginsString,  xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-
-        XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode);
 
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);

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

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

code/branches/Presentation_HS17/src/orxonox/controllers/CMakeLists.txt

@@ -19 +19 @@
   FightingController.cc
   MasterController.cc
-  AutonomousDroneController.cc
-  ArrowController.cc
 )

code/branches/Presentation_HS17/src/orxonox/graphics/Model.cc

@@ -73 +73 @@
 
         XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode);
+
         XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
         XMLPortParam(Model, "renderQueueGroup", setRenderQueueGroup, getRenderQueueGroup, xmlelement, mode);

code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.cc

@@ -43 +43 @@
 #include "interfaces/GametypeMessageListener.h"
 #include "interfaces/NotificationListener.h"
-#include "scriptablecontroller/scriptable_controller.h"
-#include "Level.h"
 
 #include "PlayerInfo.h"
@@ -78 +76 @@
         this->spawned_ = false;
         this->readyToSpawn_ = false;
-        this->isFirstSpawn_ = true;
 
         this->registerVariables();
@@ -313 +310 @@
         {
             if(this->hasStarted() && !this->hasEnded())
+
                 this->setSpawnedHelper(player, true);
-        }
-
-        // TODO We might want to handle the subsequent spawns as well somehow
-        if(player->isHumanPlayer() && player->isLocalPlayer() && this->isFirstSpawn_)
-        {
-            this->isFirstSpawn_ = false;
-            this->getLevel()->getScriptableController()->setPlayer(player);
-
-            // This handles paths relative to the 'level' directory
-            std::string script = this->getLevel()->getScript();
-            if(script.at(0) != '/')
-                script = "../levels/" + script; // Not very dynamic
-            this->getLevel()->getScriptableController()->runScript(script);
         }
     }

code/branches/Presentation_HS17/src/orxonox/infos/GametypeInfo.h

@@ -83 +83 @@
             inline bool isStartCountdownRunning() const
                 { return this->bStartCountdownRunning_; }
-
+            
             void changedStartCountdownRunning(void); // Is called when the start countdown has been either started or stopped.
 
@@ -168 +168 @@
             bool spawned_; //!< Whether the local Player is currently spawned.
             bool readyToSpawn_; //!< Whether the local Player is ready to spawn.
-            bool isFirstSpawn_;
     };
 }

code/branches/Presentation_HS17/src/orxonox/infos/HumanPlayer.cc

@@ -38 +38 @@
 #include "gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
-#include "Level.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox

code/branches/Presentation_HS17/src/orxonox/items/ShipPart.cc

@@ -42 +42 @@
 #include "items/PartDestructionEvent.h"
 #include "chat/ChatManager.h"
-#include "Level.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 
@@ -217 +215 @@
             }
         }
-
-        // This is a bit hacky, but it takes away damage control from the pawn, so it has to handle
-        // that as well.
-        this->getLevel()->getScriptableController()->pawnHit(parent_, originator, parent_->getHealth(), parent_->getShieldHealth());
-
         if (this->health_ < 0)
             this->death();

code/branches/Presentation_HS17/src/orxonox/worldentities/CMakeLists.txt

@@ -13 +13 @@
   ExplosionPart.cc
   Actionpoint.cc
-  AutonomousDrone.cc
-  Arrow.cc
   NameableStaticEntity.cc
 )

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

@@ -39 +39 @@
 
 #include "Scene.h"
-#include "Level.h"
 #include "infos/PlayerInfo.h"
 #include "controllers/NewHumanController.h"
@@ -68 +67 @@
         this->camera_ = nullptr;
         this->xmlcontroller_ = nullptr;
+        //this->controller_ = nullptr;
         this->reverseCamera_ = nullptr;
         this->bDestroyWhenPlayerLeft_ = false;

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

@@ -175 +175 @@
             inline int getTeam() const
                 { return this->team_; }
-
 
         protected:

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

@@ -36 +36 @@
 
 #include "Scene.h"
-#include "Level.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -74 +72 @@
                 this->setAngularVelocity(rotationAxis.normalisedCopy() * rotationRate.valueRadians());
         }
-
-        if(!this->id_.empty() && this->getLevel() != nullptr)
-            this->getLevel()->getScriptableController()->registerMobileEntity(this->id_, this);
     }
 

code/branches/Presentation_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"
 
 namespace orxonox
@@ -81 +79 @@
         this->parentID_ = OBJECTID_UNKNOWN;
         this->bDeleteWithParent_ = true;
-        this->id_ = -1;
 
         this->node_->setPosition(Vector3::ZERO);
@@ -163 +160 @@
         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);
@@ -185 +181 @@
         // Attached collision shapes
         XMLPortObject(WorldEntity, CollisionShape, "collisionShapes", attachCollisionShape, getAttachedCollisionShape, xmlelement, mode);
-
-        if(!this->id_.empty() && this->getLevel() != nullptr)
-            this->getLevel()->getScriptableController()->registerWorldEntity(this->id_, this);
     }
 

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

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

code/branches/Presentation_HS17/src/orxonox/worldentities/pawns/Pawn.cc

@@ -50 +50 @@
 #include "sound/WorldSound.h"
 #include "core/object/ObjectListIterator.h"
-#include "Level.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 #include "controllers/FormationController.h"
@@ -162 +160 @@
 
         XMLPortParam ( RadarViewable, "radarname", setRadarName, getRadarName, xmlelement, mode );
-
-        if(!this->id_.empty() && this->getLevel() != nullptr)
-            this->getLevel()->getScriptableController()->registerPawn(this->id_, this);
     }
 
@@ -287 +282 @@
         {
             // Health-damage cannot be absorbed by shields.
-            // Shield-damage only reduces shield health.
+            // Shield-damage only reduces shield health. 
             // Normal damage can be (partially) absorbed by shields.
 
@@ -307 +302 @@
                 this->setHealth(this->health_ - (damage - shielddamage) - healthdamage);
             }
-            this->getLevel()->getScriptableController()->pawnHit(this, originator, this->health_, this->shieldHealth_);
 
             this->lastHitOriginator_ = originator;
@@ -408 +402 @@
             }
         }
-
-        this->getLevel()->getScriptableController()->pawnKilled(this);
     }
     void Pawn::goWithStyle()
@@ -633 +625 @@
         {
             // delete all debug models
-            for(Model* model : debugWeaponSlotModels_)
+            for(Model* model : debugWeaponSlotModels_) 
             {
                 model->destroy();