@sapui5/sap.ui.vk 1.94.0 → 1.98.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ui.vk",
-  "version": "1.94.0",
+  "version": "1.98.0",
   "description": "SAPUI5 Library sap.ui.vk",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ui/vk/.library

@@ -7,7 +7,7 @@
 
         (c) Copyright 2009-2015 SAP SE. All rights reserved
     </copyright>
-    <version>1.94.0</version>
+    <version>1.98.0</version>
 
     <documentation>SAPUI5 Visualization Toolkit.</documentation>
 
@@ -54,7 +54,7 @@
                        resolve="lib" />
 
         <releasenotes xmlns="http://www.sap.com/ui5/buildext/releasenotes"
-                      url="../../../test-resources/sap/ui/vk/relnotes/changes-{major}.{minor}.json"
+                      url="../../../../test-resources/sap/ui/vk/relnotes/changes-{major}.{minor}.json"
                       resolve="lib" />
 
         <ownership xmlns="http://www.sap.com/ui5/buildext/ownership">

package/src/sap/ui/vk/AnimationPlayback.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([
@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.98.0
 	 * @extends sap.ui.base.EventProvider
 	 * @alias sap.ui.vk.AnimationPlayback
 	 * @experimental Since 1.67.0 This class is experimental and might be modified or removed in future versions.
@@ -48,13 +48,13 @@ sap.ui.define([
 			this._jsonData.id = sId;
 
 			this._jsonData.startTime = parameters && parameters.startTime ? parameters.startTime : 0;
-			this._jsonData.sequence 	= this._sequence ? this._sequence.getJSONData() : undefined;
+			this._jsonData.sequence = this._sequence ? this._sequence.getJSONData() : undefined;
 			this._jsonData.timeScale = parameters && parameters.timeScale ? parameters.timeScale : 1.0;
-			this._jsonData.preDelay 	= parameters && parameters.preDelay ? parameters.preDelay : 0.0;
+			this._jsonData.preDelay = parameters && parameters.preDelay ? parameters.preDelay : 0.0;
 			this._jsonData.postDelay = parameters && parameters.postDelay ? parameters.postDelay : 0.0;
-			this._jsonData.repeats 	= parameters && parameters.repeats ? parameters.repeats : 1;
-			this._jsonData.reversed 	= parameters && parameters.reversed ? parameters.reversed : false;
-			this._jsonData.infinite 	= parameters && parameters.infinite ? parameters.infinite : false;
+			this._jsonData.repeats = parameters && parameters.repeats ? parameters.repeats : 1;
+			this._jsonData.reversed = parameters && parameters.reversed ? parameters.reversed : false;
+			this._jsonData.infinite = parameters && parameters.infinite ? parameters.infinite : false;
 		}
 	});
 
@@ -83,6 +83,11 @@ sap.ui.define([
 
 	/**
 	 * Gets the playback start time.
+	 *
+	 * The start time is usually equal to the time when the previous playback finishes (including
+	 * its post-delay) or 0. If the playback has pre-delay then the playback start time is when its
+	 * pre-delay starts, not when its tracks start.
+	 *
 	 * @returns {float} The sequence to be played.
 	 * @public
 	 */
@@ -92,7 +97,7 @@ sap.ui.define([
 
 	/**
 	 * Sets the playback start time.
-	 * @param {float} startTime The plyback start time.
+	 * @param {float} startTime The playback start time.
 	 * @returns {sap.ui.vk.AnimationPlayback} <code>this</code> to allow method chaining.
 	 * @public
 	 */
@@ -267,7 +272,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Calculates animation playback duration
+	 * Calculates animation playback duration taking into account pre-delay, post-delay, repeats and time scale.
 	 * @returns {float} playback duration.
 	 * @public
 	 */
@@ -288,12 +293,12 @@ sap.ui.define([
 	/**
 	 * Get node property defined at the start or end of playback
 	 * @param {any} nodeRef reference to the node
-	 * @param {AnimationTrackType} type property type (translate, scale, quaterninon, opacity)
+	 * @param {AnimationTrackType} type property type (translate, scale, quaternion, opacity)
 	 * @param {boolean} isEnd if true return the property at the end of playback, otherwise at the start
 	 * @returns {float|float[]} property
 	 * @private
 	 */
-	AnimationPlayback.prototype.getNodeBoundaryProperty =  function(nodeRef, type, isEnd) {
+	AnimationPlayback.prototype.getNodeBoundaryProperty = function(nodeRef, type, isEnd) {
 		var property;
 		var nodePropertiesMap;
 		if (isEnd) {
@@ -329,8 +334,9 @@ sap.ui.define([
 	};
 
 	AnimationPlayback.prototype._setCurrentNodesPropertiesAsBoundary = function(viewStateManager, isEnd, forced) {
-		if (!forced && ((this._nodeEndPropertiesMap && this._nodeEndPropertiesMap.size && isEnd) ||
-						(this._nodeStartPropertiesMap && this._nodeStartPropertiesMap.size && !isEnd))) {
+		if (!forced
+			&& ((this._nodeEndPropertiesMap && this._nodeEndPropertiesMap.size && isEnd) ||
+				(this._nodeStartPropertiesMap && this._nodeStartPropertiesMap.size && !isEnd))) {
 			return;
 		}
 

package/src/sap/ui/vk/AnimationPlayer.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([
@@ -9,14 +9,16 @@ sap.ui.define([
 	"./AnimationMath",
 	"./AnimationTrackType",
 	"./AnimationTrackValueType",
-	"./glMatrix"
+	"./glMatrix",
+	"sap/ui/core/Core"
 ], function(
 	Element,
 	vkCore,
 	AnimationMath,
 	AnimationTrackType,
 	AnimationTrackValueType,
-	glMatrix
+	glMatrix,
+	core
 ) {
 	"use strict";
 
@@ -29,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.98.0
 	 * @extends sap.ui.core.Element
 	 * @alias sap.ui.vk.AnimationPlayer
 	 * @experimental Since 1.67.0 This class is experimental and might be modified or removed in future versions.
@@ -93,7 +95,7 @@ sap.ui.define([
 
 	AnimationPlayer.prototype._getViewStateManager = function() {
 		var vsm = this.getViewStateManager();
-		return vsm ? sap.ui.getCore().byId(vsm) : undefined;
+		return vsm ? core.byId(vsm) : undefined;
 	};
 
 	AnimationPlayer.prototype.init = function() {
@@ -125,7 +127,7 @@ sap.ui.define([
 	};
 
 	AnimationPlayer.prototype._onViewApplied = function(channel, eventId, event) {
-		if (event.source.getId() != this.getViewStateManager()) {
+		if (event.source == null || event.source.getId() !== this.getViewStateManager()) {
 			return;
 		}
 
@@ -313,7 +315,7 @@ sap.ui.define([
 		result.offset = offset;
 		if (property === AnimationTrackType.Rotate) {
 			result.absolute = data.absolute.quaternion;
-		} else if (property === AnimationTrackType.Translate){
+		} else if (property === AnimationTrackType.Translate) {
 			result.absolute = data.absolute.translate;
 		} else {
 			result.absolute = data.absolute.scale;
@@ -650,7 +652,7 @@ sap.ui.define([
 					key = track.getKey(keyCount - 2);
 				}
 			}
-			result = AnimationMath.interpolate(valueType, key, key1,  k, track);
+			result = AnimationMath.interpolate(valueType, key, key1, k, track);
 			result.time = isStart ? key.time : key1.time;
 		}
 		return result;
@@ -740,7 +742,7 @@ sap.ui.define([
 					var restOpacity = viewStateManager.getRestOpacity(node);
 					// ignore zero rest opacity for animated nodes:
 					// if we have zero rest opacity on animated node, it should be ignored as the intent is to have opacity animated.
-					if (restOpacity === 0){
+					if (restOpacity === 0) {
 						restOpacity = 1;
 					}
 					if (restOpacity > 0 && (opacity !== undefined || opacity !== null)) {
@@ -748,7 +750,7 @@ sap.ui.define([
 						if (opacityOffset) {
 							opacity /= opacityOffset;
 						}
-						data.offsetToPrevious[property] =  opacity / restOpacity;
+						data.offsetToPrevious[property] = opacity / restOpacity;
 					} else {
 						data.offsetToPrevious[property] = 1;
 					}
@@ -808,7 +810,7 @@ sap.ui.define([
 		}
 	};
 
-	AnimationPlayer.prototype._collectSequenceNodeChanges = function(time, nodeChanges, playback, infiniteTracksOnly) {
+	AnimationPlayer.prototype._collectSequenceNodeChanges = function(time, nodeChanges, playback) {
 		var sequence = playback.getSequence();
 		var animations = sequence.getNodeAnimation();
 		if (!animations) {
@@ -884,7 +886,7 @@ sap.ui.define([
 			for (var trackType in AnimationTrackType) {
 				var type = AnimationTrackType[trackType];
 				var track = animationData[type];
-				if (track &&  track.getKeysCount() && (!infiniteTracksOnly || (infiniteTracksOnly && track.isInfinite()))) {
+				if (track && track.getKeysCount() > 0) {
 					keyBracket = this._getKeyFramesBracket(time, track); // FIXME: take bracket for specific time
 					if (!keyBracket) {
 						return;
@@ -937,7 +939,7 @@ sap.ui.define([
 		}
 
 		// playback duration without pre- and post- delays
-		var playbackPlayTime = sequence.getDuration() * playback.getTimeScale() * playback.getRepeats();
+		var barePlaybackDuration = sequence.getDuration() * playback.getTimeScale() * playback.getRepeats();
 
 		// time scaled back to the sequence
 		var sequenceTime = (timeInPlayback - playback.getPreDelay()) / playback.getTimeScale();
@@ -956,15 +958,12 @@ sap.ui.define([
 
 		if (timeInPlayback < playback.getPreDelay()) {
 			// reset view to start
-			if (timeInPlayback === 0) {
-				this._collectSequenceNodeChanges(sequenceTime, nodeChanges, playback, false);
-			}
-		} else if (timeInPlayback > playback.getPreDelay() + playbackPlayTime + tolerance)  {
-			// apply only infinite tracks
-			this._collectSequenceNodeChanges(sequenceTime, nodeChanges, playback, true);
+			this._collectSequenceNodeChanges(0, nodeChanges, playback);
+		} else if (timeInPlayback > playback.getPreDelay() + barePlaybackDuration) {
+			// set animation to the very end
+			this._collectSequenceNodeChanges(sequence.getDuration() * playback.getRepeats(), nodeChanges, playback);
 		} else {
-			// apply all sequence tracks
-			this._collectSequenceNodeChanges(sequenceTime, nodeChanges, playback, false);
+			this._collectSequenceNodeChanges(sequenceTime, nodeChanges, playback);
 		}
 
 	};
@@ -1055,7 +1054,7 @@ sap.ui.define([
 				time = playback.getPreDelay();
 				this._setTime(time, idx, true);
 				playback._setCurrentNodesPropertiesAsBoundary(viewStateManager, false, forced);
-				time += sequence.getDuration();
+				time += sequence.getDuration() * playback.getTimeScale() * playback.getRepeats();
 				this._setTime(time, idx, true);
 				playback._setCurrentNodesPropertiesAsBoundary(viewStateManager, true, forced);
 				needResetTime = true;
@@ -1075,7 +1074,7 @@ sap.ui.define([
 				var startTime = 0;
 				for (idx = 0; idx < playbacks.length; idx++) {
 					playback = playbacks[idx];
-					if (playback === currentPlayback){
+					if (playback === currentPlayback) {
 						playbackIndex = idx;
 						break;
 					}

package/src/sap/ui/vk/AnimationSequence.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([
@@ -31,7 +31,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.98.0
 	 * @extends sap.ui.base.Object
 	 * @alias sap.ui.vk.AnimationSequence
 	 * @implements sap.ui.vk.IJointCollection
@@ -126,7 +126,7 @@ sap.ui.define([
 
 	AnimationSequence.prototype._findJointIndex = function(parent, node) {
 		var joints = this._jsonData.joints.filter(function(joint) {
-				return joint.node && joint.parent;
+			return joint.node && joint.parent;
 		});
 		return findIndexInArray(joints, function(joint) {
 			return (parent ? joint.parent == parent : true) && (node ? joint.node == node : true);
@@ -241,7 +241,7 @@ sap.ui.define([
 
 		var nodes = [];
 		if (!jointData) {
-			this._jsonData.joints.forEach(function(joint){
+			this._jsonData.joints.forEach(function(joint) {
 				nodes.push(joint.node);
 			});
 			// remove all joints
@@ -431,7 +431,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Reset sequence duration to maximium lenght of tracks.
+	 * Reset sequence duration to maximum length of tracks.
 	 * @param {boolean} blockSequenceChangedEvent block event for sequence changed
 	 * @returns {sap.ui.vk.AnimationSequence} <code>this</code> to allow method chaining
 	 * @public
@@ -439,7 +439,7 @@ sap.ui.define([
 	AnimationSequence.prototype.resetDuration = function(blockSequenceChangedEvent) {
 
 		var maxTrackLength = 0;
-		this._jsonData.nodes.forEach(function(node){
+		this._jsonData.nodes.forEach(function(node) {
 			var trackLength;
 			for (var trackType in node) {
 				if (trackType === "sid") {
@@ -465,7 +465,7 @@ sap.ui.define([
 			}
 		}
 
-		if (!blockSequenceChangedEvent){
+		if (!blockSequenceChangedEvent) {
 			this._fireSequenceChanged();
 		}
 
@@ -515,7 +515,7 @@ sap.ui.define([
 
 		var jointData = { node: nodeRef };
 		var joints = this.getJoint(jointData);
-		if (joints && joints.length){
+		if (joints && joints.length) {
 			return true;
 		}
 		return false;
@@ -523,7 +523,7 @@ sap.ui.define([
 
 	AnimationSequence.prototype._getCurrentNodesProperties = function(viewStateManager, nodePropertiesMap) {
 
-		this._jsonData.nodes.forEach(function(nodeProperties){
+		this._jsonData.nodes.forEach(function(nodeProperties) {
 			var data = {};
 			var trans = viewStateManager.getRelativeTransformation(nodeProperties.nodeRef);
 			for (var property in nodeProperties) {
@@ -549,7 +549,7 @@ sap.ui.define([
 
 		// FIXME: This loop will iterate over some of the nodes iterated in the previous loop. And all their properties,
 		// including non-animated, will be added to the map.
-		this._jsonData.joints.forEach(function(joint){
+		this._jsonData.joints.forEach(function(joint) {
 			if (!joint.node || !joint.parent) {
 				return;
 			}
@@ -581,4 +581,3 @@ sap.ui.define([
 
 	return AnimationSequence;
 });
-

package/src/sap/ui/vk/AnimationTimeSlider.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides control sap.ui.vk.threejs.AnimationTimeSlider
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.Slider
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/vk/AnimationTimeSliderRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/m/SliderRenderer"],
 	function(SliderRenderer) {

package/src/sap/ui/vk/AnimationTrack.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define([
@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @param {boolean} parameters.infinite infinite flag
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.98.0
 	 * @extends sap.ui.base.Object
 	 * @alias sap.ui.vk.AnimationTrack
 	 *

package/src/sap/ui/vk/AnimationTrackValueTypeSize.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides function sap.ui.vk.colorToABGR.