move worldpos and detachedcamera inside Camera

project-imprimis · Sep 25, 2023 · 6e03dec · 6e03dec
1 parent a731f6a
commit 6e03dec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/engine/render/rendergl.cpp b/src/engine/render/rendergl.cpp
@@ -470,8 +470,6 @@ void gl_init()
 
 VAR(wireframe, 0, 0, 1);
 
-vec worldpos;
-
 Camera::Camera()
 {
 }
@@ -654,12 +652,20 @@ VARP(invmouse, 0, 0, 1); //toggles inverting the mouse
 FVARP(mouseaccel, 0, 0, 1000);
 
 Camera *camera1 = nullptr;
-//used in iengine.h
-bool detachedcamera = false;
 
 bool isthirdperson()
 {
-    return player!=camera1 || detachedcamera;
+    return player!=camera1 || (camera1 && camera1->detached());
+}
+
+vec Camera::pos() const
+{
+    return worldpos;
+}
+
+bool Camera::detached() const
+{
+    return detachedcamera;
 }
 
 void Camera::fixrange()

diff --git a/src/engine/render/rendergl.h b/src/engine/render/rendergl.h
@@ -4,7 +4,6 @@
 extern int xtraverts, xtravertsva;
 extern int renderw();
 extern int renderh();
-extern vec worldpos;
 extern bool hasFBMSBS, hasTQ, hasDBT, hasES3, hasCI;
 extern int glversion, glslversion;
 extern int mesa_swap_bug;
@@ -24,8 +23,13 @@ class Camera : public dynent
         vec right() const;
         vec up() const;
         void modifyorient(float yawdelta, float pitchdelta);
+        vec pos() const;
+        bool detached() const;
     private:
         void fixrange();
+        //used in iengine.h
+        bool detachedcamera = false;
+        vec worldpos;
 };
 
 extern Camera *camera1;