Changeset 12106 for code/branches

Timestamp:

Nov 14, 2018, 11:59:52 AM (6 years ago)

Author:

linggj

Message:

Story Mode Controller added again as a controllabel entitz

Location:

code/branches/WorldMap_HS18

Files:

• data/gui/layouts/CampaignMenu.layout (modified) (1 diff)
• data/gui/scripts/CampaignMenu.lua (modified) (3 diffs)
• data/levels/StoryModeMapDev.oxw (modified) (2 diffs)
• src/orxonox/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/controllers/SMCoord.cc (added)
• src/orxonox/controllers/SMCoord.h (added)
• src/orxonox/controllers/StoryModeController.cc (modified) (5 diffs)
• src/orxonox/controllers/StoryModeController.h (modified) (2 diffs)

code/branches/WorldMap_HS18/data/gui/layouts/CampaignMenu.layout

@@ -8 +8 @@
         <Property name="BackgroundEnabled" value="False" />
               
-        <Window name="ForwardText" type="MenuWidgets/Button">
-            <Property name="Text" value="Forward" />
-            <Property name="Visible" value="True" />
-            <Property name="Area" value="{{0.1,0},{0.6,0},{0.3,0},{0.65,0}}" />
-            <Event function="CampaignMenu.forwardButton_clicked" name="Clicked" />
+
+        <Window name="RightButton" type="MenuWidgets/Button">
+            <Property name="Text" value="F" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.350,0},{0.9,0},{0.45,0},{0.95,0}}" />
+           
         </Window>
 
-        <Window name="ForwardButton" type="MenuWidgets/JuuButton">
-            <Property name="Visible" value="True" />
+         <Window name="LeftButton" type="MenuWidgets/Button">
+            <Property name="Text" value="B" />
             <Property name="MaxSize" value="{{1,0},{1,0}}" />
-            <Property name="Area" value="{{0.1,0},{0.75,0},{0.25,0},{0.95,0}}" />
-            <Event function="CampaignMenu.forwardButton_clicked" name="Clicked" />
+            <Property name="Area" value="{{0.55,0},{0.9,0},{0.65,0},{0.95,0}}" />
+           
+        </Window>
+
+        <Window name="SelectButton" type="MenuWidgets/Button">
+            <Property name="Text" value="Play" />
+            <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            <Property name="Area" value="{{0.45,0},{0.9,0},{0.55,0},{0.95,0}}" />
+            
         </Window>
 

code/branches/WorldMap_HS18/data/gui/scripts/CampaignMenu.lua

@@ -2 +2 @@
 
 local P = createMenuSheet("CampaignMenu")
+
 
 function P:onShow()
@@ -75 +76 @@
 end
 
-function P.forwardButton_clicked(e)
-    P.loadMap()
-end
+
+
 
 function P.Mission1Button_clicked(e)
@@ -124 +124 @@
 
 function P.loadMap()
-    orxonox.execute("change Game  NC_StoryModeLevel")
+    orxonox.execute("changeGame  dynamicMatch.oxw")
+     hideAllMenuSheets()
 end
 

code/branches/WorldMap_HS18/data/levels/StoryModeMapDev.oxw

@@ -22 +22 @@
     <Template link=lodtemplate_default />
   </templates>
+
+  <Template name=selectertemplate>
+  <StoryModeController team=0>
+    <attache>
+     <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="true" orientation="-0.015,0.091,0.038,-0.995"/>
+   </attache>
+ </StoryModeController>
+</Template>
+
   <?lua include("includes/notifications.oxi") ?>
 <?lua
@@ -83 +92 @@
 
 
+
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
 

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Controller.cc
+  StoryModeController.cc
+  SMCoord.cc
   HumanController.cc
   NewHumanController.cc

code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "worldentities/ControllableEntity.h"
+#include "SMCoord.h"
 
 namespace orxonox
@@ -36 +37 @@
     RegisterClass(StoryModeController);
 
-   StoryModeController::StoryModeController(Context* context) : Pawn(context)
+   StoryModeController::StoryModeController(Context* context) : ControllableEntity(context)
     {
         RegisterObject(StoryModeController);
-        moveRight_ = false;
-        moveLeft_ = false;
-        //this->setAccuracy(50);
+        float time_;
+        moveForward_=false;
+        moveBackward_=false;                     
+        boostPressed_=false;
+        setPosition(0);
+      
     }
 
     StoryModeController::~StoryModeController()
     {
-        /*for (WorldEntity* waypoint : this->waypoints_)
-        {
-            if(waypoint)
-                waypoint->destroy();
-        }*/
+        
+
+    }
+
+    void StoryModeController::updatePosition(){
+
+    }
+    void StoryModeController::setPosition(int index){
 
     }
@@ -57 +64 @@
     {
         orxout(internal_error) << "Hi" << endl;
-        
-        /*if (!this->isActive())
-            return;
-
-        if (this->waypoints_.size() == 0 || !this->getControllableEntity())
-            return;
-
-        if (false /* this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_*///)
-            //this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
-
-        //this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());
+       SUPER(StoryModeController, tick, dt);
+       time_ +=dt;
+       
+       
     }
 
     void StoryModeController::moveFrontBack(const Vector2& value)
     {
-        orxout(internal_error) << "FrontBack" << endl;
-
-            
+                    
     }
     void StoryModeController::moveRightLeft(const Vector2& value)
@@ -80 +78 @@
         orxout(internal_error) << "RightLeft" << endl; 
         if (value.x>0){
-            moveRight_ =false;
-            moveLeft_ =true;
-
-        } 
+            moveForward_ =false;
+            moveBackward_ =true;
+        } else {
+            moveBackward_ = false;
+            moveForward_ = true;
+        }
 
     }
@@ -92 +92 @@
     void StoryModeController::fire(unsigned int a){}
     void StoryModeController::fired(unsigned int b){}
-    void StoryModeController::boost(bool bBoost){}
+    void StoryModeController::boost(bool bBoost){
+        boostPressed_ = true;
+    }
 }

code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h

@@ -39 +39 @@
 namespace orxonox
 {
-    class _OrxonoxExport StoryModeController : public Pawn
+    class _OrxonoxExport StoryModeController : public ControllableEntity
     {
         public:
@@ -54 +54 @@
             virtual void fired(unsigned int firemode) override;
             virtual void boost(bool bBoost) override;
+            virtual void setPosition(int index);
             bool moveRight_ ;
             bool moveLeft_ ;
-        protected:
+        private:
+            virtual void updatePosition();                        
+            float time_;
+            bool moveForward_;
+            bool moveBackward_;                     
+            bool boostPressed_;
 
     };