Changeset 1942 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 14, 2004, 1:29:58 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: the changes of Tom wern't that grat… now no more segmentation fault. Also updated the shots to a cooler version

Location:

orxonox/trunk/core

Files:

• environment.cc (modified) (3 diffs)
• shoot_rocket.cc (modified) (1 diff)

orxonox/trunk/core/environment.cc

@@ -23 +23 @@
 using namespace std;
 
-//Sorry Bensch
-#define LEVEL_LENGTH 500
+
 
 Environment::Environment () 
 {
 
-  //Sorry Bensch: x,y = 10
-  for (int x = 0; x < 50; x++)
+
+  for (int x = 0; x < 10; x++)
     {
-      for (int y = 0; y < 50; y++)
+      for (int y = 0; y < 10; y++)
         {
-          mountainTest[x][y] =0;
+          mountainTest[x][y] = 0;
                                                  
         }
     }
-  //Sorry Bensch: x,y = 9
-  for (int x = 1; x < LEVEL_LENGTH; x++)
+
+  for (int x = 1; x < 9; x++)
     {
-      for (int y = 1; y < LEVEL_LENGTH; y++)
+      for (int y = 1; y < 9; y++)
         {
-          //mountainTest[x][y] = (float)random() / 900000000;
-          mountainTest[x][y] = (float)(random() % 4);                                       
+          mountainTest[x][y] = (float)random() / 900000000;
+                                                 
         }
     }
@@ -65 +64 @@
   
   glBegin(GL_LINES);
-  for (int x = 0; x < LEVEL_LENGTH; x += 1)
+  for (int x = 0; x < 9; x += 1)
     {
-      for (int y = 0; y < 190; y += 1)
+      for (int y = 0; y < 9; y += 1)
         {
           glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);
@@ -77 +76 @@
   
   glBegin(GL_LINES);
-  for (int y = 0; y < LEVEL_LENGTH; y += 1)
+  for (int y = 0; y < 9; y += 1)
     {
-      for (int x = 0; x < 90; x += 1)
+      for (int x = 0; x < 9; x += 1)
         {
           glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);

orxonox/trunk/core/shoot_rocket.cc

@@ -183 +183 @@
   sh->type = ROTATER;
   sh->xCor = x+radius*sin(rotateAngle); sh->yCor = y; sh->zCor = z+radius*cos(rotateAngle);
-  sh->xVel = .1*cos(rotateAngle);
-  sh->yVel = 0.4;
-  sh->zVel = .1*sin(rotateAngle);
+  sh->xVel = .1*cos(rotateAngle)/step;
+  sh->yVel = 0.4/step;
+  sh->zVel = .1*sin(rotateAngle)/step;
   sh->xAcc = 1.01; sh->yAcc = 1.01/step; sh->zAcc = 1.01;
   sh->next = lastShoot;