|
@@ -4035,7 +4035,7 @@ var BABYLON;
|
|
Tools.GetPointerPrefix = function () {
|
|
Tools.GetPointerPrefix = function () {
|
|
var eventPrefix = "pointer";
|
|
var eventPrefix = "pointer";
|
|
// Check if pointer events are supported
|
|
// Check if pointer events are supported
|
|
- if (!window.PointerEvent) {
|
|
|
|
|
|
+ if (!window.PointerEvent && !navigator.pointerEnabled) {
|
|
eventPrefix = "mouse";
|
|
eventPrefix = "mouse";
|
|
}
|
|
}
|
|
return eventPrefix;
|
|
return eventPrefix;
|
|
@@ -30292,10 +30292,14 @@ var BABYLON;
|
|
var serializationInstance = {
|
|
var serializationInstance = {
|
|
name: instance.name,
|
|
name: instance.name,
|
|
position: instance.position.asArray(),
|
|
position: instance.position.asArray(),
|
|
- rotation: instance.rotation.asArray(),
|
|
|
|
- rotationQuaternion: instance.rotationQuaternion.asArray(),
|
|
|
|
scaling: instance.scaling.asArray()
|
|
scaling: instance.scaling.asArray()
|
|
};
|
|
};
|
|
|
|
+ if (instance.rotationQuaternion) {
|
|
|
|
+ serializationInstance.rotationQuaternion = instance.rotationQuaternion.asArray();
|
|
|
|
+ }
|
|
|
|
+ else if (instance.rotation) {
|
|
|
|
+ serializationInstance.rotation = instance.rotation.asArray();
|
|
|
|
+ }
|
|
serializationObject.instances.push(serializationInstance);
|
|
serializationObject.instances.push(serializationInstance);
|
|
// Animations
|
|
// Animations
|
|
BABYLON.Animation.AppendSerializedAnimations(instance, serializationInstance);
|
|
BABYLON.Animation.AppendSerializedAnimations(instance, serializationInstance);
|