-
Notifications
You must be signed in to change notification settings - Fork 424
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[vrm10][Importer引数] ScriptedImpoter からの Import で SpringBone の初期化を回避する #2473
Merged
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
a4af90c
if IsAssetImport, Prevent runtime resource allocation.
ousttrue 53028c8
Vrm10Instance.UpdateTypes.None はやめ。不要
ousttrue 0e4bf5d
#2463 でコンストラクターで Singleton 確保したのが仇に。
ousttrue 0d8849e
Merge branch 'master' into fix/vrm10_asset_import_flag
ousttrue File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
44 changes: 44 additions & 0 deletions
44
Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10NopSpringboneRuntime.cs
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 |
---|---|---|
@@ -0,0 +1,44 @@ | ||
using System.Threading.Tasks; | ||
using UniGLTF; | ||
using UniGLTF.SpringBoneJobs.Blittables; | ||
using UnityEngine; | ||
|
||
namespace UniVRM10 | ||
{ | ||
/// <summary> | ||
/// SpcriptedImporter 経由の import 向け。 | ||
/// NativeArray の確保や DontDestroyOnLoad を回避。 | ||
/// </summary> | ||
public class Vrm10NopSpringboneRuntime : IVrm10SpringBoneRuntime | ||
{ | ||
public void Dispose() | ||
{ | ||
} | ||
|
||
public Task InitializeAsync(Vrm10Instance instance, IAwaitCaller awaitCaller) | ||
{ | ||
return Task.CompletedTask; | ||
} | ||
|
||
public void Process() | ||
{ | ||
} | ||
|
||
public bool ReconstructSpringBone() | ||
{ | ||
return false; | ||
} | ||
|
||
public void RestoreInitialTransform() | ||
{ | ||
} | ||
|
||
public void SetJointLevel(Transform joint, BlittableJointMutable jointSettings) | ||
{ | ||
} | ||
|
||
public void SetModelLevel(Transform modelRoot, BlittableModelLevel modelSettings) | ||
{ | ||
} | ||
} | ||
} |
11 changes: 11 additions & 0 deletions
11
Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10NopSpringboneRuntime.cs.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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 |
---|---|---|
|
@@ -230,6 +230,7 @@ QualitySettings: | |
PSM: 5 | ||
PSP2: 2 | ||
Samsung TV: 2 | ||
Server: 0 | ||
Standalone: 5 | ||
Switch: 5 | ||
Tizen: 2 | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SpringBoneとは関係なさそうな修正が入っている?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
あ。
まぁ、いいか 🙏