Changeset 1900 in orxonox.OLD for orxonox/trunk/core/orxonox.cc

Timestamp:

May 23, 2004, 11:21:38 PM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: hardware independant game speed, more shoots, more speed - see mail

File:

• orxonox/trunk/core/orxonox.cc (modified) (5 diffs)

orxonox/trunk/core/orxonox.cc

@@ -51 +51 @@
 Player* Orxonox::localPlayer = 0;
 bool Orxonox::pause = false;
+bool Orxonox::inputEnabled = false;
 bool Orxonox::upWeGo = false;
 bool Orxonox::downWeGo = false;
@@ -87 +88 @@
 
   glutTimerFunc(1000, timeSlice, 0);
+  cout << "measuring performance...";
 }
 
@@ -114 +116 @@
   world->addNPC(npc);
 
+  NPC* npc2 = new NPC;
+  npc2->setPosition(-2.0, 10.0, 3.0);
+  npc2->setCollisionRadius(1.0);
+  world->addNPC(npc2);
+
   glutSpecialFunc(specFunc); 
   glutSpecialUpFunc(releaseKey);
@@ -126 +133 @@
 void Orxonox::timeSlice(int value)
 {
-  cout << "fps: " << fps << endl;
+  cout << "got " << fps << endl;
+  /* this is very very unsafe: io could be uninit */
+  io->setPlayerStep(19.2 / fps); /* set player to propper speed */
+  //localPlayer->shootLaser->setShootStep(fps/48.0); /* set shoot speed */
   fps = 0;
+  inputEnabled = true;
   glutTimerFunc(1000, timeSlice, 0);
 }
@@ -259 +270 @@
 
   /* check for input to pass it over */
-  if ( !pause && (rightWeGo || leftWeGo || upWeGo || downWeGo || shoot1)) {
-    if (upWeGo)
-      (*io).goUp();
-    if (downWeGo)
+  if ( !pause && inputEnabled && 
+       (rightWeGo || leftWeGo || upWeGo || downWeGo || shoot1)) 
+    {
+      if (upWeGo)
+        (*io).goUp();
+      if (downWeGo)
       (*io).goDown();
-    if (rightWeGo)
-      (*io).goRight();
-    if (leftWeGo)
+      if (rightWeGo)
+        (*io).goRight();
+      if (leftWeGo)
       (*io).goLeft();
-    if (shoot1) 
-      (*io).shoot();
-  }
+      if (shoot1) 
+        (*io).shoot();
+    }
   /* request repaint */
   glutPostRedisplay();