Changeset 136 for cafu/trunk/CaTools/MaterialViewer.cpp

Timestamp:

08/27/10 11:30:01 (21 months ago)

Author:

Carsten

Message:

Reintegrated branches/cafu_to_wx back into trunk!

Files:

• cafu/trunk/CaTools/MaterialViewer.cpp (modified) (3 diffs)

cafu/trunk/CaTools/MaterialViewer.cpp

@@ -46 +46 @@
 
 #include "ConsoleCommands/Console.hpp"
+#include "ConsoleCommands/ConsoleInterpreter.hpp"
 #include "ConsoleCommands/ConsoleStdout.hpp"
 #include "FileSys/FileManImpl.hpp"
@@ -68 +69 @@
 static cf::FileSys::FileManImplT FileManImpl;
 cf::FileSys::FileManI* cf::FileSys::FileMan=&FileManImpl;
+
+ConsoleInterpreterI* ConsoleInterpreter=NULL;
+MaterialManagerI*    MaterialManager   =NULL;
 
 
@@ -500 +504 @@
 
 
-            MyFont->Print(SingleOpenGLWindow->GetWidth()-100, SingleOpenGLWindow->GetHeight()-18, 0x00FFFFFF, "%5.1f FPS", 1.0/DeltaTime);
+            MyFont->Print(SingleOpenGLWindow->GetWidth()-100, SingleOpenGLWindow->GetHeight()-18, float(SingleOpenGLWindow->GetWidth()), float(SingleOpenGLWindow->GetHeight()), 0x00FFFFFF, "%5.1f FPS", 1.0/DeltaTime);
         }
         MatSys::Renderer->EndFrame();