Changeset 1502 for code/trunk/src/orxonox/GraphicsEngine.h

Timestamp:

Jun 1, 2008, 3:54:20 PM (17 years ago)

Author:

rgrieder

Message:

• @everyone: Do not create a branch until I've added the svn:eol-style property correctly. Otherwise this would cost me another 4 hours or so when we want to merge back.
• merged network branch back to trunk
• I had to omit the changes from last evening concerning the line endings
• might not work yet because of the line endings
• @beni: script branch is the only branch still open. you probably will have to apply a patch because of inconsistent new lines

File:

• code/trunk/src/orxonox/GraphicsEngine.h (modified) (2 diffs)

code/trunk/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; }
 
             void windowMoved       (Ogre::RenderWindow* rw);
@@ -80 +83 @@
             static GraphicsEngine& getSingleton();
             static GraphicsEngine* getSingletonPtr() { return &getSingleton(); }
+
+            //HACK!!!
+            //void static CompositorBloomOn();
+            //void static CompositorBloomOff();
+            //void static CompositorMotionBlurOn();
+            //void static CompositorMotionBlurOff();
+
 
         private: