TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fixes:

Browse source 
Generating image previews of image assets was failing

DDS remove redundant check for stream status.

STB requires the file to be free before being written to, move check to make sure we can open the path into gBitmap and remove FileStream checks from everywhere else.
This commit is contained in:
marauder2k7 2023-11-30 10:46:51 +00:00
parent 0b451aa7b5
commit 63682c43ec
11 changed files with 39 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/gfx/bitmap/loaders/bitmapSTB.cpp
View file

@ -31,17 +31,13 @@
#define STBIWDEF static inline
#endif
#ifndef STB_IMAGE_IMPLEMENTATION
#define STB_IMAGE_IMPLEMENTATION
#define STB_IMAGE_STATIC
#include "stb_image.h"
#endif
#ifndef STB_IMAGE_WRITE_IMPLEMENTATION
#define STB_IMAGE_WRITE_IMPLEMENTATION
#define STB_IMAGE_WRITE_STATIC
#include "stb_image_write.h"
#endif
static bool sReadSTB(const Torque::Path& path, GBitmap* bitmap);
static bool sWriteSTB(const Torque::Path& path, GBitmap* bitmap, U32 compressionLevel);
@ -89,9 +85,9 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
return false;
}
// do this to map one channel to 3 and 2 channels to 4
if (channels == 2)
channels = 4;
//// do this to map one channel to 3 and 2 channels to 4
//if (channels == 2)
// channels = 4;
if (stbi_is_16_bit(path.getFullPath().c_str()))
{