Index: trunk/tests/md2_test/md2.frag =================================================================== --- trunk/tests/md2_test/md2.frag (revision 321) +++ trunk/tests/md2_test/md2.frag (revision 321) @@ -0,0 +1,37 @@ +#version 120 + +uniform sampler2D nv_t_diffuse; +uniform vec4 light_diffuse; +uniform vec4 light_specular; + +varying vec2 v_texcoord; +varying vec3 v_normal; +varying vec3 v_light_vector; +varying vec3 v_view_vector; + +void main(void) { + vec3 diff_texel = vec3( texture2D( nv_t_diffuse, v_texcoord ) ); + + vec3 nnormal = normalize( v_normal ); + vec3 nlight_vector = normalize( v_light_vector ); + vec3 nreflect_vector = reflect( -nlight_vector, nnormal ); + + float specular_amount = 0.2; + float diffuse_amount = 1.0 - specular_amount; + + float dot_prod_specular = dot( nreflect_vector, normalize( v_view_vector ) ); + float dot_prod_diffuse = dot( nlight_vector, nnormal ); + + float diffuse_factor = max( dot_prod_diffuse, 0.0 ); + float specular_factor = pow( max( dot_prod_specular, 0.0 ), 16.0 ); // 100.0 + + float final_diffuse = diffuse_amount * diffuse_factor * 0.5; + float final_specular = specular_amount * specular_factor; + + vec3 diffuse_color = light_diffuse.xyz * final_diffuse * diff_texel; + vec3 specular_color = light_specular.xyz * final_specular; + vec3 self_ilum_color = vec3 (0.0, 0.0, 0.0); + vec3 ambient_color = vec3 (0.0, 0.0, 0.0); + + gl_FragColor = vec4( max( self_ilum_color, diffuse_color + specular_color + ambient_color ), 1.0 ); +} Index: trunk/tests/md2_test/md2.vert =================================================================== --- trunk/tests/md2_test/md2.vert (revision 321) +++ trunk/tests/md2_test/md2.vert (revision 321) @@ -0,0 +1,33 @@ +#version 120 + +attribute vec2 nv_texcoord; +attribute vec3 nv_position; +attribute vec3 nv_normal; +attribute vec3 nv_next_position; +attribute vec3 nv_next_normal; + +varying vec3 v_normal; +varying vec3 v_light_vector; +varying vec3 v_view_vector; +varying vec2 v_texcoord; + +uniform mat4 nv_m_mvp; +uniform mat4 nv_m_model; +uniform mat4 nv_m_model_inv; +uniform vec3 nv_v_camera_position; +uniform vec3 light_position; +uniform float nv_interpolate; + +void main(void) +{ + vec4 position = vec4( mix( nv_position, nv_next_position, nv_interpolate ), 1.0 ); + v_normal = normalize( mix( nv_normal, nv_next_normal, nv_interpolate ) ); + v_texcoord = nv_texcoord; + gl_Position = nv_m_mvp * position; + + vec3 camera_loc = vec3(nv_m_model_inv * vec4 (nv_v_camera_position, 1.0) ); + vec3 light_loc = vec3(nv_m_model_inv * vec4 (light_position, 1.0) ); + + v_view_vector = normalize( nv_position - camera_loc ); + v_light_vector = normalize( nv_position - light_loc ); +} Index: trunk/tests/md2_test/md2_test.cc =================================================================== --- trunk/tests/md2_test/md2_test.cc (revision 239) +++ (revision ) @@ -1,175 +1,0 @@ -#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: - nv::device* m_device; - nv::window* m_window; - nv::texture2d* m_diffuse; - nv::program* m_program; - - nv::clear_state m_clear_state; - nv::render_state m_render_state; - nv::scene_state m_scene_state; - - nv::mesh_data* m_mesh_data; - nv::keyframed_mesh* m_mesh; -}; - -application::application() -{ - NV_PROFILE( "app_construct" ); - m_device = new nv::gl_device(); - m_window = m_device->create_window( 800, 600, false ); - - nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::REPEAT ); - nv::image_data* data = m_device->create_image_data( "data/manc.png" ); - m_diffuse = m_device->create_texture2d( data->get_size(), nv::RGB, 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.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( "obj.vert" ), nv::slurp( "obj.frag" ) ); - - nv::md2_loader* loader; - { - NV_PROFILE("loader->load"); - nv::c_file_system fs; - nv::stream* mesh_file = fs.open( "data/manc.md2" ); - loader = new nv::md2_loader(); - loader->load( *mesh_file ); - m_mesh_data = loader->release_mesh_data(); - delete mesh_file; - delete loader; - } - - { - NV_PROFILE("create_mesh"); - m_mesh = new nv::keyframed_mesh_gpu( m_window->get_context(), m_mesh_data, nullptr, m_program ); - } - - return true; -} - -bool application::run() -{ - nv::profiler::pointer()->log_report(); - NV_PROFILE( "app_run" ); - int keypress = 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_window->get_context()->clear( m_clear_state ); - m_mesh->update( elapsed ); - glm::vec3 eye = glm::rotate( glm::vec3( 100.0f, 25.0f, 0.0f ), (ticks / 20.f), glm::vec3( 0.0,1.0,0.0 ) ); - - m_scene_state.set_model( nv::mat4(1.0f) ); - m_scene_state.get_camera().set_lookat(eye, glm::vec3(0.0f, 25.0f, 0.0f), 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_program->set_opt_uniform( "light_position", glm::vec3(120.0, 120.0, 0) ); - m_program->set_opt_uniform( "light_diffuse", glm::vec4(1.0,1.0,1.0,1.0) ); - m_program->set_opt_uniform( "light_specular", glm::vec4(1.0,1.0,1.0,1.0) ); - m_mesh->update( m_program ); - m_window->get_context()->draw( m_render_state, m_scene_state, m_program, m_mesh ); - m_window->swap_buffers(); - - 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; -} - -application::~application() -{ - delete m_program; - delete m_mesh_data; - 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/md2_test/md2_test.lua =================================================================== --- trunk/tests/md2_test/md2_test.lua (revision 239) +++ trunk/tests/md2_test/md2_test.lua (revision 321) @@ -1,8 +1,8 @@ --- md2 load test project definition -project "md2_test" +project "nv_md2_test" kind "ConsoleApp" - files { "md2_test.cc" } + files { "nv_md2_test.cc" } includedirs { "../../" } - targetname "md2_test" - links { "nv" } - + targetname "nv_md2_test" + links { "nv-core", "nv-gl", "nv-formats" } + targetdir "../../bin" + Index: trunk/tests/md2_test/nv_md2_test.cc =================================================================== --- trunk/tests/md2_test/nv_md2_test.cc (revision 321) +++ trunk/tests/md2_test/nv_md2_test.cc (revision 321) @@ -0,0 +1,176 @@ +#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: + nv::device* m_device; + nv::window* m_window; + nv::context* m_context; + nv::texture m_diffuse; + nv::program m_program; + + nv::clear_state m_clear_state; + nv::render_state m_render_state; + nv::scene_state m_scene_state; + + nv::mesh_data* m_mesh_data; + nv::keyframed_mesh* m_mesh; + 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(); + + nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::REPEAT ); + nv::image_data* data = m_device->create_image_data( "data/manc.png" ); + m_diffuse = 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.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( "md2.vert" ), nv::slurp( "md2.frag" ) ); + + nv::md2_loader* loader; + { + NV_PROFILE("loader->load"); + nv::c_file_system fs; + nv::stream* mesh_file = fs.open( "data/manc.md2" ); + loader = new nv::md2_loader(); + loader->load( *mesh_file ); + m_mesh_data = loader->release_mesh_data(); + delete mesh_file; + delete loader; + } + + { + NV_PROFILE("create_mesh"); + m_mesh = new nv::keyframed_mesh_gpu( m_context, m_mesh_data, nullptr ); + } + + return true; +} + +bool application::run() +{ + nv::profiler::pointer()->log_report(); + NV_PROFILE( "app_run" ); + int keypress = 0; + + nv::uint32 ticks = m_device->get_ticks(); + nv::uint32 last_ticks; + nv::fps_counter_class< nv::system_us_timer > fps_counter; + + m_animation = new nv::animation_entry( "", true, 5, 0.0f, m_mesh->get_max_frames()-1 ); + m_mesh->run_animation( m_animation ); + + while(!keypress) + { + last_ticks = ticks; + ticks = m_device->get_ticks(); + nv::uint32 elapsed = ticks - last_ticks; + m_context->clear( m_clear_state ); + glm::vec3 eye = glm::rotate( glm::vec3( 100.0f, 25.0f, 0.0f ), (ticks / 20.f), glm::vec3( 0.0,1.0,0.0 ) ); + + m_scene_state.set_model( nv::mat4(1.0f) ); + m_scene_state.get_camera().set_lookat(eye, glm::vec3(0.0f, 25.0f, 0.0f), 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_device->set_opt_uniform( m_program, "light_position", glm::vec3(120.0, 120.0, 0) ); + m_device->set_opt_uniform( m_program, "light_diffuse", glm::vec4(1.0,1.0,1.0,1.0) ); + m_device->set_opt_uniform( m_program, "light_specular", glm::vec4(1.0,1.0,1.0,1.0) ); + m_mesh->update_animation( m_animation, ticks ); + 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() ); + m_window->swap_buffers(); + + 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; +} + +application::~application() +{ + m_device->release( m_program ); + delete m_mesh_data; + delete m_mesh; + delete m_animation; + 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/md2_test/obj.frag =================================================================== --- trunk/tests/md2_test/obj.frag (revision 239) +++ (revision ) @@ -1,37 +1,0 @@ -#version 120 - -uniform sampler2D nv_t_diffuse; -uniform vec4 light_diffuse; -uniform vec4 light_specular; - -varying vec2 v_texcoord; -varying vec3 v_normal; -varying vec3 v_light_vector; -varying vec3 v_view_vector; - -void main(void) { - vec3 diff_texel = vec3( texture2D( nv_t_diffuse, v_texcoord ) ); - - vec3 nnormal = normalize( v_normal ); - vec3 nlight_vector = normalize( v_light_vector ); - vec3 nreflect_vector = reflect( -nlight_vector, nnormal ); - - float specular_amount = 0.2; - float diffuse_amount = 1.0 - specular_amount; - - float dot_prod_specular = dot( nreflect_vector, normalize( v_view_vector ) ); - float dot_prod_diffuse = dot( nlight_vector, nnormal ); - - float diffuse_factor = max( dot_prod_diffuse, 0.0 ); - float specular_factor = pow( max( dot_prod_specular, 0.0 ), 16.0 ); // 100.0 - - float final_diffuse = diffuse_amount * diffuse_factor * 0.5; - float final_specular = specular_amount * specular_factor; - - vec3 diffuse_color = light_diffuse.xyz * final_diffuse * diff_texel; - vec3 specular_color = light_specular.xyz * final_specular; - vec3 self_ilum_color = vec3 (0.0, 0.0, 0.0); - vec3 ambient_color = vec3 (0.0, 0.0, 0.0); - - gl_FragColor = vec4( max( self_ilum_color, diffuse_color + specular_color + ambient_color ), 1.0 ); -} Index: trunk/tests/md2_test/obj.vert =================================================================== --- trunk/tests/md2_test/obj.vert (revision 239) +++ (revision ) @@ -1,33 +1,0 @@ -#version 120 - -attribute vec2 nv_texcoord; -attribute vec3 nv_position; -attribute vec3 nv_normal; -attribute vec3 nv_next_position; -attribute vec3 nv_next_normal; - -varying vec3 v_normal; -varying vec3 v_light_vector; -varying vec3 v_view_vector; -varying vec2 v_texcoord; - -uniform mat4 nv_m_mvp; -uniform mat4 nv_m_model; -uniform mat4 nv_m_model_inv; -uniform vec3 nv_v_camera_position; -uniform vec3 light_position; -uniform float nv_interpolate; - -void main(void) -{ - vec4 position = vec4( mix( nv_position, nv_next_position, nv_interpolate ), 1.0 ); - v_normal = normalize( mix( nv_normal, nv_next_normal, nv_interpolate ) ); - v_texcoord = nv_texcoord; - gl_Position = nv_m_mvp * position; - - vec3 camera_loc = vec3(nv_m_model_inv * vec4 (nv_v_camera_position, 1.0) ); - vec3 light_loc = vec3(nv_m_model_inv * vec4 (light_position, 1.0) ); - - v_view_vector = normalize( nv_position - camera_loc ); - v_light_vector = normalize( nv_position - light_loc ); -} Index: trunk/tests/md2_test/premake4.lua =================================================================== --- trunk/tests/md2_test/premake4.lua (revision 239) +++ trunk/tests/md2_test/premake4.lua (revision 321) @@ -8,17 +8,11 @@ defines { "DEBUG" } flags { "Symbols", "StaticRuntime" } - objdir (_ACTION or "".."/debug") + objdir ("../../".._ACTION.."/debug") configuration "release" defines { "NDEBUG" } flags { "Optimize", "StaticRuntime" } - objdir (_ACTION or "".."/release") + objdir ("../../".._ACTION.."/release") dofile("md2_test.lua") dofile("../../nv.lua") - -if _ACTION == "clean" then - for action in premake.action.each() do - os.rmdir(action.trigger) - end -end