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 1097a28c82a703bd9a56a47deb4122f94db9b1a3..e23b4bd79280f24332ef74993cb0bbda61e205a4 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -119,7 +119,7 @@ void Move_End();
 bool m_move_started;
 guint m_move_focusOut;
 
-void Zoom_Begin();
+void Zoom_Begin( int x, int y );
 void Zoom_End();
 bool m_zoom_started;
 guint m_zoom_focusOut;
@@ -127,8 +127,12 @@ guint m_zoom_focusOut;
 void ZoomIn();
 void ZoomOut();
 void ZoomInWithMouse( int pointx, int pointy );
+void FocusOnBounds( AABB& bounds );
+
+void Redraw();
 
 void RenderActive();
+
 void SetActive( bool b ){
        m_bActive = b;
        RenderActive();
@@ -166,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;
 
@@ -249,6 +253,7 @@ inline void XYWnd_Update( XYWnd& xywnd ){
        xywnd.queueDraw();
 }
 
+void XY_Centralize();
 
 struct xywindow_globals_t
 {
@@ -261,13 +266,15 @@ 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;
 
 //     bool m_bRightClick;
        bool m_bNoStipple;
-       bool m_bImprovedWheelZoom;
+       bool m_bZoomInToPointer;
 
        xywindow_globals_t() :
                color_gridback( 0.77f, 0.77f, 0.77f ),
@@ -279,13 +286,15 @@ 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 ),
                AxisColorZ( 0.f, 0.f, 1.f ),
 //             m_bRightClick( true ),
                m_bNoStipple( true ),
-               m_bImprovedWheelZoom( true ){
+               m_bZoomInToPointer( true ){
        }
 
 };