Changeset 534 for trunk/src/lua/lua_math.cc

Timestamp:

01/12/17 14:41:17 (8 years ago)

Author:

epyon

Message:

CONTINUED:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

• trunk/src/lua/lua_math.cc (modified) (7 diffs)

trunk/src/lua/lua_math.cc

@@ -11 +11 @@
 #include "nv/stl/type_traits/common.hh"
 
-static size_t nlua_swizzel_lookup[256];
+using nv::uint32;
+static nv::uint32 nlua_swizzel_lookup[256];
 
 using nv::lua::detail::is_vec;
@@ -18 +19 @@
 using nv::lua::detail::push_vec;
 
-inline bool nlua_is_swizzel( const unsigned char* str, size_t max )
+inline bool nlua_is_swizzel( const unsigned char* str, nv::uint32 max )
 {
         while (*str)
@@ -229 +230 @@
 {
         T v = to_vec<T>( L, 1 );
-        for ( size_t i = 0; i < v.size(); ++i )
+        for ( uint32 i = 0; i < v.size(); ++i )
         {
                 lua_pushnumber( L, v[i] );
@@ -241 +242 @@
         T* v = to_pvec<T>( L, 1 );
         size_t len  = 0;
-        size_t vlen = v->size();
+        uint32 vlen = v->size();
         const unsigned char * key = reinterpret_cast<const unsigned char *>( lua_tolstring( L, 2, &len ) );
-        size_t idx = 255;
+        uint32 idx = 255;
 
         if ( len == 1 )
@@ -279 +280 @@
         T* v = to_pvec<T>( L, 1 );
         size_t len  = 0;
-        size_t vlen = v->size();
+        uint32 vlen = v->size();
         const unsigned char * key = reinterpret_cast<const unsigned char *>( lua_tolstring( L, 2, &len ) );
-        size_t idx = 255;
+        uint32 idx = 255;
         if( len == 1 )
         {
@@ -294 +295 @@
         {
                 switch (len) {
-                case 2 : { vec2 v2 = to_vec<vec2>(L,3); for ( size_t i = 0; i< len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v2[i]; } return 0;
-                case 3 : { vec3 v3 = to_vec<vec3>(L,3); for ( size_t i = 0; i< len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v3[i]; } return 0;
-                case 4 : { vec4 v4 = to_vec<vec4>(L,3); for ( size_t i = 0; i< len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v4[i]; } return 0;
+                case 2 : { vec2 v2 = to_vec<vec2>(L,3); for ( uint32 i = 0; i< len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v2[i]; } return 0;
+                case 3 : { vec3 v3 = to_vec<vec3>(L,3); for ( uint32 i = 0; i< len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v3[i]; } return 0;
+                case 4 : { vec4 v4 = to_vec<vec4>(L,3); for ( uint32 i = 0; i< len; ++i) (*v)[nlua_swizzel_lookup[key[i]]] = v4[i]; } return 0;
                 default: break;
                 }
@@ -405 +406 @@
 void nv::lua::register_math( lua::state* state )
 { 
-        for (size_t i = 0; i < 256; ++i ) nlua_swizzel_lookup[i] = 255;
+        for (uint32 i = 0; i < 256; ++i ) nlua_swizzel_lookup[i] = 255;
         using nv::uchar8;
         nlua_swizzel_lookup[uchar8( 'x' )] = 0;