Embedded nogame screen into binary and exposed version info.

This commit is contained in:
rude
2009-08-15 12:48:32 +02:00
parent 576a5b0903
commit 579f9c75db
18 changed files with 1498 additions and 101 deletions
+5
View File
@@ -51,6 +51,11 @@ namespace devil
return new ImageData(file);
}
love::image::ImageData * Image::newImageData(Data * data)
{
return new ImageData(data);
}
love::image::ImageData * Image::newImageData(int width, int height)
{
return new ImageData(width, height);
+1
View File
@@ -41,6 +41,7 @@ namespace devil
const char * getName() const;
love::image::ImageData * newImageData(love::filesystem::File * file);
love::image::ImageData * newImageData(Data * data);
love::image::ImageData * newImageData(int width, int height);
}; // Image
+13 -7
View File
@@ -29,11 +29,8 @@ namespace image
{
namespace devil
{
ImageData::ImageData(filesystem::File * file)
void ImageData::load(Data * data)
{
// Read the data.
Data * data = file->read();
// Generate DevIL image.
ilGenImages(1, &image);
@@ -43,9 +40,6 @@ namespace devil
// Try to load the image.
ILboolean success = ilLoadL(IL_TYPE_UNKNOWN, (void*)data->getData(), data->getSize());
// Free local image data.
data->release();
// Check for errors
if(!success)
{
@@ -70,6 +64,18 @@ namespace devil
}
}
ImageData::ImageData(Data * data)
{
load(data);
}
ImageData::ImageData(filesystem::File * file)
{
Data * data = file->read();
load(data);
data->release();
}
ImageData::ImageData(int width, int height)
: width(width), height(height), origin(IL_ORIGIN_UPPER_LEFT), bpp(4)
{
+3
View File
@@ -53,8 +53,11 @@ namespace devil
// DevIL image identifier.
ILuint image;
void load(Data * data);
public:
ImageData(Data * data);
ImageData(love::filesystem::File * file);
ImageData(int width, int height);
virtual ~ImageData();