Merge pull request #36 from ModiaSim/gh_enableGridAnimationExport

Enable Grid support in animation export

Author: AndreaNeumayr

src/AnimationExport/exportAnimation.jl

@@ -4,9 +4,11 @@ function name2uuid(name::String)
     return string(UUIDs.uuid5(u4, name))
 end
 
-const coSysMaterialRed   = (; name="coordinateSystem.red", uuid=name2uuid("coordinateSystem.red"), type="MeshPhongMaterial", color=((255*256 + 0)*256 + 0), opacity=1, transparent=false, shininess=0.5)
-const coSysMaterialGreen = (; name="coordinateSystem.green", uuid=name2uuid("coordinateSystem.green"), type="MeshPhongMaterial", color=((255*0 + 255)*256 + 0), opacity=1, transparent=false, shininess=0.5)
-const coSysMaterialBlue  = (; name="coordinateSystem.blue", uuid=name2uuid("coordinateSystem.blue"), type="MeshPhongMaterial", color=((255*0 + 0)*256 + 255), opacity=1, transparent=false, shininess=0.5)
+colorNum(red, green, blue) = ((red*256 + green)*256 + blue)
+
+const coSysMaterialRed   = (; name="coordinateSystem.red", uuid=name2uuid("coordinateSystem.red"), type="MeshPhongMaterial", color=colorNum(255, 0, 0), opacity=1, transparent=false, shininess=0.5)
+const coSysMaterialGreen = (; name="coordinateSystem.green", uuid=name2uuid("coordinateSystem.green"), type="MeshPhongMaterial", color=colorNum(0, 255, 0), opacity=1, transparent=false, shininess=0.5)
+const coSysMaterialBlue  = (; name="coordinateSystem.blue", uuid=name2uuid("coordinateSystem.blue"), type="MeshPhongMaterial", color=colorNum(0, 0, 255), opacity=1, transparent=false, shininess=0.5)
 
 
 function exportObject(object, elements, obj::Modia3D.Composition.Object3D, sphere::Modia3D.Shapes.Sphere, initPos, initRot)
@@ -197,6 +199,31 @@ function exportObject(object, elements, obj::Modia3D.Composition.Object3D, coord
     return (r_obj, R_obj)
 end
 
+function exportObject(object, elements, obj::Modia3D.Composition.Object3D, grid::Modia3D.Shapes.Grid, initPos, initRot)
+    r_obj = Modia3D.ZeroVector3D
+    R_obj = Shapes.rotateAxis2z(grid.axis, Modia3D.NullRotation)
+    name = Modia3D.fullName(obj)
+    geometryName = name * ".geometry"
+    array = []
+    for i in 0:Int(div(grid.length+1e-12, grid.distance))
+        x = i * grid.distance - grid.length/2
+        push!(array, x, -grid.width/2, 0)
+        push!(array, x,  grid.width/2, 0)
+    end
+    for i in 0:Int(div(grid.width+1e-12, grid.distance))
+        y = i * grid.distance - grid.width/2
+        push!(array, -grid.length/2, y, 0)
+        push!(array,  grid.length/2, y, 0)
+    end
+    position = (; itemSize=3, type="Float32Array", array=array)
+    geometry = (; name=geometryName, uuid=name2uuid(geometryName), type="BufferGeometry", data=(; attributes=(; position=position)))
+    materialName = name * ".material"
+    material = (; name=materialName, uuid=name2uuid(materialName), type="LineBasicMaterial", color=colorNum(0, 0, 255), linewidth=grid.lineWidth)
+    objectInfo = getObjectInfo(name, geometry, material, initPos, initRot, type="LineSegments", R_obj=R_obj)
+    printInfoToFile(object, elements, geometry, material, nothing, objectInfo)
+    return (r_obj, R_obj)
+end
+
 function printInfoToFile(object, elements, geometry, material, shape, objectInfo)
     push!(elements.geometries, geometry)
     if !isnothing(material)
@@ -249,8 +276,8 @@ function getObjectInfoMesh(obj, initPos, initRot, scale, R_obj, meshInfo)
     return meshInfo
 end
 
-function getObjectInfo(name, geometry, material, initPos, initRot; r_obj=Modia3D.ZeroVector3D, R_obj=Modia3D.NullRotation, scale=ones(3))
-    return (; name=name, uuid=name2uuid(name), type=:Mesh, geometry=get(geometry, :uuid, nothing), material=get(material, :uuid, ""), position=initPos+initRot'*r_obj, rotation=Modia3D.rot123fromR(R_obj*initRot), scale=scale)
+function getObjectInfo(name, geometry, material, initPos, initRot; type="Mesh", r_obj=Modia3D.ZeroVector3D, R_obj=Modia3D.NullRotation, scale=ones(3))
+    return (; name=name, uuid=name2uuid(name), type=type, geometry=get(geometry, :uuid, nothing), material=get(material, :uuid, ""), position=initPos+initRot'*r_obj, rotation=Modia3D.rot123fromR(R_obj*initRot), scale=scale)
 end
 
 printVisuMaterialToJSON(obj, visuMaterial) = nothing
@@ -302,6 +329,10 @@ function printObjectToJSON(object, elements, obj; initPos=obj.r_abs, initRot=obj
         coordinateSystem::Modia3D.Shapes.CoordinateSystem = obj.shape
         (r_obj, R_obj) = exportObject(object, elements, obj, coordinateSystem, initPos, initRot)
 
+    elseif shapeKind == Modia3D.GridKind
+        grid::Modia3D.Shapes.Grid = obj.shape
+        (r_obj, R_obj) = exportObject(object, elements, obj, grid, initPos, initRot)
+
     elseif shapeKind == Modia3D.FileMeshKind
         fileMesh::Modia3D.Shapes.FileMesh = obj.shape
         (r_obj, R_obj) = exportObject(object, elements, obj, fileMesh, initPos, initRot)

src/Shapes/shape.jl

@@ -37,8 +37,6 @@ The dimension directions depend on `axis` by circularly shift:
 |   2    |   z      |   x     |
 |   3    |   x      |   y     |
 
-# Notes
-- Grid is [not supported by animation export](https://github.com/ModiaSim/PrivateModia3D.jl/issues/77).
 """
 mutable struct Grid <: Modia3D.AbstractShape
     axis::Int