mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-08 11:38:21 +02:00
BMP loading, show workspace icon files on startup panel
This commit is contained in:
parent
c8394bef26
commit
05cda98c85
11 changed files with 725 additions and 4 deletions
|
@ -6,6 +6,7 @@
|
|||
#include "img/TGAData.h"
|
||||
#include "img/PNGData.h"
|
||||
#include "img/PVRData.h"
|
||||
#include "img/BMPData.h"
|
||||
#include "img/BFIData.h"
|
||||
#include "img/JPEGData.h"
|
||||
#include "util/PerfTimer.h"
|
||||
|
@ -142,6 +143,12 @@ Texture* RenderDevice::LoadTexture(const StringImpl& fileName, int flags)
|
|||
imageData = new JPEGData();
|
||||
else if (ext == ".pvr")
|
||||
imageData = new PVRData();
|
||||
else if (ext == ".bmp")
|
||||
{
|
||||
BMPData* bmpData = new BMPData();
|
||||
bmpData->mHasTransFollowing = (flags & TextureFlag_HasTransFollowing) == 0;;
|
||||
imageData = bmpData;
|
||||
}
|
||||
else
|
||||
{
|
||||
return NULL; // Unknown format
|
||||
|
|
|
@ -156,6 +156,7 @@ enum TextureFlag : int8
|
|||
TextureFlag_Additive = 1,
|
||||
TextureFlag_NoPremult = 2,
|
||||
TextureFlag_AllowRead = 4,
|
||||
TextureFlag_HasTransFollowing = 8
|
||||
};
|
||||
|
||||
struct VertexDefData
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue