[Orxonox-commit 6615] r11255 - in code/branches/StoryModeMap_HS16: data/levels data/overlays src/orxonox/gametypes

[marvinh at orxonox.net]

Author: marvinh
Date: 2016-10-31 15:58:20 +0100 (Mon, 31 Oct 2016)
New Revision: 11255

Added:
   code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo
Modified:
   code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw
   code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc
Log:
Campaign Menu overlay wurde ueber 3d szene gelegt. nun muss in singleplayerMenulayout der link umgestellt werden, durch eigene Funktion, welche noch geschrieben werden muss. 

Modified: code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw
===================================================================
--- code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw	2016-10-31 14:27:31 UTC (rev 11254)
+++ code/branches/StoryModeMap_HS16/data/levels/StoryModeMap.oxw	2016-10-31 14:58:20 UTC (rev 11255)
@@ -1,3 +1,5 @@
+
+
 <LevelInfo
  name = "StoryModeMap"
  description = "Level that should have planets with different missions in it"
@@ -7,12 +9,12 @@
 
 <?lua
   include("stats.oxo")
-  include("HUDTemplates3.oxo")
+  include("StoryModeHUD.oxo")
   include("templates/lodInformation.oxt")
-?>
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipEscort.oxt")
 
-<?lua
-  include("templates/spaceshipEscort.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
 <Level
@@ -29,14 +31,45 @@
     skybox       = "Orxonox/Starbox"
   >
 
+<StaticEntity position="0,0,0" direction="0,0,0" mass=10000 friction=0>
+<attached>
 
+    <Model position="0,0,0" mesh="Coordinates.mesh" scale=50 />
+   </attached>
+  </StaticEntity>
 
-<!-- Dieser Teil attached funktioniert nicht bisher -->
-<StaticEntity position="0,0,0" direction="1,0,0" mass=10000 friction=0>
+
+
+<StaticEntity position="0,0,0" direction="0,0,0" mass=10000 friction=0>
   <attached>
-      <Model position="0,0,0" mesh="planet.mesh" scale=6 />
+      <Model position="-800,0,0" mesh="planet.mesh" scale=8 />
+
+      <Model position="800,0,0" mesh="planet.mesh" scale=8 />
+
+      <Model position="0,-500,0" mesh="planet.mesh" scale=8 />
+
+      <Model position="0,500,0" mesh="planet.mesh" scale=8 />
+
+      <Model position="0,0,0" mesh="planet.mesh" scale=8 />
   
-    <Model position="200,0,0" mesh="planets/muunilinst.mesh" scale=8 />
+    <Model position="300,300,0" mesh="planets/muunilinst.mesh" scale=60 />
+
+    <Model position="400,400,0" mesh="planets/muunilinst.mesh" scale=20 />
+
+    <Model position="500,500,0" mesh="planets/muunilinst.mesh" scale=18 />
+
+    <Model position="600,600,0" mesh="planets/muunilinst.mesh" scale=13 />
+
+    <Model position="-100,-100,0" mesh="planets/muunilinst.mesh" scale=8 />
+
+    <Model position="-200,-200,0" mesh="planets/muunilinst.mesh" scale=8 />
+
+    <Model position="-300,-300,0" mesh="planets/muunilinst.mesh" scale=8 />
+
+    <Model position="-400,-400,0" mesh="planets/muunilinst.mesh" scale=8 />
+
+    <Model position="-500,-500,0" mesh="planets/muunilinst.mesh" scale=8 /> 
+
   </attached>
 </StaticEntity>
 
@@ -71,16 +104,10 @@
 
 
 
-
-<?lua
-  include("templates/lodInformation.oxt")
-?>
-
-
-
 <Template name=spaceshipassff>
   <ControllableEntity
    camerapositiontemplate = spaceshipassffcameras
+
    
   >
 
@@ -93,7 +120,7 @@
     
     <!--<SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />/-->
 
-    <SpawnPoint position="991.729, -110.11, 435.404" orientation="0.534038, 0.563456, 0.212168, 0.593553" pawndesign=spaceshipassff />
+    <SpawnPoint position="000.000, 000.000, 1000.000" orientation="0, 0, 0, -1" pawndesign=spaceshipassff />
     
   </Scene>
 </Level>

Added: code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo
===================================================================
--- code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo	                        (rev 0)
+++ code/branches/StoryModeMap_HS16/data/overlays/StoryModeHUD.oxo	2016-10-31 14:58:20 UTC (rev 11255)
@@ -0,0 +1,51 @@
+<!--
+<Template name="defaultHUD">
+  <OverlayGroup name = "defaultHUD" scale = "1, 1">
+    <ChatOverlay
+     name     = "chat"
+     position = "0.03, 0.5"
+     font     = "VeraMono"
+     caption  = ""
+     textsize = 0.025
+    />
+
+    <GametypeStatus
+     name     = "state"
+     position = "0.5, 0.85"
+     font     = "VeraMono"
+     textsize = 0.05
+     colour   = "1.0, 1.0, 0.0, 0.8"
+     align    = "center"
+    />
+  </OverlayGroup>
+</Template>
+-->
+
+<Template name="spectatorhud">
+  <OverlayGroup name = "spectatorhud" scale = "1, 1">
+  </OverlayGroup>
+</Template>
+
+
+
+<Template name="spaceshiphud">
+  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+    <Map />
+
+
+    
+
+    <GUIOverlay
+      name = "QuestGUI"
+      guiname = "QuestGUI"
+      visible = "false"
+    />
+
+     <GUIOverlay
+      name = "CampaignMenu"
+      guiname = "CampaignMenu"
+      visible = "true"
+    />
+
+  </OverlayGroup>
+</Template>

Modified: code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc
===================================================================
--- code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc	2016-10-31 14:27:31 UTC (rev 11254)
+++ code/branches/StoryModeMap_HS16/src/orxonox/gametypes/StoryMode.cc	2016-10-31 14:58:20 UTC (rev 11255)
@@ -53,8 +53,8 @@
     }
 
     
-   
-    /*void StoryMode::start()
+  /* 
+    void StoryMode::start()
     {
         Gametype::start();