Skip to content

Commit 92d1604

Browse files
committed
::Projects FFI
1 parent 41a3a65 commit 92d1604

29 files changed

Lines changed: 79 additions & 46 deletions

3DRadSpace/Engine3DRadSpace/Core/Libs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128

129129
#ifndef E3DRSP_OBJECTS_EXPORT
130130
#if _WIN32
131-
#define E3DRSP_OBJECTS_EXPORT __declspec(dllimport)
131+
#define E3DRSP_OBJECTS_EXPORT
132132
#else
133133
#define E3DRSP_OBJECTS_EXPORT
134134
#endif

3DRadSpace/Engine3DRadSpace/FFI/Graphics/ShaderDesc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "ShaderDesc.hpp"
1+
#include "ShaderDesc.h"
22
#include "../../Graphics/ShaderDesc.hpp"
33

44
using namespace Engine3DRadSpace;

3DRadSpace/Engine3DRadSpace/FFI/Graphics/Viewport.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#include "Viewport.h"
22
#include "../../Graphics/Viewport.hpp"
3+
#include "../../Math/Vector3.hpp"
4+
5+
using namespace Engine3DRadSpace::Graphics;
6+
using namespace Engine3DRadSpace::Math;
37

48
E3DRSP_Vector3 E3DRSP_Viewport_Unproject(
59
const E3DRSP_Viewport* viewport,

3DRadSpace/Engine3DRadSpace/FFI/Input/Keyboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "../Core/Libs.h"
2+
#include "../../Core/Libs.h"
33
#include "Key.h"
44
#include "KeyState.h"
55

3DRadSpace/Engine3DRadSpace/FFI/Input/Mouse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "../Core/Libs.h"
2+
#include "../../Core/Libs.h"
33
#include "ButtonState.h"
44
#include "../Math/Point.h"
55

3DRadSpace/Engine3DRadSpace/FFI/Logging/Message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "../Core/Libs.h"
2+
#include "../../Core/Libs.h"
33

44
typedef struct E3DRSP_Message
55
{

3DRadSpace/Engine3DRadSpace/FFI/Logging/Warning.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma once
2-
#include "../Core/Libs.h"
2+
#include "../../Core/Libs.h"
33

44
typedef struct E3DRSP_Warning
55
{

3DRadSpace/Engine3DRadSpace/FFI/Native/Window.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "../../Native/Window.hpp"
33

44
using namespace Engine3DRadSpace;
5+
using namespace Engine3DRadSpace::Input;
56
using namespace Engine3DRadSpace::Native;
67

78
E3DRSP_Window E3DRSP_Window_Create(const char* title, size_t width, size_t height)

3DRadSpace/Engine3DRadSpace/FFI/Objects/ICamera.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include "../../Objects/ICamera.hpp"
22
#include "ICamera.h"
33

4+
using namespace Engine3DRadSpace::Objects;
5+
46
E3DRSP_Matrix4x4 E3DRSP_ICamera_GetViewMatrix(E3DRSP_ICamera cam)
57
{
68
return std::bit_cast<E3DRSP_Matrix4x4>(static_cast<ICamera*>(cam)->GetViewMatrix());

3DRadSpace/Engine3DRadSpace/FFI/Objects/IObject.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using namespace Engine3DRadSpace;
55
using namespace Engine3DRadSpace::Graphics;
6-
using namespace Engine3DRadSpace::Input;
76
using namespace Engine3DRadSpace::Math;
87
using namespace Engine3DRadSpace::Objects;
98

0 commit comments

Comments
 (0)