X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fcamwindow.h;h=02f1b3bb3bbcca3144f28dc4eb3bd116408a4b91;hb=fda16399685b08c509b0bcb559a082ed90c527a7;hp=5040e51c6de5d78780acbc36c98edd7f35f1420e;hpb=04fe1ceba51db67b2b1743e383f146ea8d31a07e;p=xonotic%2Fnetradiant.git

diff --git a/radiant/camwindow.h b/radiant/camwindow.h
index 5040e51c..02f1b3bb 100644
--- a/radiant/camwindow.h
+++ b/radiant/camwindow.h
@@ -27,57 +27,63 @@
 #include "signal/signalfwd.h"
 
 class CamWnd;
-CamWnd* NewCamWnd();
-void DeleteCamWnd( CamWnd* camwnd );
 
-void AddCameraMovedCallback( const SignalHandler& handler );
+CamWnd *NewCamWnd();
 
-void CamWnd_Update( CamWnd& camwnd );
+void DeleteCamWnd(CamWnd *camwnd);
 
-ui::Widget CamWnd_getWidget( CamWnd& camwnd );
-void CamWnd_setParent( CamWnd& camwnd, ui::Window parent );
+void AddCameraMovedCallback(const SignalHandler &handler);
 
-void GlobalCamera_setCamWnd( CamWnd& camwnd );
+void CamWnd_Update(CamWnd &camwnd);
+
+ui::GLArea CamWnd_getWidget(CamWnd &camwnd);
+
+void CamWnd_setParent(CamWnd &camwnd, ui::Window parent);
+
+void GlobalCamera_setCamWnd(CamWnd &camwnd);
+
+void fill_view_camera_menu(ui::Menu menu);
+
+void CamWnd_constructToolbar(ui::Toolbar toolbar);
 
-void fill_view_camera_menu( ui::Menu menu );
-typedef struct _GtkToolbar GtkToolbar;
-void CamWnd_constructToolbar( GtkToolbar* toolbar );
 void CamWnd_registerShortcuts();
 
 void GlobalCamera_Benchmark();
 
-const Vector3& Camera_getOrigin( CamWnd& camwnd );
-void Camera_setOrigin( CamWnd& camwnd, const Vector3& origin );
+const Vector3 &Camera_getOrigin(CamWnd &camwnd);
+
+void Camera_setOrigin(CamWnd &camwnd, const Vector3 &origin);
 
-enum
-{
-	CAMERA_PITCH = 0, // up / down
-	CAMERA_YAW = 1, // left / right
-	CAMERA_ROLL = 2, // fall over
+enum {
+    CAMERA_PITCH = 0, // up / down
+    CAMERA_YAW = 1, // left / right
+    CAMERA_ROLL = 2, // fall over
 };
 
-const Vector3& Camera_getAngles( CamWnd& camwnd );
-void Camera_setAngles( CamWnd& camwnd, const Vector3& angles );
+const Vector3 &Camera_getAngles(CamWnd &camwnd);
 
+void Camera_setAngles(CamWnd &camwnd, const Vector3 &angles);
 
-struct camwindow_globals_t
-{
-	Vector3 color_cameraback;
-	Vector3 color_selbrushes3d;
 
-	int m_nCubicScale;
+struct camwindow_globals_t {
+    Vector3 color_cameraback;
+    Vector3 color_selbrushes3d;
 
-	camwindow_globals_t() :
-		color_cameraback( 0.25f, 0.25f, 0.25f ),
-		color_selbrushes3d( 1.0f, 0.f, 0.f ),
-		m_nCubicScale( 13 ){
-	}
+    int m_nCubicScale;
+
+    camwindow_globals_t() :
+            color_cameraback(0.25f, 0.25f, 0.25f),
+            color_selbrushes3d(1.0f, 0.f, 0.f),
+            m_nCubicScale(13)
+    {
+    }
 
 };
 
 extern camwindow_globals_t g_camwindow_globals;
 
 void CamWnd_Construct();
+
 void CamWnd_Destroy();
 
 #endif