Merge pull request #128 from ModiaSim/an_updateModia3DInterface2

temporarily changes needed for Modia3D interface

Author: GerhardHippmann

src/Modia.jl

@@ -30,8 +30,34 @@ using Reexport
 @reexport using ModiaLang
 @reexport using ModiaLang.Unitful
 @reexport using ModiaLang.DifferentialEquations
+#@reexport using Modia3D
+
 const modelsPath = joinpath(ModiaLang.path, "models")
 
+# temporarily, the following code lines need to be deleted
+module Dummy
+    import Modia3D
+    using Modia3D.ModiaInterface
+    export Cone
+    export Beam
+    export Capsule
+    export Cylinder
+    export Box
+    export Ellipsoid
+    export Sphere
+    export ModelicaShape
+    export FileMesh
+    export Grid
+    export CoordinateSystem
+    export GearWheel
+    export SpringShape
+    export TextShape
+    export Font
+   # export VisualMaterial
+end
+@reexport using .Dummy
+
+
 include("Modia3D_Interface.jl")
 
 end

src/Modia3D_Interface.jl

@@ -33,23 +33,11 @@ Object3D(        ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Object3D{Fl
 Scene(           ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Scene{FloatType})                 , kwargs...)
 Visual(          ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Visual)                           , kwargs...)
 Solid(           ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Solid{FloatType})                 , kwargs...)
-Box(             ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Box{FloatType})                   , kwargs...)
-Beam(            ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Beam{FloatType})                  , kwargs...)
-Cylinder(        ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Cylinder{FloatType})              , kwargs...)
-Sphere(          ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Sphere{FloatType})                , kwargs...)
-Ellipsoid(       ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Ellipsoid{FloatType})             , kwargs...)
-Capsule(         ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Capsule{FloatType})               , kwargs...)
-Cone(            ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Cone{FloatType})                  , kwargs...)
-SpringShape(     ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Spring)                           , kwargs...)
-GearWheel(       ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.GearWheel)                        , kwargs...)
-Grid(            ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Grid)                             , kwargs...)
-VisualMaterial(  ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.VisualMaterial)                   , kwargs...)
+
+VisualMaterial(  ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Shapes.VisualMaterial)                   , kwargs...)
 MassProperties(  ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.MassProperties{FloatType})        , kwargs...)
-CoordinateSystem(; kwargs...) = Par(; _constructor = :(Modia.Modia3D.CoordinateSystem)                 , kwargs...)
-FileMesh(        ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.FileMesh)                         , kwargs...)
-Font(            ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Font)                             , kwargs...)
-TextShape(       ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.TextShape)                        , kwargs...)
-ModelicaShape(   ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.ModelicaShape)                    , kwargs...)
+
+
 Fix(             ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Fix{FloatType})                   , kwargs...)
 Bushing(         ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.Bushing{FloatType})               , kwargs...)
 SpringDamperPtP( ; kwargs...) = Par(; _constructor = :(Modia.Modia3D.SpringDamperPtP{FloatType})       , kwargs...)