Skip to content

Commit 4657238

Browse files
Add json files for AnimationExport
- Add three.js JSON Object Scene files of pcm surfaces for AnimationExport - Remove unstable reference results of test TwoCollidingBoxes - Update release notes - Update .gitignore
1 parent c8d4b5e commit 4657238

File tree

11 files changed

+528
-130
lines changed

11 files changed

+528
-130
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
docs/build/
33
docs/site/
44
.vscode/
5-
*.json
5+
/*.json

docs/src/index.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,17 @@ julia -JModia3D_sysimage.so (otherwise)
9393

9494
## Release Notes
9595

96+
### Forthcoming version
97+
98+
- Add Force Element PolygonalContactModel and tests
99+
- Add Result Element infrastructure and Result Element ContactResult
100+
- Bugfix: Correct parent Object3D torque calculation for Fix Joint with non-zero rotation
101+
- Bugfix: Enable AnimationExport in case of no renderer available
102+
103+
96104
### Version 0.12.1
97105

98-
- Adapted to Modia 0.12.0 (arguments of buildFunction in ModiaInterface had been changed,
106+
- Adapted to Modia 0.12.0 (arguments of buildFunction in ModiaInterface had been changed,
99107
as well as function names to define/access variables of built-in components)
100108
- Absolute position (`r_abs`) and orientation (`R_abs`) of visible shapes are stored in the result
101109
data structure and can be plotted (see Modia3D/test/Basid/Pendulum.jl, Modia3D/test/Segmented/TwoStageRocket3D.jl)
@@ -124,7 +132,7 @@ julia -JModia3D_sysimage.so (otherwise)
124132

125133
- Requires Modia 0.10.0. Some internal interfaces have been changed
126134
(should not have an influence on user models).
127-
135+
128136

129137
### Version 0.11.2
130138

objects/pcm/bubble.json

Lines changed: 71 additions & 0 deletions
Large diffs are not rendered by default.

objects/pcm/fractal_terrain.json

Lines changed: 71 additions & 0 deletions
Large diffs are not rendered by default.

objects/pcm/funnel.json

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"metadata": {
3+
"version": 4.5,
4+
"type": "Object",
5+
"generator": "Object3D.toJSON"
6+
},
7+
"geometries": [
8+
{
9+
"uuid": "C6FA521A-A69D-4A1A-9699-24E1BA170179",
10+
"type": "BufferGeometry",
11+
"data": {
12+
"attributes": {
13+
"position": {
14+
"itemSize": 3,
15+
"type": "Float32Array",
16+
"array": [0,0,0,1,1,0.5,-1,1,0.5,0,0,0,-1,1,0.5,-1,-1,0.5,0,0,0,-1,-1,0.5,1,-1,0.5,0,0,0,1,-1,0.5,1,1,0.5],
17+
"normalized": false
18+
},
19+
"normal": {
20+
"itemSize": 3,
21+
"type": "Float32Array",
22+
"array": [0,-0.4472135901451111,0.8944271802902222,0,-0.4472135901451111,0.8944271802902222,0,-0.4472135901451111,0.8944271802902222,0.4472135901451111,0,0.8944271802902222,0.4472135901451111,0,0.8944271802902222,0.4472135901451111,0,0.8944271802902222,0,0.4472135901451111,0.8944271802902222,0,0.4472135901451111,0.8944271802902222,0,0.4472135901451111,0.8944271802902222,-0.4472135901451111,0,0.8944271802902222,-0.4472135901451111,0,0.8944271802902222,-0.4472135901451111,0,0.8944271802902222],
23+
"normalized": false
24+
}
25+
},
26+
"boundingSphere": {
27+
"center": [0,0,0.25],
28+
"radius": 1.4361406616345072
29+
}
30+
}
31+
}],
32+
"materials": [
33+
{
34+
"uuid": "D93115E2-AFCD-43D5-8D57-D4EC0DAA5CF0",
35+
"type": "MeshPhongMaterial",
36+
"color": 16777215,
37+
"emissive": 0,
38+
"specular": 1118481,
39+
"shininess": 30,
40+
"reflectivity": 1,
41+
"refractionRatio": 0.98,
42+
"depthFunc": 3,
43+
"depthTest": true,
44+
"depthWrite": true,
45+
"colorWrite": true,
46+
"stencilWrite": false,
47+
"stencilWriteMask": 255,
48+
"stencilFunc": 519,
49+
"stencilRef": 0,
50+
"stencilFuncMask": 255,
51+
"stencilFail": 7680,
52+
"stencilZFail": 7680,
53+
"stencilZPass": 7680
54+
}],
55+
"object": {
56+
"uuid": "09D405B0-87A3-4DE1-8DFB-182EDCB3220F",
57+
"type": "Group",
58+
"name": "funnel.obj",
59+
"layers": 1,
60+
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],
61+
"children": [
62+
{
63+
"uuid": "3330825D-68E7-4565-8CEB-14A126DF0008",
64+
"type": "Mesh",
65+
"layers": 1,
66+
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],
67+
"geometry": "C6FA521A-A69D-4A1A-9699-24E1BA170179",
68+
"material": "D93115E2-AFCD-43D5-8D57-D4EC0DAA5CF0"
69+
}]
70+
}
71+
}

objects/pcm/scout_foot.json

Lines changed: 78 additions & 0 deletions
Large diffs are not rendered by default.

objects/pcm/sphere.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"metadata": {
3+
"version": 4.5,
4+
"type": "Object",
5+
"generator": "Object3D.toJSON"
6+
},
7+
"geometries": [
8+
{
9+
"uuid": "FA4052EC-E236-4AC5-9EF4-155B2F7B0208",
10+
"type": "IcosahedronGeometry",
11+
"radius": 1,
12+
"detail": 4
13+
}],
14+
"materials": [
15+
{
16+
"uuid": "3E51FF3E-5EE8-4C37-BC6E-585738EB5DF0",
17+
"type": "MeshStandardMaterial",
18+
"color": 16711680,
19+
"roughness": 1,
20+
"metalness": 0,
21+
"emissive": 16711680,
22+
"envMapIntensity": 1,
23+
"depthFunc": 3,
24+
"depthTest": true,
25+
"depthWrite": true,
26+
"colorWrite": true,
27+
"stencilWrite": false,
28+
"stencilWriteMask": 255,
29+
"stencilFunc": 519,
30+
"stencilRef": 0,
31+
"stencilFuncMask": 255,
32+
"stencilFail": 7680,
33+
"stencilZFail": 7680,
34+
"stencilZPass": 7680,
35+
"wireframe": true
36+
}],
37+
"object": {
38+
"uuid": "B8724659-1303-4DCA-A33D-8D8FB575CD58",
39+
"type": "Mesh",
40+
"name": "Icosahedron",
41+
"layers": 1,
42+
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],
43+
"geometry": "FA4052EC-E236-4AC5-9EF4-155B2F7B0208",
44+
"material": "3E51FF3E-5EE8-4C37-BC6E-585738EB5DF0"
45+
}
46+
}

objects/pcm/torus.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"metadata": {
3+
"version": 4.5,
4+
"type": "Object",
5+
"generator": "Object3D.toJSON"
6+
},
7+
"geometries": [
8+
{
9+
"uuid": "35E91A54-2CB3-4A63-81AC-ECB78E05AA52",
10+
"type": "TorusGeometry",
11+
"radius": 1,
12+
"tube": 0.3,
13+
"radialSegments": 32,
14+
"tubularSegments": 64,
15+
"arc": 6.283185307179586
16+
}],
17+
"materials": [
18+
{
19+
"uuid": "B93D3D7F-D461-4FE2-98D6-50BF723A72F0",
20+
"type": "MeshStandardMaterial",
21+
"color": 790015,
22+
"roughness": 1,
23+
"metalness": 0,
24+
"emissive": 0,
25+
"emissiveIntensity": 0.9,
26+
"envMapIntensity": 1,
27+
"refractionRatio": 0.98,
28+
"depthFunc": 3,
29+
"depthTest": true,
30+
"depthWrite": true,
31+
"colorWrite": true,
32+
"stencilWrite": false,
33+
"stencilWriteMask": 255,
34+
"stencilFunc": 519,
35+
"stencilRef": 0,
36+
"stencilFuncMask": 255,
37+
"stencilFail": 7680,
38+
"stencilZFail": 7680,
39+
"stencilZPass": 7680,
40+
"flatShading": true
41+
}],
42+
"object": {
43+
"uuid": "2F84BC80-23E2-4D53-A4AF-7DE9F9A0E364",
44+
"type": "Mesh",
45+
"name": "Torus",
46+
"layers": 1,
47+
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,-0.04687116957104298,0,1],
48+
"geometry": "35E91A54-2CB3-4A63-81AC-ECB78E05AA52",
49+
"material": "B93D3D7F-D461-4FE2-98D6-50BF723A72F0"
50+
}
51+
}

0 commit comments

Comments
 (0)