added timebar and started on keyframes

hpi-swa-teaching · Jul 1, 2021 · 8d64e0b · 8d64e0b
1 parent 410bfae
commit 8d64e0b
Show file tree

Hide file tree

Showing 61 changed files with 359 additions and 44 deletions.
diff --git a/...imationsEditor-Core.package/AnimationsEditor.class/instance/switchTimelineToMorphWith..st b/...imationsEditor-Core.package/AnimationsEditor.class/instance/switchTimelineToMorphWith..st
@@ -1,6 +1,9 @@
 eventHandling
 switchTimelineToMorphWith: aSubProperty
 	| morphProperty |
-
-	morphProperty := self propertyList detect: [:property | property targetMorph = aSubProperty targetMorph] ifNone: [].
-	self timeline switchTimelineTo: morphProperty.
+
+	(aSubProperty isKindOf: AnimationsEditorPropertyStartEnd)
+		ifFalse:  [
+			morphProperty := self propertyList detect: [:property | property targetMorph = aSubProperty targetMorph] ifNone: [].
+			self timeline switchTimelineTo: morphProperty. 
+		]. 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json
@@ -87,8 +87,8 @@
 		"seedProperties" : "DM 8/5/2020 19:54",
 		"selectMorphByHand" : "DM 8/5/2020 20:07",
 		"selectedTreeNode" : "JIZ 5/27/2020 15:31",
-		"selectedTreeNode:" : "CL 6/25/2021 14:57",
-		"switchTimelineToMorphWith:" : "CL 6/25/2021 15:01",
+		"selectedTreeNode:" : "MH 7/1/2021 10:27",
+		"switchTimelineToMorphWith:" : "MH 7/1/2021 10:33",
 		"timeline" : "CL 6/25/2021 13:51",
 		"timeline:" : "CL 6/25/2021 13:51",
 		"timelines" : "DM 8/6/2020 10:31",

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/README.md b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/README.md
diff --git a/...Core.package/AnimationsEditorKeyframe.class/class/on.withPosition.withFrame.withValue..st b/...Core.package/AnimationsEditorKeyframe.class/class/on.withPosition.withFrame.withValue..st
@@ -0,0 +1,10 @@
+as yet unclassified
+on: anAnimationsEditorTrack withPosition: aPoint withFrame: aFrame withValue: aValue 
+
+	^ self basicNew
+	      timeline: anAnimationsEditorTrack;
+		frame: aFrame;
+		value: aValue; 
+	      initialize;
+		position: aPoint;
+	      yourself.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/frame..st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/frame..st
@@ -0,0 +1,4 @@
+accessing
+frame: anObject
+
+	frame := anObject.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/frame.st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/frame.st
@@ -0,0 +1,4 @@
+accessing
+frame
+
+	^ frame
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/initialize.st
@@ -0,0 +1,7 @@
+initialization
+initialize
+
+	super initialize. 
+
+	self color: Color orange. 
+	self extent: 15@15. 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/track..st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/track..st
@@ -0,0 +1,4 @@
+accessing
+track: anObject
+
+	track := anObject.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/track.st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/track.st
@@ -0,0 +1,4 @@
+accessing
+track
+
+	^ track
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/value..st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/value..st
@@ -0,0 +1,4 @@
+accessing
+value: anObject
+
+	value := anObject.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/methodProperties.json
@@ -0,0 +1,10 @@
+{
+	"class" : {
+		"on:withPosition:withFrame:withValue:" : "MH 7/1/2021 12:22" },
+	"instance" : {
+		"frame" : "MH 7/1/2021 12:22",
+		"frame:" : "MH 7/1/2021 12:22",
+		"initialize" : "MH 7/1/2021 12:23",
+		"track" : "MH 7/1/2021 12:11",
+		"track:" : "MH 7/1/2021 12:11",
+		"value:" : "MH 7/1/2021 12:22" } }
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/properties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/properties.json
@@ -0,0 +1,16 @@
+{
+	"category" : "AnimationsEditor-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"track",
+		"frame",
+		"value" ],
+	"name" : "AnimationsEditorKeyframe",
+	"pools" : [
+		 ],
+	"super" : "RectangleMorph",
+	"type" : "normal" }
diff --git a/...AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/endTime..st b/...AnimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/endTime..st
@@ -1,3 +1,4 @@
 accessing
 endTime: aNumber
-	endTime := aNumber.
+	endTime := aNumber.
+	self changed. 
diff --git a/...imationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/startTime..st b/...imationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/instance/startTime..st
@@ -1,3 +1,4 @@
 accessing
 startTime: aNumber
-	startTime := aNumber.
+	startTime := aNumber.
+	self changed. 
diff --git a/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/methodProperties.json b/...nimationsEditor-Core.package/AnimationsEditorPropertyStartEnd.class/methodProperties.json
@@ -12,9 +12,9 @@
 		"defaultStartTime" : "DM 8/6/2020 10:37",
 		"duration" : "DM 8/4/2020 16:44",
 		"endTime" : "DM 8/6/2020 10:36",
