Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index 4eb6cf55f1f40fbd8a9739deaf6c5470c5c76012..e23b4bd79280f24332ef74993cb0bbda61e205a4 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -129,7 +129,10 @@ void ZoomOut();
 void ZoomInWithMouse( int pointx, int pointy );
 void FocusOnBounds( AABB& bounds );
 
+void Redraw();
+
 void RenderActive();
+
 void SetActive( bool b ){
        m_bActive = b;
        RenderActive();
@@ -167,8 +170,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;
 
@@ -263,6 +266,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;
@@ -281,6 +286,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 ),