Fix invalid indices in several camera test files #5

Merged
merged 1 commit into from Jul 13, 2012

Conversation

Projects
None yet
2 participants
@jterrace
Contributor

jterrace commented Jul 13, 2012

I think what happened here was that someone copied a geometry that originally had vertex, normal, and texcoord indices. You can see the original geometry in the file StandardDataSets/1_5/collada/library_animations/animation/asset/unit/unit_blessed.dae. When copying it over, they deleted the normal source and input and modified the indices. However, they removed the third index instead of the second - making the texcoord offset use the original's normal index values. This resulted in invalid indices into the texcoord array.

I took the original indices and removed the normal offset, putting the correct indices back in their place.

Fix invalid indices in several camera test files. Fixes #1.
I think what happened here was that someone copied a geometry that originally had vertex, normal, and texcoord indices. You can see the original geometry in the file StandardDataSets/1_5/collada/library_animations/animation/asset/unit/unit_blessed.dae. When copying it over, they deleted the normal source and input and modified the indices. However, they removed the third index instead of the second - making the texcoord offset use the original's normal index values. This resulted in invalid indices into the texcoord array.

I took the original indices and removed the normal offset, putting the correct indices back in their place.
@jterrace

This comment has been minimized.

Show comment
Hide comment
@jterrace

jterrace Jul 13, 2012

Contributor

I verified with pycollada that these are now valid files:

jterrace@frazzle:~/CTS$ python ~/pycollada/examples/recurse_check.py --show-summary StandardDataSets/collada/library_cameras/
'_reference_optics_orthographic_zfar_znear.dae'... SUCCESS
'_reference_optics_perspective_zfar_znear.dae'... SUCCESS
'_reference_orthographic_no_geometry.dae'... SUCCESS
'_reference_perspective_no_geometry.dae'... SUCCESS
'id_dash.dae'... SUCCESS
'id_period.dae'... SUCCESS
'id_underscore.dae'... SUCCESS
'optics_orthographic_xmag.dae'... SUCCESS
'optics_orthographic_xmag_aspect_ratio.dae'... SUCCESS
'optics_orthographic_xmag_ymag.dae'... SUCCESS
'optics_orthographic_ymag.dae'... SUCCESS
'optics_orthographic_ymag_aspect_ratio.dae'... SUCCESS
'optics_orthographic_zfar.dae'... SUCCESS
'optics_orthographic_znear.dae'... SUCCESS
'optics_perspective_xfov.dae'... SUCCESS
'optics_perspective_xfov_aspect_ratio.dae'... SUCCESS
'optics_perspective_xfov_yfov.dae'... SUCCESS
'optics_perspective_yfov.dae'... SUCCESS
'optics_perspective_yfov_aspect_ratio.dae'... SUCCESS
'optics_perspective_zfar.dae'... SUCCESS
'optics_perspective_znear.dae'... SUCCESS


Summary
=======
Files loaded successfully: 21
Files with warnings: 0
Files with errors: 0

Previously 18/21 were throwing errors.

Contributor

jterrace commented Jul 13, 2012

I verified with pycollada that these are now valid files:

jterrace@frazzle:~/CTS$ python ~/pycollada/examples/recurse_check.py --show-summary StandardDataSets/collada/library_cameras/
'_reference_optics_orthographic_zfar_znear.dae'... SUCCESS
'_reference_optics_perspective_zfar_znear.dae'... SUCCESS
'_reference_orthographic_no_geometry.dae'... SUCCESS
'_reference_perspective_no_geometry.dae'... SUCCESS
'id_dash.dae'... SUCCESS
'id_period.dae'... SUCCESS
'id_underscore.dae'... SUCCESS
'optics_orthographic_xmag.dae'... SUCCESS
'optics_orthographic_xmag_aspect_ratio.dae'... SUCCESS
'optics_orthographic_xmag_ymag.dae'... SUCCESS
'optics_orthographic_ymag.dae'... SUCCESS
'optics_orthographic_ymag_aspect_ratio.dae'... SUCCESS
'optics_orthographic_zfar.dae'... SUCCESS
'optics_orthographic_znear.dae'... SUCCESS
'optics_perspective_xfov.dae'... SUCCESS
'optics_perspective_xfov_aspect_ratio.dae'... SUCCESS
'optics_perspective_xfov_yfov.dae'... SUCCESS
'optics_perspective_yfov.dae'... SUCCESS
'optics_perspective_yfov_aspect_ratio.dae'... SUCCESS
'optics_perspective_zfar.dae'... SUCCESS
'optics_perspective_znear.dae'... SUCCESS


Summary
=======
Files loaded successfully: 21
Files with warnings: 0
Files with errors: 0

Previously 18/21 were throwing errors.

fabrobinet pushed a commit that referenced this pull request Jul 13, 2012

fabrobinet
Merge pull request #5 from jterrace/master
Fix invalid indices in several camera test files

@fabrobinet fabrobinet merged commit 9aa4b4d into KhronosGroup:master Jul 13, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment