Changeset 90 for trunk/src/gl/gl_device.cc

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/src/gl/gl_device.cc (modified) (2 diffs)

trunk/src/gl/gl_device.cc

@@ -11 +11 @@
 #include "nv/logging.hh"
 #include "nv/lib/sdl12.hh"
+#include "nv/lib/sdl_image.hh"
 
 using namespace nv;
@@ -67 +68 @@
 }
 
+// this is a temporary function that will be removed once we find a way to 
+// pass binary file data around
+image_data* nv::gl_device::create_image_data( const std::string& filename )
+{
+        load_sdl_image_library();
+        SDL_Surface* image = IMG_Load( filename.c_str() );
+        image_data* data = new image_data( glm::ivec2( image->w, image->h ), image->format->BytesPerPixel, (nv::uint8*)image->pixels );
+        return data;
+}
+
 texture2d* gl_device::create_texture2d( ivec2 size, image_format aformat, datatype adatatype, sampler asampler, void* data /*= nullptr */ )
 {