Skip to content

Commit

Permalink
Added Class MovingLine (still in progress)
Browse files Browse the repository at this point in the history
  • Loading branch information
saragrau committed May 25, 2022
1 parent 657c66b commit edfd3b2
Show file tree
Hide file tree
Showing 26 changed files with 132 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ eventHandling
playAnimations
self resetTargetMorph.
self updateInformationText: self messagePlayAnimations.
self selectedTreeNode playAnimationWithStartEnd: self propertyStartEnd.
self selectedTreeNode playAnimationWithStartEnd: self propertyStartEnd.
self timeline createMovingLine.
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"buildButtonBarWith:" : "FH 8/1/2021 18:35",
"buildInformationBarWith:" : "DM 8/4/2020 16:12",
"buildLoadJsonButtonWith:" : "FH 8/1/2021 18:37",
"buildLoadingMainWindow:" : "FH 5/9/2021 13:58",
"buildMainWindowWith:" : "mjs 8/1/2021 13:30",
"buildLoadingMainWindow:" : "SG 5/21/2022 13:24",
"buildMainWindowWith:" : "SG 5/21/2022 14:11",
"buildPlayButtonWith:" : "FH 8/1/2021 18:39",
"buildPositionUIPanelWith:" : "FH 8/1/2021 18:39",
"buildPropertiesTreeWith:" : "FH 8/1/2021 18:42",
Expand Down Expand Up @@ -57,7 +57,7 @@
"mainWindow:" : "JIZ 6/3/2020 17:04",
"messagePlayAnimations" : "CL 5/27/2021 13:48",
"numberButtons" : "CL 5/30/2021 14:05",
"playAnimations" : "FH 8/1/2021 18:48",
"playAnimations" : "SG 5/23/2022 18:41",
"propertyEditorPanel" : "DM 6/22/2020 01:27",
"propertyEditorPanel:" : "DM 6/12/2020 20:41",
"propertyEditorPanelChildren" : "FH 8/1/2021 18:25",
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
as yet unclassified
on: anAnimationsEditorTimeline
^ self basicNew timeline: anAnimationsEditorTimeline;
initialize;
yourself.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
as yet unclassified
addMovingLine
| line |
"self movingLine: (self addLineFrom: 105@25 to: 105@125)."

