diff --git a/io_scene_fbx/fbx_utils.py b/io_scene_fbx/fbx_utils.py index d661cea234791242767836d43e05d01c5b7ff9bb..b751025c0c9a09aff79f40e3aea74ca2d8a0e1ec 100644 --- a/io_scene_fbx/fbx_utils.py +++ b/io_scene_fbx/fbx_utils.py @@ -100,31 +100,30 @@ FBX_LIGHT_DECAY_TYPES = { RIGHT_HAND_AXES = { # Up, Front -> FBX values (tuples of (axis, sign), Up, Front, Coord). - # Note: Since we always stay in right-handed system, third coord sign is always positive! - ('X', 'Y'): ((0, 1), (1, -1), (2, 1)), - ('X', '-Y'): ((0, 1), (1, 1), (2, 1)), - ('X', 'Z'): ((0, 1), (2, -1), (1, 1)), - ('X', '-Z'): ((0, 1), (2, 1), (1, 1)), - ('-X', 'Y'): ((0, -1), (1, -1), (2, 1)), - ('-X', '-Y'): ((0, -1), (1, 1), (2, 1)), - ('-X', 'Z'): ((0, -1), (2, -1), (1, 1)), - ('-X', '-Z'): ((0, -1), (2, 1), (1, 1)), - ('Y', 'X'): ((1, 1), (0, -1), (2, 1)), - ('Y', '-X'): ((1, 1), (0, 1), (2, 1)), - ('Y', 'Z'): ((1, 1), (2, -1), (0, 1)), - ('Y', '-Z'): ((1, 1), (2, 1), (0, 1)), - ('-Y', 'X'): ((1, -1), (0, -1), (2, 1)), - ('-Y', '-X'): ((1, -1), (0, 1), (2, 1)), - ('-Y', 'Z'): ((1, -1), (2, -1), (0, 1)), - ('-Y', '-Z'): ((1, -1), (2, 1), (0, 1)), - ('Z', 'X'): ((2, 1), (0, -1), (1, 1)), - ('Z', '-X'): ((2, 1), (0, 1), (1, 1)), - ('Z', 'Y'): ((2, 1), (1, -1), (0, 1)), # Blender system! - ('Z', '-Y'): ((2, 1), (1, 1), (0, 1)), - ('-Z', 'X'): ((2, -1), (0, -1), (1, 1)), - ('-Z', '-X'): ((2, -1), (0, 1), (1, 1)), - ('-Z', 'Y'): ((2, -1), (1, -1), (0, 1)), - ('-Z', '-Y'): ((2, -1), (1, 1), (0, 1)), + ('X', 'Y'): ((0, 1), (1, 1), (2, 1)), + ('X', '-Y'): ((0, 1), (1, -1), (2, -1)), + ('X', 'Z'): ((0, 1), (2, 1), (1, -1)), + ('X', '-Z'): ((0, 1), (2, -1), (1, 1)), + ('-X', 'Y'): ((0, -1), (1, 1), (2, -1)), + ('-X', '-Y'): ((0, -1), (1, -1), (2, 1)), + ('-X', 'Z'): ((0, -1), (2, 1), (1, 1)), + ('-X', '-Z'): ((0, -1), (2, -1), (1, -1)), + ('Y', 'X'): ((1, 1), (0, 1), (2, -1)), + ('Y', '-X'): ((1, 1), (0, -1), (2, 1)), + ('Y', 'Z'): ((1, 1), (2, 1), (0, 1)), + ('Y', '-Z'): ((1, 1), (2, -1), (0, -1)), + ('-Y', 'X'): ((1, -1), (0, 1), (2, 1)), + ('-Y', '-X'): ((1, -1), (0, -1), (2, -1)), + ('-Y', 'Z'): ((1, -1), (2, 1), (0, -1)), + ('-Y', '-Z'): ((1, -1), (2, -1), (0, 1)), + ('Z', 'X'): ((2, 1), (0, 1), (1, 1)), + ('Z', '-X'): ((2, 1), (0, -1), (1, -1)), + ('Z', 'Y'): ((2, 1), (1, 1), (0, -1)), + ('Z', '-Y'): ((2, 1), (1, -1), (0, 1)), # Blender system! + ('-Z', 'X'): ((2, -1), (0, 1), (1, -1)), + ('-Z', '-X'): ((2, -1), (0, -1), (1, 1)), + ('-Z', 'Y'): ((2, -1), (1, 1), (0, 1)), + ('-Z', '-Y'): ((2, -1), (1, -1), (0, -1)), } diff --git a/io_scene_fbx_experimental/fbx_utils.py b/io_scene_fbx_experimental/fbx_utils.py index f0eeca03153b57244d619105813a75ffd382674f..369d9ab46e846322108859e659a4e733109a51ac 100644 --- a/io_scene_fbx_experimental/fbx_utils.py +++ b/io_scene_fbx_experimental/fbx_utils.py @@ -100,31 +100,30 @@ FBX_LIGHT_DECAY_TYPES = { RIGHT_HAND_AXES = { # Up, Front -> FBX values (tuples of (axis, sign), Up, Front, Coord). - # Note: Since we always stay in right-handed system, third coord sign is always positive! - ('X', 'Y'): ((0, 1), (1, -1), (2, 1)), - ('X', '-Y'): ((0, 1), (1, 1), (2, 1)), - ('X', 'Z'): ((0, 1), (2, -1), (1, 1)), - ('X', '-Z'): ((0, 1), (2, 1), (1, 1)), - ('-X', 'Y'): ((0, -1), (1, -1), (2, 1)), - ('-X', '-Y'): ((0, -1), (1, 1), (2, 1)), - ('-X', 'Z'): ((0, -1), (2, -1), (1, 1)), - ('-X', '-Z'): ((0, -1), (2, 1), (1, 1)), - ('Y', 'X'): ((1, 1), (0, -1), (2, 1)), - ('Y', '-X'): ((1, 1), (0, 1), (2, 1)), - ('Y', 'Z'): ((1, 1), (2, -1), (0, 1)), - ('Y', '-Z'): ((1, 1), (2, 1), (0, 1)), - ('-Y', 'X'): ((1, -1), (0, -1), (2, 1)), - ('-Y', '-X'): ((1, -1), (0, 1), (2, 1)), - ('-Y', 'Z'): ((1, -1), (2, -1), (0, 1)), - ('-Y', '-Z'): ((1, -1), (2, 1), (0, 1)), - ('Z', 'X'): ((2, 1), (0, -1), (1, 1)), - ('Z', '-X'): ((2, 1), (0, 1), (1, 1)), - ('Z', 'Y'): ((2, 1), (1, -1), (0, 1)), # Blender system! - ('Z', '-Y'): ((2, 1), (1, 1), (0, 1)), - ('-Z', 'X'): ((2, -1), (0, -1), (1, 1)), - ('-Z', '-X'): ((2, -1), (0, 1), (1, 1)), - ('-Z', 'Y'): ((2, -1), (1, -1), (0, 1)), - ('-Z', '-Y'): ((2, -1), (1, 1), (0, 1)), + ('X', 'Y'): ((0, 1), (1, 1), (2, 1)), + ('X', '-Y'): ((0, 1), (1, -1), (2, -1)), + ('X', 'Z'): ((0, 1), (2, 1), (1, -1)), + ('X', '-Z'): ((0, 1), (2, -1), (1, 1)), + ('-X', 'Y'): ((0, -1), (1, 1), (2, -1)), + ('-X', '-Y'): ((0, -1), (1, -1), (2, 1)), + ('-X', 'Z'): ((0, -1), (2, 1), (1, 1)), + ('-X', '-Z'): ((0, -1), (2, -1), (1, -1)), + ('Y', 'X'): ((1, 1), (0, 1), (2, -1)), + ('Y', '-X'): ((1, 1), (0, -1), (2, 1)), + ('Y', 'Z'): ((1, 1), (2, 1), (0, 1)), + ('Y', '-Z'): ((1, 1), (2, -1), (0, -1)), + ('-Y', 'X'): ((1, -1), (0, 1), (2, 1)), + ('-Y', '-X'): ((1, -1), (0, -1), (2, -1)), + ('-Y', 'Z'): ((1, -1), (2, 1), (0, -1)), + ('-Y', '-Z'): ((1, -1), (2, -1), (0, 1)), + ('Z', 'X'): ((2, 1), (0, 1), (1, 1)), + ('Z', '-X'): ((2, 1), (0, -1), (1, -1)), + ('Z', 'Y'): ((2, 1), (1, 1), (0, -1)), + ('Z', '-Y'): ((2, 1), (1, -1), (0, 1)), # Blender system! + ('-Z', 'X'): ((2, -1), (0, 1), (1, -1)), + ('-Z', '-X'): ((2, -1), (0, -1), (1, 1)), + ('-Z', 'Y'): ((2, -1), (1, 1), (0, 1)), + ('-Z', '-Y'): ((2, -1), (1, -1), (0, -1)), }