Changeset 520 for trunk/src/lua

Timestamp:

10/03/16 17:45:46 (9 years ago)

Author:

epyon

Message:

• ecs updates
• animation updates
• ragdoll manager
• lua has own random engine
• several minor fixes
• particle engine/particle group
• shitload of other stuff
• bullet world

Location:

trunk/src/lua

Files:

• lua_area.cc (modified) (5 diffs)
• lua_aux.cc (modified) (7 diffs)
• lua_map_tile.cc (modified) (2 diffs)
• lua_math.cc (modified) (2 diffs)

trunk/src/lua/lua_area.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/core/random.hh"
+#include "nv/lua/lua_aux.hh"
 
 using nv::lua::detail::is_coord;
@@ -333 +333 @@
         nv::sint32 xs = ( b.x - a.x ) + 1;
         nv::sint32 ys = ( b.y - a.y ) - 1;
-        nv::sint32 roll = nv::random::get().srand( 2 * xs + 2 * ys );
+        nv::sint32 roll = nv::lua::rng().srand( 2 * xs + 2 * ys );
         nv::ivec2 result;
 
@@ -356 +356 @@
         nv::sint32 xs = ( b.x - a.x ) - 1;
         nv::sint32 ys = ( b.y - a.y ) - 1;
-        nv::sint32 roll = nv::random::get().srand( 2 * xs + 2 * ys );
+        nv::sint32 roll = nv::lua::rng().srand( 2 * xs + 2 * ys );
         nv::ivec2 result;
 
@@ -375 +375 @@
 {
         nv::rectangle area = to_area( L, 1 );
-        push_coord( L, nv::random::get().range( area.ul, area.lr ) );
+        push_coord( L, nv::lua::rng().range( area.ul, area.lr ) );
         return 1;
 }
@@ -383 +383 @@
         nv::rectangle area  = to_area( L, 1 );
         nv::ivec2     dim   = to_coord( L, 2 );
-        nv::ivec2     start = nv::random::get().range( area.ul, area.lr - dim );
+        nv::ivec2     start = nv::lua::rng().range( area.ul, area.lr - dim );
         push_area( L, nv::rectangle( start, start + dim ) );
         return 1;

trunk/src/lua/lua_aux.cc

@@ -9 +9 @@
 #include "nv/lua/lua_raw.hh"
 #include "nv/core/random.hh"
+
+static nv::random lua_rng;
 
 static int nluaaux_table_copy( lua_State* L )
@@ -94 +96 @@
         if ( dice < 1 )  luaL_argerror( L, 1, "die count lower than 1!" );
         if ( sides < 1 ) luaL_argerror( L, 2, "side count lower than 1!" );
-        lua_pushnumber( L, nv::random::get().dice( static_cast< nv::uint32 >( dice ), static_cast< nv::uint32 >( sides ) ) );
+        lua_pushnumber( L, lua_rng.dice( static_cast< nv::uint32 >( dice ), static_cast< nv::uint32 >( sides ) ) );
         return 1;
 }
@@ -102 +104 @@
         if ( lua_gettop( L ) == 0 )
         {
-                lua_pushnumber( L, nv::random::get().frand(1.0f) );
+                lua_pushnumber( L, lua_rng.frand(1.0f) );
         }
         else
@@ -110 +112 @@
                         lua_Integer arg1 = luaL_checkinteger( L, 1 );
                         if ( arg1 < 1 ) arg1 = 1;
-                        nlua_pushunsigned( L, nv::random::get().urange( 1, static_cast<nv::uint32>( arg1 ) ) );
+                        nlua_pushunsigned( L, lua_rng.urange( 1, static_cast<nv::uint32>( arg1 ) ) );
                 }
                 else
@@ -116 +118 @@
                         int arg1 = static_cast< int >( luaL_checkinteger( L, 1 ) );
                         int arg2 = static_cast< int >( luaL_checkinteger( L, 2 ) );
-                        int result = ( arg2 >= arg1 ? nv::random::get().srange( arg1, arg2 ) : nv::random::get().srange( arg2, arg1 ) );
+                        int result = ( arg2 >= arg1 ? lua_rng.srange( arg1, arg2 ) : lua_rng.srange( arg2, arg1 ) );
                         lua_pushinteger( L, result );
                 }
@@ -125 +127 @@
 static int nluaaux_math_randomseed( lua_State* L )
 {
-        nv::random::get().set_seed( nlua_tounsigned( L, 1 ) );
+        lua_rng.set_seed( nlua_tounsigned( L, 1 ) );
         return 0;
 }
@@ -137 +139 @@
 };
 
+nv::random & nv::lua::rng()
+{
+        return lua_rng;
+}
+
 void nv::lua::register_aux( lua::state* state )
 {

trunk/src/lua/lua_map_tile.cc

@@ -11 +11 @@
 #include "nv/stl/numeric.hh"
 #include "nv/stl/algorithm.hh"
-#include "nv/core/random.hh"
+#include "nv/lua/lua_aux.hh"
 #include "nv/lua/lua_area.hh"
 #include "nv/lua/lua_math.hh"
@@ -207 +207 @@
 static int nlua_map_tile_flip_random( lua_State* L )
 {
-        switch ( nv::random::get().urand( 4 ) )
+        switch ( nv::lua::rng().urand( 4 ) )
         {
         case 1 : nlua_map_tile_flip_x( L ); break;

trunk/src/lua/lua_math.cc

@@ -8 +8 @@
 
 #include "nv/lua/lua_raw.hh"
-#include "nv/core/random.hh"
+#include "nv/lua/lua_aux.hh"
 #include "nv/stl/type_traits/common.hh"
 
@@ -126 +126 @@
 int nlua_vec_random( lua_State* L )
 {
-        push_vec<T>( L, nv::random::get().range( to_vec<T>( L, 1 ), to_vec<T>( L, 2 ) ) );
+        push_vec<T>( L, nv::lua::rng().range( to_vec<T>( L, 1 ), to_vec<T>( L, 2 ) ) );
         return 1;
 }