Merge commit '8d6828cd68e9104c2c68b962b341b4f572b4bc38' into master-merge

[xonotic/netradiant.git] / radiant / xywindow.h

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index 966f374996a95f6b738eaf2b3bf16855b651c49b..07db53ece29caa2e8141576fb1be77e395dfd8fd 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -128,7 +128,10 @@ void ZoomIn();
 void ZoomOut();
 void ZoomInWithMouse( int pointx, int pointy );
 
+void Redraw();
+
 void RenderActive();
+
 void SetActive( bool b ){
        m_bActive = b;
        RenderActive();
@@ -166,8 +169,8 @@ guint m_chasemouse_handler;
 void ChaseMouse();
 bool chaseMouseMotion( int pointx, int pointy );
 
-void updateModelview();
-void updateProjection();
+void updateModelview(bool reconstruct = true);
+void updateProjection(bool reconstruct = true);
 Matrix4 m_projection;
 Matrix4 m_modelview;
 
@@ -261,6 +264,8 @@ struct xywindow_globals_t
        Vector3 color_selbrushes;
        Vector3 color_clipper;
        Vector3 color_viewname;
+       Vector3 color_gridminor_alt;
+       Vector3 color_gridmajor_alt;
        Vector3 AxisColorX;
        Vector3 AxisColorY;
        Vector3 AxisColorZ;
@@ -279,6 +284,8 @@ struct xywindow_globals_t
                color_selbrushes( 1.f, 0.f, 0.f ),
                color_clipper( 0.f, 0.f, 1.f ),
                color_viewname( 0.5f, 0.f, 0.75f ),
+               color_gridminor_alt( 0.f, 0.f, 0.f ),
+               color_gridmajor_alt( 0.f, 0.f, 0.f ),
 
                AxisColorX( 1.f, 0.f, 0.f ),
                AxisColorY( 0.f, 1.f, 0.f ),