Index: trunk/tests/md5_test/md5.frag =================================================================== --- trunk/tests/md5_test/md5.frag (revision 321) +++ trunk/tests/md5_test/md5.frag (revision 321) @@ -0,0 +1,50 @@ +#version 120 + +uniform sampler2D nv_t_diffuse; +uniform sampler2D nv_t_specular; +uniform sampler2D nv_t_normal; +uniform vec4 light_diffuse; +uniform vec4 light_specular; +uniform mat4 nv_m_view_inv; + +varying vec2 v_texcoord; +varying vec3 v_normal; +varying vec3 v_light_vector; +varying vec3 v_view_vector; +varying vec4 v_position; +varying mat3 v_m33_tangent; + +void main(void) { + vec2 texcoord = v_texcoord; + // + vec4 encoded_normal = texture2D( nv_t_normal, texcoord ); + encoded_normal.y = 1 - encoded_normal.y; + vec3 local_coords = 2.0 * encoded_normal.rgb - vec3(1.0); + vec3 normal_direction = normalize(v_m33_tangent * local_coords); + vec3 view_direction = normalize(vec3(nv_m_view_inv * vec4(0.0, 0.0, 0.0, 1.0) - v_position)); + vec3 nnormal = normal_direction; + // + +// vec3 nnormal = normalize( v_normal ); + vec3 nlight_vector = normalize( v_light_vector ); + vec3 nview_vector = normalize( v_view_vector ); + vec3 nreflect_vector = reflect( -nlight_vector, nnormal ); + + float specular_value = clamp( dot( nreflect_vector, nview_vector ), 0.0, 1.0 ); + specular_value = pow( specular_value, 6.0 ); + float diffuse_value = max( dot( nlight_vector, nnormal ), 0.0 ); + + vec3 diff_texel = vec3( texture2D( nv_t_diffuse, texcoord ) ); + vec4 spec_texel = texture2D( nv_t_specular, texcoord ); + + float specular_amount = spec_texel.x; + float diffuse_amount = 1.0 - specular_amount; + + float final_specular = specular_amount * specular_value; + float final_diffuse = diffuse_amount * diffuse_value; + + vec3 diffuse_color = light_diffuse.xyz * final_diffuse * diff_texel; + vec3 specular_color = light_specular.xyz * final_specular; + + gl_FragColor = vec4( diffuse_color + specular_color, 1.0 ); +} Index: trunk/tests/md5_test/md5.vert =================================================================== --- trunk/tests/md5_test/md5.vert (revision 321) +++ trunk/tests/md5_test/md5.vert (revision 321) @@ -0,0 +1,37 @@ +#version 120 + +attribute vec2 nv_texcoord; +attribute vec3 nv_position; +attribute vec3 nv_normal; +attribute vec3 nv_tangent; + +varying vec3 v_normal; +varying vec3 v_light_vector; +varying vec3 v_view_vector; +varying vec4 v_position; +varying vec2 v_texcoord; +varying mat3 v_m33_tangent; + +uniform mat4 nv_m_model; +uniform mat4 nv_m_modelview; +uniform mat4 nv_m_projection; +uniform mat3 nv_m_normal; +uniform mat4 nv_m_mvp; +uniform float nv_interpolate; +uniform vec3 light_position; + +void main(void) { + vec4 vertex = vec4( nv_position, 1.0 ); + vec3 eye_pos = vec3( nv_m_modelview * vertex ); + v_normal = normalize( nv_m_normal * nv_normal ); + v_light_vector = vec3( normalize( light_position - eye_pos ) ); + v_view_vector = vec3( normalize( -eye_pos ) ); + + v_m33_tangent[0] = normalize(nv_m_normal * nv_tangent); + v_m33_tangent[2] = v_normal; + v_m33_tangent[1] = normalize(cross(v_m33_tangent[2], v_m33_tangent[0])); + + v_texcoord = nv_texcoord; + v_position = nv_m_model * vertex; + gl_Position = nv_m_mvp * vertex; +} Index: trunk/tests/md5_test/md5_test.cc =================================================================== --- trunk/tests/md5_test/md5_test.cc (revision 261) +++ (revision ) @@ -1,246 +1,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class application -{ -public: - application(); - bool initialize(); - bool run(); - ~application(); -protected: - void load_animation( const std::string& path ); -protected: - - - nv::device* m_device; - nv::window* m_window; - nv::texture2d* m_diffuse; - nv::texture2d* m_specular; - nv::texture2d* m_normal; - nv::clear_state m_clear_state; - nv::render_state m_render_state; - nv::scene_state m_scene_state; - - nv::skeletal_mesh* m_mesh; - nv::program* m_program; - nv::md5_mesh_data* m_mesh_data; - nv::md5_animation* m_animation; - -}; - -application::application() -{ - NV_PROFILE( "app_construct" ); - m_device = new nv::gl_device(); - m_window = m_device->create_window( 800, 600, false ); - m_animation = nullptr; - - nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::REPEAT ); - nv::image_data* data = m_device->create_image_data( "data/qshambler_d.png" ); - m_diffuse = m_device->create_texture2d( data->get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)data->get_data() ); - delete data; - data = m_device->create_image_data( "data/qshambler_s.png" ); - m_specular = m_device->create_texture2d( data->get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)data->get_data() ); - delete data; - - data = m_device->create_image_data( "data/qshambler_local.png" ); - m_normal = m_device->create_texture2d( data->get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)data->get_data() ); - delete data; - - m_clear_state.buffers = nv::clear_state::COLOR_AND_DEPTH_BUFFER; - m_render_state.depth_test.enabled = true; - m_render_state.culling.enabled = true; - m_render_state.culling.order = nv::culling::CCW; - m_render_state.blending.enabled = false; - m_render_state.blending.src_rgb_factor = nv::blending::SRC_ALPHA; - m_render_state.blending.dst_rgb_factor = nv::blending::ONE_MINUS_SRC_ALPHA; - m_render_state.blending.src_alpha_factor = nv::blending::SRC_ALPHA; - m_render_state.blending.dst_alpha_factor = nv::blending::ONE_MINUS_SRC_ALPHA; -} - -bool application::initialize() -{ - NV_PROFILE( "app_initialize" ); - m_program = m_device->create_program( nv::slurp( "md5.vert" ), nv::slurp( "md5.frag" ) ); - - nv::md5_loader* loader = nullptr; - { - NV_PROFILE("loader->load"); - nv::c_file_system fs; - nv::stream* mesh_file = fs.open( "data/qshambler.md5mesh" ); - loader = new nv::md5_loader(); - loader->load( *mesh_file ); - delete mesh_file; - } - - { - NV_PROFILE("create_mesh"); - m_mesh_data = (nv::md5_mesh_data*)loader->release_mesh_data(); - m_mesh = new nv::skeletal_mesh( m_window->get_context(), m_mesh_data ); - delete loader; - } - - load_animation( "data/walk.md5anim" ); - return true; -} - -bool application::run() -{ - nv::profiler::pointer()->log_report(); - NV_PROFILE( "app_run" ); - int keypress = 0; - - glm::vec3 move( 0, 50.f, 0 ); - - nv::uint32 ticks = m_device->get_ticks(); - nv::uint32 last_ticks; - nv::fps_counter_class< nv::system_us_timer > fps_counter; - - //m_mesh->setup_animation( 0, m_mesh->get_max_frames(), 2, true ); - - while(!keypress) - { - last_ticks = ticks; - ticks = m_device->get_ticks(); - nv::uint32 elapsed = ticks - last_ticks; - m_mesh->update( elapsed ); - { - NV_PROFILE( "clear" ); - m_window->get_context()->clear( m_clear_state ); - } - - { - NV_PROFILE( "update_sh" ); - - glm::vec3 source( 250.0f, 0.0f, 0.0f ); - glm::vec3 eye = glm::rotate( source, (ticks / 20.f), glm::vec3( 0.0,1.0,0.0 ) ); - - m_scene_state.get_camera().set_lookat(eye + move, glm::vec3(0.0f, 0.0f, 0.0f) + move, glm::vec3(0.0, 1.0, 0.0)); - m_scene_state.get_camera().set_perspective(60.0f, 1.0f*800.0f/600.0f, 0.1f, 1000.0f); - - m_diffuse ->bind( 0 ); - m_specular->bind( 1 ); - m_normal ->bind( 2 ); - m_program->set_opt_uniform( "light_position", glm::vec3(180.0, 180.0, 0) ); - m_program->set_opt_uniform( "light_diffuse", glm::vec4(0.7,0.7,0.7,1.0) ); - m_program->set_opt_uniform( "light_specular", glm::vec4(1.0,1.0,1.0,1.0) ); - } - - { - NV_PROFILE( "draw" ); - m_scene_state.set_model(nv::mat4( - 1.f,0.f,0.f,0.f, - 0.f,0.f,1.f,0.f, - 0.f,1.f,0.f,0.f, - 0.f,0.f,0.f,1.f - ) ); - - m_window->get_context()->draw( m_render_state, m_scene_state, m_program, m_mesh ); - } - - { - NV_PROFILE( "swap" ); - m_window->swap_buffers(); - } - - { - NV_PROFILE( "pollevent" ); - nv::io_event event; - while(m_window->poll_event(event)) - { - switch (event.type) - { - case nv::EV_QUIT: - keypress = 1; - break; - case nv::EV_KEY: - if (event.key.pressed) - { - switch (event.key.code) - { - case nv::KEY_ESCAPE : keypress = 1; break; - case nv::KEY_F1 : nv::profiler::pointer()->log_report(); break; - default: break; - } - } - break; - default: break; - } - } - } - fps_counter.tick(); - } - return true; -} - -void application::load_animation( const std::string& path ) -{ - delete m_animation; - m_animation = nullptr; - NV_PROFILE("load_animation"); - nv::c_file_system fs; - nv::stream* anim_file = fs.open( path.c_str() ); - - if ( anim_file != nullptr ) - { - m_animation = new nv::md5_animation(); - if ( !m_animation->load_animation(*anim_file) ) - { - delete m_animation; - m_animation = nullptr; - } - m_mesh->setup_animation( m_animation ); - delete anim_file; - } -} - - -application::~application() -{ - delete m_program; - delete m_mesh; - delete m_diffuse; - delete m_window; - delete m_device; -} - - -int main(int, char* []) -{ - nv::logger log(nv::LOG_TRACE); - log.add_sink( new nv::log_file_sink("log.txt"), nv::LOG_TRACE ); - log.add_sink( new nv::log_console_sink(), nv::LOG_TRACE ); - - NV_LOG( nv::LOG_NOTICE, "Logging started" ); - application app; - if ( app.initialize() ) - { - app.run(); - } - NV_LOG( nv::LOG_NOTICE, "Logging stopped" ); - - return 0; -} - Index: trunk/tests/md5_test/md5_test.lua =================================================================== --- trunk/tests/md5_test/md5_test.lua (revision 321) +++ trunk/tests/md5_test/md5_test.lua (revision 321) @@ -0,0 +1,8 @@ +project "nv_md5_test" + kind "ConsoleApp" + files { "nv_md5_test.cc" } + includedirs { "../../" } + targetname "nv_md5_test" + links { "nv-core", "nv-gl", "nv-formats" } + targetdir "../../bin" + Index: trunk/tests/md5_test/nv_md5_test.cc =================================================================== --- trunk/tests/md5_test/nv_md5_test.cc (revision 321) +++ trunk/tests/md5_test/nv_md5_test.cc (revision 321) @@ -0,0 +1,240 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +class application +{ +public: + application(); + bool initialize(); + bool run(); + ~application(); +protected: + void load_animation( const std::string& path ); +protected: + + + nv::device* m_device; + nv::window* m_window; + nv::context* m_context; + nv::texture m_diffuse; + nv::texture m_specular; + nv::texture m_normal; + nv::clear_state m_clear_state; + nv::render_state m_render_state; + nv::scene_state m_scene_state; + + nv::skeletal_mesh* m_mesh; + nv::program m_program; + nv::mesh_data* m_mesh_data; + nv::animation_entry* m_animation; + +}; + +application::application() +{ + NV_PROFILE( "app_construct" ); + m_device = new nv::gl_device(); + m_window = m_device->create_window( 800, 600, false ); + m_context = m_window->get_context(); + m_animation = nullptr; + + nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::REPEAT ); + nv::image_data* data = m_device->create_image_data( "data/qshambler_d.png" ); + m_diffuse = m_device->create_texture( data, sampler ); + delete data; + data = m_device->create_image_data( "data/qshambler_s.png" ); + m_specular = m_device->create_texture( data, sampler ); + delete data; + + data = m_device->create_image_data( "data/qshambler_local.png" ); + m_normal = m_device->create_texture( data, sampler ); + delete data; + + m_clear_state.buffers = nv::clear_state::COLOR_AND_DEPTH_BUFFER; + m_render_state.depth_test.enabled = true; + m_render_state.culling.enabled = true; + m_render_state.culling.order = nv::culling::CCW; + m_render_state.blending.enabled = false; + m_render_state.blending.src_rgb_factor = nv::blending::SRC_ALPHA; + m_render_state.blending.dst_rgb_factor = nv::blending::ONE_MINUS_SRC_ALPHA; + m_render_state.blending.src_alpha_factor = nv::blending::SRC_ALPHA; + m_render_state.blending.dst_alpha_factor = nv::blending::ONE_MINUS_SRC_ALPHA; +} + +bool application::initialize() +{ + NV_PROFILE( "app_initialize" ); + m_program = m_device->create_program( nv::slurp( "md5.vert" ), nv::slurp( "md5.frag" ) ); + + nv::md5_loader* loader = nullptr; + { + NV_PROFILE("loader->load"); + nv::c_file_system fs; + nv::stream* mesh_file = fs.open( "data/qshambler.md5mesh" ); + loader = new nv::md5_loader(); + loader->load( *mesh_file ); + delete mesh_file; + } + + { + NV_PROFILE("create_mesh"); + m_mesh_data = loader->release_mesh_data(); + m_mesh = new nv::skeletal_mesh_cpu( m_context, m_mesh_data, loader->release_mesh_nodes_data() ); + delete loader; + } + + load_animation( "data/walk.md5anim" ); + return true; +} + +bool application::run() +{ + nv::profiler::pointer()->log_report(); + NV_PROFILE( "app_run" ); + int keypress = 0; + + glm::vec3 move( 0, 50.f, 0 ); + + nv::uint32 ticks = m_device->get_ticks(); + nv::uint32 last_ticks; + nv::fps_counter_class< nv::system_us_timer > fps_counter; + + //m_mesh->setup_animation( 0, m_mesh->get_max_frames(), 2, true ); + + while(!keypress) + { + last_ticks = ticks; + ticks = m_device->get_ticks(); + m_mesh->update_animation( m_animation, ticks ); + m_context->clear( m_clear_state ); + + { + NV_PROFILE( "update_sh" ); + + glm::vec3 source( 250.0f, 0.0f, 0.0f ); + glm::vec3 eye = glm::rotate( source, (ticks / 20.f), glm::vec3( 0.0,1.0,0.0 ) ); + + m_scene_state.get_camera().set_lookat(eye + move, glm::vec3(0.0f, 0.0f, 0.0f) + move, glm::vec3(0.0, 1.0, 0.0)); + m_scene_state.get_camera().set_perspective(60.0f, 1.0f*800.0f/600.0f, 0.1f, 1000.0f); + + m_context->bind( m_diffuse, nv::TEX_DIFFUSE ); + m_context->bind( m_specular, nv::TEX_SPECULAR ); + m_context->bind( m_normal, nv::TEX_NORMAL ); + m_device->set_opt_uniform( m_program, "light_position", glm::vec3(180.0, 180.0, 0) ); + m_device->set_opt_uniform( m_program, "light_diffuse", glm::vec4(0.7,0.7,0.7,1.0) ); + m_device->set_opt_uniform( m_program, "light_specular", glm::vec4(1.0,1.0,1.0,1.0) ); + } + + { + NV_PROFILE( "draw" ); + m_scene_state.set_model(nv::mat4( + 1.f,0.f,0.f,0.f, + 0.f,0.f,1.f,0.f, + 0.f,1.f,0.f,0.f, + 0.f,0.f,0.f,1.f + ) ); + + m_mesh->update( m_program ); + m_context->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_mesh->get_vertex_array(), m_mesh->get_index_count() ); + } + + { + NV_PROFILE( "swap" ); + m_window->swap_buffers(); + } + + { + NV_PROFILE( "pollevent" ); + nv::io_event event; + while(m_window->poll_event(event)) + { + switch (event.type) + { + case nv::EV_QUIT: + keypress = 1; + break; + case nv::EV_KEY: + if (event.key.pressed) + { + switch (event.key.code) + { + case nv::KEY_ESCAPE : keypress = 1; break; + case nv::KEY_F1 : nv::profiler::pointer()->log_report(); break; + default: break; + } + } + break; + default: break; + } + } + } + fps_counter.tick(); + } + return true; +} + +void application::load_animation( const std::string& path ) +{ + delete m_animation; + m_animation = nullptr; + NV_PROFILE("load_animation"); + nv::c_file_system fs; + nv::stream* anim_file = fs.open( path.c_str() ); + + if ( anim_file != nullptr ) + { + nv::md5_loader* loader = new nv::md5_loader(); + loader->load( *anim_file ); + delete anim_file; + m_animation = new nv::skeletal_animation_entry_cpu( "", loader->release_mesh_nodes_data(), true ); + m_mesh->run_animation( m_animation ); + delete loader; + } +} + + +application::~application() +{ + m_device->release( m_program ); + delete m_mesh; + m_device->release( m_diffuse ); + delete m_window; + delete m_device; +} + + +int main(int, char* []) +{ + nv::logger log(nv::LOG_TRACE); + log.add_sink( new nv::log_file_sink("log.txt"), nv::LOG_TRACE ); + log.add_sink( new nv::log_console_sink(), nv::LOG_TRACE ); + + NV_LOG( nv::LOG_NOTICE, "Logging started" ); + application app; + if ( app.initialize() ) + { + app.run(); + } + NV_LOG( nv::LOG_NOTICE, "Logging stopped" ); + + return 0; +} + Index: trunk/tests/md5_test/premake4.lua =================================================================== --- trunk/tests/md5_test/premake4.lua (revision 321) +++ trunk/tests/md5_test/premake4.lua (revision 321) @@ -0,0 +1,18 @@ +solution "nv_md5_test" + configurations { "debug", "release" } + + language "C++" + flags { "ExtraWarnings", "NoPCH" } + + configuration "debug" + defines { "DEBUG" } + flags { "Symbols", "StaticRuntime" } + objdir ("../../".._ACTION.."/debug") + + configuration "release" + defines { "NDEBUG" } + flags { "Optimize", "StaticRuntime" } + objdir ("../../".._ACTION.."/release") + + dofile("md5_test.lua") + dofile("../../nv.lua")