Merge commit '87f4eea939309a5ea1972323e237d23afdf01104' into master-merge

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

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index bb9e92ddc8f271613219ba735682d13af48f9856..41fb89f89b9b053d6ce663a4687ce9fb3e722156 100644 (file)
--- a/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@ -130,12 +130,23 @@ void ZoomInWithMouse( int pointx, int pointy );
 
 void Redraw();
 
 
 void Redraw();
 

+void RenderActive();
+

 void SetActive( bool b ){
        m_bActive = b;
 void SetActive( bool b ){
        m_bActive = b;

+       RenderActive();

 };
 bool Active(){
        return m_bActive;
 };
 };
 bool Active(){
        return m_bActive;
 };

+struct camera_icon_t
+{
+       float x, y, fov, box;
+       double a;
+};
+camera_icon_t Cam;
+void UpdateCameraIcon();
+

 
 void Clipper_OnLButtonDown( int x, int y );
 void Clipper_OnLButtonUp( int x, int y );
 
 void Clipper_OnLButtonDown( int x, int y );
 void Clipper_OnLButtonUp( int x, int y );


@@ -143,6 +154,8 @@ void Clipper_OnMouseMoved( int x, int y );
 void Clipper_Crosshair_OnMouseMoved( int x, int y );
 void DropClipPoint( int pointx, int pointy );
 
 void Clipper_Crosshair_OnMouseMoved( int x, int y );
 void DropClipPoint( int pointx, int pointy );
 

+void SetCustomPivotOrigin( int pointx, int pointy );
+

 void SetViewType( VIEWTYPE n );
 bool m_bActive;
 
 void SetViewType( VIEWTYPE n );
 bool m_bActive;
 


@@ -200,10 +213,12 @@ bool m_entityCreate;
 
 public:
 void ButtonState_onMouseDown( unsigned int buttons ){
 
 public:
 void ButtonState_onMouseDown( unsigned int buttons ){

-       m_buttonstate |= buttons;
+       //m_buttonstate |= buttons;
+       m_buttonstate = buttons;

 }
 void ButtonState_onMouseUp( unsigned int buttons ){
 }
 void ButtonState_onMouseUp( unsigned int buttons ){

-       m_buttonstate &= ~buttons;
+       //m_buttonstate &= ~buttons;
+       m_buttonstate = 0;

 }
 unsigned int getButtonState() const {
        return m_buttonstate;
 }
 unsigned int getButtonState() const {
        return m_buttonstate;


@@ -255,7 +270,7 @@ struct xywindow_globals_t
        Vector3 AxisColorY;
        Vector3 AxisColorZ;
 
        Vector3 AxisColorY;
        Vector3 AxisColorZ;
 

-       bool m_bRightClick;
+//     bool m_bRightClick;

        bool m_bNoStipple;
        bool m_bImprovedWheelZoom;
 
        bool m_bNoStipple;
        bool m_bImprovedWheelZoom;
 


@@ -275,8 +290,8 @@ struct xywindow_globals_t
                AxisColorX( 1.f, 0.f, 0.f ),
                AxisColorY( 0.f, 1.f, 0.f ),
                AxisColorZ( 0.f, 0.f, 1.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( false ),
+//             m_bRightClick( true ),
+               m_bNoStipple( true ),

                m_bImprovedWheelZoom( true ){
        }
 
                m_bImprovedWheelZoom( true ){
        }