Merge pull request #492 from FunkyAss/fix/call_api_pulls_inline

Fix "Call API pulls inline API"

docs/source/call.rst

@@ -15,5 +15,6 @@ It would be duplicate documentation also it
 would be hard to sync documentation between inline and call version for me.
 
 By including **clgm/cglm.h** you include all inline versions. To get precompiled
-versions you need to include **cglm/call.h** header it also includes all
+versions you need to include **cglm/call.h** header. When using the
-call versions plus *clgm/cglm.h* (inline versions)
+precompiled versions, explicitly including **cglm/cglm.h** is still necessary
+for the inline versions to be included.

include/cglm/call.h

@@ -11,7 +11,6 @@
 extern "C" {
 #endif
 
-#include "cglm.h"
 #include "call/vec2.h"
 #include "call/vec3.h"
 #include "call/vec4.h"

include/cglm/call/aabb2d.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 /* DEPRECATED! use _diag */
 #define glmc_aabb2d_size(aabb) glmc_aabb2d_diag(aabb)

include/cglm/call/affine.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/affine2d.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/bezier.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float

include/cglm/call/box.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/cam.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/ortho_lh_no.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/ortho_lh_zo.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/ortho_rh_no.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/ortho_rh_zo.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/persp_lh_no.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/persp_lh_zo.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/persp_rh_no.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/persp_rh_zo.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/project_no.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/project_zo.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/view_lh_no.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/view_lh_zo.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/view_rh_no.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/clipspace/view_rh_zo.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../../cglm.h"
+#include "../../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/curve.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float

include/cglm/call/ease.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float

include/cglm/call/euler.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/frustum.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/io.h

@@ -12,7 +12,8 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
+#include <stdio.h>
 
 CGLM_EXPORT
 void

include/cglm/call/ivec2.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/ivec3.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/ivec4.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/mat2.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/mat2x3.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/mat2x4.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/mat3.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_mat3_dup(mat, dest)  glmc_mat3_copy(mat, dest)

include/cglm/call/mat3x2.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/mat3x4.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/mat4.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_mat4_udup(mat, dest) glmc_mat4_ucopy(mat, dest)

include/cglm/call/mat4x2.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/mat4x3.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/noise.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float

include/cglm/call/plane.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/project.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/quat.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/ray.h

@@ -10,7 +10,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "../cglm.h"
+
+#include "../common.h"
 
 CGLM_EXPORT
 bool

include/cglm/call/sphere.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 float

include/cglm/call/vec2.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 CGLM_EXPORT
 void

include/cglm/call/vec3.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_vec_dup(v, dest)          glmc_vec3_copy(v, dest)

include/cglm/call/vec4.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include "../cglm.h"
+#include "../common.h"
 
 /* DEPRECATED! use _copy, _ucopy versions */
 #define glmc_vec4_dup3(v, dest)         glmc_vec4_copy3(v, dest)

include/cglm/euler.h

@@ -83,25 +83,6 @@
 #  include "clipspace/view_rh_no.h"
 #endif
 
-
-/*!
- * if you have axis order like vec3 orderVec = [0, 1, 2] or [0, 2, 1]...
- * vector then you can convert it to this enum by doing this:
- * @code
- * glm_euler_seq order;
- * order = orderVec[0] | orderVec[1] << 2 | orderVec[2] << 4;
- * @endcode
- * you may need to explicit cast if required
- */
-typedef enum glm_euler_seq {
-  GLM_EULER_XYZ = 0 << 0 | 1 << 2 | 2 << 4,
-  GLM_EULER_XZY = 0 << 0 | 2 << 2 | 1 << 4,
-  GLM_EULER_YZX = 1 << 0 | 2 << 2 | 0 << 4,
-  GLM_EULER_YXZ = 1 << 0 | 0 << 2 | 2 << 4,
-  GLM_EULER_ZXY = 2 << 0 | 0 << 2 | 1 << 4,
-  GLM_EULER_ZYX = 2 << 0 | 1 << 2 | 0 << 4
-} glm_euler_seq;
-
 CGLM_INLINE
 glm_euler_seq
 glm_euler_order(int ord[3]) {

include/cglm/types.h

@@ -91,6 +91,25 @@ typedef CGLM_ALIGN_MAT    vec4  mat4[4];
 typedef vec2                    mat4x2[4];  /* [col (4), row (2)] */
 typedef vec3                    mat4x3[4];  /* [col (4), row (3)] */
 
+
+/*!
+ * if you have axis order like vec3 orderVec = [0, 1, 2] or [0, 2, 1]...
+ * vector then you can convert it to this enum by doing this:
+ * @code
+ * glm_euler_seq order;
+ * order = orderVec[0] | orderVec[1] << 2 | orderVec[2] << 4;
+ * @endcode
+ * you may need to explicit cast if required
+ */
+typedef enum glm_euler_seq {
+  GLM_EULER_XYZ = 0 << 0 | 1 << 2 | 2 << 4,
+  GLM_EULER_XZY = 0 << 0 | 2 << 2 | 1 << 4,
+  GLM_EULER_YZX = 1 << 0 | 2 << 2 | 0 << 4,
+  GLM_EULER_YXZ = 1 << 0 | 0 << 2 | 2 << 4,
+  GLM_EULER_ZXY = 2 << 0 | 0 << 2 | 1 << 4,
+  GLM_EULER_ZYX = 2 << 0 | 1 << 2 | 0 << 4
+} glm_euler_seq;
+
 /*
   Important: cglm stores quaternion as [x, y, z, w] in memory since v0.4.0 
   it was [w, x, y, z] before v0.4.0 ( v0.3.5 and earlier ). w is real part.