Skip to content

Commit dd448d3

Browse files
committed
update snapshots
1 parent be9f20d commit dd448d3

20 files changed

Lines changed: 3880 additions & 2612 deletions

test/ecs/composites/cool-sphere.composite.scene-snapshot.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,7 @@
2020
"parent": 512
2121
}
2222
},
23-
<<<<<<< HEAD
24-
<<<<<<< HEAD
25-
"core-schema::Network-Entity": {},
26-
"core-schema::Network-Parent": {},
27-
=======
28-
>>>>>>> 2cfa6733 (fix: snapshots)
2923
"composite::root": {},
30-
=======
31-
"composite::root": {
32-
"512": {
33-
"src": "cool-sphere.composite",
34-
"entities": [
35-
{
36-
"src": 0,
37-
"dest": 512
38-
},
39-
{
40-
"src": 512,
41-
"dest": 513
42-
}
43-
]
44-
}
45-
},
46-
>>>>>>> 67c518f0 (update snapshots)
4724
"core::MeshRenderer": {
4825
"513": {
4926
"mesh": {

test/ecs/composites/cube-scene.composite.scene-snapshot.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,7 @@
2020
"parent": 512
2121
}
2222
},
23-
<<<<<<< HEAD
24-
<<<<<<< HEAD
25-
"core-schema::Network-Entity": {},
26-
"core-schema::Network-Parent": {},
27-
=======
28-
>>>>>>> 2cfa6733 (fix: snapshots)
2923
"composite::root": {},
30-
=======
31-
"composite::root": {
32-
"512": {
33-
"src": "cube-scene.composite",
34-
"entities": [
35-
{
36-
"src": 0,
37-
"dest": 512
38-
},
39-
{
40-
"src": 512,
41-
"dest": 513
42-
}
43-
]
44-
}
45-
},
46-
>>>>>>> 67c518f0 (update snapshots)
4724
"core::MeshRenderer": {
4825
"513": {
4926
"mesh": {
Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,4 @@
11
{
22
"core::Transform": {},
3-
<<<<<<< HEAD
4-
<<<<<<< HEAD
5-
"core-schema::Network-Entity": {},
6-
"core-schema::Network-Parent": {},
7-
=======
8-
>>>>>>> 2cfa6733 (fix: snapshots)
93
"composite::root": {}
10-
=======
11-
"composite::root": {
12-
"512": {
13-
"src": "empty.composite",
14-
"entities": [
15-
{
16-
"src": 0,
17-
"dest": 512
18-
}
19-
]
20-
}
21-
}
22-
>>>>>>> 67c518f0 (update snapshots)
234
}

test/ecs/composites/one-transform.composite.scene-snapshot.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,5 @@
2020
"parent": 512
2121
}
2222
},
23-
<<<<<<< HEAD
24-
<<<<<<< HEAD
25-
"core-schema::Network-Entity": {},
26-
"core-schema::Network-Parent": {},
27-
=======
28-
>>>>>>> 2cfa6733 (fix: snapshots)
2923
"composite::root": {}
30-
=======
31-
"composite::root": {
32-
"512": {
33-
"src": "one-transform.composite",
34-
"entities": [
35-
{
36-
"src": 0,
37-
"dest": 512
38-
},
39-
{
40-
"src": 518,
41-
"dest": 513
42-
}
43-
]
44-
}
45-
}
46-
>>>>>>> 67c518f0 (update snapshots)
4724
}

test/ecs/composites/parented-transform.composite.scene-snapshot.json

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,34 +39,7 @@
3939
"parent": 513
4040
}
4141
},
42-
<<<<<<< HEAD
43-
<<<<<<< HEAD
44-
"core-schema::Network-Entity": {},
45-
"core-schema::Network-Parent": {},
46-
=======
47-
>>>>>>> 2cfa6733 (fix: snapshots)
4842
"composite::root": {},
49-
=======
50-
"composite::root": {
51-
"512": {
52-
"src": "parented-transform.composite",
53-
"entities": [
54-
{
55-
"src": 0,
56-
"dest": 512
57-
},
58-
{
59-
"src": 518,
60-
"dest": 513
61-
},
62-
{
63-
"src": 519,
64-
"dest": 514
65-
}
66-
]
67-
}
68-
},
69-
>>>>>>> 67c518f0 (update snapshots)
7043
"custom-parenter": {
7144
"513": {
7245
"customParent": 512,

test/ecs/composites/relative/second-level/one-transform.composite.scene-snapshot.json

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,5 @@
2020
"parent": 512
2121
}
2222
},
23-
<<<<<<< HEAD
24-
<<<<<<< HEAD
25-
"core-schema::Network-Entity": {},
26-
"core-schema::Network-Parent": {},
27-
=======
28-
>>>>>>> 2cfa6733 (fix: snapshots)
2923
"composite::root": {}
30-
=======
31-
"composite::root": {
32-
"512": {
33-
"src": "relative/second-level/one-transform.composite",
34-
"entities": [
35-
{
36-
"src": 0,
37-
"dest": 512
38-
},
39-
{
40-
"src": 518,
41-
"dest": 513
42-
}
43-
]
44-
}
45-
}
46-
>>>>>>> 67c518f0 (update snapshots)
4724
}
-1.26 KB
Binary file not shown.

0 commit comments

Comments
 (0)