TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix required for loading the binary gltf files included in the assimp unit test shapes.

Browse source
This commit is contained in:
OTHGMars 2019-04-15 19:05:14 -04:00
parent 6111eb466e
commit 04f5eb6b68
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/lib/assimp/code/glTF2Asset.inl
View file

@ -405,6 +405,8 @@ inline void Buffer::Read(Value& obj, Asset& r)
inline bool Buffer::LoadFromStream(IOStream& stream, size_t length, size_t baseOffset) inline bool Buffer::LoadFromStream(IOStream& stream, size_t length, size_t baseOffset)
{ {
byteLength = length ? length : stream.FileSize(); byteLength = length ? length : stream.FileSize();
if ((byteLength + baseOffset) > stream.FileSize())
byteLength = stream.FileSize() - baseOffset;
if (baseOffset) { if (baseOffset) {
stream.Seek(baseOffset, aiOrigin_SET); stream.Seek(baseOffset, aiOrigin_SET);

2
Engine/lib/assimp/code/glTFAsset.inl
View file

@ -345,6 +345,8 @@ inline void Buffer::Read(Value& obj, Asset& r)
inline bool Buffer::LoadFromStream(IOStream& stream, size_t length, size_t baseOffset) inline bool Buffer::LoadFromStream(IOStream& stream, size_t length, size_t baseOffset)
{ {
byteLength = length ? length : stream.FileSize(); byteLength = length ? length : stream.FileSize();
if ((byteLength + baseOffset) > stream.FileSize())
byteLength = stream.FileSize() - baseOffset;
if (baseOffset) { if (baseOffset) {
stream.Seek(baseOffset, aiOrigin_SET); stream.Seek(baseOffset, aiOrigin_SET);