[Orxonox-commit 7815] r12407 - in code/branches/Presentation_FS19: . data/levels data/overlays src/modules

[wiesep at orxonox.net]

Author: wiesep
Date: 2019-05-22 13:49:19 +0200 (Wed, 22 May 2019)
New Revision: 12407

Added:
   code/branches/Presentation_FS19/data/levels/MouseAPIExample.oxw
   code/branches/Presentation_FS19/data/overlays/MouseCursor.oxo
   code/branches/Presentation_FS19/src/modules/MouseAPI/
   code/branches/Presentation_FS19/src/modules/MouseAPIExample/
Modified:
   code/branches/Presentation_FS19/
   code/branches/Presentation_FS19/src/modules/CMakeLists.txt
Log:
Merged MouseAPI_FS19

Index: code/branches/Presentation_FS19
===================================================================
--- code/branches/Presentation_FS19	2019-05-22 11:27:11 UTC (rev 12406)
+++ code/branches/Presentation_FS19	2019-05-22 11:49:19 UTC (rev 12407)

Property changes on: code/branches/Presentation_FS19
___________________________________________________________________
Modified: svn:mergeinfo
## -11,6 +11,7 ##
 /code/branches/HUD_HS16:11212-11390,11392-11699
 /code/branches/Highscore_HS16:11226-11355
 /code/branches/Masterserver_FS18:11816-12026
+/code/branches/MouseAPI_FS19:12205-12406
 /code/branches/OrxoKart_HS18:12037-12193
 /code/branches/OrxyRoad_FS18:11823-12029
 /code/branches/ParticleEffectsFS15:10309-10612
Copied: code/branches/Presentation_FS19/data/levels/MouseAPIExample.oxw (from rev 12406, code/branches/MouseAPI_FS19/data/levels/MouseAPIExample.oxw)
===================================================================
--- code/branches/Presentation_FS19/data/levels/MouseAPIExample.oxw	                        (rev 0)
+++ code/branches/Presentation_FS19/data/levels/MouseAPIExample.oxw	2019-05-22 11:49:19 UTC (rev 12407)
@@ -0,0 +1,51 @@
+<LevelInfo
+ name = "MouseAPI Example"
+ description = "A level to test our MouseAPI"
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("MouseCursor.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level gametype=MouseGametype>
+ 
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+  <!--<?lua include("includes/notifications.oxi") ?>-->
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox"
+  >
+  
+    <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 team=0 position="-200,0,0" lookat="0,0,0"  />
+    
+
+<MouseAPIExample position="0,-0,-70" direction="0,0,0" id=1>
+    <attached> 
+	<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10" /> 
+    </attached> 
+</MouseAPIExample>
+
+<MouseAPIExample position="0,0,70" direction="0,0,0" id=2>
+    <attached> 
+	<Model position="0,0,0" mesh="sphere.mesh" scale=10 /> 
+    </attached> 
+</MouseAPIExample>
+
+<MouseAPIExample position="0,70,0" direction="0,0,0" id=3>
+    <attached> 
+	<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,100" /> 
+    </attached> 
+</MouseAPIExample>
+
+  </Scene>
+</Level>
+

Copied: code/branches/Presentation_FS19/data/overlays/MouseCursor.oxo (from rev 12406, code/branches/MouseAPI_FS19/data/overlays/MouseCursor.oxo)
===================================================================
--- code/branches/Presentation_FS19/data/overlays/MouseCursor.oxo	                        (rev 0)
+++ code/branches/Presentation_FS19/data/overlays/MouseCursor.oxo	2019-05-22 11:49:19 UTC (rev 12407)
@@ -0,0 +1,5 @@
+<Template name="MouseCursor">
+<OverlayGroup name = "MouseCursorGroup" scale = "1, 1">
+    <MouseAPICursor name="cursor" position = "0, 0" size="0.03, 0.03" cursorShape="cursor.png" cursorColor="1,0,1"></MouseAPICursor>
+</OverlayGroup>
+</Template>

Modified: code/branches/Presentation_FS19/src/modules/CMakeLists.txt
===================================================================
--- code/branches/Presentation_FS19/src/modules/CMakeLists.txt	2019-05-22 11:27:11 UTC (rev 12406)
+++ code/branches/Presentation_FS19/src/modules/CMakeLists.txt	2019-05-22 11:49:19 UTC (rev 12407)
@@ -52,3 +52,5 @@
 ADD_SUBDIRECTORY(orxyroad)
 ADD_SUBDIRECTORY(orxokart)
 ADD_SUBDIRECTORY(wagnis)
+ADD_SUBDIRECTORY(MouseAPI)
+ADD_SUBDIRECTORY(MouseAPIExample)