-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
ccd8e93
commit e77c335
Showing
18 changed files
with
66 additions
and
78 deletions.
There are no files selected for viewing
5 changes: 3 additions & 2 deletions
5
packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/loadFrames.with..st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...class/instance/testLoadJsonCircleMorph.st → ...torTest.class/instance/testCircleMorph.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...lass/instance/testLoadJsonDefaultMorph.st → ...orTest.class/instance/testDefaultMorph.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 0 additions & 9 deletions
9
...mationsEditor-Tests.package/AnimationsEditorTest.class/instance/testLoadJsonLoadMorphs.st
This file was deleted.
Oops, something went wrong.
12 changes: 5 additions & 7 deletions
12
...ationsEditor-Tests.package/AnimationsEditorTest.class/instance/testLoadJsonTargetColor.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,12 @@ | ||
| initialize-release | ||
| loadJson | ||
| testLoadJsonTargetColor | ||
| | data morph morphProperty | | ||
|
|
||
| data := {{'properties' ->{{ | ||
| 'value' -> 'blue'. | ||
| 'name' -> 'color' | ||
| } as: Dictionary | ||
| }} as: Dictionary} as: Array. | ||
| data := {{'frame' -> 500 . 'properties' -> {{'value' -> 'blue' . 'name' -> 'color'} as: Dictionary}} as: Dictionary . {'frame' -> 1000 . 'properties' -> {{'value' -> 'lightGray' . 'name' -> 'color'} as: Dictionary}} as: Dictionary} as: Array. | ||
|
|
||
| morph := Morph new openInWorld. | ||
| morphProperty := self animationsEditorInstance addTargetMorph: morph. | ||
| self animationsEditorInstance loadFrames: data with: morphProperty. | ||
| self assert: (morphProperty subproperties at: 'color') targetColor = Color blue. | ||
| self assert: ((morphProperty subproperties at: 'color') targetValues at: 500) = 'blue'. | ||
| self assert: ((morphProperty subproperties at: 'color') targetValues at: 1000) = 'lightGray'. | ||
| morph abandon. |
15 changes: 5 additions & 10 deletions
15
...onsEditor-Tests.package/AnimationsEditorTest.class/instance/testLoadJsonTargetPosition.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,12 @@ | ||
| initialize-release | ||
| loadJson | ||
| testLoadJsonTargetPosition | ||
| | data morph morphProperty | | ||
|
|
||
| data := {{'properties' ->{{ | ||
| 'value' -> 48.0. | ||
| 'name' -> 'positionX' | ||
| } as: Dictionary. | ||
| { | ||
| 'value' -> 104 . | ||
| 'name' -> 'positionY' | ||
| } as: Dictionary}} as: Dictionary} as: Array. | ||
| data := {{'frame' -> 500. 'properties' -> {{'value' -> 48. 'name' -> 'positionX'} as: Dictionary. {'value' -> 104. 'name' -> 'positionY'} as: Dictionary}} as: Dictionary . {'frame' -> 1000. 'properties' -> {{'value' -> 3. 'name' -> 'positionX'} as: Dictionary. {'value' -> 42. 'name' -> 'positionY'} as: Dictionary}} as: Dictionary} as: Array. | ||
|
|
||
| morph := Morph new openInWorld. | ||
| morphProperty := self animationsEditorInstance addTargetMorph: morph. | ||
| self animationsEditorInstance loadFrames: data with: morphProperty. | ||
| self assert: (morphProperty subproperties at: 'position') targetPosition = (48@104). | ||
| self assert: ((morphProperty subproperties at: 'position') targetValues at: 500) = (48 @ 104). | ||
| self assert: ((morphProperty subproperties at: 'position') targetValues at: 1000) = (3 @ 42). | ||
| morph abandon. |
11 changes: 5 additions & 6 deletions
11
...onsEditor-Tests.package/AnimationsEditorTest.class/instance/testLoadJsonTargetRotation.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,12 @@ | ||
| initialize-release | ||
| loadJson | ||
| testLoadJsonTargetRotation | ||
| | data morph morphProperty | | ||
|
|
||
| data := {{'properties' ->{{ | ||
| 'value' -> 40 . | ||
| 'name' -> 'rotation' | ||
| }as: Dictionary}} as: Dictionary} as: Array. | ||
| data := {{'frame' -> 500. 'properties' -> {{'value' -> 40. 'name' -> 'rotation'} as: Dictionary}} as: Dictionary. {'frame' -> 1000. 'properties' -> {{'value' -> 80. 'name' -> 'rotation'} as: Dictionary}} as: Dictionary} as: Array. | ||
|
|
||
| morph := Morph new openInWorld. | ||
| morphProperty := self animationsEditorInstance addTargetMorph: morph. | ||
| self animationsEditorInstance loadFrames: data with: morphProperty. | ||
| self assert: (morphProperty subproperties at: 'rotation') targetRotation = 40. | ||
| self assert: ((morphProperty subproperties at: 'rotation') targetValues at: 500) = 40. | ||
| self assert: ((morphProperty subproperties at: 'rotation') targetValues at: 1000) = 80. | ||
| morph abandon. |
16 changes: 5 additions & 11 deletions
16
...mationsEditor-Tests.package/AnimationsEditorTest.class/instance/testLoadJsonTargetSize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,12 @@ | ||
| initialize-release | ||
| loadJson | ||
| testLoadJsonTargetSize | ||
| | data morph morphProperty | | ||
|
|
||
| data := {{'properties' ->{{ | ||
| 'value' -> 50 . | ||
| 'name' -> 'width' | ||
| } as: Dictionary. | ||
| { | ||
| 'value' -> 40 . | ||
| 'name' -> 'height' | ||
| } as: Dictionary | ||
| }} as: Dictionary} as: Array. | ||
| data := {{'frame' -> 500. 'properties' -> {{'value' -> 50. 'name' -> 'width'} as: Dictionary. {'value' -> 40. 'name' -> 'height'} as: Dictionary}} as: Dictionary. {'frame' -> 1000. 'properties' -> {{'value' -> 87. 'name' -> 'width'} as: Dictionary. {'value' -> 500. 'name' -> 'height'} as: Dictionary}} as: Dictionary} as: Array. | ||
|
|
||
| morph := Morph new openInWorld. | ||
| morphProperty := self animationsEditorInstance addTargetMorph: morph. | ||
| self animationsEditorInstance loadFrames: data with: morphProperty. | ||
| self assert: (morphProperty subproperties at: 'size') targetSize = (50@40). | ||
| self assert: ((morphProperty subproperties at: 'size') targetValues at: 500) = (50 @ 40). | ||
| self assert: ((morphProperty subproperties at: 'size') targetValues at: 1000) = (87 @ 500). | ||
| morph abandon. |
10 changes: 10 additions & 0 deletions
10
...ages/AnimationsEditor-Tests.package/AnimationsEditorTest.class/instance/testLoadMorphs.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| loadJson | ||
| testLoadMorphs | ||
| | morph data | | ||
|
|
||
| data := {{'type' -> 'Morph'. 'properties' -> {}. 'frames' -> {{'frame' -> 500. 'properties' -> {}} as: Dictionary}} as: Dictionary. {'type' -> 'Morph'. 'properties' -> {}. 'frames' -> {{'frame' -> 1000 . 'properties' -> {}} as: Dictionary}} as: Dictionary}. | ||
|
|
||
| morph := self animationsEditorInstance loadMorphs: data. | ||
| self assert: self animationsEditorInstance propertyList size = 4. | ||
| self animationsEditorInstance propertyList third targetMorph abandon. | ||
| self animationsEditorInstance propertyList fourth targetMorph abandon |
4 changes: 2 additions & 2 deletions
4
...st.class/instance/testLoadJsonStartEnd.st → ...orTest.class/instance/testLoadStartEnd.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ass/instance/testLoadJsonPropertyColor.st → ...ss/instance/testLoadStartPropertyColor.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| initialize-release | ||
| testLoadJsonPropertyColor | ||
| loadJson | ||
| testLoadStartPropertyColor | ||
| | morph data | | ||
|
|
||
| data := {{ | ||
|
|
||
4 changes: 2 additions & 2 deletions
4
.../instance/testLoadJsonPropertyPosition.st → ...instance/testLoadStartPropertyPosition.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
.../instance/testLoadJsonPropertyRotation.st → ...instance/testLoadStartPropertyRotation.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...lass/instance/testLoadJsonPropertySize.st → ...ass/instance/testLoadStartPropertySize.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| initialize-release | ||
| testLoadJsonPropertySize | ||
| loadJson | ||
| testLoadStartPropertySize | ||
| | morph data | | ||
|
|
||
| data := {{ | ||
|
|
||
4 changes: 2 additions & 2 deletions
4
...rTest.class/instance/testLoadJsonMorph.st → ...onsEditorTest.class/instance/testMorph.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...ss/instance/testLoadJsonRectangleMorph.st → ...Test.class/instance/testRectangleMorph.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters