Changeset 1141

Timestamp:

Apr 22, 2008, 10:20:40 PM (16 years ago)

Author:

FelixSchulthess

Message:

created ExecptionHandler for Felix::FridgeUnderrunException

Location:

code/branches/console/src/orxonox/console

Files:

• InGameConsole.cc (modified) (2 diffs)
• InGameConsole.h (modified) (1 diff)

code/branches/console/src/orxonox/console/InGameConsole.cc

@@ -89 +89 @@
         // for the beginning, don't scroll
         scroll = 0;
+        scrollTimer = 0;
         cursor = 0;
         // create overlay and elements
@@ -151 +152 @@
     */
     void InGameConsole::tick(float dt){
-        float top = consoleOverlayContainer->getTop();
-        if(scroll!=0){
-            top = top + 0.02*scroll;
-            consoleOverlayContainer->setTop(top);
-        }
-        if(top <= -1.2*REL_HEIGHT){
-            // window has completely scrolled up
-            scroll = 0;
-            consoleOverlay->hide();
-            active = false;
-        }
-        if(top >= 0){
-            // window has completely scrolled down
-            scroll = 0;
-            consoleOverlayContainer->setTop(0);
-            active = true;
+        scrollTimer += dt;
+        if(scrollTimer >= 0.01){
+            float top = consoleOverlayContainer->getTop();
+            scrollTimer = 0;
+            if(scroll!=0){
+                // scroll
+                top = top + 0.02*scroll;
+                consoleOverlayContainer->setTop(top);
+            }
+            if(top <= -1.2*REL_HEIGHT){
+                // window has completely scrolled up
+                scroll = 0;
+                consoleOverlay->hide();
+                active = false;
+            }
+            if(top >= 0){
+                // window has completely scrolled down
+                scroll = 0;
+                consoleOverlayContainer->setTop(0);
+                active = true;
+            }
         }
 

code/branches/console/src/orxonox/console/InGameConsole.h

@@ -74 +74 @@
             int windowH;
             int scroll;
+            float scrollTimer;
             float cursor;
             bool active;