[Orxonox-commit 7150] r11767 - in code/branches/Presentation_HS17_merge: . src/modules/superorxobros
landauf at orxonox.net
landauf at orxonox.net
Sun Feb 18 16:10:36 CET 2018
Author: landauf
Date: 2018-02-18 16:10:35 +0100 (Sun, 18 Feb 2018)
New Revision: 11767
Removed:
code/branches/Presentation_HS17_merge/BlenderFilesSOB/
code/branches/Presentation_HS17_merge/SOB.oxw
code/branches/Presentation_HS17_merge/TRANSFER/
code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.h
Log:
[SOBv2_HS17] removed a bunch of files that shouldn't be here
Deleted: code/branches/Presentation_HS17_merge/SOB.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/SOB.oxw 2018-02-18 15:02:50 UTC (rev 11766)
+++ code/branches/Presentation_HS17_merge/SOB.oxw 2018-02-18 15:10:35 UTC (rev 11767)
@@ -1,792 +0,0 @@
-<LevelInfo
- name = "Super Orxo Bros."
- description = "The retro-game Super Mario Bros. in Orxonox."
- tags = "minigame"
- screenshot = "SOB.png"
- />
-
- <?lua
- include("HUDTemplates3.oxo")
- include("jumpHUD.oxo")
- include("stats.oxo")
- include("templates/lodInformation.oxt")
- include("overlays/SOBHUD.oxo")
- ?>
-
- <Template name=mushroom defaults=0>
- <SOBMushroom collisionType="dynamic" speed=30>
- <attached>
- <Model mesh="Pilz.mesh" position="0,0,21" scale=3 pitch=90/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBMushroom>
- </Template>
-
- <Template name=coin defaults=0 >
- <SOBCoin speed = 15 lifetime = 0.7>
- <attached>
- <Model mesh="Coin.mesh" position="0,0,11" scale=3 pitch=-90 roll=90/>
- </attached>
-
- </SOBCoin>
- </Template>
-
-
-
- <Template name=sobfigurecameras defaults=0>
- <SOBFigure>
- <camerapositions>
- <CameraPosition position="0,-150,30" absolute=true mouselook=false drag=false direction="0,1,0"/>
- </camerapositions>
- </SOBFigure>
- </Template>
-
-
-
-
- <Template name=sobFigureTemplate>
- <SOBFigure camerapositiontemplate=sobfigurecameras collisionType="dynamic" position="0,0,30">
- <attached>
- <Model mesh="orxo.mesh" position = "0,0,12" scale=2.5 pitch=0 roll=90 yaw=90/>
- <ParticleSpawner source="Orxonox/fire4" startdelay=0 position="-4,0,0" visible="false"/>
- </attached>
-
- <collisionShapes>
- <BoxCollisionShape position="-2,0,2" halfExtents="3,1,10" />
- </collisionShapes>
-
-
- </SOBFigure>
- </Template>
-
-
-
-
-
-
- <Level
- plugins = "superorxobros"
- gametype = "SOB"
- >-
-
-
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true"/>
-
-
- <Scene ambientlight="1.0, 1.0, 1.0" skybox="Orxonox/skyBoxBasic">
- <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="1984,-5,88 " orientation="0.534038, 0.563456, 0.212168, 0.593553" />
-
-
-
- <MovableEntity >
- <attached>
- <SOBCenterpoint name=jumpcenter cameraOffset="10" figureTemplate=sobFigureTemplate>
- <attached>
- </attached>
- </SOBCenterpoint>
-
- </attached>
- </MovableEntity>
-
-
- <!--Gumba-->
-
- <SOBGumba collisionType="dynamic" speed=40 position = "240,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,1" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
- <SOBGumba collisionType="dynamic" speed=30 position = "420,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
- <SOBGumba collisionType="dynamic" speed=30 position = "500,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=30 position = "510,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
- <SOBGumba collisionType="dynamic" speed=30 position = "930,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=20 position = "940,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=30 position = "1180,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=20 position = "1190,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=30 position = "1320,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=20 position = "1330,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=30 position = "1750,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
- <SOBGumba collisionType="dynamic" speed=20 position = "1770,0,0">
- <attached>
- <Model mesh="Goomba.mesh" position="0,0,21" scale=3 pitch=90/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,20" halfExtents="5,5,3" />
- </collisionShapes>
- </SOBGumba>
-
-
- <!--CollisionShape for Gumba-->
- <StaticEntity collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,-20" halfExtents="5,5,5" />
- <BoxCollisionShape position="890,0,-20" halfExtents="5,5,5" />
-
-
-
-
- </collisionShapes>
- </StaticEntity>
-
-
-
-
-
-
-
- <!-- Boden 1 -->
- <Model mesh="Cube2.12.mesh" position="0,0,-30" scale=10 Pitch=90/> <!-- B1.1 -->
- <Model mesh="Cube2.12.mesh" position="120,0,-30" scale=10 Pitch=90/> <!-- B1.2-->
- <Model mesh="Cube2.12.mesh" position="240,0,-30" scale=10 Pitch=90/> <!-- B1.3 -->
- <Model mesh="Cube2.12.mesh" position="360,0,-30" scale=10 Pitch=90/> <!-- B1.4 -->
- <Model mesh="Cube2.12.mesh" position="480,0,-30" scale=10 Pitch=90/> <!-- B1.5 -->
- <Model mesh="Cube2.6.mesh" position="600,0,-30" scale=10 Pitch=90/> <!-- B1.6 -->
- <Model mesh="Cube2.3.mesh" position="660,0,-30" scale=10 Pitch=90/> <!-- B1.7 -->
-
-
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
- <BoxCollisionShape position="340,0,-20" halfExtents="345,5,5" />
- </collisionShapes>
- </StaticEntity>
-
-
-
-
- <!-- Luft 1 -->
-
-
- <SOBQBlock collisionType="static" type="Coin" position="170,0,20" mass='-1'> <!-- L1.1 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90 />
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <SOBQBlock collisionType="static" type="Coin" position="230,0,60" mass='-1' >
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/> <!-- L1.2 -->
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="210,0,20" scale=10 /> <!-- L1.3 -->
-
-
- <SOBQBlock collisionType="static" type="Mushroom" position="220,0,20" mass='-1'><!--ITEM-->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/> <!-- L1.4 -->
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" /><!-- 3 -->
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="230,0,20" scale=10/> <!-- L1.5 -->
-
- <SOBQBlock collisionType="static" type="Coin" position="240,0,20" mass='-1'><!-- ? Block -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/> <!-- L1.6 -->
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="250,0,20" scale=10/> <!-- L1.7 -->
- <!-- Rohre-->
- <Model mesh="Rohr.mesh" position="295,5,-35" scale=10 roll=90 yaw=90 pitch=-90/> <!-- L1.8 -->
- <Model mesh="Rohr.mesh" position="395,5,-25" scale=10 roll=90 yaw=90 pitch=-90/> <!-- L1.9 -->
- <Model mesh="Rohr.mesh" position="475,5,-15" scale=10 roll=90 yaw=90 pitch=-90 /> <!-- L1.10 -->
- <Model mesh="Rohr.mesh" position="585,5,-15" scale=10 roll=90 yaw=90 pitch=-90 /> <!-- L1.11 -->
-
- <SOBQBlock collisionType="static" type="Mushroom" position="650,0,30" mass='-1'>
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/> <!-- L1.12 -->
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
-
-
-
-
-
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
-
- <BoxCollisionShape position="210,0,20" halfExtents="5,5,5" /> <!-- 1.3 -->
- <BoxCollisionShape position="230,0,20" halfExtents="5,5,5" /> <!-- 1.5 -->
- <BoxCollisionShape position="250,0,20" halfExtents="5,5,5" /> <!-- 1.7 -->
-
-
- </collisionShapes>
- </StaticEntity>
-
-
- <StaticEntity collisionType="static" >
- <collisionShapes>
-
-
- <BoxCollisionShape position="295,0,-4" halfExtents="12,5,12" /> <!-- 1.8 -->
- <BoxCollisionShape position="395,0,1" halfExtents="12,5,17" /> <!-- 1.9 -->
- <BoxCollisionShape position="475,0,6" halfExtents="12,5,22" /> <!-- 1.10 -->
- <BoxCollisionShape position="585,0,6" halfExtents="12,5,22" /> <!-- 1.11 -->
-
- </collisionShapes>
- </StaticEntity>
-
-
-
-
-
-
-
- <!-- Boden 2 -->
- <Model mesh="Cube2.12.mesh" position="710,0,-30" scale=10 Pitch=90/> <!-- B2.1 -->
- <Model mesh="Cube2.3.mesh" position="830,0,-30" scale=10 Pitch=90/> <!-- B2.2 -->
-
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
- <BoxCollisionShape position="780,0,-20" halfExtents="75,5,5" />
- </collisionShapes>
- </StaticEntity>
-
-
-
-
-
- <!-- Luft 2 -->
- <Model mesh="Cube1.1.mesh" position="770,0,20" scale=10/> <!-- L2.1 -->
-
- <SOBQBlock collisionType="static" type="Mushroom" position="780,0,20" mass='-1'> <!-- L2.2 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="790,0,20" scale=10/> <!-- L2.3 -->
- <Model mesh="Cube1.6.mesh" position="800,0,60" scale=10/> <!-- L2.4 -->
- <Model mesh="Cube1.1.mesh" position="860,0,60" scale=10/> <!-- L2.5 -->
- <Model mesh="Cube1.1.mesh" position="870,0,60" scale=10/> <!-- L2.6 -->
-
- <StaticEntity collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="770,0,20" halfExtents="5,5,5" /> <!-- 2.1 -->
-
- <BoxCollisionShape position="790,0,20" halfExtents="5,5,5" /> <!-- 2.3 -->
- <BoxCollisionShape position="835,0,60" halfExtents="40,5,5" /> <!-- 2.4 to 2.6 -->
-
-
-
-
- </collisionShapes>
- </StaticEntity>
-
-
- <!-- Luft 3 -->
- <Model mesh="Cube1.3.mesh" position="910,0,60" scale=10/> <!-- L3.1 -->
-
- <SOBQBlock collisionType="static" type="Coin" position="940,0,60" mass='-1'> <!-- L3.2 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <SOBQBlock collisionType="static" type="Mushroom" position="940,0,20" mass='-1'> <!-- L3.3 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
-
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="1000,0,20" scale=10/> <!-- L3.4 -->
-
-
- <SOBQBlock collisionType="static" type="Mushroom" position="1010,0,20" mass='-1'> <!-- L3.5 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <SOBQBlock collisionType="static" type="Coin" position="1060,0,20" mass='-1'> <!-- L3.6 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
-
- <SOBQBlock collisionType="static" type="Mushroom" position="1090,0,60" mass='-1'> <!-- L3.7 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <SOBQBlock collisionType="static" type="Coin" position="1090,0,20" mass='-1'> <!-- L3.8 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <SOBQBlock collisionType="static" type="Coin" position="1120,0,20" mass='-1'> <!-- L3.9 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="1180,0,20" scale=10/> <!-- L3.10 -->
-
- <Model mesh="Cube1.3.mesh" position="1210,0,60" scale=10/> <!-- L3.11 -->
-
- <Model mesh="Cube1.1.mesh" position="1280,0,60" scale=10/> <!-- L3.12 -->
-
- <SOBQBlock collisionType="static" type="Coin" position="1290,0,60" mass='-1'> <!-- L3.13 -->
- <attached>
- <Model mesh="QCube.mesh" type="Mushroom" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
-
- <SOBQBlock collisionType="static" type="Coin" position="1300,0,60" mass='-1'> <!-- L3.14 -->
- <attached>
- <Model mesh="QCube.mesh" type="Mushroom" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="1310,0,60" scale=10/> <!-- L3.15 -->
- <Model mesh="Cube1.1.mesh" position="1290,0,20" scale=10/> <!-- L3.16 -->
- <Model mesh="Cube1.1.mesh" position="1300,0,20" scale=10/> <!-- L3.17 -->
-
-
-
- <Model mesh="Dreieck.mesh" position="1370,0,-10" scale=10 Roll=90 Pitch=90 yaw=90/> <!-- L3.18 -->
- <Model mesh="Dreieck.mesh" position="1400,0,-10" scale=10 Roll=90 Pitch=-90 yaw=90/> <!-- L3.19 -->
- <Model mesh="Dreieck_links+1.mesh" position="1510,0,-10" scale=10 Roll=90 Pitch=90 yaw=90/> <!-- L3.20 -->
-
-
-
- <StaticEntity collisionType="static">
- <collisionShapes>
-
- <BoxCollisionShape position="1355,0,-10" halfExtents="20,5,5" /> <!-- 3.18 -->
- <BoxCollisionShape position="1360,0,0" halfExtents="15,5,5" />
- <BoxCollisionShape position="1365,0,10" halfExtents="10,5,5" />
- <BoxCollisionShape position="1370,0,20" halfExtents="5,5,5" />
-
- <BoxCollisionShape position="1415,0,-10" halfExtents="20,5,5" /> <!-- 3.19-->
- <BoxCollisionShape position="1410,0,0" halfExtents="15,5,5" />
- <BoxCollisionShape position="1405,0,10" halfExtents="10,5,5" />
- <BoxCollisionShape position="1400,0,20" halfExtents="5,5,5" />
-
- <BoxCollisionShape position="1500,0,-10" halfExtents="25,5,5" /> <!-- 3.20 -->
- <BoxCollisionShape position="1505,0,0" halfExtents="20,5,5" />
- <BoxCollisionShape position="1510,0,10" halfExtents="15,5,5" />
- <BoxCollisionShape position="1515,0,20" halfExtents="10,5,5" />
-
-
-
-
-
- </collisionShapes>
- </StaticEntity>
-
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
- <BoxCollisionShape position="920,0,60" halfExtents="15,5,5" /> <!-- 3.1 -->
-
- <BoxCollisionShape position="1000,0,20" halfExtents="5,5,5" /> <!-- 3.4 -->
-
-
- <BoxCollisionShape position="1180,0,20" halfExtents="5,5,5" /> <!-- 3.10 -->
- <BoxCollisionShape position="1220,0,60" halfExtents="15,5,5" /> <!-- 3.11 -->
- <BoxCollisionShape position="1280,0,60" halfExtents="5,5,5" /> <!-- 3.12 -->
- <BoxCollisionShape position="1310,0,60" halfExtents="5,5,5" /> <!-- 3.15 -->
- <BoxCollisionShape position="1300,0,20" halfExtents="10,5,5" /> <!-- 3.16 and 3.17-->
-
- </collisionShapes>
- </StaticEntity>
-
-
-
-
- <!-- Boden3 -->
- <Model mesh="Cube2.12.mesh" position="890,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.12.mesh" position="1010,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.12.mesh" position="1130,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.12.mesh" position="1250,0,-30" scale=10 Pitch=90/>
-
- <Model mesh="Cube2.12.mesh" position="1370,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.2.mesh" position="1490,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.2.mesh" position="1510,0,-30" scale=10 Pitch=90/>
-
-
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
- <BoxCollisionShape position="1205,0,-20" halfExtents="320,5,5" />
- </collisionShapes>
- </StaticEntity>
-
-
-
-
-
- <!-- Luft4 -->
- <Model mesh="Dreieck.mesh" position="1560,0,-10" scale=10 Roll=90 Pitch=-90 yaw=90/> <!-- L4.1 -->
-
- <Model mesh="Rohr.mesh" position="1645,5,-35" scale=10 roll=90 yaw=90 pitch=-90 /> <!-- L4.2 -->
-
- <Model mesh="Cube1.1.mesh" position="1690,0,20" scale=10/> <!-- L4.3 -->
- <Model mesh="Cube1.1.mesh" position="1700,0,20" scale=10/> <!-- L4.4 -->
-
- <SOBQBlock collisionType="static" type="Coin" position="1710,0,20" mass='-1'> <!-- L4.5 -->
- <attached>
- <Model mesh="QCube.mesh" scale=10 pitch=90/>
- <Model mesh="QCube-grey.mesh" scale=10 pitch=90 visible=false/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBQBlock>
-
- <Model mesh="Cube1.1.mesh" position="1720,0,20" scale=10/> <!-- L4.6 -->
- <Model mesh="Rohr.mesh" position="1805,5,-35" scale=10 roll=90 yaw=90 pitch=-90 /> <!-- L4.7 -->
- <Model mesh="Dreieckgross.mesh" position="1850,0,-10" scale=10 pitch=90 /> <!-- L4.8 -->
-
-
-
-
- <Model mesh="Schloss.mesh" position="2050,40,60" scale=12 pitch=90/> <!-- L4.12 -->
- <Model mesh="Fahne.mesh" position="1984,-5,88" scale=10 pitch=90/> <!-- L4.11 -->
- <Model mesh="Fahnenstange.mesh" position="1990,0,95" pitch=90 scale=3/> <!-- L4.10 -->
- <Model mesh="Fundament.mesh" position="1990,0,-10" scale=10 yaw=180/> <!-- L4.9 -->
-
-
-
-
- <!-- FLAG -->
- <SOBFlagstone points = 100 position="1990,0,10" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 200 position="1990,0,20" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 400 position="1990,0,30" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 800 position="1990,0,40" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 1600 position="1990,0,50" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 2200 position="1990,0,60" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 2700 position="1990,0,70" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 3400 position="1990,0,80" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
- <SOBFlagstone points = 4000 position="1990,0,90" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBFlagstone>
-
-
- <!-- Castlestone -->
- <SOBCastlestone position="2060,0,-10" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBCastlestone>
-
- <SOBCastlestone position="2050,40,-10" collisionType="static">
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />
- </collisionShapes>
- </SOBCastlestone>
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
- <BoxCollisionShape position="2050,20,-20" halfExtents="5,20,5" />
- </collisionShapes>
- </StaticEntity>
-
-
-
-
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
-
- <BoxCollisionShape position="1690,0,20" halfExtents="5,5,5" /> <!-- 4.3 -->
- <BoxCollisionShape position="1700,0,20" halfExtents="5,5,5" /> <!-- 4.4 -->
- <BoxCollisionShape position="1720,0,20" halfExtents="5,5,5" /> <!-- 4.6 -->
-
-
- </collisionShapes>
- </StaticEntity>
-
-
- <StaticEntity collisionType="static">
- <collisionShapes>
-
- <BoxCollisionShape position="1575,0,-10" halfExtents="20,5,5" /> <!-- 4.1-->
- <BoxCollisionShape position="1570,0,0" halfExtents="15,5,5" />
- <BoxCollisionShape position="1565,0,10" halfExtents="10,5,5" />
- <BoxCollisionShape position="1560,0,20" halfExtents="5,5,5" />
-
- <BoxCollisionShape position="1645,0,-4" halfExtents="12,5,12" /> <!-- 4.2 -->
-
-
- <BoxCollisionShape position="1805,0,-4" halfExtents="12,5,12" /> <!-- 4.7 -->
-
- <BoxCollisionShape position="1860,0,-10" halfExtents="45,5,5" /> <!-- 4.8 -->
- <BoxCollisionShape position="1865,0,0" halfExtents="40,5,5" />
- <BoxCollisionShape position="1870,0,10" halfExtents="35,5,5" />
- <BoxCollisionShape position="1875,0,20" halfExtents="30,5,5" />
- <BoxCollisionShape position="1880,0,30" halfExtents="25,5,5" />
- <BoxCollisionShape position="1885,0,40" halfExtents="20,5,5" />
- <BoxCollisionShape position="1890,0,50" halfExtents="15,5,5" />
- <BoxCollisionShape position="1895,0,60" halfExtents="10,5,5" />
- <BoxCollisionShape position="1990,0,125" halfExtents="5,5,30" />
- <BoxCollisionShape position="1940,0,150" halfExtents="45,5,5" />
-
-
-
- </collisionShapes>
- </StaticEntity>
-
-
-
-
-
-
-
- //Boden4
- <Model mesh="Cube2.12.mesh" position="1560,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.12.mesh" position="1680,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.12.mesh" position="1800,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.12.mesh" position="1920,0,-30" scale=10 Pitch=90/>
- <Model mesh="Cube2.12.mesh" position="2040,0,-30" scale=10 Pitch=90/>
-
-
-
- <Model mesh="Cube1.3.mesh" position="1990,10,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.3.mesh" position="1990,20,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.3.mesh" position="1990,30,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.3.mesh" position="1990,40,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.3.mesh" position="1960,10,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.1.mesh" position="1980,20,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.1.mesh" position="1970,20,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.1.mesh" position="1980,30,-20" scale=10 Pitch=90/>
-
- <Model mesh="Cube1.1.mesh" position="2000,50,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.1.mesh" position="2010,50,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.1.mesh" position="2010,60,-20" scale=10 Pitch=90/>
-
-
- <Model mesh="Cube1.6.mesh" position="2020,10,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2020,20,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2020,30,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2020,40,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2020,50,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2020,60,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2020,70,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2080,10,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2080,20,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2080,30,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2080,40,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.6.mesh" position="2080,50,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.3.mesh" position="2080,60,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.1.mesh" position="2110,60,-20" scale=10 Pitch=90/>
- <Model mesh="Cube1.3.mesh" position="2080,70,-20" scale=10 Pitch=90/>
-
-
-
- <StaticEntity collisionType="static" mass='-1'>
- <collisionShapes>
- <BoxCollisionShape position="1855,0,-20" halfExtents="300,5,5" />
- </collisionShapes>
- </StaticEntity>
-
-
-
-
-
-
-
-
-
- </Scene>
- </Level>
-
Deleted: code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.cc 2018-02-18 15:02:50 UTC (rev 11766)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.cc 2018-02-18 15:10:35 UTC (rev 11767)
@@ -1,196 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Florian Zinggeler
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file InvaderShip.cc
- @brief Implementation of the InvaderShip class.
-*/
-
-#include "Orxo.h"
-
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-//#include "Invader.h"
-//#include "InvaderEnemy.h"
-#include "graphics/Camera.h"
-//#include "weapons/projectiles/Projectile.h"
-
-namespace orxonox
-{
- RegisterClass(Orxo);
-
- Orxo::Orxo(Context* context) : SpaceShip(context)
- {
- RegisterObject(Orxo);
-
- speed = 500;
- damping = 10;
- }
-
- void Orxo::tick(float dt)
- {
- /*Vector3 pos = getPosition();
-
- //Movement calculation
- lastTimeFront += dt * damping;
- lastTimeLeft += dt * damping;
- lastTime += dt;
-
- velocity.x = interpolate(clamp(lastTimeLeft, 0.0f, 1.0f), desiredVelocity.x, 0.0f);
- velocity.y = interpolate(clamp(lastTimeFront, 0.0f, 1.0f), desiredVelocity.y, 0.0f);
-
- //Execute movement
- if (this->hasLocalController())
- {
- float dist_y = velocity.y * dt;
- float dist_x = velocity.x * dt;
- if(dist_y + posforeward > -42*3 && dist_y + posforeward < 42*6)
- posforeward += dist_y;
- else
- {
- velocity.y = 0;
- // restart if game ended
- if (getGame())
- if (getGame()->bEndGame)
- {
- getGame()->start();
- return;
- }
- }
- if (pos.z + dist_x > 42*2.5 || pos.z + dist_x < -42*3)
- velocity.x = 0;
- pos += Vector3(1000 + velocity.y, 0, velocity.x) * dt;
- }
-
-
- // Camera
- Camera* camera = this->getCamera();
- if (camera != nullptr)
- {
- camera->setPosition(Vector3(-pos.z, -posforeward, 0));
- camera->setOrientation(Vector3::UNIT_Z, Degree(90));
- }
-
-
-
- // bring back on track!
- if(pos.y != 0)
- pos.y = 0;
-
- setPosition(pos);
- setOrientation(Vector3::UNIT_Y, Degree(270));
-
- // Level up!
- if (pos.x > 42000)
- {
- updateLevel();
- setPosition(Vector3(0, 0, pos.z)); // pos - Vector3(30000, 0, 0)
- }*/
-
- SUPER(Orxo, tick, dt);
- }
-
- void Orxo::updateLevel()
- {
- lastTime = 0;
- /*if (getGame())
- getGame()->levelUp();*/
- }
-
- void Orxo::moveFrontBack(const Vector2& value)
- {
- Pawn::moveFrontBack(value);
- lastTimeLeft = 0;
- desiredVelocity.x = -value.x * speed;
- }
-
- void Orxo::moveRightLeft(const Vector2& value)
- {
- lastTimeFront = 0;
- desiredVelocity.y = value.y * speed * 42;
- }
- void Orxo::boost(bool bBoost)
- {
- // isFireing = bBoost;
- }
- void Orxo::rotateRoll(const Vector2& value)
- {/*
- if (getGame())
- if (getGame()->bEndGame)
- getGame()->end();
- */}
- inline bool Orxo::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
- {
- /*// orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
- InvaderEnemy* enemy = orxonox_cast<InvaderEnemy*>(otherObject);
- Projectile* shot = orxonox_cast<Projectile*>(otherObject);
- // ensure that this gets only called once per enemy.
- if (enemy != nullptr && lastEnemy != enemy)
- {
- lastEnemy = enemy;
-
- removeHealth(20);
- if (getGame())
- {
- getGame()->multiplier = 1;
- }
- }
- // was shot, decrease multiplier
- else if (shot != nullptr && lastShot != shot)
- {
- if (getGame() && orxonox_cast<InvaderEnemy*>(shot->getShooter()) != nullptr)
- {
- if (getGame()->multiplier > 1)
- {
- lastShot = shot;
- getGame()->multiplier -= 1;
- }
- }
- }
- return false;
- // SUPER(InvaderShip, collidesAgainst, otherObject, contactPoint);
- */
- return false;
- }
-
- /*SOB* Orxo::getGame()
- {
- if (game == nullptr)
- {
- for (SOB* sob : ObjectList<SOB>())
- game = sob;
- }
- return game;
- }*/
-
- void Orxo::death()
- {
- //getGame()->costLife();
- Pawn::death();
- }
-}
Deleted: code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.h 2018-02-18 15:02:50 UTC (rev 11766)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/Orxo.h 2018-02-18 15:10:35 UTC (rev 11767)
@@ -1,95 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Florian Zinggeler
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file InvaderShip.h
- @brief Declaration of the InvaderShip class.
-*/
-
-#ifndef _Orxo_H__
-#define _Orxo_H__
-
-//#include "invader/InvaderPrereqs.h"
-
-//#include "weapons/WeaponsPrereqs.h"
-#include "worldentities/pawns/SpaceShip.h"
-
-namespace orxonox
-{
- class Orxo : public SpaceShip
- {
- public:
- Orxo(Context* context);
-
- virtual void tick(float dt) override;
-
-
- // overwrite for 2d movement
- virtual void moveFrontBack(const Vector2& value) override;
- virtual void moveRightLeft(const Vector2& value) override;
-
- // Starts or stops fireing
- virtual void boost(bool bBoost) override;
-
- //no rotation!
- virtual void rotateYaw(const Vector2& value) override{};
- virtual void rotatePitch(const Vector2& value) override{};
- //return to main menu if game has ended.
- virtual void rotateRoll(const Vector2& value) override;
-
- virtual void updateLevel();
-
- virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
-
-
-
-
-
-
-
- protected:
- virtual void death() override;
- private:
- //SOB* getGame();
- //WeakPtr<SOB> game;
- Camera* camera;
- float speed, damping, posforeward;
- float lastTimeFront, lastTimeLeft, lastTime;
- struct Velocity
- {
- float x;
- float y;
- } velocity, desiredVelocity;
-
- // WeakPtr<InvaderEnemy> lastEnemy;
- //WeakPtr<Projectile> lastShot;
-
- };
-}
-
-#endif /* _InvaderShip_H__ */
More information about the Orxonox-commit
mailing list