Changeset 1477 for code/branches

Timestamp:

May 29, 2008, 10:22:53 AM (16 years ago)

Author:

landauf

Message:

• small char-length tweaking for my system (because i have to show the shell)
• fixed bug causing orxonox to loop forever when loading the config file (you'll like this, felix)

Location:

code/branches/network/src

Files:

• orxonox/GraphicsEngine.cc (modified) (2 diffs)
• orxonox/GraphicsEngine.h (modified) (1 diff)
• orxonox/console/InGameConsole.cc (modified) (2 diffs)
• util/String.cc (modified) (1 diff)

code/branches/network/src/orxonox/GraphicsEngine.cc

@@ -54 +54 @@
 
 namespace orxonox {
-  
+
   SetConsoleCommandShortcut(GraphicsEngine, CompositorBloomOn).setAccessLevel(AccessLevel::User);
   SetConsoleCommandShortcut(GraphicsEngine, CompositorMotionBlurOn).setAccessLevel(AccessLevel::User);
@@ -303 +303 @@
     else
       return 0;
+  }
+
+  /**
+    @brief Returns the window aspect ratio height/width.
+    @return The ratio
+  */
+  float GraphicsEngine::getWindowAspectRatio() const
+  {
+    if (this->renderWindow_)
+        return (float)this->renderWindow_->getHeight() / (float)this->renderWindow_->getWidth();
+    else
+        return 1.0f;
   }
 

code/branches/network/src/orxonox/GraphicsEngine.h

@@ -72 +72 @@
             int getWindowWidth() const;
             int getWindowHeight() const;
+            float getWindowAspectRatio() const;
             float getAverageFPS() const
             { if (renderWindow_) return this->renderWindow_->getAverageFPS(); else return 0.0f; }

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

@@ -47 +47 @@
 
 #define LINES 30
-#define CHAR_WIDTH1 7.34 // fix this please - determine the char-width dynamically
+#define CHAR_WIDTH1 7.78 //34 // fix this please - determine the char-width dynamically
 #define CHAR_WIDTH2 8.28 // fix this please - determine the char-width dynamically
-#define CHAR_WIDTH3 7.78 // fix this please - determine the char-width dynamically
+#define CHAR_WIDTH3 7.80 //78 // fix this please - determine the char-width dynamically
 
 namespace orxonox
@@ -465 +465 @@
         static std::string char2 = "Z4";
 
-        if (pos > maxCharsPerLine_)
+        if (pos > (int)maxCharsPerLine_)
           pos = maxCharsPerLine_;
         else if (pos < 0)

code/branches/network/src/util/String.cc

@@ -112 +112 @@
     {
         quotecount++;
+        quote++;
     }