-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12974 from aws-lumberyard-dev/gallowj/LYN-16200
Studio Tools, DCC Scene Exporter Tooling Updates
- Loading branch information
Showing
38 changed files
with
2,211 additions
and
1,855 deletions.
There are no files selected for viewing
Empty file.
3 changes: 3 additions & 0 deletions
3
...LyIntegration/TechnicalArt/DccScriptingInterface/Assets/TestData/ExportTest/rocks_grid.mb
Git LFS file not shown
3 changes: 3 additions & 0 deletions
3
...t/DccScriptingInterface/Assets/TestData/ExportTest/textures/rocks_BaseColor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...lArt/DccScriptingInterface/Assets/TestData/ExportTest/textures/rocks_Height.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...rt/DccScriptingInterface/Assets/TestData/ExportTest/textures/rocks_Metallic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...lArt/DccScriptingInterface/Assets/TestData/ExportTest/textures/rocks_Normal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions
3
...t/DccScriptingInterface/Assets/TestData/ExportTest/textures/rocks_Roughness.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
74 changes: 37 additions & 37 deletions
74
...Blender/AddOns/SceneExporter/constants.py → ...Scripts/addons/SceneExporter/constants.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,37 @@ | ||
# coding:utf-8 | ||
#!/usr/bin/python | ||
# | ||
# Copyright (c) Contributors to the Open 3D Engine Project. | ||
# For complete copyright and license terms please see the LICENSE at the root of this distribution. | ||
# | ||
# SPDX-License-Identifier: Apache-2.0 OR MIT | ||
# | ||
# | ||
# ------------------------------------------------------------------------- | ||
from pathlib import Path | ||
# ------------------------------------------------------------------------- | ||
|
||
EXPORT_LIST_OPTIONS = ( ( ('0', 'Selected with in texture folder', | ||
'Export selected meshes with textures in a texture folder.'), | ||
('1', 'Selected with Textures in same folder', | ||
'Export selected meshes with textures in the same folder'), | ||
('2', 'Only Meshes', 'Only export the selected meshes, no textures') | ||
)) | ||
NO_ANIMATION = 'No Animation' | ||
KEY_FRAME_ANIMATION = 'Keyframe Animation' | ||
MESH_AND_RIG = 'Just Mesh with Rig' | ||
SKIN_ATTACHMENT = 'Skin Attachment Mesh with Rig' | ||
ANIMATION_LIST_OPTIONS = ( ( | ||
('0', NO_ANIMATION, 'Export with no keyframe Animation.'), | ||
('1', KEY_FRAME_ANIMATION, 'Mesh needs to be parented to Armature with weights in order for O3DE to detect Entity as an Actor.'), | ||
('2', MESH_AND_RIG, 'Key All Bones, Force exporting at least one key of animation for all bones'), | ||
('3', SKIN_ATTACHMENT, 'Export a mesh with the Armature bones for use as a O3DE Skin Attachment.'), | ||
)) | ||
|
||
UDP = {'o3de_atom_lod' : '_lod', 'o3de_atom_phys' : '_phys'} | ||
TAG_O3DE = '.o3de' | ||
IMAGE_EXT = ('', '.jpg', '.png', '.JPG', '.PNG') | ||
USER_HOME = Path.home() | ||
DEFAULT_SDK_MANIFEST_PATH = Path.home().joinpath(f'{TAG_O3DE}','o3de_manifest.json') | ||
WIKI_URL = 'https://github.com/o3de/o3de/blob/development/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Blender/AddOns/SceneExporter/README.md' | ||
PLUGIN_VERSION = '1.5' | ||
# coding:utf-8 | ||
#!/usr/bin/python | ||
# | ||
# Copyright (c) Contributors to the Open 3D Engine Project. | ||
# For complete copyright and license terms please see the LICENSE at the root of this distribution. | ||
# | ||
# SPDX-License-Identifier: Apache-2.0 OR MIT | ||
# | ||
# | ||
# ------------------------------------------------------------------------- | ||
from pathlib import Path | ||
# ------------------------------------------------------------------------- | ||
|
||
EXPORT_LIST_OPTIONS = ( ( ('0', 'Selected with in texture folder', | ||
'Export selected meshes with textures in a texture folder.'), | ||
('1', 'Selected with Textures in same folder', | ||
'Export selected meshes with textures in the same folder'), | ||
('2', 'Only Meshes', 'Only export the selected meshes, no textures') | ||
)) | ||
NO_ANIMATION = 'No Animation' | ||
KEY_FRAME_ANIMATION = 'Keyframe Animation' | ||
MESH_AND_RIG = 'Just Mesh with Rig' | ||
SKIN_ATTACHMENT = 'Skin Attachment Mesh with Rig' | ||
ANIMATION_LIST_OPTIONS = ( ( | ||
('0', NO_ANIMATION, 'Export with no keyframe Animation.'), | ||
('1', KEY_FRAME_ANIMATION, 'Mesh needs to be parented to Armature with weights in order for O3DE to detect Entity as an Actor.'), | ||
('2', MESH_AND_RIG, 'Key All Bones, Force exporting at least one key of animation for all bones'), | ||
('3', SKIN_ATTACHMENT, 'Export a mesh with the Armature bones for use as a O3DE Skin Attachment.'), | ||
)) | ||
|
||
UDP = {'o3de_atom_lod' : '_lod', 'o3de_atom_phys' : '_phys'} | ||
TAG_O3DE = '.o3de' | ||
IMAGE_EXT = ('', '.jpg', '.png', '.JPG', '.PNG') | ||
USER_HOME = Path.home() | ||
DEFAULT_SDK_MANIFEST_PATH = Path.home().joinpath(f'{TAG_O3DE}','o3de_manifest.json') | ||
WIKI_URL = 'https://github.com/o3de/o3de/blob/development/Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Tools/DCC/Blender/AddOns/SceneExporter/README.md' | ||
PLUGIN_VERSION = '1.5' |
Oops, something went wrong.