Changeset 9406 in orxonox.OLD for trunk/src/lib/graphics/graphics_engine.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/lib/graphics/graphics_engine.cc (modified) (5 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -50 +50 @@
  #include "static_model.h"
 #endif
-using namespace std;
 
 SHELL_COMMAND(wireframe, GraphicsEngine, wireframe);
-
+SHELL_COMMAND(fps, GraphicsEngine, toggleFPSdisplay);
 
 /**
@@ -67 +66 @@
   this->bDisplayFPS = false;
   this->bAntialiasing = false;
+  this->bDedicated = false;
   this->minFPS = 9999;
   this->maxFPS = 0;
@@ -164 +164 @@
   MultiType textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "1");
   Texture::setTextureEnableState(textures.getBool());
+
+  // check it is a dedicated network node: so no drawings are made
+  MultiType dedicated = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO, CONFIG_NAME_NO_RENDER, "0");
+  this->bDedicated = dedicated.getBool();
 
   // searching for a usefull resolution
@@ -604 +608 @@
 }
 
+/**
+ * this draws the graphics engines graphics effecs
+ */
 void GraphicsEngine::draw() const
 {
-  //  LightManager::getInstance()->draw();
-
-  if (this->graphicsEffects != NULL)
+  if( this->graphicsEffects != NULL)
   {
     //draw the graphics effects
-    list<BaseObject*>::const_iterator it;
+    std::list<BaseObject*>::const_iterator it;
     for (it = this->graphicsEffects->begin(); it != this->graphicsEffects->end(); it++)
       dynamic_cast<GraphicsEffect*>(*it)->draw();
@@ -618 +623 @@
   Render2D::getInstance()->draw(E2D_LAYER_BOTTOM, E2D_LAYER_ABOVE_ALL);
   Shader::restoreShader();
+}
+
+
+void GraphicsEngine::toggleFPSdisplay()
+{
+  this->displayFPS(!this->bDisplayFPS);
 }