Changeset 515 for trunk

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

Files:

• nv/engine/model_manager.hh (modified) (5 diffs)
• nv/engine/particle_engine.hh (modified) (2 diffs)
• nv/interface/device.hh (modified) (1 diff)
• nv/lua/lua_state.hh (modified) (1 diff)
• src/engine/model_manager.cc (modified) (1 diff)
• src/engine/particle_engine.cc (modified) (6 diffs)
• src/gl/gl_context.cc (modified) (1 diff)
• src/lua/lua_state.cc (modified) (1 diff)

trunk/nv/engine/model_manager.hh

@@ -40 +40 @@
                 resource< data_channel_set > mesh;
                 resource< material >         material;
+                string32                     tag;
                 transform                    local;
                 random_range< vec3 >         position;
@@ -54 +55 @@
                         target->mesh      = mesh;
                         target->material  = material;
+                        target->tag       = tag;
                         target->local     = local;
                         target->rotation  = rotation;
@@ -84 +86 @@
                 resource< data_channel_set > mesh;
                 resource< material >         material;
+                shash64                      tag;
                 sint16                       attach_id;
                 sint16                       parent_id;
@@ -176 +179 @@
                         if ( m == selected ) parent_flags |= FMF_FOCUS;
 
-                        if ( m->mesh || m->force )
+                        if ( m->mesh || m->force || !m->tag.empty() )
                         {
                                 uint32 id = result.count++;
@@ -183 +186 @@
                                 re.material = m->material;
                                 re.local = tr;
+                                re.tag = m->tag;
                                 re.parent_id = parent_id;
                                 re.attach_id = m->attach_id;

trunk/nv/engine/particle_engine.hh

@@ -187 +187 @@
                 void release( particle_system_group group );
                 void release( particle_system system );
-                void update( particle_system system, float dtime );
+                void update( particle_system system, transform model, float dtime );
                 void render( particle_system system, const scene_state& s );
                 void set_texcoords( particle_system system, vec2 a, vec2 b );
@@ -200 +200 @@
                 void generate_data( particle_system_info* info, const scene_state& s );
                 void destroy_particles( particle_system_info* info, float dtime );
-                void create_particles( particle_system_info* info, float dtime );
+                void create_particles( particle_system_info* info, transform tr, float dtime );
                 void update_particles( particle_system_info* info, float dtime );
                 void update_emmiters( particle_system_info* info, float dtime );

trunk/nv/interface/device.hh

@@ -130 +130 @@
                 wrap wrap_s;
                 wrap wrap_t;
-
-                sampler() : filter_min( LINEAR ), filter_max( LINEAR ), wrap_s( REPEAT ), wrap_t( REPEAT ) {}
-                sampler( filter min, filter max, wrap s, wrap t )
-                        : filter_min( min ), filter_max( max ), wrap_s( s ), wrap_t( t ) {}
+                wrap wrap_r;
+
+                sampler() : filter_min( LINEAR ), filter_max( LINEAR ), wrap_s( REPEAT ), wrap_t( REPEAT ), wrap_r( REPEAT ) {}
+                sampler( filter min, filter max, wrap s, wrap t, wrap r )
+                        : filter_min( min ), filter_max( max ), wrap_s( s ), wrap_t( t ), wrap_r( r ) {}
                 sampler( filter f, wrap w )
-                        : filter_min( f ), filter_max( f ), wrap_s( w ), wrap_t( w ) {}
+                        : filter_min( f ), filter_max( f ), wrap_s( w ), wrap_t( w ), wrap_r( w )
+                {}
 
         };

trunk/nv/lua/lua_state.hh

@@ -378 +378 @@
                         string128 get_string128( string_view element, string_view defval = string_view() );
                         string64 get_string64( string_view element, string_view defval = string_view() );
+                        string32 get_string32( string_view element, string_view defval = string_view() );
 
                         char get_char( string_view element, char defval = ' ' );

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 /*= "" */ )