[Orxonox-commit 7820] r12412 - in code/branches/Presentation_FS19: data/levels src/modules/asteroids2D src/modules/pong
wiesep at orxonox.net
wiesep at orxonox.net
Wed May 22 15:17:23 CEST 2019
Author: wiesep
Date: 2019-05-22 15:17:23 +0200 (Wed, 22 May 2019)
New Revision: 12412
Modified:
code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw
code/branches/Presentation_FS19/data/levels/pong.oxw
code/branches/Presentation_FS19/data/levels/tetris.oxw
code/branches/Presentation_FS19/data/levels/towerDefense.oxw
code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc
code/branches/Presentation_FS19/src/modules/pong/Pong.cc
Log:
Reverted unwanted changes
Modified: code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw
===================================================================
--- code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw 2019-05-22 12:59:08 UTC (rev 12411)
+++ code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw 2019-05-22 13:17:23 UTC (rev 12412)
@@ -43,7 +43,7 @@
<!-- <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"/> -->
<Light type=directional position="-100, 10000, -700" lookat="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
- <SpawnPoint team=0 position="0,0,50" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
+ <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass= Asteroids2DShip pawndesign=spaceshipasteroids2d />
<!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
Modified: code/branches/Presentation_FS19/data/levels/pong.oxw
===================================================================
--- code/branches/Presentation_FS19/data/levels/pong.oxw 2019-05-22 12:59:08 UTC (rev 12411)
+++ code/branches/Presentation_FS19/data/levels/pong.oxw 2019-05-22 13:17:23 UTC (rev 12412)
@@ -15,7 +15,6 @@
<Template name=pongbatcameras defaults=0>
<PongBat>
<camerapositions>
- <!---- Verschidene Kameraeinstellungen festlegen ---->
<CameraPosition position="0,150,0" pitch=-90 absolute=true />
<CameraPosition position="0,50,160" drag=true mouselook=true />
<CameraPosition position="0,40,125" drag=true mouselook=true />
@@ -51,6 +50,7 @@
</PongBall>
</Template>
+
<Level
plugins = "pong"
gametype = "Pong"
Modified: code/branches/Presentation_FS19/data/levels/tetris.oxw
===================================================================
--- code/branches/Presentation_FS19/data/levels/tetris.oxw 2019-05-22 12:59:08 UTC (rev 12411)
+++ code/branches/Presentation_FS19/data/levels/tetris.oxw 2019-05-22 13:17:23 UTC (rev 12412)
@@ -124,11 +124,68 @@
</WaypointController>
</controller>
</SpaceShip>
-
-
-
+ <SpaceShip position="-500,-500,-400" lookat="0,0,0">
+ <templates>
+ <Template link=spaceshippirate />
+ </templates>
+ <controller>
+ <WaypointController team=10>
+ <waypoints>
+ <Model mesh="cube.mesh" scale=0 position="-1000,-200,0" />
+ <Model mesh="cube.mesh" scale=0 position="-700,-150,650" />
+ <Model mesh="cube.mesh" scale=0 position="-55,-75,1000" />
+ <Model mesh="cube.mesh" scale=0 position="650,100,650" />
+ <Model mesh="cube.mesh" scale=0 position="1000,150,0" />
+ <Model mesh="cube.mesh" scale=0 position="650,100,-650" />
+ <Model mesh="cube.mesh" scale=0 position="-55,0,-1000" />
+ <Model mesh="cube.mesh" scale=0 position="-700,-100,-650" />
+ </waypoints>
+ </WaypointController>
+ </controller>
+ </SpaceShip>
+ <SpaceShip position="-700,200,651" lookat="1,0,0">
+ <templates>
+ <Template link=spaceshipghost />
+ </templates>
+ <controller>
+ <WaypointController team=10 accuracy=300>
+ <waypoints>
+ <Model mesh="cube.mesh" scale=0 position="-700,200,650" />
+ <Model mesh="cube.mesh" scale=0 position="-55,100,1000" />
+ <Model mesh="cube.mesh" scale=0 position="650,0,650" />
+ <Model mesh="cube.mesh" scale=0 position="1000,-100,0" />
+ <Model mesh="cube.mesh" scale=0 position="650,0,-650" />
+ <Model mesh="cube.mesh" scale=0 position="-55,100,-1000" />
+ <Model mesh="cube.mesh" scale=0 position="-700,200,-650" />
+ <Model mesh="cube.mesh" scale=0 position="-1000,300,0" />
+ </waypoints>
+ </WaypointController>
+ </controller>
+ </SpaceShip>
+ <SpaceShip position="1000,-75,0" lookat="0,0,0">
+ <templates>
+ <Template link=spaceshipHtwo />
+ </templates>
+ <controller>
+ <WaypointController team=10>
+ <waypoints>
+ <Model mesh="cube.mesh" scale=0 position="400,240,400" />
+ <Model mesh="cube.mesh" scale=0 position="-55,240,700" />
+ <Model mesh="cube.mesh" scale=0 position="-500,240,400" />
+ <Model mesh="cube.mesh" scale=0 position="-700,240,0" />
+ <Model mesh="cube.mesh" scale=0 position="-500,240,-400" />
+ <Model mesh="cube.mesh" scale=0 position="-55,240,-700" />
+ <Model mesh="cube.mesh" scale=0 position="400,240,-400" />
+ <Model mesh="cube.mesh" scale=0 position="700,240,0" />
+ </waypoints>
+ </WaypointController>
+ </controller>
+ </SpaceShip>
+
+
+
</Scene>
</Level>
Modified: code/branches/Presentation_FS19/data/levels/towerDefense.oxw
===================================================================
--- code/branches/Presentation_FS19/data/levels/towerDefense.oxw 2019-05-22 12:59:08 UTC (rev 12411)
+++ code/branches/Presentation_FS19/data/levels/towerDefense.oxw 2019-05-22 13:17:23 UTC (rev 12412)
@@ -105,13 +105,13 @@
<DefaultWeaponmodeLink firemode=0 weaponmode=0 />
</links>
<Weapon>
- <BallGun mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=0 shielddamage=4 />
+ <LightningGun mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 />
</Weapon>
</WeaponPack>
</weaponpacks>
<munition>
- <BallMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
- </munition>x
+ <LightningMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
+ </munition>
<attached>
<Backlight position="0,0,0" scale=2.0 colour="0.4, 0.0, 1.0" width=10 length=10 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" loop=1 />
</attached>
Modified: code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc
===================================================================
--- code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc 2019-05-22 12:59:08 UTC (rev 12411)
+++ code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc 2019-05-22 13:17:23 UTC (rev 12412)
@@ -68,7 +68,7 @@
void Asteroids2DShip::tick(float dt)
{
- //SUPER(Asteroids2DShip, tick, dt);
+ SUPER(Asteroids2DShip, tick, dt);
Vector3 pos = this->getPosition();
//ensure that the ship stays in playing field
Modified: code/branches/Presentation_FS19/src/modules/pong/Pong.cc
===================================================================
--- code/branches/Presentation_FS19/src/modules/pong/Pong.cc 2019-05-22 12:59:08 UTC (rev 12411)
+++ code/branches/Presentation_FS19/src/modules/pong/Pong.cc 2019-05-22 13:17:23 UTC (rev 12412)
@@ -126,7 +126,6 @@
*/
void Pong::start()
{
- orxout() << "Hello" << endl;
if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
{
if (this->ball_ == nullptr) // If there is no ball, create a new ball.
More information about the Orxonox-commit
mailing list