Changeset 378 for trunk/src/lua/lua_glm.cc

Timestamp:

05/29/15 12:12:47 (10 years ago)

Author:

epyon

Message:

• important fix in reverse_iterator operators
• std::string functions removed or converted to string_ref in string.hh
• capi.hh - more function forwards and usage of them instead of libc
• more std removal
• assert fix

File:

• trunk/src/lua/lua_glm.cc (modified) (2 diffs)

trunk/src/lua/lua_glm.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/stl/string.hh"
 #include "nv/core/random.hh"
+#include "nv/stl/traits/common.hh"
 
 static size_t nlua_swizzel_lookup[256];
@@ -292 +292 @@
 {
         T v = to_vec<T>( L, 1 );
-        std::string s = "(";
-        for ( size_t i = 0; i < v.length(); ++i )
-        {
-                if (i > 0) s += ",";
-                s += nv::to_string(v[i]);
-        }
-        s+=")";
-        lua_pushstring( L, s.c_str() );
+        bool fl = nv::is_floating_point<typename T::value_type>::value;
+        switch ( v.length() )
+        {
+        case 1: lua_pushfstring( L, ( fl ? "(%f)"          : "(%d)" ),          v[0] );
+        case 2: lua_pushfstring( L, ( fl ? "(%f,%f)"       : "(%d,%d)" ),       v[0], v[1] );
+        case 3: lua_pushfstring( L, ( fl ? "(%f,%f,%f)"    : "(%d,%d,%d)" ),    v[0], v[1], v[2] );
+        case 4: lua_pushfstring( L, ( fl ? "(%f,%f,%f,%f)" : "(%d,%d,%d,%d)" ), v[0], v[1], v[2], v[3] );
+        default:
+                lua_pushliteral( L, "(vector?)" ); break;
+        }
         return 1;
 }