Skip to content

exportAnimation.jl bug fix from #144 juguma #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreaNeumayr merged 4 commits into from
Sep 28, 2026
Merged

exportAnimation.jl bug fix from #144 juguma #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd2cdd2
exportAnimation.jl bug fix from #144 juguma
AndreaNeumayr Sep 4, 2026
d324588
Merge remote-tracking branch 'origin/main' into an_issue144
AndreaNeumayr Sep 11, 2026
e5ffc9a
update test.yml
AndreaNeumayr Sep 11, 2026
8c80572
one example does not work under ubuntu
AndreaNeumayr Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
version:
- '1.10.0'
- '1.10'
os:
- ubuntu-latest
- windows-latest
Expand Down
17 changes: 9 additions & 8 deletions src/AnimationExport/exportAnimation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,16 +271,17 @@ function exportObject(object, elements, obj::Modia3D.Composition.Object3D, fileM
# overwrite materials of mesh object children
materialName = Modia3D.fullName(obj) * ".material"
for material in meshObject["materials"]
push!(material, "name" => materialName, "uuid" => name2uuid(materialName))
material["name"] = materialName
material["uuid"] = name2uuid(materialName)
if fileMesh.useMaterialColor
push!(material, "color" => colorNum(obj.visualMaterial.color[1], obj.visualMaterial.color[2], obj.visualMaterial.color[3]))
material["color"] = colorNum(obj.visualMaterial.color[1], obj.visualMaterial.color[2], obj.visualMaterial.color[3])
end
if fileMesh.doubleSided
push!(material, "side" => 2) # THREE.DoubleSide
material["side"] = 2 # THREE.DoubleSide
end
end
for child in (meshObject["object"])["children"]
push!(child, "material" => name2uuid(materialName))
child["material"] = name2uuid(materialName)
end
end

Expand All @@ -293,11 +294,11 @@ function exportObject(object, elements, obj::Modia3D.Composition.Object3D, fileM
end

function getObjectInfoMesh(obj, initPos, initRot, scale, R_obj, meshInfo)
push!(meshInfo, "name" => Modia3D.fullName(obj) )
meshInfo["name"] = Modia3D.fullName(obj)
delete!(meshInfo, "matrix")
push!(meshInfo, "position" => initPos )
push!(meshInfo, "rotation" => Modia3D.rot123fromR(R_obj*initRot) )
push!(meshInfo, "scale" => scale )
meshInfo["position"] = initPos
meshInfo["rotation"] = Modia3D.rot123fromR(R_obj*initRot)
meshInfo["scale"] = scale

return meshInfo
end
Expand Down
4 changes: 3 additions & 1 deletion test/includeTests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ end
Test.@testset "Segmented" begin
include(joinpath("Segmented", "TwoStageRocket3D.jl"))
if testsExtend >= normalTests
include(joinpath("Segmented", "YouBotDynamicState.jl"))
if Sys.iswindows()
include(joinpath("Segmented", "YouBotDynamicState.jl"))
end
include(joinpath("Segmented", "YouBotFixBox.jl"))
include(joinpath("Segmented", "YouBotFixSphere.jl"))
include(joinpath("Segmented", "ScenarioSegmentedCollisionOff.jl"))
Expand Down
Loading