Index: trunk/tests/objload_test/nv_objload_test.cc =================================================================== --- trunk/tests/objload_test/nv_objload_test.cc (revision 321) +++ trunk/tests/objload_test/nv_objload_test.cc (revision 321) @@ -0,0 +1,157 @@ +#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::context* m_context; + nv::window* m_window; + nv::texture m_diffuse; + nv::texture m_specular; + nv::scene_state m_scene_state; + nv::clear_state m_clear_state; + nv::render_state m_render_state; + + nv::vertex_array m_va; + nv::program m_program; + nv::mesh_data* m_mesh; +}; + +application::application() +{ + 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* image = m_device->create_image_data( "diffuse.png" ); + m_diffuse = m_device->create_texture( image, sampler ); + delete image; + + image = m_device->create_image_data( "specular.png" ); + m_specular = m_device->create_texture( image, sampler ); + delete image; + + 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::c_file_system fs; + nv::stream* mesh_file = fs.open( "mesh.obj" ); + + nv::obj_loader* loader = new nv::obj_loader(); + loader->load( *mesh_file ); + m_mesh = loader->release_mesh_data(); + delete mesh_file; + delete loader; + + m_program = m_device->create_program( nv::slurp( "obj.vert" ), nv::slurp( "obj.frag" ) ); + m_va = m_context->create_vertex_array( m_mesh, nv::STATIC_DRAW ); + + return true; +} + +bool application::run() +{ + int keypress = 0; + + glm::vec3 move( 0, 0, 0 ); + + while(!keypress) + { + m_window->get_context()->clear( m_clear_state ); + m_scene_state.set_model( glm::mat4() ); + m_scene_state.get_camera().set_perspective(60.0f, 1.0f*800.0f/600.0f, 0.1f, 1000.0f); + m_scene_state.get_camera().set_lookat(glm::vec3(6.0f, 8.0f, 6.0f) + move, glm::vec3(0.0f, 4.0f, 0.0f) + move, glm::vec3(0.0, 1.0, 0.0)); + + m_context->bind( m_diffuse, nv::TEX_DIFFUSE ); + m_context->bind( m_specular, nv::TEX_SPECULAR ); + m_device->set_uniform( m_program, "light_position", glm::vec3(12.0, 12.0, 0) ); + m_device->set_uniform( m_program, "light_diffuse", glm::vec4(0.7,0.7,0.7,1.0) ); + m_device->set_uniform( m_program, "light_specular", glm::vec4(1.0,1.0,1.0,1.0) ); + m_device->set_uniform( m_program, "custom_color_1", glm::vec3(1.0,0.0,0.0) ); + m_device->set_uniform( m_program, "custom_color_2", glm::vec3(0.0,0.0,1.0) ); + m_context->draw( nv::TRIANGLES, m_render_state, m_scene_state, m_program, m_va, m_mesh->get_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_LEFT : move.x = move.x - 1.0f; break; + case nv::KEY_RIGHT : move.x = move.x + 1.0f; break; + case nv::KEY_UP : move.z = move.z - 1.0f; break; + case nv::KEY_DOWN : move.z = move.z + 1.0f; break; + default: break; + } + } + break; + default: break; + } + } + } + return true; +} + +application::~application() +{ + delete m_mesh; + m_device->release( m_program ); + m_device->release( m_diffuse ); + m_device->release( m_specular ); + 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/objload_test/obj.frag =================================================================== --- trunk/tests/objload_test/obj.frag (revision 239) +++ trunk/tests/objload_test/obj.frag (revision 321) @@ -1,6 +1,6 @@ #version 120 -uniform sampler2D diffuse; -uniform sampler2D specular; +uniform sampler2D nv_diffuse; +uniform sampler2D nv_specular; uniform vec4 light_diffuse; uniform vec4 light_specular; @@ -23,6 +23,6 @@ float diffuse_value = max( dot( nlight_vector, nnormal ), 0.0 ); - vec3 diff_texel = vec3( texture2D( diffuse, v_texcoord ) ); - vec4 spec_texel = texture2D( specular, v_texcoord ); + vec3 diff_texel = vec3( texture2D( nv_diffuse, v_texcoord ) ); + vec4 spec_texel = texture2D( nv_specular, v_texcoord ); float specular_amount = spec_texel.x; Index: trunk/tests/objload_test/obj.vert =================================================================== --- trunk/tests/objload_test/obj.vert (revision 239) +++ trunk/tests/objload_test/obj.vert (revision 321) @@ -10,5 +10,5 @@ varying vec2 v_texcoord; -uniform mat4 matrix_mvp; +uniform mat4 nv_m_mvp; uniform mat4 nv_m_modelview; uniform mat4 nv_m_projection; @@ -24,4 +24,4 @@ v_texcoord = nv_texcoord; - gl_Position = matrix_mvp * vertex; + gl_Position = nv_m_mvp * vertex; } Index: trunk/tests/objload_test/objload_test.cc =================================================================== --- trunk/tests/objload_test/objload_test.cc (revision 239) +++ (revision ) @@ -1,174 +1,0 @@ -#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::texture2d* m_specular; - nv::clear_state m_clear_state; - nv::render_state m_render_state; - - nv::vertex_array* m_va; - nv::program* m_program; - nv::mesh_data* m_mesh; -}; - -application::application() -{ - 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* sprites = m_device->create_image_data( "diffuse.png" ); - m_diffuse = m_device->create_texture2d( sprites->get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)sprites->get_data() ); - delete sprites; - - sprites = m_device->create_image_data( "specular.png" ); - m_specular = m_device->create_texture2d( sprites->get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)sprites->get_data() ); - delete sprites; - - 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::c_file_system fs; - nv::stream* mesh_file = fs.open( "mesh.obj" ); - -// nv::mesh_loader* loader = new nv::obj_loader(); -// loader->load( *mesh_file ); -// nv::mesh_data_old* mesh = loader->release_mesh_data(); -// m_count = loader->get_size(); -// delete mesh_file; -// delete loader; - - nv::obj_loader* loader = new nv::obj_loader(); - loader->load( *mesh_file ); - m_mesh = loader->release_mesh_data(); - delete mesh_file; - delete loader; - - m_program = m_device->create_program( nv::slurp( "obj.vert" ), nv::slurp( "obj.frag" ) ); - -// nv::vertex_buffer* vb = nullptr; - m_va = m_device->create_vertex_array( m_mesh, nv::STATIC_DRAW ); - - return true; -} - -bool application::run() -{ - int keypress = 0; - - glm::vec3 move( 0, 0, 0 ); - - while(!keypress) - { - m_window->get_context()->clear( m_clear_state ); - - glm::mat4 model = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, 0.0f)); - glm::mat4 view = glm::lookAt(glm::vec3(6.0f, 8.0f, 6.0f) + move, glm::vec3(0.0f, 4.0f, 0.0f) + move, glm::vec3(0.0, 1.0, 0.0)); - glm::mat4 projection = glm::perspective(60.0f, 1.0f*800.0f/600.0f, 0.1f, 1000.0f); - glm::mat4 mv = view * model; - glm::mat3 normal_matrix = glm::transpose(glm::inverse(glm::mat3(mv))); - - m_diffuse->bind( 0 ); - m_specular->bind( 1 ); - m_program->set_opt_uniform( "nv_m_modelview", mv ); - m_program->set_opt_uniform( "nv_m_projection", projection ); - m_program->set_opt_uniform( "nv_m_normal", normal_matrix ); - m_program->set_uniform( "matrix_mvp", projection * mv ); - m_program->set_uniform( "light_position", glm::vec3(12.0, 12.0, 0) ); - m_program->set_uniform( "light_diffuse", glm::vec4(0.7,0.7,0.7,1.0) ); - m_program->set_uniform( "light_specular", glm::vec4(1.0,1.0,1.0,1.0) ); - m_program->set_uniform( "custom_color_1", glm::vec3(1.0,0.0,0.0) ); - m_program->set_uniform( "custom_color_2", glm::vec3(0.0,0.0,1.0) ); - m_program->set_uniform( "diffuse", 0 ); - m_program->set_uniform( "specular", 1 ); - m_window->get_context()->draw( nv::TRIANGLES, m_render_state, m_program, m_va, m_mesh->get_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_LEFT : move.x = move.x - 1.0f; break; - case nv::KEY_RIGHT : move.x = move.x + 1.0f; break; - case nv::KEY_UP : move.z = move.z - 1.0f; break; - case nv::KEY_DOWN : move.z = move.z + 1.0f; break; - default: break; - } - } - break; - default: break; - } - } - } - return true; -} - -application::~application() -{ - delete m_mesh; - delete m_program; - delete m_diffuse; - delete m_specular; - 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/objload_test/objload_test.lua =================================================================== --- trunk/tests/objload_test/objload_test.lua (revision 239) +++ trunk/tests/objload_test/objload_test.lua (revision 321) @@ -1,8 +1,7 @@ --- obj load test project definition -project "objload_test" +project "nv_objload_test" kind "ConsoleApp" - files { "objload_test.cc" } + files { "nv_objload_test.cc" } includedirs { "../../" } - targetname "objload_test" - links { "nv" } - + targetname "nv_objload_test" + links { "nv-core", "nv-gl", "nv-gfx", "nv-formats" } + targetdir "../../bin" Index: trunk/tests/objload_test/premake4.lua =================================================================== --- trunk/tests/objload_test/premake4.lua (revision 239) +++ trunk/tests/objload_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("objload_test.lua") dofile("../../nv.lua") - -if _ACTION == "clean" then - for action in premake.action.each() do - os.rmdir(action.trigger) - end -end