[1.0] Migration の修正 #1305
Merged
[1.0] Migration の修正 #1305
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
Contributor
ousttrue
commented
Oct 14, 2021
ousttrue
commented
- Migration の UnitTest でマイグレーション後ロードするようにした
- SpringBone の nullcheck(bones key)
- 頂点カラーなどが含まれるモデル
- TANGENT, COLOR_0, TEXCOORD_1 の処理
Santarh
approved these changes
Oct 14, 2021
| var data = new GlbLowLevelParser(gltf.FullName, migrated).Parse(); | ||
| UniGLTF.Extensions.VRMC_vrm.GltfDeserializer.TryGet(data.GLTF.extensions, out UniGLTF.Extensions.VRMC_vrm.VRMC_vrm vrm); | ||
| Assert.NotNull(vrm); | ||
| Vrm10Data.TryParseOrMigrate(gltf.FullName, true, out Vrm10Data vrm); |
There was a problem hiding this comment.
結果の bool を Assert してもいいかも？（まあ要らないか）
| @@ -129,10 +129,13 @@ public static UniGLTF.Extensions.VRMC_springBone.VRMC_springBone Migrate(UniGLTF | |||
| // その差異に対応して、7cmの遠さに node を追加する。 | |||
| foreach (var x in sa["boneGroups"].ArrayItems()) | |||
| { | |||
| foreach (var y in x["bones"].ArrayItems()) | |||
| if (x.ContainsKey("bones")) | |||
There was a problem hiding this comment.
if (!x.ContainsKey("bones")) continue; のほうがインデントは少なくて見通しはよさそう（好みによる）
| @@ -163,30 +166,33 @@ public static UniGLTF.Extensions.VRMC_springBone.VRMC_springBone Migrate(UniGLTF | |||
| // 5 | |||
| // ] | |||
| // }, | |||
| foreach (var y in x["bones"].ArrayItems()) | |||
| if (x.ContainsKey("bones")) | |||
| @@ -82,6 +82,7 @@ struct MorphAccessor | |||
| var uv = AddAccessor<Vector2>(mesh.VertexBuffer.TexCoords); | |||
| var weights = AddAccessor<Vector4>(mesh.VertexBuffer.Weights); | |||
| var joints = AddAccessor<UShort4>(mesh.VertexBuffer.Joints); | |||
| var color = AddAccessor<Vector4>(mesh.VertexBuffer.Colors); | |||
| @@ -99,13 +100,17 @@ struct MorphAccessor | |||
| gltfPrim.indices = AddAccessor(subIndices); | |||
| gltfPrim.attributes.POSITION = position.Value; | |||
| gltfPrim.attributes.NORMAL = normal.Value; | |||
| gltfPrim.attributes.TANGENT = -1; | |||
There was a problem hiding this comment.
明示的に代入しないと何かが起こっていた？
default の 0 になってたりしてたのかな？
uint? とか null 許容型をとるのが C# らしくはありそうだが…境界領域だから optional は -1 としたほうが取り回しは楽か
There was a problem hiding this comment.
Migration する前の変更する前の値が残ってました
There was a problem hiding this comment.
index(というかint, float, bool)を使うところは全部 Nullable の方がよいのだけど、作ったときはその知見が無かった。
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.