line := LineMorph
from: 105@25
to: 105@125
color: Color black
width: self lineWidth.
self movingLine: line.
self addMorph: line.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
as yet unclassified
initialize
super initialize.
self
extent: 3@100;
color: Color black;
position: self startMargin@25.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
as yet unclassified
lineWidth
^3
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
movingLine: anObject
movingLine := anObject
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
movingLine
^ movingLine
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
as yet unclassified
step
|duration offset|
"duration := (self timeline endTime - self timeline startTime)/100. --> richtige Zeit"
((self position x) > (self convertFrameToPosition: (self timeline endTime))) ifTrue: [self abandon]
ifFalse:
[duration := (self timeline endTime - self timeline startTime)/100.
offset := (self timeline width - (self startMargin) - (self endMargin)) / duration.
self position: self position + (offset@0).]


Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
as yet unclassified
stepTime
^1
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"class" : {
"on:" : "SG 5/21/2022 16:01" },
"instance" : {
"addMovingLine" : "SG 5/23/2022 18:37",
"initialize" : "SG 5/23/2022 18:57",
"lineWidth" : "SG 5/23/2022 18:47",
"movingLine" : "SG 5/23/2022 18:48",
"movingLine:" : "SG 5/23/2022 18:48",
"step" : "SG 5/23/2022 19:28",
"stepTime" : "SG 5/23/2022 18:37" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"category" : "AnimationsEditor-Core",
"classinstvars" : [
],
"classvars" : [
],
"commentStamp" : "",
"instvars" : [
"movingLine" ],
"name" : "AnimationsEditorMovingLine",
"pools" : [
],
"super" : "AnimationsEditorTimelineObject",
"type" : "normal" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
updating
addMovingLine
| line |
"self movingLine: (self addLineFrom: 105@25 to: 105@125)."

line := LineMorph
from: 105@25
to: 105@125
color: Color black
width: self lineWidth.
self movingLine: line.
self addMorph: line.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
movingLine: anObject
movingLine := anObject
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
movingLine
^ movingLine
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
as yet unclassified
step
"duration := (self timeline endTime - self timeline startTime)/1000. --> richtige Zeit
duration := (self timeline endTime - self timeline startTime).
offset := self lineSegmentWidth / duration.
self movingLine position: self movingLine position + (offset@0)."
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
as yet unclassified
stepTime
^1
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
updating
updateScale
self addStartEndLine.
self addIntermediateLines.
self addIntermediateLines.
"self addMovingLine."
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@
"addEndLine" : "MH 8/1/2021 19:30",
"addIntermediateLines" : "MH 8/1/2021 19:21",
"addLineFrom:to:" : "MH 8/1/2021 19:22",
"addMovingLine" : "SG 5/23/2022 17:59",
"addStartEndLine" : "MH 8/1/2021 19:24",
"addStartLine" : "MH 8/1/2021 19:28",
"initialize" : "MH 8/1/2021 19:00",
"lineHeight" : "MH 8/1/2021 19:00",
"lineWidth" : "MH 8/1/2021 19:22",
"movingLine" : "SG 5/23/2022 17:22",
"movingLine:" : "SG 5/23/2022 17:22",
"startEndLineHeight" : "MH 8/1/2021 19:00",
"updateScale" : "MH 8/1/2021 19:01" } }
"step" : "SG 5/23/2022 18:41",
"stepTime" : "SG 5/23/2022 18:02",
"updateScale" : "SG 5/23/2022 18:41" } }
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
],
"commentStamp" : "CL 8/2/2021 08:50",
"instvars" : [
],
"movingLine" ],
"name" : "AnimationsEditorTimebar",
"pools" : [
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
creation
createMovingLine
self
movingLine: (AnimationsEditorMovingLine on: self);
addMorphFront: movingLine.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
movingLine: anObject
movingLine := anObject
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
movingLine
^ movingLine
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,25 @@
"addTrackFor:withPosition:" : "MH 8/1/2021 18:58",
"animationsEditor" : "MH 8/1/2021 18:56",
"animationsEditor:" : "MH 8/1/2021 18:56",
"createMovingLine" : "SG 5/21/2022 20:37",
"createTracks" : "MH 8/1/2021 18:58",
"deleteTracks" : "MH 8/1/2021 18:48",
"endTime" : "MH 8/1/2021 18:57",
"endTime:" : "MH 8/1/2021 18:57",
"initialExtent" : "MH 8/1/2021 18:57",
"initialize" : "MH 8/1/2021 18:48",
"initialize" : "SG 5/21/2022 15:43",
"initializeStartEndTime" : "mjs 7/31/2021 17:38",
"movingLine" : "SG 5/21/2022 15:38",
"movingLine:" : "SG 5/21/2022 15:38",
"property" : "MH 8/1/2021 18:57",
"property:" : "MH 8/1/2021 18:57",
"scrollPane" : "MH 8/1/2021 18:57",
"setDefaultProperty" : "MH 8/1/2021 18:58",
"startTime" : "MH 8/1/2021 18:57",
"startTime:" : "MH 8/1/2021 18:57",
"switchTimelineTo:" : "MH 8/1/2021 18:58",
"switchTimelineTo:" : "SG 5/23/2022 18:40",
"timebar" : "MH 8/1/2021 18:57",
"timebar:" : "MH 8/1/2021 18:57",
"trackHeight" : "MH 8/1/2021 18:57",
"update:" : "CL 8/2/2021 08:51",
"update:" : "SG 5/23/2022 18:40",
"updateExtent" : "MH 8/1/2021 18:58" } }
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"timebar",
"property",
"startTime",
"endTime" ],
"endTime",
"movingLine" ],
"name" : "AnimationsEditorTimeline",
"pools" : [
],
Expand Down

0 comments on commit edfd3b2

Please sign in to comment.