gltf: Add GLTFHandleBinary::HANDLE_BINARY_EMBED_AS_UNCOMPRESSED #72440
Conversation
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
lyuma
force-pushed
the
gltf_embed_as_uncompressed
branch
from
1a76afb to
595f284
Compare
This was referenced Jan 31, 2023
akien-mga
reviewed
Jan 31, 2023
lyuma
force-pushed
the
gltf_embed_as_uncompressed
branch
from
595f284 to
95569f5
Compare
lyuma
force-pushed
the
gltf_embed_as_uncompressed
branch
from
95569f5 to
5213d84
Compare
reduz
requested changes
Jan 31, 2023
| @@ -87,7 +87,7 @@ Node *EditorSceneFormatImporterGLTF::import_scene(const String &p_path, uint32_t | |||
|
|
|||
| void EditorSceneFormatImporterGLTF::get_import_options(const String &p_path, | |||
| List<ResourceImporter::ImportOption> *r_options) { | |||
| r_options->push_back(ResourceImporterScene::ImportOption(PropertyInfo(Variant::INT, "meshes/handle_gltf_embedded_images", PROPERTY_HINT_ENUM, "Discard All Textures,Extract Textures,Embed As Basis Universal", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), GLTFState::HANDLE_BINARY_EXTRACT_TEXTURES)); | |||
| r_options->push_back(ResourceImporterScene::ImportOption(PropertyInfo(Variant::INT, "meshes/handle_gltf_embedded_images", PROPERTY_HINT_ENUM, "Discard All Textures,Extract Textures,Embed As Basis Universal,Embed as Uncompressed", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), GLTFState::HANDLE_BINARY_EXTRACT_TEXTURES)); | |||
There was a problem hiding this comment.
Please add a GLTF section for this, such as:
gltf/embedded_image_handling instead of taking over the mesh section. We already do this for Blender files.
There was a problem hiding this comment.
I changed it to use this name
lyuma
force-pushed
the
gltf_embed_as_uncompressed
branch
from
5213d84 to
e66560c
Compare
lyuma
force-pushed
the
gltf_embed_as_uncompressed
branch
3 times, most recently
from
83d7767 to
0a2a6f7
Compare
|
Updated the PR to also respect project import defaults. It will reimport them with Detect 3D after the gltf completes, which should be okay since it will run multithreaded, and avoids some hardcoded constants. The original code set "compress/mode" to 2 but wrote remap instead of params, so it didn't actually work. Now that I'm reading the project defaults, there isn't a clean way to override the compression mode without disregarding the user's project settings, so I removed that part. |
lyuma
force-pushed
the
gltf_embed_as_uncompressed
branch
from
0a2a6f7 to
122a40c
Compare
This option allows for a safe fallback for embedded gltf textures in cases where VRAM compression is not needed. Add an is_editor_hint guard around GLTFHandleBinary::HANDLE_BINARY_EXTRACT_TEXTURES, to use EMBED_AS_UNCOMPRESSED by default at runtime. This provides an option for pixel art to be stored losslessly. Additionally, respect project importer defaults for texture import settings. Avoid writing and reimporting extracted textures identical to version on disk.
lyuma
force-pushed
the
gltf_embed_as_uncompressed
branch
from
122a40c to
bc24d01
Compare
reduz
approved these changes
Feb 1, 2023
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This option allows for a safe fallback for embedded gltf textures in cases where VRAM compression is not needed.
Add an is_editor_hint guard around GLTFHandleBinary::HANDLE_BINARY_EXTRACT_TEXTURES, to use EMBED_AS_UNCOMPRESSED by default at runtime.
This provides an option for pixel art to be stored losslessly.
Additionally, respect project importer defaults for texture import settings.
Threw in another check to avoid overwriting and reimporting textures which were already extracted & identical to what is on disk.
Fixes #72200
Fixes #72195
Fixes #72467
Fixes #72191