Changeset 12277 for code/branches

Timestamp:

Apr 4, 2019, 4:16:22 PM (6 years ago)

Author:

jeromela

Message:

Spielfeld angepasst. Next: Fumktionalitaet auch anpassen

Location:

code/branches/OrxoBlox_FS19

Files:

• data/levels/orxoblox.oxw (modified) (3 diffs)
• src/modules/OrxoBlox/OrxoBlox.cc (modified) (3 diffs)
• src/modules/OrxoBlox/OrxoBloxCenterpoint.cc (modified) (2 diffs)

code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

@@ -27 +27 @@
   <OrxoBloxBat camerapositiontemplate=OrxoBloxbatcameras>
     <attached>
-      <Model position="0,0,3" mesh="cube.mesh" scale3D="14,2,2" />
+      <Model position="60,0,-50" mesh="cube.mesh" scale3D="2,2,14" />
       <!--Model roll=180 mesh="OrxoBloxbat.mesh" scale=0.045 /-->
     </attached>
@@ -53 +53 @@
 
 
+
 <Level
   plugins = "OrxoBlox"
@@ -76 +77 @@
     <MovableEntity rotationrate=5 rotationaxis="0,0,1">
       <attached>
-        <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="200,120" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25>
+        <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="100,120" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25>
           <attached>
-            <Model position="0,0,60" mesh="cube.mesh" scale3D="105,1,1" />
-            <Model position="0,0,-60" mesh="cube.mesh" scale3D="105,1,1" />
+            <!-- Balken die das Spielfeld begrenzen. -->
+            <Model position="0,0,-50" mesh="cube.mesh" scale3D="60,1,1" />
+            <Model position="60,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
+            <Model position="-60,0,0" mesh="cube.mesh" scale3D="1,1,50"/>
 
             <ParticleSpawner name=scoreeffect_right position="120,0, 45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -68 +68 @@
         this->bat_[0] = nullptr;
 
-        this->setHUDTemplate("OrxoBloxHUD");
+        //this->setHUDTemplate("pongHUD");
+        //Error when specified
 
         // Pre-set the timer, but don't start it yet.
@@ -126 +127 @@
     void OrxoBlox::start()
     {
-        orxout() << "Hello" << endl;
         if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
         {
@@ -185 +185 @@
         // Reset the variable.
         this->bForceSpawn_ = temp;
+
     }
 

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxCenterpoint.cc

@@ +1 @@
+/**
+    Centerpoint: Konstruktion Spielfeld. Wird in orxoblox.oxw definiert.
+*/
+
+
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -53 +58 @@
         this->width_ = 200;
         this->height_ = 120;
-        this->ballspeed_ = 100;
+        this->ballspeed_ = 60;
         this->ballaccfactor_ = 1.0;
         this->batspeed_ = 60;