[1.0] thumbnail の名前が無い時に SubAssetKey を作るのに失敗するのを修正 #1193
Merged
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
ousttrue
changed the title
|
FixTextureNameUnique を整理しました。 |
ousttrue
commented
Sep 7, 2021
| /// </summary> | ||
| private static void FixTextureNameUnique(glTF GLTF) | ||
| { | ||
| var used = new HashSet<string>(); | ||
| for (var textureIdx = 0; textureIdx < GLTF.textures.Count; ++textureIdx) | ||
| { | ||
| var gltfTexture = GLTF.textures[textureIdx]; | ||
| var gltfImage = GLTF.images[gltfTexture.source]; | ||
| if (!string.IsNullOrEmpty(gltfImage.uri) && !gltfImage.uri.StartsWith("data:")) | ||
| if (gltfTexture.source != textureIdx) |
There was a problem hiding this comment.
ここに来ないことを 強く 期待している
ousttrue
changed the title
|
やりなおし |
ousttrue
force-pushed
the
fix10/empty_thumbnail_name
branch
from
4d1c45f to
aad1b12
Compare
ousttrue
changed the title
ousttrue
commented
Sep 7, 2021
| { | ||
| imageName = THUMBNAIL_NAME; | ||
| } | ||
| var uniqueName = GlbLowLevelParser.FixNameUnique(used, imageName); |
There was a problem hiding this comment.
FixNameUnique で thumbnail 用の名前を作り出す !
Santarh
approved these changes
Sep 8, 2021
| { | ||
| imageName = THUMBNAIL_NAME; | ||
| } | ||
| var uniqueName = GlbLowLevelParser.FixNameUnique(used, imageName); |
| var textureIndex = kv.Value.GetInt32(); | ||
| if (textureIndex == -1) | ||
| { | ||
| meta.ThumbnailImage = -1; |
| else | ||
| { | ||
| var gltfTexture = gltf.textures[textureIndex]; | ||
| meta.ThumbnailImage = gltfTexture.source; |
| var index = vrm.VrmExtension.Meta.ThumbnailImage.Value; | ||
|
|
||
| // empty thumbnail name | ||
| vrm.Data.GLTF.images[index].name = null; |
There was a problem hiding this comment.
image の name が null でもロードできる
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.
#1188