-		"endTime:" : "DM 6/18/2020 13:52",
+		"endTime:" : "MH 7/1/2021 09:35",
 		"endTimeAsString" : "DM 8/5/2020 20:46",
 		"initialize" : "DM 6/22/2020 01:37",
 		"startTime" : "DM 8/6/2020 10:37",
-		"startTime:" : "DM 6/18/2020 13:51",
+		"startTime:" : "MH 7/1/2021 09:35",
 		"startTimeAsString" : "DM 8/5/2020 21:08" } }
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/README.md b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/README.md
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/class/on.withExtent..st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/class/on.withExtent..st
@@ -0,0 +1,8 @@
+initialize
+on: anAnimationsEditorTimeline withExtent: anotherPoint
+
+	^ self basicNew
+	        timeline: anAnimationsEditorTimeline;
+	        initialize;
+		  extent: anotherPoint;
+	        yourself.
diff --git a/...mationsEditor-Core.package/AnimationsEditorTimebar.class/instance/addIntermediateLines.st b/...mationsEditor-Core.package/AnimationsEditorTimebar.class/instance/addIntermediateLines.st
@@ -0,0 +1,13 @@
+updating
+addIntermediateLines
+	| positionX |
+
+	self timeline startTime + 1
+		to: self timeline endTime - 1
+		do: [:frame | frame \\ 100 = 0 
+				ifTrue: [
+					positionX := self convertFrameToPosition: frame. 
+					self addLineFrom: positionX @ self height to: positionX @ (self height - self lineHeight)]
+				].
+
+
diff --git a/...s/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/addLineFrom.to..st b/...s/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/addLineFrom.to..st
@@ -0,0 +1,6 @@
+updating
+addLineFrom: aStartPoint to: anEndPoint
+	| line |
+
+	line := LineMorph from: aStartPoint to: anEndPoint color: Color black width: 3. 
+	self addMorph: line. 
diff --git a/...s/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/addStartEndLine.st b/...s/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/addStartEndLine.st
@@ -0,0 +1,8 @@
+updating
+addStartEndLine
+
+	self addLineFrom: self startMargin @ self height to: self startMargin @ (self height - self startEndLineHeight).
+	self addLineFrom: self startMargin + self lineSegmentWidth @ self height to: self startMargin + self lineSegmentWidth @ (self height - self startEndLineHeight). 
+
+
+
diff --git a/...ionsEditor-Core.package/AnimationsEditorTimebar.class/instance/convertFrameToPosition..st b/...ionsEditor-Core.package/AnimationsEditorTimebar.class/instance/convertFrameToPosition..st
@@ -0,0 +1,8 @@
+updating
+convertFrameToPosition: aFrame 
+	| position |
+
+	position := aFrame / ((self timeline endTime - self timeline startTime) / self lineSegmentWidth) + self startMargin.
+
+	^position. 
+
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/endMargin.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/endMargin.st
@@ -0,0 +1,4 @@
+constants
+endMargin 
+
+	^10. 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/initialize.st
@@ -0,0 +1,5 @@
+initialization
+initialize
+
+	super initialize. 
+	self color: Color white.  
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/lineHeight.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/lineHeight.st
@@ -0,0 +1,4 @@
+constants
+lineHeight
+
+	^ 10. 
diff --git a/.../AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/lineSegmentWidth.st b/.../AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/lineSegmentWidth.st
@@ -0,0 +1,5 @@
+constants
+lineSegmentWidth 
+
+	^ self width - self startMargin - self endMargin. 
+
diff --git a/...nimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/startEndLineHeight.st b/...nimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/startEndLineHeight.st
@@ -0,0 +1,4 @@
+constants
+startEndLineHeight
+
+	^ 20. 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/startMargin.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/startMargin.st
@@ -0,0 +1,4 @@
+constants
+startMargin
+
+	^ 85. 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/timeline..st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/timeline..st
@@ -0,0 +1,4 @@
+accessing
+timeline: anObject
+
+	timeline := anObject.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/timeline.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/timeline.st
@@ -0,0 +1,4 @@
+accessing
+timeline
+
+	^ timeline
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/updateScale.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/updateScale.st
@@ -0,0 +1,7 @@
+updating
+updateScale
+
+	self addStartEndLine. 
+	self addIntermediateLines. 
+
+
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json
@@ -0,0 +1,17 @@
+{
+	"class" : {
+		"on:withExtent:" : "MH 7/1/2021 10:57" },
+	"instance" : {
+		"addIntermediateLines" : "MH 7/1/2021 12:08",
+		"addLineFrom:to:" : "MH 7/1/2021 10:19",
+		"addStartEndLine" : "MH 7/1/2021 12:07",
+		"convertFrameToPosition:" : "MH 7/1/2021 12:05",
+		"endMargin" : "MH 7/1/2021 10:08",
+		"initialize" : "MH 7/1/2021 09:48",
+		"lineHeight" : "MH 7/1/2021 12:06",
+		"lineSegmentWidth" : "MH 7/1/2021 12:03",
+		"startEndLineHeight" : "MH 7/1/2021 12:06",
+		"startMargin" : "MH 7/1/2021 11:34",
+		"timeline" : "MH 7/1/2021 09:23",
+		"timeline:" : "MH 7/1/2021 09:23",
+		"updateScale" : "MH 7/1/2021 12:08" } }
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/properties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "AnimationsEditor-Core",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"timeline" ],
+	"name" : "AnimationsEditorTimebar",
+	"pools" : [
+		 ],
+	"super" : "RectangleMorph",
+	"type" : "normal" }
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/class/newWith..st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/class/newWith..st
@@ -1,4 +1,4 @@
-as yet unclassified
+initialize
 newWith: anAnimationsEditor
 
 	^ self 

diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/addTimebar.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/addTimebar.st
@@ -0,0 +1,8 @@
+initialization
+addTimebar 
+	| timebar |
+
+	timebar := AnimationsEditorTimebar on: self withExtent: self width @ self trackHeight. 
+	self addMorph: timebar.
+	self timebar: timebar. 
+	self timebar updateScale. 
diff --git a/...sEditor-Core.package/AnimationsEditorTimeline.class/instance/addTrackFor.withPosition..st b/...sEditor-Core.package/AnimationsEditorTimeline.class/instance/addTrackFor.withPosition..st
@@ -1,9 +1,13 @@
-as yet unclassified
+creation
 addTrackFor: aProperty withPosition: aNumber
 	| track |
 
-	track := AnimationsEditorTrack on: self withProperty: aProperty withPosition: (0 @ aNumber) withExtent: (self width @ self trackHeight).
-	self addMorph: track.
+	track := AnimationsEditorTrack
+				on: self
+				withProperty: aProperty
+				withPosition: 0 @ aNumber
+				withExtent: self width @ self trackHeight.
+	self addMorph: track
 
 
 
diff --git a/...ges/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/createTracks.st b/...ges/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/createTracks.st
@@ -0,0 +1,8 @@
+creation
+createTracks 
+	| positionY |
+
+	positionY := self trackHeight.
+	self property subproperties do: [:subproperty | 
+		self addTrackFor: subproperty withPosition: positionY. 
+		positionY := positionY + self trackHeight].
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/endTime..st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/endTime..st
@@ -0,0 +1,4 @@
+accessing
+endTime: anObject
+
+	endTime := anObject.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/endTime.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/endTime.st
@@ -0,0 +1,4 @@
+accessing
+endTime
+
+	^ endTime
diff --git a/...es/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialExtent.st b/...es/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialExtent.st
@@ -0,0 +1,4 @@
+constants
+initialExtent
+
+	^ 550 @ 100. 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st
@@ -1,6 +1,8 @@
-accessing
+initialization
 initialize
-	
+
 	super initialize.
-	self extent: 550@100.
+
+	self extent: self initialExtent. 
 	self color: Color white.
+	self initializeStartEndTime. 
diff --git a/...ionsEditor-Core.package/AnimationsEditorTimeline.class/instance/initializeStartEndTime.st b/...ionsEditor-Core.package/AnimationsEditorTimeline.class/instance/initializeStartEndTime.st
@@ -0,0 +1,10 @@
+initialization
+initializeStartEndTime 
+	| startEndProperty |
+
+	startEndProperty := self animationsEditor propertyList first. 
+	self
+		startTime: startEndProperty startTime; 
+		endTime: startEndProperty endTime.
+	startEndProperty addDependent: self.
+
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/startTime..st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/startTime..st
@@ -0,0 +1,4 @@
+accessing
+startTime: anObject
+
+	startTime := anObject.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/startTime.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/startTime.st
@@ -0,0 +1,4 @@
+accessing
+startTime
+
+	^ startTime
diff --git a/...nimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/switchTimelineTo..st b/...nimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/switchTimelineTo..st
@@ -1,9 +1,6 @@
-accessing
+creation
 switchTimelineTo: aProperty
-	| positionY |
 
 	self property: aProperty.
-	positionY := 0.
-	aProperty subproperties do: [:subproperty | 
-		self addTrackFor: subproperty withPosition: positionY. 
-		positionY := positionY + self trackHeight].
+	self addTimebar. 
+	self createTracks. 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/timebar..st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/timebar..st
@@ -0,0 +1,4 @@
+accessing
+timebar: anObject
+
+	timebar := anObject.