Skip to content

Commit

Permalink
Add json files for AnimationExport
Browse files Browse the repository at this point in the history
- Add three.js JSON Object Scene files of pcm surfaces for AnimationExport
- Remove unstable reference results of test TwoCollidingBoxes
- Update release notes
- Update .gitignore
  • Loading branch information
GerhardHippmann committed Nov 2, 2023
1 parent c8d4b5e commit 4657238
Show file tree
Hide file tree
Showing 11 changed files with 528 additions and 130 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
docs/build/
docs/site/
.vscode/
*.json
/*.json
12 changes: 10 additions & 2 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,17 @@ julia -JModia3D_sysimage.so (otherwise)

## Release Notes

### Forthcoming version

- Add Force Element PolygonalContactModel and tests
- Add Result Element infrastructure and Result Element ContactResult
- Bugfix: Correct parent Object3D torque calculation for Fix Joint with non-zero rotation
- Bugfix: Enable AnimationExport in case of no renderer available


### Version 0.12.1

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

- Requires Modia 0.10.0. Some internal interfaces have been changed
(should not have an influence on user models).


### Version 0.11.2

Expand Down
71 changes: 71 additions & 0 deletions objects/pcm/bubble.json

Large diffs are not rendered by default.

71 changes: 71 additions & 0 deletions objects/pcm/fractal_terrain.json

Large diffs are not rendered by default.

71 changes: 71 additions & 0 deletions objects/pcm/funnel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"metadata": {
"version": 4.5,
"type": "Object",
"generator": "Object3D.toJSON"
},
"geometries": [
{
"uuid": "C6FA521A-A69D-4A1A-9699-24E1BA170179",
"type": "BufferGeometry",
"data": {
"attributes": {
"position": {
"itemSize": 3,
"type": "Float32Array",
"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],
"normalized": false
},
"normal": {
"itemSize": 3,
"type": "Float32Array",
"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],
"normalized": false
}
},
"boundingSphere": {
"center": [0,0,0.25],
"radius": 1.4361406616345072
}
}
}],
"materials": [
{
"uuid": "D93115E2-AFCD-43D5-8D57-D4EC0DAA5CF0",
"type": "MeshPhongMaterial",
"color": 16777215,
"emissive": 0,
"specular": 1118481,
"shininess": 30,
"reflectivity": 1,
"refractionRatio": 0.98,
"depthFunc": 3,
"depthTest": true,
"depthWrite": true,
"colorWrite": true,
"stencilWrite": false,
"stencilWriteMask": 255,
"stencilFunc": 519,
"stencilRef": 0,
"stencilFuncMask": 255,
"stencilFail": 7680,
"stencilZFail": 7680,
"stencilZPass": 7680
}],
"object": {
"uuid": "09D405B0-87A3-4DE1-8DFB-182EDCB3220F",
"type": "Group",
"name": "funnel.obj",
"layers": 1,
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],
"children": [
{
"uuid": "3330825D-68E7-4565-8CEB-14A126DF0008",
"type": "Mesh",
"layers": 1,
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],
"geometry": "C6FA521A-A69D-4A1A-9699-24E1BA170179",
"material": "D93115E2-AFCD-43D5-8D57-D4EC0DAA5CF0"
}]
}
}
78 changes: 78 additions & 0 deletions objects/pcm/scout_foot.json

Large diffs are not rendered by default.

46 changes: 46 additions & 0 deletions objects/pcm/sphere.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"metadata": {
"version": 4.5,
"type": "Object",
"generator": "Object3D.toJSON"
},
"geometries": [
{
"uuid": "FA4052EC-E236-4AC5-9EF4-155B2F7B0208",
"type": "IcosahedronGeometry",
"radius": 1,
"detail": 4
}],
"materials": [
{
"uuid": "3E51FF3E-5EE8-4C37-BC6E-585738EB5DF0",
"type": "MeshStandardMaterial",
"color": 16711680,
"roughness": 1,
"metalness": 0,
"emissive": 16711680,
"envMapIntensity": 1,
"depthFunc": 3,
"depthTest": true,
"depthWrite": true,
"colorWrite": true,
"stencilWrite": false,
"stencilWriteMask": 255,
"stencilFunc": 519,
"stencilRef": 0,
"stencilFuncMask": 255,
"stencilFail": 7680,
"stencilZFail": 7680,
"stencilZPass": 7680,
"wireframe": true
}],
"object": {
"uuid": "B8724659-1303-4DCA-A33D-8D8FB575CD58",
"type": "Mesh",
"name": "Icosahedron",
"layers": 1,
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1],
"geometry": "FA4052EC-E236-4AC5-9EF4-155B2F7B0208",
"material": "3E51FF3E-5EE8-4C37-BC6E-585738EB5DF0"
}
}
51 changes: 51 additions & 0 deletions objects/pcm/torus.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"metadata": {
"version": 4.5,
"type": "Object",
"generator": "Object3D.toJSON"
},
"geometries": [
{
"uuid": "35E91A54-2CB3-4A63-81AC-ECB78E05AA52",
"type": "TorusGeometry",
"radius": 1,
"tube": 0.3,
"radialSegments": 32,
"tubularSegments": 64,
"arc": 6.283185307179586
}],
"materials": [
{
"uuid": "B93D3D7F-D461-4FE2-98D6-50BF723A72F0",
"type": "MeshStandardMaterial",
"color": 790015,
"roughness": 1,
"metalness": 0,
"emissive": 0,
"emissiveIntensity": 0.9,
"envMapIntensity": 1,
"refractionRatio": 0.98,
"depthFunc": 3,
"depthTest": true,
"depthWrite": true,
"colorWrite": true,
"stencilWrite": false,
"stencilWriteMask": 255,
"stencilFunc": 519,
"stencilRef": 0,
"stencilFuncMask": 255,
"stencilFail": 7680,
"stencilZFail": 7680,
"stencilZPass": 7680,
"flatShading": true
}],
"object": {
"uuid": "2F84BC80-23E2-4D53-A4AF-7DE9F9A0E364",
"type": "Mesh",
"name": "Torus",
"layers": 1,
"matrix": [1,0,0,0,0,1,0,0,0,0,1,0,0,-0.04687116957104298,0,1],
"geometry": "35E91A54-2CB3-4A63-81AC-ECB78E05AA52",
"material": "B93D3D7F-D461-4FE2-98D6-50BF723A72F0"
}
}
Loading

0 comments on commit 4657238

Please sign in to comment.