Changeset 508 for trunk/src

Timestamp:

07/19/16 13:43:10 (9 years ago)

Author:

epyon

Message:

• nv::engine upgrades
• default_resource_manager implementation

Location:

trunk/src

Files:

• engine/animation.cc (modified) (1 diff)
• engine/default_resource_manager.cc (added)
• engine/material_manager.cc (modified) (2 diffs)
• engine/mesh_manager.cc (modified) (1 diff)
• engine/model_manager.cc (modified) (2 diffs)
• engine/renderer.cc (modified) (1 diff)
• engine/shadow.cc (added)
• io/c_stream.cc (modified) (1 diff)

trunk/src/engine/animation.cc

@@ -41 +41 @@
                 {
                         nv::c_file_system fs;
-                        nv::stream* poses_file = fs.open( poses_path );
+                        nv::stream* poses_file = open_stream( fs, poses_path );
+                        NV_ASSERT_ALWAYS( poses_file, "CANT FIND POSES FILE!" );
                         nv::nmd_loader* ploader = new nv::nmd_loader( nullptr );
                         ploader->load( *poses_file );

trunk/src/engine/material_manager.cc

@@ -39 +39 @@
 
                 // HACK
-                for ( uint32 i = 0; i < 8; ++i )
-                        if ( result->textures[i].is_nil() )
-                                result->textures[i] = m_default;
+                for ( uint32 i = 0; i < 5; ++i )
+                        if ( result->textures[i].is_nil() )
+                                result->textures[i] = m_default;
 
                 return add( id, result );
@@ -77 +77 @@
                                 if ( i != TEX_EMISSIVE )
                                         NV_LOG_ERROR( "Texture file not found! : ", m->paths[i] );
-                                m->paths[i].clear();
+                                //m->paths[i].clear();
                         }
                 }

trunk/src/engine/mesh_manager.cc

@@ -18 +18 @@
                 gm->va = m_context->create_vertex_array( &*lmesh, STATIC_DRAW );
                 gm->count = lmesh->get_channel_size( slot::INDEX );
-                gm->shader = lmesh->get_channel( slot::BONEINDEX ) != nullptr ? BONE : NORMAL;
+                gm->shader = lmesh->get_channel( slot::BONEINDEX ) != nullptr ? BONE : DIRECT;
                 return add( mesh.id(), gm );
         }

trunk/src/engine/model_manager.cc

@@ -64 +64 @@
                 if ( table.is_number( "attach" ) )
                 {
-                        attach_id = table.get_integer( "attach", -1 );
+                        attach_id = sint16( table.get_integer( "attach", -1 ) );
                         //                              parent_id = 0;
                 }
@@ -71 +71 @@
                         auto it = m->node_names.find( table.get_string_hash_64( "attach" ) );
                         if ( it != m->node_names.end() )
-                                attach_id = it->second + 1;
+                                attach_id = sint16( it->second + 1 );
                         int error; int hack;
                 }

trunk/src/engine/renderer.cc

@@ -6 +6 @@
 
 #include "nv/engine/renderer.hh"
