Changeset 515 for trunk/src

Timestamp:

08/16/16 19:45:45 (9 years ago)

Author:

epyon

Message:

• model tag support
• local transform particle engines
• fix for 3d textures
• minor cleanups/fixes

Location:

trunk/src

Files:

• engine/model_manager.cc (modified) (1 diff)
• engine/particle_engine.cc (modified) (6 diffs)
• gl/gl_context.cc (modified) (1 diff)
• lua/lua_state.cc (modified) (1 diff)

trunk/src/engine/model_manager.cc

@@ -58 +58 @@
         if ( table.is_string( "material" ) )
                 cmaterial = m_rm->get< material >( table.get_string128( "material" ) );
+
+        if ( table.is_string( "tag" ) )
+                node->tag = table.get_string32( "tag" );
 
         if ( table.has_field( "path" ) )

trunk/src/engine/particle_engine.cc

@@ -605 +605 @@
 }
 
-void nv::particle_engine::update( particle_system system, float dtime )
+void nv::particle_engine::update( particle_system system, transform model, float dtime  )
 {
         particle_system_info* info = m_systems.get( system );
@@ -621 +621 @@
                 update_emmiters( info, dtime );
                 destroy_particles( info, dtime );
-                create_particles( info, dtime );
+                create_particles( info, model, dtime );
                 update_particles( info, dtime );
 
@@ -776 +776 @@
 }
 
-void nv::particle_engine::create_particles( particle_system_info* info, float dtime )
+void nv::particle_engine::create_particles( particle_system_info* info, transform model, float dtime )
 {
         uint32 ecount = info->data->emmiter_count;
@@ -782 +782 @@
 
         random& r = random::get();
-        vec3 source;
-        mat3 orient;
-//      bool local = info->data->local;
+        bool local = model.is_identity();
 //      if ( !local ) 
 //      {
@@ -806 +804 @@
                                         edata.emmiter_func( &(info->data->emmiters[i]), &pinfo, 1 );
                                         pinfo.position = vec3();
-//                                      if ( !local ) pinfo.position  = orient * pinfo.position + source;
                                         pinfo.position+= edata.position;
-                                        pinfo.color    = edata.color_min == edata.color_max ? 
+                                        if ( !local )
+                                                pinfo.position = pinfo.position * model;
+                                        pinfo.color    = edata.color_min == edata.color_max ?
                                                 edata.color_min : r.range( edata.color_min, edata.color_max );
                                         pinfo.size     = edata.size_min == edata.size_max ?
@@ -829 +828 @@
                                                 float sin_theta = sqrt(1.0f - cos_theta * cos_theta );
                                                 float phi       = r.frange( 0.0f, 2* math::pi<float>() );
-                                                pinfo.velocity  = orient * 
+                                                pinfo.velocity  = model.get_orientation() * 
                                                         ( edata.odir * ( cos(phi) * sin_theta ) +
                                                         edata.cdir * ( sin(phi)*sin_theta ) +

trunk/src/gl/gl_context.cc

@@ -964 +964 @@
         glTexParameteri( gl_type, GL_TEXTURE_WRAP_S, GLint( nv::sampler_wrap_to_enum( asampler.wrap_s ) ) );
         glTexParameteri( gl_type, GL_TEXTURE_WRAP_T, GLint( nv::sampler_wrap_to_enum( asampler.wrap_t ) ) );
+        glTexParameteri( gl_type, GL_TEXTURE_WRAP_R, GLint( nv::sampler_wrap_to_enum( asampler.wrap_r ) ) );
 
         if ( is_depth )

trunk/src/lua/lua_state.cc

@@ -344 +344 @@
 }
 
+
+nv::string32 nv::lua::table_guard::get_string32( string_view element, string_view defval /*= string_view() */ )
+{
+        lua_getfield( m_state, -1, element.data() );
+        size_t l = 0;
+        const char* str = nullptr;
+        if ( lua_type( m_state, -1 ) == LUA_TSTRING )
+        {
+                str = lua_tolstring( m_state, -1, &l );
+        }
+        else
+        {
+                l = defval.size();
+                str = defval.data();
+        }
+        string32 result( str, l );
+        lua_pop( m_state, 1 );
+        return result;
+}
 
 char lua::table_guard::get_char( string_view element, char defval /*= "" */ )