Changeset 369 for trunk/src/lua

Timestamp:

05/22/15 13:21:44 (10 years ago)

Author:

epyon

Message:

• removed all std headers (except cassert) from common.hh
• sized int types in common.hh with static_assert checks
• char8 -> uchar8/schar8 and 16/32
• omitted core->stl includes fixed

Location:

trunk/src/lua

Files:

• lua_glm.cc (modified) (1 diff)
• lua_map_tile.cc (modified) (4 diffs)

trunk/src/lua/lua_glm.cc

@@ -360 +360 @@
 { 
         for (size_t i = 0; i < 256; ++i ) nlua_swizzel_lookup[i] = 255;
-        using nv::char8;
-        nlua_swizzel_lookup[char8( 'x' )] = 0;
-        nlua_swizzel_lookup[char8( 'r' )] = 0;
-        nlua_swizzel_lookup[char8( 's' )] = 0;
-        nlua_swizzel_lookup[char8( '0' )] = 0;
-        nlua_swizzel_lookup[char8( 'y' )] = 1;
-        nlua_swizzel_lookup[char8( 'g' )] = 1;
-        nlua_swizzel_lookup[char8( 't' )] = 0;
-        nlua_swizzel_lookup[char8( '1' )] = 1;
-        nlua_swizzel_lookup[char8( 'z' )] = 2;
-        nlua_swizzel_lookup[char8( 'b' )] = 2;
-        nlua_swizzel_lookup[char8( 'u' )] = 0;
-        nlua_swizzel_lookup[char8( '2' )] = 2;
-        nlua_swizzel_lookup[char8( 'w' )] = 3;
-        nlua_swizzel_lookup[char8( 'a' )] = 3;
-        nlua_swizzel_lookup[char8( 'v' )] = 0;
-        nlua_swizzel_lookup[char8( '3' )] = 3;
+        using nv::uchar8;
+        nlua_swizzel_lookup[uchar8( 'x' )] = 0;
+        nlua_swizzel_lookup[uchar8( 'r' )] = 0;
+        nlua_swizzel_lookup[uchar8( 's' )] = 0;
+        nlua_swizzel_lookup[uchar8( '0' )] = 0;
+        nlua_swizzel_lookup[uchar8( 'y' )] = 1;
+        nlua_swizzel_lookup[uchar8( 'g' )] = 1;
+        nlua_swizzel_lookup[uchar8( 't' )] = 0;
+        nlua_swizzel_lookup[uchar8( '1' )] = 1;
+        nlua_swizzel_lookup[uchar8( 'z' )] = 2;
+        nlua_swizzel_lookup[uchar8( 'b' )] = 2;
+        nlua_swizzel_lookup[uchar8( 'u' )] = 0;
+        nlua_swizzel_lookup[uchar8( '2' )] = 2;
+        nlua_swizzel_lookup[uchar8( 'w' )] = 3;
+        nlua_swizzel_lookup[uchar8( 'a' )] = 3;
+        nlua_swizzel_lookup[uchar8( 'v' )] = 0;
+        nlua_swizzel_lookup[uchar8( '3' )] = 3;
         int stack = lua_gettop( L );
 

trunk/src/lua/lua_map_tile.cc

@@ -20 +20 @@
 struct map_tile
 {
-        nv::uint8* data;
-        nv::char8* ascii;
-        nv::uint16 size_x;
-        nv::uint16 size_y;
+        nv::uint8*  data;
+        nv::uchar8* ascii;
+        nv::uint16  size_x;
+        nv::uint16  size_y;
 };
 
@@ -66 +66 @@
         }
         tile.data  = new nv::uint8[ tile.size_x * tile.size_y ];
-        tile.ascii = ( ascii ? new nv::char8[ tile.size_x * tile.size_y ] : nullptr );
+        tile.ascii = ( ascii ? new nv::uchar8[ tile.size_x * tile.size_y ] : nullptr );
 
         nv::uint8 translation[256] = { 0 };
@@ -89 +89 @@
                 for ( nv::uint16 row = 0; row < tile.size_y; row++ )
                 {
-                        nv::char8 gylph = (nv::char8)code[ row * ( tile.size_x + 1 ) + line ];
+                        nv::uchar8 gylph = (nv::uchar8)code[ row * ( tile.size_x + 1 ) + line ];
                         // TODO: check for errors
                         tile.data[ row * tile.size_x + line ] = translation[ gylph ];
@@ -110 +110 @@
         if ( old_tile->ascii )
         {
-                new_tile->ascii = new nv::char8[ size ];
+                new_tile->ascii = new nv::uchar8[ size ];
         }
         std::copy( old_tile->data, old_tile->data + size, new_tile->data );