+
+#include "nv/core/profiler.hh"
+
+using namespace nv;
+
+renderer::renderer( context* ctx )
+        : m_context( ctx )
+{
+        for ( auto& i : m_statistics ) i = 0;
+
+        struct qvtx
+        {
+                nv::vec2 position;
+                nv::vec2 texcoord;
+        };
+
+        qvtx quad[] = {
+                qvtx{ vec2( -1.0f,-1.0f ), vec2( 0.0f, 0.0f ) },
+                qvtx{ vec2( 1.0f,-1.0f ),  vec2( 1.0f, 0.0f ) },
+                qvtx{ vec2( 1.0f,1.0f ),   vec2( 1.0f, 1.0f ) },
+                qvtx{ vec2( 1.0f,1.0f ),   vec2( 1.0f, 1.0f ) },
+                qvtx{ vec2( -1.0f,1.0f ),  vec2( 0.0f, 1.0f ) },
+                qvtx{ vec2( -1.0f,-1.0f ), vec2( 0.0f, 0.0f ) },
+        };
+        m_quad = m_context->create_vertex_array( quad, 6, STATIC_DRAW );
+}
+
+void renderer::sort()
+{
+        stable_sort( m_elements.begin(), m_elements.end(), renderer_element_compare() );
+}
+
+
+void renderer::render( const scene_state& s, const render_pass& pass )
+{
+        scene_state ss( s );
+        m_context->bind( pass.fbuffer, FRAMEBUFFER );
+        m_context->set_draw_buffers( pass.output_count, pass.output );
+        m_context->set_viewport( ss.get_viewport() );
+
+        if ( pass.cstate.buffers != buffer_mask::NO_BUFFER )
+                m_context->clear( pass.cstate );
+
+        for ( uint32 i = 0; i < size( pass.binds ); ++i )
+                if ( pass.binds[i] )
+                        m_context->bind( pass.binds[i], texture_slot( i ) );
+
+        resource_id current_mat;
+        mat4 model = ss.get_model();
+        for ( const renderer_element& element : m_elements )
+                if ( match( element.flags, pass ) )
+                {
+                        ss.set_model( model * element.model.extract() );
+                        if ( auto mesh = element.mesh.lock() )
+                                if ( mesh->count > 0 )
+                                        if ( auto program = pass.programs[mesh->shader].lock() )
+                                        {
+                                                if ( element.mat.id() != current_mat )
+                                                {
+                                                        if ( auto mat = element.mat.lock() )
+                                                        {
+                                                                for ( uint32 i = 0; i < 8; ++i )
+                                                                        if ( mat->textures[i] && !pass.binds[i] )
+                                                                                m_context->bind( mat->textures[i], nv::texture_slot( i ) );
+                                                                current_mat = element.mat.id();
+                                                        }
+                                                }
+
+                                                m_context->get_device()->set_opt_uniform( *program, "nv_bone_offset", element.bone_offset );
+                                                m_context->get_device()->set_opt_uniform( *program, "nv_flags", unsigned( *element.flags.data() ) );
+
+                                                m_context->apply_engine_uniforms( *program, ss );
+                                                m_context->draw( TRIANGLES, pass.rstate, *program, mesh->va, mesh->count );
+
+                                                m_statistics[TRIANGLE_COUNT] += mesh->count / 3;
+                                                m_statistics[DRAW_CALL]++;
+                                        }
+                }
+
+        m_context->bind( pass.fbuffer, FRAMEBUFFER );
+}
+
+void renderer::render( const scene_state& ss, const render_pass& pass, vertex_array va, uint32 va_count, uint32 program_idx )
+{
+        m_context->bind( pass.fbuffer, FRAMEBUFFER );
+        m_context->set_draw_buffers( pass.output_count, pass.output );
+        m_context->set_viewport( ss.get_viewport() );
+
+        if ( pass.cstate.buffers != buffer_mask::NO_BUFFER )
+                m_context->clear( pass.cstate );
+
+        for ( uint32 i = 0; i < size( pass.binds ); ++i )
+                if ( pass.binds[i] )
+                        m_context->bind( pass.binds[i], texture_slot(i) );
+
+        if ( auto program = pass.programs[program_idx].lock() )
+        {
+                m_context->apply_engine_uniforms( *program, ss );
+                m_context->draw( TRIANGLES, pass.rstate, *program, va, va_count );
+                m_statistics[ TRIANGLE_COUNT ] += 2;
+                m_statistics[ DRAW_CALL ]++;
+        }
+
+        m_context->bind( pass.fbuffer, FRAMEBUFFER );
+}
+
+void nv::renderer::render_direct( const scene_state& s, const render_pass& pass, const nv::array_view< renderer_direct_element >& elements, uint32 program_idx )
+{
+        if ( m_elements.size() == 0 ) return;
+
+        scene_state ss( s );
+        m_context->bind( pass.fbuffer, FRAMEBUFFER );
+        m_context->set_draw_buffers( pass.output_count, pass.output );
+        m_context->set_viewport( ss.get_viewport() );
+
+        if ( pass.cstate.buffers != buffer_mask::NO_BUFFER )
+                m_context->clear( pass.cstate );
+
+        for ( uint32 i = 0; i < size( pass.binds ); ++i )
+                if ( pass.binds[i] )
+                        m_context->bind( pass.binds[i], texture_slot( i ) );
+
+        resource_id current_mat;
+        resource_id current_prog;
+
+        mat4 model = ss.get_model();
+        for ( uint32 index = 0; index < elements.size(); ++index )
+        {
+                const renderer_direct_element& element = elements[index];
+                if ( match( element.flags, pass ) )
+                {
+                        ss.set_model( model * element.model.extract() );
+                        if ( element.count > 0 )
+                        {
+                                if ( auto program = element.programs[program_idx].lock() )
+                                {
+                                        if ( element.material.id() != current_mat )
+                                        {
+                                                if ( auto mat = element.material.lock() )
+                                                {
+                                                        for ( uint32 i = 0; i < 8; ++i )
+                                                                if ( mat->textures[i] && !pass.binds[i] )
+                                                                        m_context->bind( mat->textures[i], nv::texture_slot( i ) );
+                                                        current_mat = element.material.id();
+                                                }
+                                        }
+
+                                        m_context->get_device()->set_opt_uniform( *program, "nv_flags", unsigned( *element.flags.data() ) );
+                                        m_context->get_device()->set_opt_uniform( *program, "nv_index", unsigned( index ) );
+                                        m_context->apply_engine_uniforms( *program, ss );
+
+                                        if ( element.instances > 0 )
+                                                m_context->draw_instanced( TRIANGLES, pass.rstate, *program, element.instances, element.va, element.count, element.first );
+                                        else
+                                                m_context->draw( TRIANGLES, pass.rstate, *program, element.va, element.count, element.first );
+
+                                        m_statistics[TRIANGLE_COUNT] += ( element.count / 3 ) * max< uint32 >( element.instances, 1 );
+                                        m_statistics[DRAW_CALL]++;
+                                }
+                        }
+                }
+        }
+        m_context->bind( pass.fbuffer, FRAMEBUFFER );
+}

trunk/src/io/c_stream.cc

@@ -75 +75 @@
         {
                 struct stat fstat; 
-                int result = stat(m_file_name, &fstat ); 
+                int result = stat(m_file_name.data(), &fstat ); 
                 if ( result != 0 ) 
                 {