diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on..st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on..st deleted file mode 100644 index 3a3155e4..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on..st +++ /dev/null @@ -1,5 +0,0 @@ -as yet unclassified -on: anAnimationsEditorTimeline - ^ self basicNew timeline: anAnimationsEditorTimeline; - initialize; - yourself. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withExtent..st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withExtent..st new file mode 100644 index 00000000..0dff8886 --- /dev/null +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withExtent..st @@ -0,0 +1,6 @@ +initialization +on: anAnimationsEditorTimeline withExtent: anotherPoint + ^ self basicNew timeline: anAnimationsEditorTimeline; + initialize; + extent: anotherPoint ; + yourself. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withPosition.withExtent..st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withPosition.withExtent..st deleted file mode 100644 index f78d9826..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withPosition.withExtent..st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -on: anAnimationsEditorTimeline withPosition: aPosition withExtent: anExtent - ^ self basicNew timeline: anAnimationsEditorTimeline; - initialize; - position: aPosition; - extent: anExtent; - yourself. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withPositionY.withExtent..st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withPositionY.withExtent..st deleted file mode 100644 index 61a397f9..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/class/on.withPositionY.withExtent..st +++ /dev/null @@ -1,7 +0,0 @@ -as yet unclassified -on: anAnimationsEditorTimeline withPositionY: aPoint withExtent: anotherPoint - ^ self basicNew timeline: anAnimationsEditorTimeline; - initialize; - "position: (self startMargin @ aPoint);" - extent: anotherPoint ; - yourself. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/initialize.st index 3382aa16..5bc1c0a3 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/initialize.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/initialize.st @@ -1,7 +1,7 @@ initialization initialize super initialize. - self - extent: 3@100; - color: Color black; - position: self startMargin@25. + self + color: Color black; + position: self startMargin @ self trackHeight; + playMovingAnimation. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine..st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine..st deleted file mode 100644 index 7c38d5ba..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -movingLine: anObject - movingLine := anObject. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine.st deleted file mode 100644 index d241954f..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -movingLine - ^ movingLine. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/playMovingAnimation.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/playMovingAnimation.st new file mode 100644 index 00000000..630793e3 --- /dev/null +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/playMovingAnimation.st @@ -0,0 +1,12 @@ +accessing +playMovingAnimation + | animation | + animation:= (AnimPropertyAnimation + on: self + property: #position + start: self position + end: self position + (self animationDuration@0) + duration: self animationDuration) + start; + register; + finishBlock: [self abandon]. diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY..st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY..st deleted file mode 100644 index 81e54c98..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -positionY: anObject - positionY := anObject. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY.st deleted file mode 100644 index 08a05941..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -positionY - ^ positionY. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/setMovingSpeedPerHundredMilliseconds.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/setMovingSpeedPerHundredMilliseconds.st deleted file mode 100644 index bc974df5..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/setMovingSpeedPerHundredMilliseconds.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -setMovingSpeedPerHundredMilliseconds - self speed: (self timeline width - (self startMargin) - (self endMargin)) / self animationDuration * 100. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed..st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed..st deleted file mode 100644 index da4c4b50..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -speed: anObject - speed := anObject. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed.st deleted file mode 100644 index 53b7f327..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -speed - ^ speed. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/step.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/step.st deleted file mode 100644 index 6d3fbcf4..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/step.st +++ /dev/null @@ -1,9 +0,0 @@ -stepping and presenter -step - | endPositionX| - - endPositionX := self timeline width - (self endMargin). - (self position x >= endPositionX) ifTrue: [self abandon] - ifFalse: - [self position: self position + (1@0* self speed).]. - \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/stepTime.st b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/stepTime.st deleted file mode 100644 index dbf1f0ff..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/stepTime.st +++ /dev/null @@ -1,3 +0,0 @@ -stepping and presenter -stepTime - ^ 100. diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json index 4df20be6..4a3985e5 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json @@ -1,8 +1,6 @@ { "class" : { - "on:" : "SG 5/21/2022 16:01", - "on:withPosition:withExtent:" : "ob 6/9/2022 21:39", - "on:withPositionY:withExtent:" : "ob 6/9/2022 21:40" }, + "on:withExtent:" : "Noel Bastubbe 7/4/2022 15:27" }, "instance" : { "animationDuration" : "ob 6/9/2022 21:31", "initialize" : "ob 6/9/2022 21:29", @@ -16,3 +14,4 @@ "speed:" : "ob 6/9/2022 20:26", "step" : "ob 6/9/2022 20:45", "stepTime" : "Noel Bastubbe 6/22/2022 12:27" } } + diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/properties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/properties.json index 941a5b55..ce44b070 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/properties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/properties.json @@ -6,9 +6,7 @@ ], "commentStamp" : "", "instvars" : [ - "movingLine", - "speed", - "positionY" ], + ], "name" : "AnimationsEditorMovingLine", "pools" : [ ], diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/lineWidth.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/lineWidth.st deleted file mode 100644 index 13f86520..00000000 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/lineWidth.st +++ /dev/null @@ -1,3 +0,0 @@ -constants -lineWidth - ^ 3. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json index 6ff873cc..0b8e58f8 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json @@ -16,13 +16,12 @@ "endTime" : "Noel Bastubbe 6/22/2022 12:27", "endTime:" : "6/14/2022 17:04:37", "getDurationString:" : "6/14/2022 17:04:37", - "initialize" : "ob 6/13/2022 13:21", + "initialize" : "Noel Bastubbe 7/4/2022 15:31", "initializeDuration" : "6/14/2022 17:04:37", "intermediateLineDistance" : "Noel Bastubbe 6/14/2022 17:16", "labelXOffset" : "6/14/2022 17:04:37", "labelYOffset" : "6/14/2022 17:04:37", "lineHeight" : "MH 8/1/2021 19:00", - "lineWidth" : "MH 8/1/2021 19:22", "movingLine" : "Noel Bastubbe 6/22/2022 12:28", "movingLine:" : "Noel Bastubbe 6/22/2022 12:28", "startEndLineHeight" : "MH 8/1/2021 19:00", diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/createMovingLine.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/createMovingLine.st index 71484872..d5099f7e 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/createMovingLine.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/createMovingLine.st @@ -7,10 +7,8 @@ createMovingLine do: [:subproperty | subproperty isActivated ifTrue: [ numberOfProperties := numberOfProperties + 1].]. - + self movingLine ifNotNil: [self movingLine abandon]. self - movingLine: (AnimationsEditorMovingLine on: self withPositionY: self trackHeight withExtent: 3@(numberOfProperties * self trackHeight)); + movingLine: (AnimationsEditorMovingLine on: self withExtent: self lineWidth @ (numberOfProperties * self trackHeight)); addMorphFront: movingLine. - - self movingLine setMovingSpeedPerHundredMilliseconds. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st index 3b221c0c..635658d5 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st @@ -1,8 +1,8 @@ initialization initialize - super initialize. - self - extent: self initialExtent; - color: Color lightGray; - setDefaultProperty; - initializeStartEndTime. \ No newline at end of file + super initialize. + self + extent: self initialExtent; + color: Color lightGray; + setDefaultProperty; + initializeStartEndTime. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json index 069f43ae..90aaee95 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json @@ -14,7 +14,7 @@ "endTime" : "MH 8/1/2021 18:57", "endTime:" : "MH 8/1/2021 18:57", "initialExtent" : "MH 8/1/2021 18:57", - "initialize" : "SG 5/21/2022 15:43", + "initialize" : "Noel Bastubbe 7/4/2022 15:32", "initializeStartEndTime" : "mjs 7/31/2021 17:38", "minimumExtent" : "NR 7/18/2022 10:43", "movingLine" : "SG 5/21/2022 15:38", @@ -28,7 +28,6 @@ "switchTimelineTo:" : "SG 6/17/2022 16:00", "timebar" : "MH 8/1/2021 18:57", "timebar:" : "MH 8/1/2021 18:57", - "trackHeight" : "MH 8/1/2021 18:57", "update:" : "SG 5/23/2022 18:40", - "updateExtent" : "NR 7/18/2022 10:41", + "updateExtent" : "MH 8/1/2021 18:58", "updateStartEndProperty" : "6/17/2022 14:09:28" } } diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/lineWidth.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/lineWidth.st similarity index 100% rename from packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/lineWidth.st rename to packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/lineWidth.st diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/trackHeight.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/trackHeight.st similarity index 100% rename from packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/trackHeight.st rename to packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/trackHeight.st diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json index 3c9b6708..fa84cdad 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json @@ -5,6 +5,8 @@ "convertFrameToPosition:" : "Noel Bastubbe 6/9/2022 17:42", "endMargin" : "MH 8/1/2021 18:59", "lineSegmentWidth" : "MH 8/1/2021 18:59", + "lineWidth" : "Noel Bastubbe 7/4/2022 15:23", "startMargin" : "Noel Bastubbe 6/9/2022 17:45", "timeline" : "MH 8/1/2021 19:00", - "timeline:" : "MH 8/1/2021 18:48" } } + "timeline:" : "MH 8/1/2021 18:48", + "trackHeight" : "Noel Bastubbe 7/4/2022 15:20" } } diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/referenceTime..st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/referenceTime..st new file mode 100644 index 00000000..d33cf97f --- /dev/null +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/referenceTime..st @@ -0,0 +1,3 @@ +accessing +referenceTime: anObject + referenceTime := anObject \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/referenceTime.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/referenceTime.st new file mode 100644 index 00000000..00fcbcea --- /dev/null +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/referenceTime.st @@ -0,0 +1,3 @@ +accessing +referenceTime + ^ referenceTime \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/runCase.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/runCase.st new file mode 100644 index 00000000..09372e9b --- /dev/null +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/runCase.st @@ -0,0 +1,6 @@ +testing +runCase + + AnimAnimationRegistry + value: AnimAnimationRegistry new + during: [super runCase]. \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/setUp.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/setUp.st index 80711473..e81ad24e 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/setUp.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/setUp.st @@ -1,9 +1,10 @@ testing setUp - | morph referenceTime | + | morph | super setUp. referenceTime := WorldState lastCycleTime. + AnimAnimationRegistry value updateAnimations: referenceTime. self animationsEditorInstance: AnimationsEditor open. morph := Morph new openInWorld. self animationsEditorInstance addTargetMorph: morph. diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInRightPosition.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInRightPosition.st index c9c6d819..46466bea 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInRightPosition.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInRightPosition.st @@ -1,19 +1,15 @@ testing testMovingLineInRightPosition -| movingLine | - - movingLine:= Morph new extent: 3@100; - color: Color black; - position: 105@25. - 5 timesRepeat: [self moveMovingLine: movingLine]. - Transcript show: movingLine position x. - movingLine comeToFront. - - - Transcript show: ' '. - Transcript show: ((self timeline width - 130)/2+105). - self assert: true "((movingLine position x) between: ((self timeline width - 130)/2+105 - (5*self inaccuracyFactor)) and: ((self timeline width - 130)/2+105))". - + self timeline createMovingLine. + self movingLine: self timeline movingLine. + self + should: self movingLine position rounded = (self movingLine startMargin @ self timeline trackHeight); + wait: 250; + assert: (self movingLine position x rounded between: (self movingLine startMargin + 249) and: (self movingLine startMargin + 251)); + wait: 250; + assert: (self movingLine position x rounded between: (self movingLine startMargin + 499) and: (self movingLine startMargin + 501)); + wait: 250; + assert: (self movingLine position x rounded between: (self movingLine startMargin + 749) and: (self movingLine startMargin + 751)). diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInitializedInRightPosition.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInitializedInRightPosition.st index 39091433..4ab8319f 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInitializedInRightPosition.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineInitializedInRightPosition.st @@ -3,10 +3,4 @@ testMovingLineInitializedInRightPosition self timeline createMovingLine. self movingLine: self timeline movingLine. - self assert: (self movingLine position ) = (self movingLine startMargin @ self timeline trackHeight). - - - - - - + self assert: (self movingLine position ) = (self movingLine startMargin @ self timeline trackHeight). \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineStoppedAtEndMargin.st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineStoppedAtEndMargin.st index 5cf5fc3e..c86ab3c6 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineStoppedAtEndMargin.st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/testMovingLineStoppedAtEndMargin.st @@ -1,11 +1,10 @@ testing testMovingLineStoppedAtEndMargin -|movingLine| - movingLine:= Morph new extent: 3@100; - color: Color black; - position: self startMargin @self timeline trackHeight. - 1000 timesRepeat: [self moveMovingLine: movingLine]. - self assert: (movingLine position) = ((self timeline width - self endMargin)@ self timeline trackHeight). + self timeline createMovingLine. + self movingLine: self timeline movingLine. + self + wait: 1500; + should: self movingLine position x = (self movingLine startMargin + 1000). diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/wait..st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/wait..st index 59f5007a..a676e199 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/wait..st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/wait..st @@ -1,6 +1,6 @@ -calculation +support wait: milliseconds "Wait some time in terms of the main world cycle. Split up waiting time into slices of 5 virtual milliseconds to get close to the real behavior." self waitNow: 0. - milliseconds // 5 timesRepeat: [self waitNow: 5]. + milliseconds // 5 timesRepeat: [self waitNow: 5]. \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/waitNow..st b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/waitNow..st index 2444403d..62c20535 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/waitNow..st +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/instance/waitNow..st @@ -1,5 +1,5 @@ -calculation +support waitNow: milliseconds - |referenceTime| + referenceTime := referenceTime + milliseconds. AnimAnimationRegistry value updateAnimations: referenceTime. \ No newline at end of file diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json index 391853c8..79dbf331 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/methodProperties.json @@ -21,8 +21,11 @@ "positionTrack" : "MH 8/1/2021 18:42", "positionTrack:" : "MH 8/1/2021 18:42", "propertyPosition" : "SG 6/22/2022 14:15", + "referenceTime" : "Noel Bastubbe 7/12/2022 11:18", + "referenceTime:" : "Noel Bastubbe 7/12/2022 11:18", + "runCase" : "Noel Bastubbe 7/12/2022 12:00", "secondLastOn:" : "NB 8/1/2021 12:16", - "setUp" : "SG 6/22/2022 14:15", + "setUp" : "Noel Bastubbe 7/12/2022 11:27", "startFrame" : "MH 8/1/2021 18:42", "startMargin" : "ob 5/29/2022 17:46", "tearDown" : "SG 6/22/2022 14:15", @@ -36,5 +39,5 @@ "testWidthOfTimeline" : "6/17/2022 14:09:29", "timeline" : "MH 8/1/2021 18:43", "timeline:" : "MH 8/1/2021 18:43", - "wait:" : "ob 5/27/2022 16:59", - "waitNow:" : "ob 5/27/2022 17:00" } } + "wait:" : "Noel Bastubbe 7/12/2022 11:18", + "waitNow:" : "Noel Bastubbe 7/12/2022 11:18" } } diff --git a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/properties.json b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/properties.json index 967b8093..1992b8d7 100644 --- a/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/properties.json +++ b/packages/AnimationsEditor-Tests.package/AnimationsEditorTimelineTest.class/properties.json @@ -10,7 +10,8 @@ "timeline", "positionTrack", "addedKeyframeMorph", - "movingLine" ], + "movingLine", + "referenceTime" ], "name" : "AnimationsEditorTimelineTest", "pools" : [ ],