Changeset 177

Timestamp:

07/27/13 16:31:34 (12 years ago)

Author:

epyon

Message:

• common - added narrow_cast (to be expanded)
• lua/glm - added random coord constructor and UNIT/ZERO constants for each vector class

Location:

trunk

Files:

• nv/common.hh (modified) (1 diff)
• src/lua/lua_glm.cc (modified) (11 diffs)

trunk/nv/common.hh

@@ -195 +195 @@
 }
 
+template <typename T, typename U>
+T narrow_cast(const U& a)
+{
+        return static_cast<T>(a & T(0xFFFFFFFFFFFFFFFF) );
+}
+
 #endif // NV_COMMON_HH

trunk/src/lua/lua_glm.cc

@@ -9 +9 @@
 #include "nv/lua/lua_raw.hh"
 #include "nv/string.hh"
+#include "nv/random.hh"
 
 static size_t nlua_swizzel_lookup[256];
@@ -24 +25 @@
 template < typename T, size_t k >
 struct nlua_vec_constructor {
+        static inline T unit() { return T(); }
         static inline T construct( lua_State*, int ) {
                 return T();
@@ -30 +32 @@
 
 template < typename T > struct nlua_vec_constructor< T, 1 > {
+        static inline T unit() { return T( 1 ); }
         static inline T construct( lua_State* L, int index ) {
                 return T( lua_tonumber( L, index ) );
@@ -36 +39 @@
 
 template < typename T > struct nlua_vec_constructor< T, 2 > {
+        static inline T unit() { return T( 1, 1 ); }
         static inline T construct( lua_State* L, int index ) {
                 if ( lua_type( L, index ) == LUA_TUSERDATA )
@@ -45 +49 @@
 
 template < typename T > struct nlua_vec_constructor< T, 3 > {
+        static inline T unit() { return T( 1, 1, 1 ); }
         static inline T construct( lua_State* L, int index ) {
                 typedef glm::detail::tvec2<typename T::value_type> vec2;
@@ -65 +70 @@
 
 template < typename T > struct nlua_vec_constructor< T, 4 > {
+        static inline T unit() { return T( 1, 1, 1, 1 ); }
         static inline T construct( lua_State* L, int index ) {
                 typedef glm::detail::tvec2<typename T::value_type> vec2;
@@ -113 +119 @@
 
 template< typename T >
+int nlua_vec_random( lua_State* L )
+{
+        nlua_push_vec<T>( L, nv::random::get().range( nlua_to_vec<T>( L, 1 ), nlua_to_vec<T>( L, 2 ) ) );
+        return 1;
+}
+
+template< typename T >
 int nlua_vec_clone( lua_State* L )
 {
@@ -118 +131 @@
         return 1;
 }
-
 
 template< typename T >
@@ -291 +303 @@
         static const struct luaL_Reg nlua_vec_sf [] = {
                 { "new",            nlua_vec_new<T> },
+                { "random",         nlua_vec_random<T> },
                 {NULL, NULL}
         };
@@ -297 +310 @@
                 { "clone",          nlua_vec_clone<T> },
                 { "get",            nlua_vec_get<T> },
+                { "tostring",       nlua_vec_tostring<T> },
                 {NULL, NULL}
         };
@@ -330 +344 @@
         nlua_register( L, nlua_vec_sm, -1 );
         lua_setmetatable( L, -2 );
+
+        nlua_push_vec( L, T() );
+        lua_setfield( L, -2, "ZERO" );
+        nlua_push_vec( L, nlua_vec_constructor<T,sizeof( T ) / sizeof( typename T::value_type )>::unit() );
+        lua_setfield( L, -2, "UNIT" );
         return 1;
 }