|
@@ -956,9 +956,9 @@ var BABYLON;
|
|
//Return an array with all BABYLON.Mesh
|
|
//Return an array with all BABYLON.Mesh
|
|
return babylonMeshesArray;
|
|
return babylonMeshesArray;
|
|
};
|
|
};
|
|
- OBJFileLoader.OPTIMIZE_WITH_UV = false;
|
|
|
|
return OBJFileLoader;
|
|
return OBJFileLoader;
|
|
}());
|
|
}());
|
|
|
|
+ OBJFileLoader.OPTIMIZE_WITH_UV = false;
|
|
BABYLON.OBJFileLoader = OBJFileLoader;
|
|
BABYLON.OBJFileLoader = OBJFileLoader;
|
|
if (BABYLON.SceneLoader) {
|
|
if (BABYLON.SceneLoader) {
|
|
//Add this loader into the register plugin
|
|
//Add this loader into the register plugin
|
|
@@ -996,6 +996,9 @@ var BABYLON;
|
|
if (!loaderData) {
|
|
if (!loaderData) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ if (this.onParsed) {
|
|
|
|
+ this.onParsed(loaderData);
|
|
|
|
+ }
|
|
var loader = this._getLoader(loaderData, onError);
|
|
var loader = this._getLoader(loaderData, onError);
|
|
if (!loader) {
|
|
if (!loader) {
|
|
return;
|
|
return;
|
|
@@ -1007,6 +1010,9 @@ var BABYLON;
|
|
if (!loaderData) {
|
|
if (!loaderData) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ if (this.onParsed) {
|
|
|
|
+ this.onParsed(loaderData);
|
|
|
|
+ }
|
|
var loader = this._getLoader(loaderData, onError);
|
|
var loader = this._getLoader(loaderData, onError);
|
|
if (!loader) {
|
|
if (!loader) {
|
|
return;
|
|
return;
|
|
@@ -1187,11 +1193,11 @@ var BABYLON;
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
};
|
|
};
|
|
- // V1 options
|
|
|
|
- GLTFFileLoader.HomogeneousCoordinates = false;
|
|
|
|
- GLTFFileLoader.IncrementalLoading = true;
|
|
|
|
return GLTFFileLoader;
|
|
return GLTFFileLoader;
|
|
}());
|
|
}());
|
|
|
|
+ // V1 options
|
|
|
|
+ GLTFFileLoader.HomogeneousCoordinates = false;
|
|
|
|
+ GLTFFileLoader.IncrementalLoading = true;
|
|
BABYLON.GLTFFileLoader = GLTFFileLoader;
|
|
BABYLON.GLTFFileLoader = GLTFFileLoader;
|
|
var BinaryReader = (function () {
|
|
var BinaryReader = (function () {
|
|
function BinaryReader(arrayBuffer) {
|
|
function BinaryReader(arrayBuffer) {
|
|
@@ -2753,9 +2759,9 @@ var BABYLON;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
};
|
|
- GLTFLoader.Extensions = {};
|
|
|
|
return GLTFLoader;
|
|
return GLTFLoader;
|
|
}());
|
|
}());
|
|
|
|
+ GLTFLoader.Extensions = {};
|
|
GLTF1.GLTFLoader = GLTFLoader;
|
|
GLTF1.GLTFLoader = GLTFLoader;
|
|
;
|
|
;
|
|
BABYLON.GLTFFileLoader.CreateGLTFLoaderV1 = function () { return new GLTFLoader(); };
|
|
BABYLON.GLTFFileLoader.CreateGLTFLoaderV1 = function () { return new GLTFLoader(); };
|
|
@@ -3007,10 +3013,10 @@ var BABYLON;
|
|
}
|
|
}
|
|
return GLTFUtils._DefaultMaterial;
|
|
return GLTFUtils._DefaultMaterial;
|
|
};
|
|
};
|
|
- // The GLTF default material
|
|
|
|
- GLTFUtils._DefaultMaterial = null;
|
|
|
|
return GLTFUtils;
|
|
return GLTFUtils;
|
|
}());
|
|
}());
|
|
|
|
+ // The GLTF default material
|
|
|
|
+ GLTFUtils._DefaultMaterial = null;
|
|
GLTF1.GLTFUtils = GLTFUtils;
|
|
GLTF1.GLTFUtils = GLTFUtils;
|
|
})(GLTF1 = BABYLON.GLTF1 || (BABYLON.GLTF1 = {}));
|
|
})(GLTF1 = BABYLON.GLTF1 || (BABYLON.GLTF1 = {}));
|
|
})(BABYLON || (BABYLON = {}));
|
|
})(BABYLON || (BABYLON = {}));
|
|
@@ -4478,9 +4484,9 @@ var BABYLON;
|
|
}
|
|
}
|
|
return babylonTexture;
|
|
return babylonTexture;
|
|
};
|
|
};
|
|
- GLTFLoader.Extensions = {};
|
|
|
|
return GLTFLoader;
|
|
return GLTFLoader;
|
|
}());
|
|
}());
|
|
|
|
+ GLTFLoader.Extensions = {};
|
|
GLTF2.GLTFLoader = GLTFLoader;
|
|
GLTF2.GLTFLoader = GLTFLoader;
|
|
BABYLON.GLTFFileLoader.CreateGLTFLoaderV2 = function (parent) { return new GLTFLoader(parent); };
|
|
BABYLON.GLTFFileLoader.CreateGLTFLoaderV2 = function (parent) { return new GLTFLoader(parent); };
|
|
})(GLTF2 = BABYLON.GLTF2 || (BABYLON.GLTF2 = {}));
|
|
})(GLTF2 = BABYLON.GLTF2 || (BABYLON.GLTF2 = {}));
|
|
@@ -4616,12 +4622,12 @@ var BABYLON;
|
|
}
|
|
}
|
|
return false;
|
|
return false;
|
|
};
|
|
};
|
|
- //
|
|
|
|
- // Utilities
|
|
|
|
- //
|
|
|
|
- GLTFLoaderExtension._Extensions = [];
|
|
|
|
return GLTFLoaderExtension;
|
|
return GLTFLoaderExtension;
|
|
}());
|
|
}());
|
|
|
|
+ //
|
|
|
|
+ // Utilities
|
|
|
|
+ //
|
|
|
|
+ GLTFLoaderExtension._Extensions = [];
|
|
GLTF2.GLTFLoaderExtension = GLTFLoaderExtension;
|
|
GLTF2.GLTFLoaderExtension = GLTFLoaderExtension;
|
|
})(GLTF2 = BABYLON.GLTF2 || (BABYLON.GLTF2 = {}));
|
|
})(GLTF2 = BABYLON.GLTF2 || (BABYLON.GLTF2 = {}));
|
|
})(BABYLON || (BABYLON = {}));
|
|
})(BABYLON || (BABYLON = {}));
|
|
@@ -4696,12 +4702,12 @@ var BABYLON;
|
|
});
|
|
});
|
|
});
|
|
});
|
|
};
|
|
};
|
|
- /**
|
|
|
|
- * Specify the minimal delay between LODs in ms (default = 250)
|
|
|
|
- */
|
|
|
|
- MSFTLOD.MinimalLODDelay = 250;
|
|
|
|
return MSFTLOD;
|
|
return MSFTLOD;
|
|
}(GLTF2.GLTFLoaderExtension));
|
|
}(GLTF2.GLTFLoaderExtension));
|
|
|
|
+ /**
|
|
|
|
+ * Specify the minimal delay between LODs in ms (default = 250)
|
|
|
|
+ */
|
|
|
|
+ MSFTLOD.MinimalLODDelay = 250;
|
|
Extensions.MSFTLOD = MSFTLOD;
|
|
Extensions.MSFTLOD = MSFTLOD;
|
|
GLTF2.GLTFLoader.RegisterExtension(new MSFTLOD());
|
|
GLTF2.GLTFLoader.RegisterExtension(new MSFTLOD());
|
|
})(Extensions = GLTF2.Extensions || (GLTF2.Extensions = {}));
|
|
})(Extensions = GLTF2.Extensions || (GLTF2.Extensions = {}));
|