Restrict conditions about using raw texture file bytes while exporting glTF in UnityEditor. #967
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
Santarh
commented
May 21, 2021
| { | ||
| if (texture is Texture2D texture2D && !string.IsNullOrEmpty(UnityEditor.AssetDatabase.GetAssetPath(texture2D))) | ||
| // Exists as UnityEditor Texture2D Assets ? | ||
| if (!TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var textureImporter)) return false; |
There was a problem hiding this comment.
Editor に Asset として存在しない Texture2D は使用しない
Santarh
commented
May 21, 2021
| if (!TryGetAsEditorTexture2DAsset(texture, out var texture2D, out var textureImporter)) return false; | ||
|
|
||
| // Maintain original width/height ? | ||
| if (!IsTextureSizeMaintained(texture2D, textureImporter)) return false; |
There was a problem hiding this comment.
Asset Importer の設定で画像サイズを縮小するように求めている Texture2D は使用しない
Santarh
commented
May 21, 2021
| if (!IsTextureSizeMaintained(texture2D, textureImporter)) return false; | ||
|
|
||
| // Equals color space ? | ||
| if (!IsFileColorSpaceSameWithExportColorSpace(texture2D, textureImporter, exportColorSpace)) return false; |
There was a problem hiding this comment.
glTF Texture Property と Unity Texture Asset Importer の色空間が異なるときは使用しない
Santarh
commented
May 21, 2021
| // | ||
| case TextureImporterType.Default: | ||
| break; | ||
| case TextureImporterType.NormalMap: |
There was a problem hiding this comment.
Unity Texture Asset Importer の Texture Type が Normal map であるときは使用しない
Santarh
commented
May 21, 2021
| } | ||
| // NormalMap Property のテクスチャは必ず NormalMap として解釈してコピーする。 | ||
| // Texture Asset の設定に依らず、Standard Shader で得られる見た目と同じ結果を得るため。 | ||
| var texture2D = NormalConverter.Export(src); |
There was a problem hiding this comment.
glTF Texture Property が NormalMap であることを求めているときは使用しない
ousttrue
reviewed
May 21, 2021
| @@ -74,6 +77,42 @@ public void AssignLinearImageToSrgbTextureProperty() | |||
| UnityEngine.Object.DestroyImmediate(exportedTex); | |||
| } | |||
|
|
|||
| [Test] | |||
ousttrue
approved these changes
May 21, 2021
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.
Editor での glTF 出力時、生のテクスチャファイルのデータを使用するか否かの条件を厳しくした。
なぜなら
UnityEngine.Texture2Dが表現するデータと、そのUnityEngine.Texture2Dが参照する画像ファイルのデータは必ずしも一致せず、その一致条件もかなり厳しいからである。具体的には以下の場合に使用しないように変更した。
normalTexture)Normal mapであるとき