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

Fix archive

Browse source 
Incorrect cmake directory was messing up reading from zips
STB was failing to read from zips, it was failing to get the file info, something we were using as an early out, now if that files on the filepath, we use the memory read instead since stream needs to be a success to get to that point.
This commit is contained in:
marauder2k7 2024-03-01 10:06:18 +00:00
parent 5d1f306668
commit cd6656be35
3 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/CMakeLists.txt
View file

@ -97,7 +97,7 @@ endif (WIN32 AND TORQUE_D3D11)
# Handle core
torqueAddSourceDirectories("core" "core/stream" "core/strings" "core/util"
"core/util/journal" "core/util/zip" "core/util/compressors")
"core/util/journal" "core/util/zip" "core/util/zip/compressors")
# Handle GUI
torqueAddSourceDirectories("gui" "gui/buttons" "gui/containers" "gui/controls" "gui/core"
"gui/game" "gui/shiny" "gui/utility" "gui/3d")

11
Engine/source/gfx/bitmap/gBitmap.cpp
View file

@ -1279,9 +1279,14 @@ template<> void *Resource<GBitmap>::create(const Torque::Path &path)
const String extension = path.getExtension();
if( !bmp->readBitmap( extension, path ) )
{
Con::errorf( "Resource<GBitmap>::create - error reading '%s'", path.getFullPath().c_str() );
delete bmp;
bmp = NULL;
// we can only get here if the stream was successful, so attempt to read the stream.
Con::warnf("Was unable to load as file, going to try the stream instead.");
if (!bmp->readBitmapStream(extension, stream, stream.getStreamSize()))
{
Con::errorf("Resource<GBitmap>::create - error reading '%s'", path.getFullPath().c_str());
delete bmp;
bmp = NULL;
}
}
return bmp;

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

@ -195,6 +195,12 @@ bool sReadSTB(const Torque::Path& path, GBitmap* bitmap)
if (!stbi_info(path.getFullPath().c_str(), &x, &y, &channels))
{
FrameAllocator::setWaterMark(prevWaterMark);
const char* stbErr = stbi_failure_reason();
if (!stbErr)
stbErr = "Unknown Error!";
Con::errorf("STB failed to get image info: %s", stbErr);
return false;
}
@ -326,7 +332,7 @@ bool sReadStreamSTB(Stream& stream, GBitmap* bitmap, U32 len)
stbErr = "Unknown Error!";
Con::errorf("STB failed to get image info: %s", stbErr);
return false;
Con::warnf("Going to attempt to load stream anyway.");
}
S32 reqCom = comp;