Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

[xonotic/netradiant.git] / contrib / camera / camera.h

diff --git a/contrib/camera/camera.h b/contrib/camera/camera.h
index 9ded63866780b0ca9608916de3cbd06a40ac7b02..ba008a2cc0e2c342137034c54061894848b9c55c 100644 (file)
--- a/contrib/camera/camera.h
+++ b/contrib/camera/camera.h
@@ -35,14 +35,11 @@ typedef unsigned char byte;
 #include <stdio.h>
 
 #define USE_QERTABLE_DEFINE
-
 #include "iscenegraph.h"
 #include "qerplugin.h"
 
 #define USE_QGLTABLE_DEFINE
-
 #include "igl.h"
-
 extern _QERQglTable __QGLTABLENAME;
 
 #include "iui.h"
@@ -66,12 +63,12 @@ extern _QERQglTable g_QglTable;
 extern _QERUITable g_UITable;
 extern _QERCameraTable g_CameraTable;
 
-extern CRenderer *Renderer;
-extern CListener *Listener;
+extern CRenderer          *Renderer;
+extern CListener          *Listener;
 
 // splinelib
 #define CAMERA_PLUGIN
-#define DotProduct(a, b)         ( ( a )[0] * ( b )[0] + ( a )[1] * ( b )[1] + ( a )[2] * ( b )[2] )
+#define DotProduct( a,b )         ( ( a )[0] * ( b )[0] + ( a )[1] * ( b )[1] + ( a )[2] * ( b )[2] )
 
 #include "splines/splines.h"
 
@@ -79,7 +76,7 @@ extern CListener *Listener;
 #define MAX_CAMERAS 64
 extern idCameraDef camera[MAX_CAMERAS];
 
-extern "C" qboolean loadCamera(int camNum, const char *name);
+extern "C" qboolean loadCamera( int camNum, const char *name );
 
 #ifndef PATH_MAX
 #define PATH_MAX 260
@@ -91,91 +88,71 @@ extern "C" qboolean loadCamera(int camNum, const char *name);
 
 class CCamera {
 public:
-    CCamera(int i)
-    {
-        cam = &camera[i];
-        camnum = i;
-        Init();
-    }
-
-    ~CCamera();
-
-    void Init()
-    {
-        next = prev = NULL;
-        fileName[0] = '\0';
-        hasbeensaved = 0;
-    }
-
-    idCameraDef *GetCam()
-    {
-        return (cam);
-    }
-
-    int GetCamNum()
-    {
-        return (camnum);
-    }
-
-    char *GetFileName()
-    {
-        return (fileName);
-    }
-
-    void SetFileName(const char *name, bool save)
-    {
-        strcpy(fileName, name);
-        if (save) {
-            hasbeensaved = 1;
-        }
-    }
-
-    CCamera *GetNext()
-    {
-        return (next);
-    }
-
-    CCamera *GetPrev()
-    {
-        return (prev);
-    }
-
-    void SetNext(CCamera *camera)
-    {
-        next = camera;
-    }
-
-    void SetPrev(CCamera *camera)
-    {
-        prev = camera;
-    }
-
-    int HasBeenSaved()
-    {
-        return (hasbeensaved);
-    }
-
-    void HasBeenModified()
-    {
-        if (hasbeensaved) {
-            hasbeensaved = 2;
-        }
-    }
+CCamera( int i ) {
+       cam = &camera[i];
+       camnum = i;
+       Init();
+}
+~CCamera();
+
+void Init() {
+       next = prev = NULL;
+       fileName[0] = '\0';
+       hasbeensaved = 0;
+}
+
+idCameraDef *GetCam() {
+       return( cam );
+}
+int GetCamNum() {
+       return( camnum );
+}
+
+char *GetFileName() {
+       return( fileName );
+}
+void SetFileName( const char *name, bool save ) {
+       strcpy( fileName, name );
+       if ( save ) {
+               hasbeensaved = 1;
+       }
+}
+
+CCamera *GetNext() {
+       return( next );
+}
+
+CCamera *GetPrev() {
+       return( prev );
+}
+
+void SetNext( CCamera *camera ) {
+       next = camera;
+}
+void SetPrev( CCamera *camera ) {
+       prev = camera;
+}
+
+int HasBeenSaved() {
+       return( hasbeensaved );
+}
+void HasBeenModified() {
+       if ( hasbeensaved ) {
+               hasbeensaved = 2;
+       }
+}
 
 protected:
-    idCameraDef *cam;
-    int camnum;
-    CCamera *next, *prev;
-    char fileName[PATH_MAX];
-    int hasbeensaved;       // 0:never saved 1:saved 2:saved, but modified
+idCameraDef *cam;
+int camnum;
+CCamera *next, *prev;
+char fileName[PATH_MAX];
+int hasbeensaved;       // 0:never saved 1:saved 2:saved, but modified
 };
 
 CCamera *AllocCam();
-
-void FreeCam(CCamera *cam);
-
-void SetCurrentCam(CCamera *cam);
-
+void FreeCam( CCamera *cam );
+void SetCurrentCam( CCamera *cam );
 CCamera *GetCurrentCam();
 
 // globals