HIDPI_GL_3D_CANVAS needs CAMERA so move it over

3d-viewer/3d_canvas/board_adapter.cpp

@@ -23,7 +23,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include "../3d_rendering/camera.h"
+#include <gal/3d/camera.h>
 #include "board_adapter.h"
 #include <board_design_settings.h>
 #include <board_stackup_manager/board_stackup.h>

3d-viewer/3d_canvas/board_adapter.h

@@ -31,7 +31,7 @@
 #include "../3d_rendering/raytracing/accelerators/container_2d.h"
 #include "../3d_rendering/raytracing/accelerators/container_3d.h"
 #include "../3d_rendering/raytracing/shapes3D/bbox_3d.h"
-#include "../3d_rendering/camera.h"
+#include <gal/3d/camera.h>
 #include "../3d_enums.h"
 #include "../3d_cache/3d_cache.h"
 #include "../common_ogl/ogl_attr_list.h"

3d-viewer/3d_rendering/post_shader.h

@@ -30,7 +30,7 @@
 #ifndef POST_SHADER_H
 #define POST_SHADER_H
 
-#include "camera.h"
+#include <gal/3d/camera.h>
 
 class POST_SHADER
 {

3d-viewer/3d_rendering/raytracing/raypacket.h

@@ -27,7 +27,7 @@
 
 #include "ray.h"
 #include "frustum.h"
-#include "../camera.h"
+#include <gal/3d/camera.h>
 
 #define RAYPACKET_DIM (1 << 3)
 #define RAYPACKET_MASK (unsigned int) ( ( RAYPACKET_DIM - 1 ) )

3d-viewer/3d_rendering/track_ball.h

@@ -30,7 +30,7 @@
 #ifndef TRACK_BALL_H
 #define TRACK_BALL_H
 
-#include "camera.h"
+#include <gal/3d/camera.h>
 
 
 class TRACK_BALL : public CAMERA

3d-viewer/CMakeLists.txt

@@ -71,7 +71,6 @@ set(3D-VIEWER_SRCS
     ${DIR_RAY_3D}/triangle_3d.cpp
     3d_rendering/buffers_debug.cpp
     3d_rendering/render_3d_base.cpp
-    3d_rendering/camera.cpp
     3d_rendering/color_rgb.cpp
     3d_rendering/image.cpp
     3d_rendering/post_shader.cpp

common/gal/3d/camera.cpp

@@ -26,7 +26,7 @@
  * @file camera.cpp
  */
 
-#include "camera.h"
+#include <gal/3d/camera.h>
 #include <wx/log.h>
 #include <algorithm>
 

common/gal/CMakeLists.txt

@@ -14,6 +14,8 @@ set( GAL_SRCS
     ../view/view_overlay.cpp
     ../view/zoom_controller.cpp
 
+    3d/camera.cpp
+
     # OpenGL GAL
     opengl/opengl_gal.cpp
     opengl/gl_resources.cpp

include/gal/gal.h

@@ -0,0 +1,32 @@
+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2023 KiCad Developers, see AUTHORS.txt for contributors.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <import_export.h>
+
+#ifndef SWIG
+	#if defined( KIGAL_DLL )
+		#define GAL_API APIEXPORT
+	#else
+		#define GAL_API APIIMPORT
+	#endif
+#else
+#define GAL_API
+#endif

include/gal/hidpi_gl_3D_canvas.h

@@ -26,7 +26,7 @@
 #define HIDPI_GL_3D_CANVAS_H
 
 #include <atomic>
-#include "3d_rendering/camera.h"
+#include <gal/3d/camera.h>
 #include <gal/hidpi_gl_canvas.h>
 #include <wx/image.h>
 #include <wx/timer.h>