Load gltf .bin files from correct directory

diff --git a/code/glTF2Asset.inl b/code/glTF2Asset.inl
index 3d4a4ee..03c2279 100644 (file)
--- a/code/glTF2Asset.inl
+++ b/code/glTF2Asset.inl
@@ -337,7 +337,9 @@ inline void Buffer::Read(Value& obj, Asset& r)
     }
     else { // Local file
         if (byteLength > 0) {
-            IOStream* file = r.OpenFile(uri, "rb");
+            std::string dir = !r.mCurrentAssetDir.empty() ? (r.mCurrentAssetDir + "/") : "";
+
+            IOStream* file = r.OpenFile(dir + uri, "rb");
             if (file) {
                 bool ok = LoadFromStream(*file, byteLength);
                 delete file;

diff --git a/code/glTFAsset.inl b/code/glTFAsset.inl
index bb4bb50..9284ccb 100644 (file)
--- a/code/glTFAsset.inl
+++ b/code/glTFAsset.inl
@@ -316,7 +316,9 @@ inline void Buffer::Read(Value& obj, Asset& r)
     }
     else { // Local file
         if (byteLength > 0) {
-            IOStream* file = r.OpenFile(uri, "rb");
+            std::string dir = !r.mCurrentAssetDir.empty() ? (r.mCurrentAssetDir + "/") : "";
+
+            IOStream* file = r.OpenFile(dir + uri, "rb");
             if (file) {
                 bool ok = LoadFromStream(*file, byteLength);
                 delete file;