Changeset 47

Timestamp:

05/28/13 18:08:27 (12 years ago)

Author:

epyon

Message:

• cleaned up commented out code

File:

• trunk/tests/render_test/rl.cc (modified) (4 diffs)

trunk/tests/render_test/rl.cc

@@ -87 +87 @@
 };
 
-application* g_application;
-
 application::application()
 {
@@ -210 +208 @@
                 m_window->get_context()->clear( m_clear_state );
 
-                //              float d = -4.0f;
-                float angle = (float)(SDL_GetTicks() / 1000.0 * 45);  // 45° per second
-                glm::vec3 axis_y(0.0, 1.0, 0.0);
-                glm::mat4 anim  = glm::rotate(glm::mat4(1.0f), angle, axis_y);
-
-                //                      glm::mat4 model = glm::translate(glm::mat4(1.0f), glm::vec3(0.0, 0.0, d));
-                //                      glm::mat4 view  = glm::lookAt(glm::vec3(0.0, 2.0, 0.0), glm::vec3(0.0, 0.0, d), glm::vec3(0.0, 1.0, 0.0));
-
                 glm::mat4 model = glm::translate(glm::mat4(1.0f), glm::vec3(-8.5, 0.0, -8.0));
                 glm::mat4 view  = glm::lookAt(glm::vec3(0.0, 20.0, 5.0) + move, glm::vec3(0.0, 4.0, 0.0) + move, glm::vec3(0.0, 1.0, 0.0));
                 glm::mat4 projection = glm::perspective(25.0f, 1.0f*800.0f/600.0f, 0.1f, 100.0f);
-                //projection = glm::ortho(-10.0f, 10.0f, -10.0f, 10.0f, 0.1f, 100.0f);
                 glm::mat4 mv         = view * model;
-                glm::mat3 N          = glm::transpose(glm::inverse(glm::mat3(mv)));
 
                 m_texture->bind( 0 );
@@ -272 +260 @@
 }
 
-/*
-class test_resource : public nv::resource
-{
-public:
-        typedef std::shared_ptr< test_resource > ptr;
-public:
-        test_resource() {}
-        virtual bool load() { return true; };
-        virtual bool unload() { return true; };
-};
-*/
-//      nv::resource_manager::pointer()->register_resource_type<test_resource>("test");
-
-
 
 int main(int, char* [])
@@ -294 +268 @@
         
         NV_LOG( nv::LOG_NOTICE, "Logging started" );
-
-//      nv::load_freetype_library();
-// 
-//      size_t depth = 3;
-//      nv::texture_atlas tex( glm::ivec2( 512, 512 ), depth );
-//      for ( nv::uint16 i = 10; i < 32; i += 2 )
-//      {
-//              nv::texture_font font( &tex, "aero.ttf", i );
-//              font.load_glyphs( "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" );
-//      }
-
-        g_application = new application();
-
-//      SDL_Surface* s = SDL_CreateRGBSurfaceFrom( (void*)tex.get_data(), 512, 512, depth * 8, 512 * depth,0,0,0,0);
-//      SDL_SaveBMP_RW( s, SDL_RWFromFile("test.bmp", "wb"), 1);
-
-        if ( g_application->initialize() )
+        application app;
+        if ( app.initialize() )
         {
-                g_application->run();
-        }
-        delete g_application;
-
+                app.run();
+        }
         NV_LOG( nv::LOG_NOTICE, "Logging stopped" );