Changeset 90 for trunk/tests/render_test

Timestamp:

06/02/13 22:33:59 (12 years ago)

Author:

epyon

Message:

• common - windows SCL warnings proper suppression
• common - NV_DEPRECATED added
• interface/image_data added
• image constructible from image_data by ownership transfer
• device - create_image_data added (temporary)
• gl_device - create_image_data implementation (temporary)

File:

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

trunk/tests/render_test/rl.cc

@@ -1 +1 @@
 #include <nv/lib/sdl12.hh>
-#include <nv/lib/sdl_image.hh>
 #include <nv/interface/vertex_buffer.hh>
 #include <nv/gl/gl_device.hh>
@@ -87 +86 @@
         m_window = m_device->create_window( 800, 600 );
         
-        nv::load_sdl_image_library();
-        SDL_Surface* texture = IMG_Load( "spritesheet.png" );
-        nv::image sprites( glm::ivec2( texture->w, texture->h ), 4, (nv::uint8*)texture->pixels );
+        nv::image_data* sprites = m_device->create_image_data( "spritesheet.png" );
         nv::sampler sampler( nv::sampler::NEAREST, nv::sampler::REPEAT );
-        m_texture = m_device->create_texture2d( sprites.get_size(), nv::RGBA, nv::UBYTE, sampler, (void*)sprites.get_data() );
+        m_texture = 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;