aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNguyễn Gia Phong <mcsinyx@disroot.org>2021-12-11 22:35:46 +0700
committerNguyễn Gia Phong <mcsinyx@disroot.org>2021-12-11 22:35:46 +0700
commit161761ec1d024df2edb27468261a5ae8b290bce0 (patch)
tree1d0634e72d05703e390668ad8142efd8dd3fcf27 /src
parent521320a29e168396e8812b3acf1cf9d3e287537c (diff)
downloadblackshades-161761ec1d024df2edb27468261a5ae8b290bce0.tar.gz
Make Camera.h compatible with C
Diffstat (limited to 'src')
-rw-r--r--src/Camera.h6
-rw-r--r--src/Game.h2
-rw-r--r--src/cimport.zig1
3 files changed, 4 insertions, 5 deletions
diff --git a/src/Camera.h b/src/Camera.h
index 1aeb6ee..b4c06b4 100644
--- a/src/Camera.h
+++ b/src/Camera.h
@@ -25,9 +25,9 @@
#include "Quaternions.h"
struct Camera {
- XYZ position;
- XYZ oldposition;
- XYZ targetoffset;
+ struct XYZ position;
+ struct XYZ oldposition;
+ struct XYZ targetoffset;
float rotation, rotation2;
float oldrotation, oldrotation2;
diff --git a/src/Game.h b/src/Game.h
index 5933e3a..7e663ab 100644
--- a/src/Game.h
+++ b/src/Game.h
@@ -33,12 +33,12 @@
#include <GL/gl.h>
#include <GLFW/glfw3.h>
+#include "Camera.h"
#include "Quaternions.h"
#include "config.h"
#include "misc.h"
#ifdef __cplusplus
-#include "Camera.h"
#include "Skeleton.h"
#include "Models.h"
#include "Text.h"
diff --git a/src/cimport.zig b/src/cimport.zig
index efde6b7..b5d66e9 100644
--- a/src/cimport.zig
+++ b/src/cimport.zig
@@ -1,5 +1,4 @@
usingnamespace @cImport({
@cInclude("Game.h");
@cInclude("Constants.h");
- @cInclude("Quaternions.h");
});