X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fxywindow.h;h=ac059329518178de2d63c32843579c56352f6be8;hp=bb9e92ddc8f271613219ba735682d13af48f9856;hb=HEAD;hpb=ba54332d190b19c00bb8f15ee7d7b7634221646d

diff --git a/radiant/xywindow.h b/radiant/xywindow.h
index bb9e92dd..e23b4bd7 100644
--- 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,15 +127,27 @@ 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();
 };
 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 );
@@ -143,6 +155,8 @@ void Clipper_OnMouseMoved( int x, int y );
 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;
 
@@ -200,10 +214,12 @@ bool m_entityCreate;
 
 public:
 void ButtonState_onMouseDown( unsigned int buttons ){
-	m_buttonstate |= buttons;
+	//m_buttonstate |= buttons;
+	m_buttonstate = buttons;
 }
 void ButtonState_onMouseUp( unsigned int buttons ){
-	m_buttonstate &= ~buttons;
+	//m_buttonstate &= ~buttons;
+	m_buttonstate = 0;
 }
 unsigned int getButtonState() const {
 	return m_buttonstate;
@@ -237,6 +253,7 @@ inline void XYWnd_Update( XYWnd& xywnd ){
 	xywnd.queueDraw();
 }
 
+void XY_Centralize();
 
 struct xywindow_globals_t
 {
@@ -255,9 +272,9 @@ struct xywindow_globals_t
 	Vector3 AxisColorY;
 	Vector3 AxisColorZ;
 
-	bool m_bRightClick;
+//	bool m_bRightClick;
 	bool m_bNoStipple;
-	bool m_bImprovedWheelZoom;
+	bool m_bZoomInToPointer;
 
 	xywindow_globals_t() :
 		color_gridback( 0.77f, 0.77f, 0.77f ),
@@ -275,9 +292,9 @@ 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 ),
-		m_bRightClick( true ),
-		m_bNoStipple( false ),
-		m_bImprovedWheelZoom( true ){
+//		m_bRightClick( true ),
+		m_bNoStipple( true ),
+		m_bZoomInToPointer( true ){
 	}
 
 };