Changeset 12180 for code/branches/Merge_HS18

Timestamp:

Dec 11, 2018, 2:52:30 PM (6 years ago)

Author:

merholzl

Message:

World Map merging

Location:

code/branches/Merge_HS18

Files:

• . (modified) (1 prop)
• data/gui/layouts/CampaignMenu.layout (modified) (13 diffs)
• data/gui/scripts/CampaignMenu.lua (modified) (4 diffs)
• data/levels/MapExample.oxw (copied) (copied from code/branches/WorldMap_HS18/data/levels/MapExample.oxw)
• data/levels/StoryModeMap.oxw (modified) (4 diffs)
• data/levels/emptyLevel22.oxw (copied) (copied from code/branches/WorldMap_HS18/data/levels/emptyLevel22.oxw)
• data/levels/templates/MapExample.oxt (copied) (copied from code/branches/WorldMap_HS18/data/levels/templates/MapExample.oxt)
• data/levels/templates/StoryMode.oxt (modified) (1 diff)
• data/levels/templates/StoryModeEscort.oxt (modified) (1 diff)
• data/overlays/MapExampleHUD.oxo (copied) (copied from code/branches/WorldMap_HS18/data/overlays/MapExampleHUD.oxo)
• data/overlays/StoryModeHUD.oxo (modified) (1 diff)
• src/modules/flappyorx/FlappyOrxShip.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefense.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseSelecter.cc (modified) (1 diff)
• src/orxonox/controllers/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/controllers/SMCoord.cc (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.cc)
• src/orxonox/controllers/SMCoord.h (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/SMCoord.h)
• src/orxonox/controllers/StoryModeController.cc (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.cc)
• src/orxonox/controllers/StoryModeController.h (copied) (copied from code/branches/WorldMap_HS18/src/orxonox/controllers/StoryModeController.h)
• src/orxonox/gametypes/StoryMode.cc (modified) (2 diffs)
• svn-commit.tmp (copied) (copied from code/branches/WorldMap_HS18/svn-commit.tmp)

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

@@ -7 +7 @@
         <Property name="Area" value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property name="BackgroundEnabled" value="False" />
+              
+
+        
+
         <Window name="Mission1Text" type="MenuWidgets/Button">
             <Property name="Text" value="Mission One" />
@@ -13 +17 @@
             <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission1Button" type="MenuWidgets/JuuButton">
             <Property name="Visible" value="False" />
@@ -19 +24 @@
             <Event function="CampaignMenu.Mission1Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission2Text" type="MenuWidgets/Button">
             <Property name="Text" value="Fight in our Back" />
-            <Property name="Visible" value="False" />
+            <Property name="Visible" value="True" />
             <Property name="Area" value="{{0.35,0},{0.6,0},{0.55,0},{0.65,0}}" />
             <Property name="Disabled" value="True" />
             <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
         </Window>
+        
         <Window name="Mission2Button" type="MenuWidgets/JuuButton">
-            <Property name="Visible" value="False" />
+            <Property name="Visible" value="True" />
             <Property name="MaxSize" value="{{1,0},{1,0}}" />
             <Property name="Area" value="{{0.4,0},{0.7,0},{0.5,0},{0.85,0}}" />
@@ -33 +40 @@
             <Event function="CampaignMenu.Mission2Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission3Text" type="MenuWidgets/Button">
             <Property name="Text" value="Pirate Attack" />
@@ -47 +55 @@
             <Event function="CampaignMenu.Mission3Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission4Text" type="MenuWidgets/Button">
             <Property name="Text" value="Trip to Area 51" />
@@ -61 +70 @@
             <Event function="CampaignMenu.Mission4Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission5Text" type="MenuWidgets/Button">
             <Property name="Text" value="Area 51 under Fire" />
@@ -75 +85 @@
             <Event function="CampaignMenu.Mission5Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission6Text" type="MenuWidgets/Button">
             <Property name="Text" value="Escape the Bastards" />
@@ -85 +96 @@
             <Property name="Visible" value="False" />
             <Property name="MaxSize" value="{{1,0},{1,0}}" />
+            
             <Property name="Area" value="{{0.6,0},{0.17,0},{0.65,0},{0.27,0}}" />
-            <Property name="Disabled" value="True" />
+            
+            <Property name="Disabled" value="True" /> 
             <Event function="CampaignMenu.Mission6Button_clicked" name="Clicked" />
         </Window>
@@ -96 +109 @@
             <Property name="Area" value="{{0.4,0},{0.025,0},{0.6,0},{0.075,0}}" />
         </Window>
+
         <Window name="Mission7Button" type="MenuWidgets/JuuButton">
             <Property name="Visible" value="False" />
@@ -117 +131 @@
             <Event function="CampaignMenu.Mission8Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="Mission9Text" type="MenuWidgets/Button">
             <Property name="Text" value="Retaliation" />
@@ -131 +146 @@
             <Event function="CampaignMenu.Mission9Button_clicked" name="Clicked" />
         </Window>
+
         <Window name="CampaignMenuBackButton" type="MenuWidgets/Button">
             <Property name="Text" value="Back" />
@@ -137 +153 @@
             <Event function="CampaignMenu.CampaignMenuBackButton_clicked" name="Clicked" />
         </Window>
+
+
         <Window name="CampaignMenuCongratulation" type="MenuWidgets/StaticText">
             <Property name="Text" value="Campaign Completed!!!" />
@@ -146 +164 @@
             <Property name="Area" value="{{0.4,0},{0.15,0},{0.6,0},{0.2,0}}" />
         </Window>
+        
     </Window>
 </GUILayout>

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

@@ -2 +2 @@
 
 local P = createMenuSheet("CampaignMenu")
+
 
 function P:onShow()
