diff --git a/3d-viewer/3d_canvas/board_adapter.cpp b/3d-viewer/3d_canvas/board_adapter.cpp index 44240833cf..8f17670469 100644 --- a/3d-viewer/3d_canvas/board_adapter.cpp +++ b/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 #include "board_adapter.h" #include #include diff --git a/3d-viewer/3d_canvas/board_adapter.h b/3d-viewer/3d_canvas/board_adapter.h index 5aacc90b9a..a93bdd49c6 100644 --- a/3d-viewer/3d_canvas/board_adapter.h +++ b/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 #include "../3d_enums.h" #include "../3d_cache/3d_cache.h" #include "../common_ogl/ogl_attr_list.h" diff --git a/3d-viewer/3d_rendering/post_shader.h b/3d-viewer/3d_rendering/post_shader.h index 75fec9776e..564d70088d 100644 --- a/3d-viewer/3d_rendering/post_shader.h +++ b/3d-viewer/3d_rendering/post_shader.h @@ -30,7 +30,7 @@ #ifndef POST_SHADER_H #define POST_SHADER_H -#include "camera.h" +#include class POST_SHADER { diff --git a/3d-viewer/3d_rendering/raytracing/raypacket.h b/3d-viewer/3d_rendering/raytracing/raypacket.h index 9d6e76456f..bfe0cfdf8a 100644 --- a/3d-viewer/3d_rendering/raytracing/raypacket.h +++ b/3d-viewer/3d_rendering/raytracing/raypacket.h @@ -27,7 +27,7 @@ #include "ray.h" #include "frustum.h" -#include "../camera.h" +#include #define RAYPACKET_DIM (1 << 3) #define RAYPACKET_MASK (unsigned int) ( ( RAYPACKET_DIM - 1 ) ) diff --git a/3d-viewer/3d_rendering/track_ball.h b/3d-viewer/3d_rendering/track_ball.h index 9693ce0f99..ed3b262c1d 100644 --- a/3d-viewer/3d_rendering/track_ball.h +++ b/3d-viewer/3d_rendering/track_ball.h @@ -30,7 +30,7 @@ #ifndef TRACK_BALL_H #define TRACK_BALL_H -#include "camera.h" +#include class TRACK_BALL : public CAMERA diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt index 8bc57bebbc..492b69f6ae 100644 --- a/3d-viewer/CMakeLists.txt +++ b/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 diff --git a/3d-viewer/3d_rendering/camera.cpp b/common/gal/3d/camera.cpp similarity index 99% rename from 3d-viewer/3d_rendering/camera.cpp rename to common/gal/3d/camera.cpp index ad7e294657..7886ff6913 100644 --- a/3d-viewer/3d_rendering/camera.cpp +++ b/common/gal/3d/camera.cpp @@ -26,7 +26,7 @@ * @file camera.cpp */ -#include "camera.h" +#include #include #include diff --git a/common/gal/CMakeLists.txt b/common/gal/CMakeLists.txt index 076300f69c..ee23a3c3da 100644 --- a/common/gal/CMakeLists.txt +++ b/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 diff --git a/3d-viewer/3d_rendering/camera.h b/include/gal/3d/camera.h similarity index 100% rename from 3d-viewer/3d_rendering/camera.h rename to include/gal/3d/camera.h diff --git a/include/gal/gal.h b/include/gal/gal.h new file mode 100644 index 0000000000..4b2ffcab1e --- /dev/null +++ b/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 . + */ + +#pragma once + +#include + +#ifndef SWIG + #if defined( KIGAL_DLL ) + #define GAL_API APIEXPORT + #else + #define GAL_API APIIMPORT + #endif +#else +#define GAL_API +#endif \ No newline at end of file diff --git a/include/gal/hidpi_gl_3D_canvas.h b/include/gal/hidpi_gl_3D_canvas.h index 75849e893b..948dd67b01 100644 --- a/include/gal/hidpi_gl_3D_canvas.h +++ b/include/gal/hidpi_gl_3D_canvas.h @@ -26,7 +26,7 @@ #define HIDPI_GL_3D_CANVAS_H #include -#include "3d_rendering/camera.h" +#include #include #include #include