Changeset 12412

Timestamp:

May 22, 2019, 3:17:23 PM (6 years ago)

Author:

wiesep

Message:

Reverted unwanted changes

Location:

code/branches/Presentation_FS19

Files:

• data/levels/Asteroids2D.oxw (modified) (1 diff)
• data/levels/pong.oxw (modified) (2 diffs)
• data/levels/tetris.oxw (modified) (1 diff)
• data/levels/towerDefense.oxw (modified) (1 diff)
• src/modules/asteroids2D/Asteroids2DShip.cc (modified) (1 diff)
• src/modules/pong/Pong.cc (modified) (1 diff)

code/branches/Presentation_FS19/data/levels/Asteroids2D.oxw

@@ -44 +44 @@
     <!-- <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" /> -->

code/branches/Presentation_FS19/data/levels/pong.oxw

@@ -16 +16 @@
   <PongBat>
     <camerapositions>
-      <!---- Verschidene Kameraeinstellungen festlegen ---->
       <CameraPosition position="0,150,0" pitch=-90 absolute=true />
       <CameraPosition position="0,50,160" drag=true mouselook=true />
@@ -51 +50 @@
   </PongBall>
 </Template>
+
 
 <Level

code/branches/Presentation_FS19/data/levels/tetris.oxw

@@ -125 +125 @@
       </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>
     
     

code/branches/Presentation_FS19/data/levels/towerDefense.oxw

@@ -106 +106 @@
         </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 />

code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc

@@ -69 +69 @@
     void Asteroids2DShip::tick(float dt)
     {
-        //SUPER(Asteroids2DShip, tick, dt);
+        SUPER(Asteroids2DShip, tick, dt);
         Vector3 pos = this->getPosition();
 

code/branches/Presentation_FS19/src/modules/pong/Pong.cc

@@ -127 +127 @@
     void Pong::start()
     {
-        orxout() << "Hello" << endl;
         if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
         {