@@ -33 +34 @@
     end
 end
-
+--Updated Buttons der levels
 function P.updateButton(index, button)
+    --Wenn genuegend Levels vorhanden sind, wird der Butten angezeigt
     if (P.shouldDisplayButton(index)) then
         button:setProperty("Visible", "True")
 
+        --wenn genuegend levels bestanden sind, wird er benutzbar
         if (P.shouldEnableButton(index)) then
             button:setProperty("Disabled", "False")
         end
     end
+end
+
+function P.Test(e)
+     orxonox.execute("startMainMenu")
 end
 
@@ -69 +76 @@
 end
 
+
+
+
 function P.Mission1Button_clicked(e)
+    P.loadLevel(P.FindLevel(0))
+end
+function P.KeyPressed(e)
     P.loadLevel(P.FindLevel(0))
 end
@@ -110 +123 @@
 end
 
+function P.loadMap()
+    orxonox.execute("changeGame  dynamicMatch.oxw")
+     hideAllMenuSheets()
+end
+
 function P.FindLevel(index)
     local filename = orxonox.LevelManager:getInstance():getCampaignMission(index)

code/branches/Merge_HS18/data/levels/StoryModeMap.oxw

@@ -11 +11 @@
   include("StoryModeHUD.oxo")
   include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/StoryMode.oxt")
 ?>
@@ -21 +22 @@
     <Template link=lodtemplate_default />
   </templates>
+
+   
+
   <?lua include("includes/notifications.oxi") ?>
 
@@ -27 +31 @@
     skybox       = "Orxonox/Starbox"
   >
+   
+    
+    
+    
 
-
-    <StaticEntity position="0,0,0" direction="0,0,0" >
+    <StaticEntity position="0,0,0" direction="0,0,-1" >
       <attached>
 
-        <Model position="600,370,0" mesh="planets/moon.mesh" scale=100 />
+        <Model name="a" position="550,300,0" mesh="planets/moon.mesh" scale=100 visible="true" />
+        <Billboard colour="1,0,0.05" position="550,300,-80"  material="Flares/lensflare" scale=4.5 />
+
+        <Model name="a" position="600,370,0" mesh="planets/moon.mesh" scale=100 visible="true" />
+         
+        
+         <Model position="550,300,0" mesh="assff.mesh" scale=20  visible="false" orientation="-0.015,0.091,0.038,-0.995"/>
+        
         <Billboard colour="1,1,0.05" position="600,370,-80"  material="Flares/lensflare" scale=4.5 />
-  
-        <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  />
+       
+
+        <Model position="100,350,-250" mesh="planets/moon.mesh" scale=100  visible="true"/>
+         
         <Billboard colour="1,1,0.05" position="100,350,-330"  material="Flares/lensflare" scale=4.5 />
 
-        <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 />
+        <Model position="-600,250,-500" mesh="planets/moon.mesh" scale=100 visible="true"/>
         <Billboard colour="1,1,0.05" position="-600,250,-580"  material="Flares/lensflare" scale=5 />
 
@@ -62 +78 @@
     </StaticEntity>
 
+    
+
     <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"/>
 
-    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=StoryMode />
+    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" spawnclass=StoryMode pawndesign=StoryMode />
+    
     
   </Scene>

code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt

@@ -1 +1 @@
 <Template name=StoryMode>
-  <Pawn
+  <StoryModeController
    hudtemplate            = StoryModeMap
   />

code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt

@@ -43 +43 @@
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
+      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=20 mesh="escortShip.mesh" />
       <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />

code/branches/Merge_HS18/data/overlays/StoryModeHUD.oxo

@@ -11 +11 @@
   </OverlayGroup>
 </Template>
+  <Template name="spectatorhud">
+  <OverlayGroup name = "spectatorhud" scale = "1, 1">
+  </OverlayGroup>
+</Template>

code/branches/Merge_HS18/src/modules/flappyorx/FlappyOrxShip.cc

@@ -38 +38 @@
 #include "graphics/Camera.h"
 #include "graphics/ParticleSpawner.h"
+#include "worldentities/pawns/SpaceShip.h"
 #include <math.h> 
 #include <ctime>

code/branches/Merge_HS18/src/modules/towerdefense/TowerDefense.cc

@@ -272 +272 @@
         if (hasStarted() == false || player_ == nullptr)
         {
+            orxout(internal_warning) << "Heere" << endl;
             return;
         }
+
+        orxout(internal_warning) << "2" << endl;
         timeUntilNextWave_ -= dt;
         timeSinceLastSpawn_ += dt;
@@ -280 +283 @@
         if (selecter != nullptr && selecter->buildTower_ == true)
         {
+             orxout(internal_warning) << "3" << endl;
             selecter->buildTower_ = false;
 

code/branches/Merge_HS18/src/modules/towerdefense/TowerDefenseSelecter.cc

@@ -108 +108 @@
     void TowerDefenseSelecter::moveFrontBack(const Vector2& value)
     {
+        
         if (value.x > 0)
         {

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Controller.cc
+  StoryModeController.cc
+  SMCoord.cc
   HumanController.cc
   NewHumanController.cc
@@ -20 +22 @@
   MasterController.cc
   ArrowController.cc;
-  AutonomousDroneController.cc;
+  AutonomousDroneController.cc; 
+  StoryModeController.cc;
         
 )

code/branches/Merge_HS18/src/orxonox/gametypes/StoryMode.cc

@@ -47 +47 @@
     StoryMode::StoryMode(Context* context) : Gametype(context)
     {
+        
         RegisterObject(StoryMode);
 
@@ -65 +66 @@
     void StoryMode::exit()
     {
-        orxout() << "s funktioniert"<< endl;
+      
         for (StoryMode* mission : ObjectList<StoryMode>())
         { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!