Merge branch 'luaglm' into luaglm-dev/cfx

Author: gottfriedleibniz

CMakeLists.txt

@@ -583,7 +583,7 @@ OPTION(GLM_FORCE_SILENT_WARNINGS "Silent C++ warnings from language extensions"
 
 # Formerly known as 'GLM_FORCE_QUAT_DATA_WXYZ', however, changed without support
 # for backwards compatibility in-mind; must be compensated for in source.
-OPTION(GLM_FORCE_QUAT_DATA_XYZW "Force GLM to store quat data as x,y,z,w instead of w,x,y,z" ON)
+OPTION(GLM_FORCE_QUAT_DATA_XYZW "Force GLM to store quat data as x,y,z,w instead of w,x,y,z" OFF)
 # GLM_FORCE_PRECISION_{ LOWP_FLOAT, MEDIUMP_FLOAT, HIGHP_FLOAT }
 
 ADD_COMPILE_DEFINITIONS(GLM_ENABLE_EXPERIMENTAL)
@@ -654,7 +654,8 @@ IF( GLM_FORCE_SILENT_WARNINGS )
 ENDIF()
 
 IF( GLM_FORCE_QUAT_DATA_XYZW )
-  ADD_COMPILE_DEFINITIONS(GLM_FORCE_QUAT_DATA_XYZW)
+  MESSAGE(FATAL_ERROR "Disable GLM_FORCE_QUAT_DATA_XYZW" )
+  # ADD_COMPILE_DEFINITIONS(GLM_FORCE_QUAT_DATA_XYZW)
 ENDIF()
 
 IF( LUA_GLM_INCLUDE_EXT )

EXTENDED.md

@@ -558,7 +558,7 @@ See [libs/scripts](libs/scripts) for a collection of example/test scripts using
 1. Support for integer vectors/matrices. Either by introducing an additional type, e.g., `LUA_TVECTORI`, or splitting the vector tag `LUA_TVECTOR` into `LUA_TVECTOR2`, `LUA_TVECTOR3`, `LUA_TVECTOR4`, and `LUA_TQUAT` and use variant bits for the primitive type.
 1. Replace `glm/gtc/random.{inl,hpp}` with a variant that takes advantage of CXX11's [Pseudo-random number generation](https://en.cppreference.com/w/cpp/numeric/random) facilities (and unify it with `math.random`).
 1. One downside to vectors/quaternions being an explicit `Value` is that they increase the minimum Value size to at least 16 bytes. Given that types in Lua are fairly transparent, it may be beneficial to introduce, or at least experiment with, a compile-time option to make vector/quaternion types collectible.
-1. Support for triangles and meshes, retrofit current spatial indexing structures for triangles, and consider BSPs.
+1. Support for meshes and retrofit current spatial indexing structures for triangles; consider BSPs.
 1. Include broad phase collision scripting examples, e.g., dynamic AABB tree and/or multibox sweep-and-prune.
 1. Initial support for frustums (both orthographic and perspective) and OBBs, or, at minimum, the more computationally complex parts of these structures.
 1. Allow some binding functions to be independently applied to each value or structure on the call stack. If disabled, only operate on the minimum number of required objects (following lmathlib). For example:
@@ -580,6 +580,7 @@ See [libs/scripts](libs/scripts) for a collection of example/test scripts using
 Ordered by priority.
 1. [geom](libs/glm-binding/geom): SIMD support (... for the most commonly use functions).
 1. Add support for two-dimensional geometrical structures: Ray2D, Line2D, Plane2D.
+1. Optimize `binding` functions that use 'glm_i2v'. Logic redundant with ``gLuaSharedTrait::Next(LB)``.
 1. Optimize `glm_createMatrix`. Profiling case '4x4 matrix creation (lua_Alloc)' is the one of the slowest operations in the added vector/matrix API. Worse when using the default Windows allocator.
 1. Optimize runtime swizzling: `swizzle` and `glmVec_get`. It is likely possible to improve this operation by 15/20 percent.
 1. Improve support for `glm::mat3x4` and `glm::mat4x3`.

README.md

@@ -7,6 +7,11 @@
 #define lglm_cpp
 #define LUA_CORE
 
+/* @TEMP Disallow 820a2c0e625f26000c688d841836bb10483be34d */
+#if defined(GLM_FORCE_QUAT_DATA_XYZW)
+  #error "glm broke compatbility, please compile without GLM_FORCE_QUAT_DATA_XYZW"
+#endif
+
 /*
 @@ LUA_API_LINKAGE is a mark for the linkage specification to core API functions
 */
@@ -1035,8 +1040,12 @@ lua_Integer luaO_HashString(const char *string, size_t length, int ignore_case)
   hash ^= (hash >> 11);
   hash += (hash << 15);
 
+#if defined(GRIT_POWER_UHASH)
+  return l_castU2S(hash);
+#else
   // @TODO: Eventually avoid sign-extension issues. If ever...
   return (lua_Integer)(int)hash;
+#endif
 }
 
 /* gritLua functions stored in lbaselib; considered deprecated */
