add missing includes, which would tangle up type recognition

This commit is contained in:
arthur.jamet
2021-05-23 21:58:30 +02:00
parent 77534276ef
commit 4264cd76b8
6 changed files with 15 additions and 15 deletions
+1 -2
View File
@@ -105,6 +105,5 @@ if (NOT raylib_FOUND)
endif()
add_library(${LIB_NAME} STATIC ${SRC} ${HEADERS})
target_compile_definitions(${LIB_NAME} INTERFACE INTERNAL=private)
target_compile_definitions(${LIB_NAME} PRIVATE INTERNAL=public)
target_compile_definitions(${LIB_NAME} INTERFACE INTERNAL=private PRIVATE INTERNAL=public)
target_link_libraries(${LIB_NAME} raylib)
+3 -3
View File
@@ -7,7 +7,7 @@
#include "Camera/Camera2D.hpp"
RAY::Camera::Camera2D::Camera2D(const Vector2 &offset, const Vector2 &target, float rotation, float zoom):
RAY::Camera::Camera2D::Camera2D(const RAY::Vector2 &offset, const RAY::Vector2 &target, float rotation, float zoom):
_camera({offset, target, rotation, zoom})
{
}
@@ -33,12 +33,12 @@ void RAY::Camera::Camera2D::setZoom(float zoom)
this->_camera.zoom = zoom;
}
const Vector2 &RAY::Camera::Camera2D::getOffset(void) const
RAY::Vector2 RAY::Camera::Camera2D::getOffset(void) const
{
return this->_camera.offset;
}
const Vector2 &RAY::Camera::Camera2D::getTarget(void) const
RAY::Vector2 RAY::Camera::Camera2D::getTarget(void) const
{
return this->_camera.target;
}
+3 -2
View File
@@ -9,6 +9,7 @@
#define CAMERA2D_HPP_
#include <raylib.h>
#include "Vector/Vector2.hpp"
#include "Camera/ICamera.hpp"
namespace RAY::Camera {
@@ -41,9 +42,9 @@ namespace RAY::Camera {
void setZoom(float zoom);
//! @brief Get Offset
const Vector2 &getOffset(void) const;
Vector2 getOffset(void) const;
//! @brief Get target
const Vector2 &getTarget(void) const;
Vector2 getTarget(void) const;
//! @brief Get rotation
float getRotation(void) const;
//! @brief Get zoom
+4 -4
View File
@@ -7,7 +7,7 @@
#include "Camera/Camera3D.hpp"
RAY::Camera::Camera3D::Camera3D(const Vector3 &position, const Vector3 &target, const Vector3 &up, float fovy, Projection projection):
RAY::Camera::Camera3D::Camera3D(const RAY::Vector3 &position, const RAY::Vector3 &target, const RAY::Vector3 &up, float fovy, Projection projection):
_camera({position, target, up, fovy, projection})
{
}
@@ -37,17 +37,17 @@ void RAY::Camera::Camera3D::setProjection(Projection projection)
this->_camera.projection = projection;
}
const Vector3 &RAY::Camera::Camera3D::getPosition(void) const
RAY::Vector3 RAY::Camera::Camera3D::getPosition(void) const
{
return this->_camera.position;
}
const Vector3 &RAY::Camera::Camera3D::getTarget(void) const
RAY::Vector3 RAY::Camera::Camera3D::getTarget(void) const
{
return this->_camera.target;
}
const Vector3 &RAY::Camera::Camera3D::getUp(void) const
RAY::Vector3 RAY::Camera::Camera3D::getUp(void) const
{
return this->_camera.up;
}
+4 -3
View File
@@ -9,6 +9,7 @@
#define CAMERA3D_HPP_
#include <raylib.h>
#include "Vector/Vector3.hpp"
#include "Camera/ICamera.hpp"
#include "Camera/CameraProjection.hpp"
#include "Camera/CameraMode.hpp"
@@ -46,11 +47,11 @@ namespace RAY::Camera {
void setProjection(Projection projection);
//! @brief Get Position
const Vector3 &getPosition(void) const;
Vector3 getPosition(void) const;
//! @brief Get target
const Vector3 &getTarget(void) const;
Vector3 getTarget(void) const;
//! @brief Get up
const Vector3 &getUp(void) const;
Vector3 getUp(void) const;
//! @brief Get Fovy
float getFovy(void) const;
//! @brief Get projection
@@ -9,7 +9,6 @@
#define ADRAWABLE3D_HPP_
#include <raylib.h>
#include "Vector/Vector3.hpp"
#include "Drawables/IDrawable.hpp"
#include "Color.hpp"