|
@@ -677,7 +677,6 @@ var BABYLON;
|
|
}
|
|
}
|
|
var effectiveTarget = propertyPath.split(".");
|
|
var effectiveTarget = propertyPath.split(".");
|
|
var values = value.split(",");
|
|
var values = value.split(",");
|
|
- // Get effective Target
|
|
|
|
for (var i = 0; i < effectiveTarget.length; i++) {
|
|
for (var i = 0; i < effectiveTarget.length; i++) {
|
|
target = target[effectiveTarget[i]];
|
|
target = target[effectiveTarget[i]];
|
|
}
|
|
}
|
|
@@ -780,7 +779,6 @@ var BABYLON;
|
|
for (var i = 0; i < parsedAction.children.length; i++)
|
|
for (var i = 0; i < parsedAction.children.length; i++)
|
|
traverse(parsedAction.children[i], trigger, condition, newAction, null);
|
|
traverse(parsedAction.children[i], trigger, condition, newAction, null);
|
|
};
|
|
};
|
|
- // triggers
|
|
|
|
for (var i = 0; i < parsedActions.children.length; i++) {
|
|
for (var i = 0; i < parsedActions.children.length; i++) {
|
|
var triggerParams;
|
|
var triggerParams;
|
|
var trigger = parsedActions.children[i];
|
|
var trigger = parsedActions.children[i];
|
|
@@ -801,14 +799,19 @@ var BABYLON;
|
|
var soundName = parsedSound.name;
|
|
var soundName = parsedSound.name;
|
|
var soundUrl = rootUrl + soundName;
|
|
var soundUrl = rootUrl + soundName;
|
|
var options = {
|
|
var options = {
|
|
- autoplay: parsedSound.autoplay, loop: parsedSound.loop, volume: parsedSound.volume,
|
|
|
|
- spatialSound: parsedSound.spatialSound, maxDistance: parsedSound.maxDistance,
|
|
|
|
|
|
+ autoplay: parsedSound.autoplay,
|
|
|
|
+ loop: parsedSound.loop,
|
|
|
|
+ volume: parsedSound.volume,
|
|
|
|
+ spatialSound: parsedSound.spatialSound,
|
|
|
|
+ maxDistance: parsedSound.maxDistance,
|
|
rolloffFactor: parsedSound.rolloffFactor,
|
|
rolloffFactor: parsedSound.rolloffFactor,
|
|
refDistance: parsedSound.refDistance,
|
|
refDistance: parsedSound.refDistance,
|
|
distanceModel: parsedSound.distanceModel,
|
|
distanceModel: parsedSound.distanceModel,
|
|
playbackRate: parsedSound.playbackRate
|
|
playbackRate: parsedSound.playbackRate
|
|
};
|
|
};
|
|
- var newSound = new BABYLON.Sound(soundName, soundUrl, scene, function () { scene._removePendingData(newSound); }, options);
|
|
|
|
|
|
+ var newSound = new BABYLON.Sound(soundName, soundUrl, scene, function () {
|
|
|
|
+ scene._removePendingData(newSound);
|
|
|
|
+ }, options);
|
|
scene._addPendingData(newSound);
|
|
scene._addPendingData(newSound);
|
|
if (parsedSound.position) {
|
|
if (parsedSound.position) {
|
|
var soundPosition = BABYLON.Vector3.FromArray(parsedSound.position);
|
|
var soundPosition = BABYLON.Vector3.FromArray(parsedSound.position);
|
|
@@ -1055,6 +1058,9 @@ var BABYLON;
|
|
});
|
|
});
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
+ if (!found) {
|
|
|
|
+ BABYLON.Tools.Warn("Geometry not found for mesh " + parsedMesh.id);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Material ?
|
|
// Material ?
|
|
@@ -1078,7 +1084,9 @@ var BABYLON;
|
|
}
|
|
}
|
|
if (!materialFound) {
|
|
if (!materialFound) {
|
|
loadedMaterialsIds.push(parsedMesh.materialId);
|
|
loadedMaterialsIds.push(parsedMesh.materialId);
|
|
- parseMaterialById(parsedMesh.materialId, parsedData, scene, rootUrl);
|
|
|
|
|
|
+ if (!parseMaterialById(parsedMesh.materialId, parsedData, scene, rootUrl)) {
|
|
|
|
+ BABYLON.Tools.Warn("Material not found for mesh " + parsedMesh.id);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Skeleton ?
|
|
// Skeleton ?
|
|
@@ -1098,7 +1106,6 @@ var BABYLON;
|
|
meshes.push(mesh);
|
|
meshes.push(mesh);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- // Connecting parents
|
|
|
|
for (index = 0; index < scene.meshes.length; index++) {
|
|
for (index = 0; index < scene.meshes.length; index++) {
|
|
var currentMesh = scene.meshes[index];
|
|
var currentMesh = scene.meshes[index];
|
|
if (currentMesh._waitingParentId) {
|
|
if (currentMesh._waitingParentId) {
|
|
@@ -1133,7 +1140,6 @@ var BABYLON;
|
|
scene.fogEnd = parsedData.fogEnd;
|
|
scene.fogEnd = parsedData.fogEnd;
|
|
scene.fogDensity = parsedData.fogDensity;
|
|
scene.fogDensity = parsedData.fogDensity;
|
|
}
|
|
}
|
|
- // Lights
|
|
|
|
for (var index = 0; index < parsedData.lights.length; index++) {
|
|
for (var index = 0; index < parsedData.lights.length; index++) {
|
|
var parsedLight = parsedData.lights[index];
|
|
var parsedLight = parsedData.lights[index];
|
|
parseLight(parsedLight, scene);
|
|
parseLight(parsedLight, scene);
|
|
@@ -1226,12 +1232,10 @@ var BABYLON;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- // Meshes
|
|
|
|
for (index = 0; index < parsedData.meshes.length; index++) {
|
|
for (index = 0; index < parsedData.meshes.length; index++) {
|
|
var parsedMesh = parsedData.meshes[index];
|
|
var parsedMesh = parsedData.meshes[index];
|
|
parseMesh(parsedMesh, scene, rootUrl);
|
|
parseMesh(parsedMesh, scene, rootUrl);
|
|
}
|
|
}
|
|
- // Cameras
|
|
|
|
for (index = 0; index < parsedData.cameras.length; index++) {
|
|
for (index = 0; index < parsedData.cameras.length; index++) {
|
|
var parsedCamera = parsedData.cameras[index];
|
|
var parsedCamera = parsedData.cameras[index];
|
|
parseCamera(parsedCamera, scene);
|
|
parseCamera(parsedCamera, scene);
|
|
@@ -1239,7 +1243,6 @@ var BABYLON;
|
|
if (parsedData.activeCameraID) {
|
|
if (parsedData.activeCameraID) {
|
|
scene.setActiveCameraByID(parsedData.activeCameraID);
|
|
scene.setActiveCameraByID(parsedData.activeCameraID);
|
|
}
|
|
}
|
|
- // Browsing all the graph to connect the dots
|
|
|
|
for (index = 0; index < scene.cameras.length; index++) {
|
|
for (index = 0; index < scene.cameras.length; index++) {
|
|
var camera = scene.cameras[index];
|
|
var camera = scene.cameras[index];
|
|
if (camera._waitingParentId) {
|
|
if (camera._waitingParentId) {
|
|
@@ -1266,7 +1269,6 @@ var BABYLON;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- // Connect parents & children and parse actions
|
|
|
|
for (index = 0; index < scene.meshes.length; index++) {
|
|
for (index = 0; index < scene.meshes.length; index++) {
|
|
var mesh = scene.meshes[index];
|
|
var mesh = scene.meshes[index];
|
|
if (mesh._waitingParentId) {
|
|
if (mesh._waitingParentId) {
|
|
@@ -1309,4 +1311,3 @@ var BABYLON;
|
|
});
|
|
});
|
|
})(Internals = BABYLON.Internals || (BABYLON.Internals = {}));
|
|
})(Internals = BABYLON.Internals || (BABYLON.Internals = {}));
|
|
})(BABYLON || (BABYLON = {}));
|
|
})(BABYLON || (BABYLON = {}));
|
|
-//# sourceMappingURL=babylon.babylonFileLoader.js.map
|
|
|