@@ -1280,8 +1289,13 @@ LUA_API void lua_pushvector (lua_State *L, lua_Float4 f4, int variant) {
   }
   else if (b_variant == LUA_VVECTOR1)
     lua_pushnumber(L, cast_num(f4.x));
-  else if (b_variant == LUA_VQUAT)
+  else if (b_variant == LUA_VQUAT) {
+#if defined(GLM_FORCE_QUAT_DATA_XYZW)
+    glm_pushvec_quat(L, glmVector(glm::qua<glm_Float>(f4.x, f4.y, f4.z, f4.w)));
+#else
     glm_pushvec_quat(L, glmVector(glm::qua<glm_Float>(f4.w, f4.x, f4.y, f4.z)));
+#endif
+  }
   else
     glm_pushvec(L, glmVector(glm::vec<4, glm_Float>(f4.x, f4.y, f4.z, f4.w)), glm_dimensions(b_variant));
 }
@@ -1647,12 +1661,20 @@ LUA_API int glmVec_qua(lua_State *L) {
     if (ttisvector3(o2))  // <angle, axis>, degrees for gritLua compatibility
       return glm_pushquat(L, glm::angleAxis(cast_glmfloat(glm::radians(nvalue(o1))), glm_vecvalue(o2).v3));
     else if (ttisnumber(o2)) {  // <w, x, y, z>
+#if defined(GLM_FORCE_QUAT_DATA_XYZW)
+      const glm_Float w = cast_glmfloat(nvalue(o1));
+      const glm_Float x = cast_glmfloat(nvalue(o2));
+      const glm_Float y = cast_glmfloat(luaL_checknumber(L, 3));
+      const glm_Float z = cast_glmfloat(luaL_checknumber(L, 4));
+      return glm_pushquat(L, glm::qua<glm_Float>(x, y, z, w));
+#else
       return glm_pushquat(L, glm::qua<glm_Float>(
         cast_glmfloat(nvalue(o1)),
         cast_glmfloat(nvalue(o2)),
         cast_glmfloat(luaL_checknumber(L, 3)),
         cast_glmfloat(luaL_checknumber(L, 4)))
       );
+#endif
     }
     return luaL_error(L, "{w, x, y, z} or {angle, axis} expected");
   }

lglm.cpp

@@ -49,6 +49,7 @@ extern LUA_API_LINKAGE {
   #include "geom/line.hpp"
   #include "geom/linesegment.hpp"
   #include "geom/ray.hpp"
+  #include "geom/triangle.hpp"
   #include "geom/sphere.hpp"
   #include "geom/plane.hpp"
   #include "geom/polygon.hpp"
@@ -656,6 +657,22 @@ struct gLuaBase {
     return 2;
   }
 
+  template<glm::length_t D, typename T>
+  LUA_TRAIT_QUALIFIER int Pull(const gLuaBase &LB, int idx_, glm::Triangle<D, T> &t) {
+    Pull(LB, idx_, t.a);
+    Pull(LB, idx_ + 1, t.b);
+    Pull(LB, idx_ + 2, t.c);
+    return 3;
+  }
+
+  template<glm::length_t D, typename T>
+  LUA_TRAIT_QUALIFIER int Push(gLuaBase &LB, const glm::Triangle<D, T> &t) {
+    Push(LB, t.a);
+    Push(LB, t.b);
+    Push(LB, t.c);
+    return 3;
+  }
+
   template<glm::length_t D, typename T>
   LUA_TRAIT_QUALIFIER int Pull(const gLuaBase &LB, int idx_, glm::Sphere<D, T> &s) {
     Pull(LB, idx_, s.pos);

libs/glm-binding/bindings.hpp

@@ -13,6 +13,12 @@
 */
 #ifndef __EXT_EXTENSION_QUAT_HPP__
 #define __EXT_EXTENSION_QUAT_HPP__
+
+/* @TEMP Disallow 820a2c0e625f26000c688d841836bb10483be34d */
+#if defined(GLM_FORCE_QUAT_DATA_XYZW)
+  #error "glm broke compatbility, please compile without GLM_FORCE_QUAT_DATA_XYZW"
+#endif
+
 #if !defined(GLM_ENABLE_EXPERIMENTAL)
   #define GLM_ENABLE_EXPERIMENTAL
 #endif