Skip to content

Commit d839af4

Browse files
zferguszfergus
committed
Fixed broken JSON
1 parent cd431fa commit d839af4

16 files changed

+32
-48
lines changed

‎fixtures/2D/compactor.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.001,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
0.0
2121
],
2222
"coefficient_restitution": 1.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
5.0,

‎fixtures/2D/newtons-cradle/num_balls=5-num_points=8-cor=1.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
0.0
2121
],
2222
"coefficient_restitution": 1,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
5.5,

‎fixtures/2D/saw/interlocking-saws/num-teeth=100.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": -1,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.0,

‎fixtures/2D/saw/interlocking-saws/num-teeth=1000.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": -1,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.0,

‎fixtures/2D/stacking/line-stack/num_line=10-thickness=0.01-v0=-100.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
0
2121
],
2222
"coefficient_restitution": -1,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
5.0,

‎fixtures/2D/stacking/line-stack/num_line=10-thickness=0.01-v0=-1000.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
0
2121
],
2222
"coefficient_restitution": -1,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
5.0,

‎fixtures/2D/stacking/line-stack/num_line=10-thickness=0.01-v0=-10000.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
0
2121
],
2222
"coefficient_restitution": -1,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
5.0,

‎fixtures/2D/stacking/tower/num_blocks=2-cor=-1-x_offset=0.6.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-08,
@@ -21,8 +21,7 @@
2121
-9.81
2222
],
2323
"coefficient_restitution": -1,
24-
"rigid_bodies": [
25-
{
24+
"rigid_bodies": [{
2625
"vertices": [
2726
[
2827
0.5,

‎fixtures/2D/stacking/tower/num_blocks=2-cor=-1-x_offset=0.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-08,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": -1,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

‎fixtures/2D/stacking/tower/num_blocks=2-cor=1-x_offset=0.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-08,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": 1.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

‎fixtures/2D/stacking/tower/num_blocks=4-cor=-1-x_offset=0-rotated-falling.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": -1.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

‎fixtures/2D/stacking/tower/num_blocks=4-cor=-1-x_offset=0-rotated.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.1,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-08,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": -1.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

‎fixtures/2D/stacking/tower/num_blocks=4-cor=0-x_offset=0-falling.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": 0.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

‎fixtures/2D/stacking/tower/num_blocks=4-cor=0-x_offset=0-rotated-falling.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.01,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-06,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": 0.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

‎fixtures/2D/stacking/tower/num_blocks=4-cor=1-x_offset=0-rotated.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.1,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-08,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": 1.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

‎fixtures/2D/stacking/tower/num_blocks=4-cor=10-x_offset=0-rotated.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"timestep": 0.1,
55
"distance_barrier_constraint": {
66
"initial_barrier_activation_distance": 0.01,
7-
"detection_method": "hash_grid",
7+
"detection_method": "hash_grid"
88
},
99
"homotopy_solver": {
1010
"e_b": 1e-08,
@@ -20,8 +20,7 @@
2020
-9.81
2121
],
2222
"coefficient_restitution": 10.0,
23-
"rigid_bodies": [
24-
{
23+
"rigid_bodies": [{
2524
"vertices": [
2625
[
2726
0.5,

0 commit comments

Comments
 (0)