merge review refactor

hpi-swa-teaching · Jun 10, 2021 · 8ea04f8 · 8ea04f8
1 parent d7ca95a
commit 8ea04f8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/...nimationsEditor-Core.package/AnimationsEditorProperty.class/instance/isKey.outOfBound..st b/...nimationsEditor-Core.package/AnimationsEditorProperty.class/instance/isKey.outOfBound..st
@@ -1,4 +1,4 @@
 accessing
 isKey: aNumber outOfBound: aStartEndProperty
 
-	^ aNumber <= aStartEndProperty endTime and: [aNumber >= aStartEndProperty startTime].
+	^ aNumber between: aStartEndProperty startTime and: aStartEndProperty endTime.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorProperty.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorProperty.class/methodProperties.json
@@ -20,7 +20,7 @@
 		"frame" : "CL 5/13/2021 10:24",
 		"frame:" : "CL 5/13/2021 10:25",
 		"hasSubproperties" : "DM 8/6/2020 11:02",
-		"isKey:outOfBound:" : "CL 5/30/2021 13:39",
+		"isKey:outOfBound:" : "CL 6/10/2021 10:16",
 		"isKeyframeExistent" : "CL 5/31/2021 15:42",
 		"messageKeyframeOutOfBounds" : "CL 5/27/2021 09:49",
 		"playAnimationWithStartEnd:" : "CL 5/31/2021 15:42",

diff --git a/...tyColor.class/instance/createAnimationFor.withKey.withLastKey.withValue.withLastValue..st b/...tyColor.class/instance/createAnimationFor.withKey.withLastKey.withValue.withLastValue..st
@@ -1,18 +1,21 @@
 accessing
 createAnimationFor: aMorph withKey: aKey withLastKey: aLastKey withValue: aValue withLastValue: aLastTargetValue
+	| halfDuration |
+
+	halfDuration := (aKey-aLastKey)//2.
 	^ AnimCompositeAnimation new
 		 add:
 			(AnimAlphaBlendAnimation new
 				morph: aMorph;
 				startValue: 1.0;
 				endValue: 0.0;
-				duration: ((aKey-aLastKey)//2);
+				duration: halfDuration;
 				finishBlock: [aMorph color: (Color colorFrom:aValue)]);
 		add:  
 			(AnimAlphaBlendAnimation new
 				morph: aMorph;
 				startValue: 0.0;
 				endValue: 1.0;
-				duration: ((aKey-aLastKey)//2));
+				duration: halfDuration);
 		yourself.
 
diff --git a/...s/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json b/...s/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json
@@ -11,7 +11,7 @@
 		"buildUIWith:" : "JIZ 6/3/2020 17:10",
 		"canCreateAnimation" : "DM 8/6/2020 10:26",
 		"canRenderUI" : "DM 8/5/2020 21:07",
-		"createAnimationFor:withKey:withLastKey:withValue:withLastValue:" : "FH 6/9/2021 10:31",
+		"createAnimationFor:withKey:withLastKey:withValue:withLastValue:" : "CL 6/10/2021 10:19",
 		"defaultTargetColor" : "mjs 5/21/2021 11:39",
 		"initialize" : "DM 7/7/2020 10:44",
 		"targetColor" : "DM 8/7/2020 17:19",