Skip to content
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.

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

Fix malformed irr files #5182

Merged
merged 4 commits into from Jul 18, 2023

Conversation

tellypresence
Copy link
Contributor

@tellypresence tellypresence commented Jul 15, 2023

Partial fix for #5171

Historical note: at this time UTF16 IRR model loading is completely broken. The UTF16 files have been edited in lock-step with their UTF8 counterparts, but it was not possible to test the UTF16 files when this PR was submitted.
Changes in this PR

test/models/IRR/scenegraphAnim.irr
test/models/IRR/scenegraphAnim_UTF16LE.irr
Fix typo which was causing malformed xml. After this fix, the UTF8 file still fails to load due to Validation failed: Empty node animation channel

test/models/IRR/scenegraphAnimMod.irr
test/models/IRR/scenegraphAnimMod_UTF16LE.irr
New files which slightly modify the original 2 files:

  • disable 3 problematic animation blocks
  • change dwarf mesh type to "animatedMesh"

The UTF8 test/models/IRR/scenegraphAnimMod.irr now successfully loads and contains cellar and dwarf meshes, plus a cube and two sphere primitives:
assimp_pr_5182_sceneGraphAnimMod_cellar_dwarf_cube_2_spheres

Copy link
Member

@kimkulling kimkulling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work.

@kimkulling kimkulling merged commit bf7ccb6 into assimp:master Jul 18, 2023
11 checks passed
@kimkulling
Copy link
Member

Merged, thanks a lot for your contributions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants