Changeset 139 for trunk/tests/objload_test/objload_test.cc

Timestamp:

06/29/13 20:32:29 (12 years ago)

Author:

epyon

Message:

• program - set_opt_uniform added
• example extended to feature per-pixel lighting, self-illumination mapping, specular mapping and dual custom colors mapping

File:

• trunk/tests/objload_test/objload_test.cc (modified) (4 diffs)

trunk/tests/objload_test/objload_test.cc

@@ -24 +24 @@
         ~application();
 protected:
-        nv::device* m_device;
-        nv::window* m_window;
-        nv::texture2d* m_texture;
-        nv::clear_state m_clear_state;
-        nv::render_state m_render_state;
+        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;
@@ -40 +41 @@
         m_device = new nv::gl_device();
         m_window = m_device->create_window( 800, 600 );
+        nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::REPEAT );
         
         nv::image_data* sprites = m_device->create_image_data( "diffuse.png" );
-        nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::REPEAT );
-        m_texture = m_device->create_texture2d( sprites->get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)sprites->get_data() );
+        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;
 
@@ -86 +91 @@
                 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_texture->bind( 0 );
+                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", glm::vec3(8.5, 8.5, 0) );
-                m_program->set_uniform( "tex", 0 );
+                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_count * 3 );
                 m_window->swap_buffers();
@@ -127 +142 @@
         delete m_program;
         delete m_mesh;
-        delete m_texture;
+        delete m_diffuse;
+        delete m_specular;
         delete m_window;
         delete m_device;