Merged PR 17: Implement rigid body Fix multiple bugs
Implement rigid body Fix saveload bug: having null elements Fix events being duplicated and not being removed
This commit is contained in:
Eric Nguyen
parent
d2e1d9f0a4
commit
616fe3e9ac
22 changed files with 804 additions and 95 deletions
436
src/tests/resources/rigidbodytest.json
Normal file
436
src/tests/resources/rigidbodytest.json
Normal file
|
|
@ -0,0 +1,436 @@
|
|||
{
|
||||
"history": [
|
||||
{
|
||||
"MainContainer": {
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "main",
|
||||
"TypeCounters": {}
|
||||
},
|
||||
{
|
||||
"LastAction": "Add container",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 75,
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "main",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Select container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 75,
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": "7",
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": "",
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": "2",
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": "20",
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": "200",
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": "2000",
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": "20000",
|
||||
"height": 100,
|
||||
"isRigidBody": false,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
},
|
||||
{
|
||||
"LastAction": "Change property of container Container-0",
|
||||
"MainContainer": {
|
||||
"children": [
|
||||
{
|
||||
"children": [],
|
||||
"properties": {
|
||||
"id": "Container-0",
|
||||
"parentId": "main",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"isRigidBody": true,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
},
|
||||
"userData": {
|
||||
"type": "Container"
|
||||
}
|
||||
}
|
||||
],
|
||||
"properties": {
|
||||
"id": "main",
|
||||
"parentId": "null",
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"width": 2000,
|
||||
"height": 100,
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
},
|
||||
"userData": {}
|
||||
},
|
||||
"SelectedContainerId": "Container-0",
|
||||
"TypeCounters": {
|
||||
"Container": 0
|
||||
}
|
||||
}
|
||||
],
|
||||
"historyCurrentStep": 10,
|
||||
"configuration": {
|
||||
"AvailableContainers": [
|
||||
{
|
||||
"Type": "Container",
|
||||
"Width": 75,
|
||||
"Height": 100,
|
||||
"Style": {
|
||||
"fillOpacity": 0,
|
||||
"stroke": "green"
|
||||
}
|
||||
}
|
||||
],
|
||||
"AvailableSymbols": [],
|
||||
"MainContainer": {
|
||||
"Type": "Container",
|
||||
"Width": 2000,
|
||||
"Height": 100,
|
||||
"Style": {
|
||||
"fillOpacity": 0,
|
||||
"stroke": "black"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue