Merge pull request #37 from ModiaSim/an_initializeScene

An initialize scene

Author: GerhardHippmann

src/Composition/_module.jl

@@ -45,7 +45,7 @@ export deleteMaterialLastContactDictContactEnd
 
 export NoGravityField, UniformGravityField, PointGravityField, gravityAcceleration
 export G, EarthMass, EarthRadius
-export Scene, SceneOptions
+export Scene
 export upwardsDirection, cameraPosition
 export animationData, animationStep
 

src/Composition/dynamicCollision.jl

@@ -189,7 +189,7 @@ function visualizeContactAndSupportPoints(ch, world)
     end
 end
 
-printWarnContSupPoints(nVisualContSupPoints) = @warn("If all contact points and/or support points should be visualized please set nVisualContSupPoints = $nVisualContSupPoints in SceneOptions.")
+printWarnContSupPoints(nVisualContSupPoints) = @warn("If all contact points and/or support points should be visualized please set nVisualContSupPoints = $nVisualContSupPoints in Scene.")
 
 # the sphere is visible and its absolute position is updated (this point was computed by the mpr algorithm)
 function setVisualizationContactProperties!(obj::Composition.Object3D, transparency::Float64, point::SVector{3,Float64})

src/Composition/dynamics.jl

@@ -6,8 +6,8 @@ function getJointsAndObject3DsWithoutParents!(evaluatedParameters,
         if typeof(value) == Object3D
             if value.parent === value
                 push!(object3DWithoutParents, value)
-            elseif typeof(value.feature) == Modia3D.Composition.SceneOptions
-                error(value.path, ": Object3D has a parent and defines SceneOptions!")
+            elseif typeof(value.feature) == Modia3D.Composition.Scene
+                error(value.path, ": Object3D has a parent and defines Scene!")
             end
 
         elseif typeof(value) <: Modia3D.AbstractJoint
@@ -66,10 +66,10 @@ end
 
 
 function initAnalysis2!(world)
-    # Construct Scene(..) object
+    # use Scene(..) of world object
     Modia3D.Composition.EmptyObject3DFeature
-    if typeof(world.feature) <: Modia3D.SceneOptions
-        scene = Modia3D.Scene(world.feature)
+    if typeof(world.feature) <: Modia3D.Scene
+        scene = world.feature
     else
         scene = Modia3D.Scene()
     end
@@ -150,9 +150,11 @@ function setModiaJointVariables!(id::Int, _leq_mode, instantiatedModel::ModiaLan
             separateObjects[id] = mbs
 
             # Print
+            #=
             if false
                 printScene(scene)
             end
+            =#
 
             if scene.visualize
                 TimerOutputs.@timeit instantiatedModel.timer "Modia3D_0 initializeVisualization" Modia3D.Composition.initializeVisualization(Modia3D.renderer[1], scene.allVisuElements)

src/Composition/handler.jl

@@ -299,8 +299,7 @@ function build_superObjs!(scene::Scene, world::Object3D)::Nothing
 end
 
 
-function visualizeWorld!(world::Object3D; sceneOptions = SceneOptions())::Nothing
-    scene = Scene(sceneOptions)
+function visualizeWorld!(world::Object3D; scene = Scene())::Nothing
     scene.analysis = Modia3D.KinematicAnalysis
     initAnalysis!(world, scene)
     updatePosition!(world)
@@ -400,7 +399,7 @@ function chooseAndBuildUpTree(world::Object3D, scene::Scene)
     else
         build_tree!(scene, world)
         if scene.options.enableContactDetection
-            error("Collision handling is only possible with the optimized structure. Please set useOptimizedStructure = true in Modia3D.SceneOptions.")
+            error("Collision handling is only possible with the optimized structure. Please set useOptimizedStructure = true in Modia3D.Scene.")
         end
     end
     if length(scene.allVisuElements) > 0

src/Composition/object3D.jl

@@ -108,7 +108,7 @@ mutable struct Object3D <: Modia3D.AbstractObject3D
     I_CM::SMatrix{3,3,Float64,9}  # Inertia matrix at Center of Mass resolved in a frame in the center of mass that is parallel to Object3D in [kg*m^2]
 
     # Additional information associated with Object3D
-    feature::Union{Modia3D.AbstractObject3DFeature, Modia3D.AbstractSceneOptions}  # Optional feature associated with Object3D
+    feature::Union{Modia3D.AbstractObject3DFeature, Modia3D.AbstractScene}  # Optional feature associated with Object3D
     twoObject3Dobject::Vector{Modia3D.AbstractTwoObject3DObject}  # Optional AbstractTwoObject3DObject object associated with Object3D
     hasCutJoint::Bool          # = true if it has a cut joint
     hasForceElement::Bool      # = true if it has a force element
@@ -123,7 +123,7 @@ mutable struct Object3D <: Modia3D.AbstractObject3D
 
     # = True: Coordinate system of Object3D is always visualized
     # = False: Coordinate system of Object3D is never visualized
-    # = Inherited: Coordinate system of Object3D is visualized, if SceneOptions(visualizeFrames=true)
+    # = Inherited: Coordinate system of Object3D is visualized, if Scene(visualizeFrames=true)
     visualizeFrame::Modia3D.Ternary
     visualizationFrame::Vector{Object3D} # If to be visualized, the Object3D holding the coordinate system.
 
@@ -496,7 +496,7 @@ hasParent(            obj::Object3D) = !(obj.parent === obj)
 hasNoParent(          obj::Object3D) =   obj.parent === obj
 hasChildren(          obj::Object3D) = length(obj.children) > 0
 hasNoChildren(        obj::Object3D) = length(obj.children) == 0
-isWorld(              obj::Object3D) = hasNoParent(obj) && typeof(obj.feature) == Modia3D.SceneOptions
+isWorld(              obj::Object3D) = hasNoParent(obj) && typeof(obj.feature) == Modia3D.Scene
 isNotWorld(           obj::Object3D) = !(isWorld(obj))
 isMovable(            obj::Object3D) = obj.interactionManner.movable
 isLockable(           obj::Object3D) = obj.interactionManner.lockable
@@ -517,13 +517,13 @@ objectHasMovablePos(  obj::Object3D) = !isnothing(obj.interactionManner.movableP
 
 featureHasMass(obj::Object3D) = featureHasMass(obj.feature)
 featureHasMass(feature::Modia3D.AbstractObject3DFeature) = false
-featureHasMass(feature::Modia3D.AbstractSceneOptions) = false
+featureHasMass(feature::Modia3D.AbstractScene) = false
 featureHasMass(feature::Shapes.Solid)                 = !isnothing(feature.massProperties)
 
 isVisible(obj::Object3D, renderer::Modia3D.AbstractRenderer) = isVisible(obj.feature, renderer)
 isVisible(feature::Modia3D.AbstractObject3DFeature, renderer::Modia3D.AbstractRenderer) = false
 
-isVisible(feature::Modia3D.AbstractSceneOptions, renderer::Modia3D.AbstractRenderer) = false
+isVisible(feature::Modia3D.AbstractScene, renderer::Modia3D.AbstractRenderer) = false
 
 canCollide(feature::Modia3D.AbstractObject3DFeature) = false