Changeset 136 for cafu/trunk/Ca3DE/Client/Graphs.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/Ca3DE/Client/Graphs.cpp (modified) (5 diffs)

cafu/trunk/Ca3DE/Client/Graphs.cpp

@@ -26 +26 @@
 /****************************/
 
+#include "../AppCafu.hpp"
+#include "../MainFrame.hpp"
 #include "Graphs.hpp"
 #include "MaterialSystem/MaterialManager.hpp"
@@ -31 +33 @@
 #include "MaterialSystem/Renderer.hpp"
 #include "Math3D/Matrix.hpp"
-#include "OpenGL/OpenGLWindow.hpp"      // OpenGL Window
 
 
@@ -81 +82 @@
 void GraphsT::Draw(unsigned long ClientFrameNr)
 {
+    const wxSize  FrameSize=wxGetApp().GetMainFrame()->GetClientSize();
     unsigned long FrameNr=512;
 
@@ -89 +91 @@
     MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, MatrixT());
     MatSys::Renderer->SetMatrix(MatSys::RendererI::WORLD_TO_VIEW,  MatrixT());
-    MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, float(SingleOpenGLWindow->GetWidth()), float(SingleOpenGLWindow->GetHeight()), 0.0f, -1.0f, 1.0f));
+    MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,     MatrixT::GetProjOrthoMatrix(0.0f, float(FrameSize.GetWidth()), float(FrameSize.GetHeight()), 0.0f, -1.0f, 1.0f));
 
     static MatSys::MeshT LinesMesh (MatSys::MeshT::Lines ); LinesMesh .Vertices.Overwrite();
@@ -100 +102 @@
         LinesMesh.Vertices.PushBackEmpty();
         LinesMesh.Vertices[LinesMesh.Vertices.Size()-1].SetColor(0.5, 0.5, 0.5);
-        LinesMesh.Vertices[LinesMesh.Vertices.Size()-1].SetOrigin((SingleOpenGLWindow->GetWidth()-512)/2+FrameNr, SingleOpenGLWindow->GetHeight()-10);
+        LinesMesh.Vertices[LinesMesh.Vertices.Size()-1].SetOrigin((FrameSize.GetWidth()-512)/2+FrameNr, FrameSize.GetHeight()-10);
 
         LinesMesh.Vertices.PushBackEmpty();
         LinesMesh.Vertices[LinesMesh.Vertices.Size()-1].SetColor(0.5, 0.5, 0.5);
-        LinesMesh.Vertices[LinesMesh.Vertices.Size()-1].SetOrigin((SingleOpenGLWindow->GetWidth()-512)/2+FrameNr, SingleOpenGLWindow->GetHeight()-10-FPS[FrameIndex]);
+        LinesMesh.Vertices[LinesMesh.Vertices.Size()-1].SetOrigin((FrameSize.GetWidth()-512)/2+FrameNr, FrameSize.GetHeight()-10-FPS[FrameIndex]);
 
 
         PointsMesh.Vertices.PushBackEmpty();
         PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetColor(1.0, 0.0, 1.0);
-        PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetOrigin((SingleOpenGLWindow->GetWidth()-512)/2+FrameNr, SingleOpenGLWindow->GetHeight()-10-Heading[FrameIndex]);
+        PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetOrigin((FrameSize.GetWidth()-512)/2+FrameNr, FrameSize.GetHeight()-10-Heading[FrameIndex]);
 
         PointsMesh.Vertices.PushBackEmpty();
         PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetColor(0.0, 1.0, 0.0);
-        PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetOrigin((SingleOpenGLWindow->GetWidth()-512)/2+FrameNr, SingleOpenGLWindow->GetHeight()-10-PosY[FrameIndex]);
+        PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetOrigin((FrameSize.GetWidth()-512)/2+FrameNr, FrameSize.GetHeight()-10-PosY[FrameIndex]);
 
         PointsMesh.Vertices.PushBackEmpty();
         PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetColor(0.0, 0.0, 1.0);
-        PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetOrigin((SingleOpenGLWindow->GetWidth()-512)/2+FrameNr, SingleOpenGLWindow->GetHeight()-10-PosZ[FrameIndex]);
+        PointsMesh.Vertices[PointsMesh.Vertices.Size()-1].SetOrigin((FrameSize.GetWidth()-512)/2+FrameNr, FrameSize.GetHeight()-10-PosZ[FrameIndex]);
 
         ClientFrameNr--;