Skip to content
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

VRM1.0の読み込みサポート #856

Merged
merged 44 commits into from Nov 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e83573e
Replace VRM Load Controller to 1.0 supported version
malaybaku Oct 2, 2022
f2904ae
Setup default animator controller
malaybaku Oct 2, 2022
fcc5e8d
Replace facial expression system to VRM10 based API
malaybaku Oct 2, 2022
a37486c
Move noto-sans font asset into fonts folder
malaybaku Oct 4, 2022
ce3b6f5
WIP: create meta data view for VRM 1.0
malaybaku Oct 4, 2022
e34dde0
WIP: make load process work though it leads bugs
malaybaku Oct 5, 2022
49a1729
Fix Vrm0x model load trouble
malaybaku Oct 5, 2022
1804a87
comment out VRM0.x procs
malaybaku Oct 5, 2022
034b043
fix compile error
malaybaku Oct 5, 2022
fa33014
WIP: fix things
malaybaku Oct 5, 2022
aa3c218
Remove unused class
malaybaku Oct 6, 2022
e98abfc
Fix layout etc.
malaybaku Oct 6, 2022
f17daac
Avoid NRE by model replace
malaybaku Oct 6, 2022
4d62ba4
Destroy meta view related model object
malaybaku Oct 6, 2022
0e6a261
Fix IK setups
malaybaku Oct 6, 2022
c246e95
Fix basic facial expression to work
malaybaku Oct 6, 2022
e7b1507
Handle VRM10 instance update timing explicitly
malaybaku Oct 7, 2022
6e694a2
Merge branch 'develop' into feature/support_vrm10
malaybaku Oct 7, 2022
d6f4eca
Remove job-styled SpringBone impl
malaybaku Oct 9, 2022
89a5e58
Use forked UniVRM /
malaybaku Oct 10, 2022
7d60222
Use alloc-reduced spring bone logics
malaybaku Oct 10, 2022
0f50fbb
Add debug bone visualizer
malaybaku Oct 11, 2022
92ee408
Update scene ref
malaybaku Oct 16, 2022
c656d75
Revert to use animator to get bones
malaybaku Nov 25, 2022
a463c0a
Use newest UniVRM to apply wind effect more simplly
malaybaku Nov 26, 2022
50d7217
Update Visual Studio ver to 17.4.1
malaybaku Nov 26, 2022
2d901c3
GUI app fix blendshape clip name for VRM1.0 format before sending data
malaybaku Nov 26, 2022
8013682
Save blendshape data as-is, but send blendshape according to VRM 1.0 …
malaybaku Nov 26, 2022
6702b58
FaceSwitch data clip name is vrm0 based, but translated to vrm1.0 nam…
malaybaku Nov 26, 2022
39ee469
Neutral / Offset clip name is translated
malaybaku Nov 26, 2022
8134011
impl blendshape clip name translation
malaybaku Nov 26, 2022
d33dbc5
Define converter to show old clip names
malaybaku Nov 26, 2022
ded6719
Fix compile error
malaybaku Nov 26, 2022
11b7ddb
Apply converter to face switch / clip setting UIs
malaybaku Nov 26, 2022
9359b5d
Avoid editor time NRE
malaybaku Nov 26, 2022
dc3e919
Fix compiler warning
malaybaku Nov 26, 2022
3b89bf3
Show VRM 1.0 clip name for WtM edit UI
malaybaku Nov 26, 2022
16c0235
Add debug code to check blendshape exclude setting
malaybaku Nov 27, 2022
e6b095e
Fix handling of surprised blendshape / sending motion requests' blend…
malaybaku Nov 27, 2022
8259901
Fix how to replace VRM0 clip names to VRM1
malaybaku Nov 27, 2022
de86033
Fix default face switch content / capitalize preset expressions
malaybaku Nov 28, 2022
e9a7c10
refactor / fix to translate AIUEO blendshapes
malaybaku Nov 28, 2022
bdafebd
Enlarge MMF size
malaybaku Nov 28, 2022
2c6626c
fix caption
malaybaku Nov 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 5395904245375780253}
- component: {fileID: 3748028266611161169}
- component: {fileID: 8701057551241780110}
- component: {fileID: 7797473119978373343}
- component: {fileID: 5187863769921554747}
- component: {fileID: 6241239198292537160}
- component: {fileID: 6186883453983643772}
Expand Down Expand Up @@ -53,7 +52,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 528308ecc8af46647b68473c1f06c11b, type: 3}
m_Name:
m_EditorClassIdentifier:
blendShapeInitializer: {fileID: 7797473119978373343}
lipSyncContext: {fileID: 8501418776315766171}
lipSyncIntegrator: {fileID: 6125060425342205146}
autoBlink: {fileID: 2335327280039312852}
Expand Down Expand Up @@ -87,18 +85,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d80971aa6a886324db1bfcf2a2c34bd5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7797473119978373343
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3748028266611161173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a125f000c2a422b4c88a36e60296385a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5187863769921554747
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Expand Up @@ -30,7 +30,6 @@ Transform:
m_Children:
- {fileID: 4403582645890784493}
- {fileID: 4403582645735969391}
- {fileID: 5952249983603830923}
- {fileID: 7502228934553232097}
m_Father: {fileID: 0}
m_RootOrder: 0
Expand Down Expand Up @@ -87,46 +86,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 5203461303792189549}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6280833885169497037
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 914461298883566549}
m_Modifications:
- target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 853238483135863806, guid: 48e4e24e48cf43543ab508e6a42a1591,
type: 3}
propertyPath: m_Name
value: ReplacedVRMSpringBoneScheduler
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 48e4e24e48cf43543ab508e6a42a1591, type: 3}
--- !u!4 &5952249983603830923 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 410006747659649862, guid: 48e4e24e48cf43543ab508e6a42a1591,
type: 3}
m_PrefabInstance: {fileID: 6280833885169497037}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6638005332231117493
PrefabInstance:
m_ObjectHideFlags: 0
Expand All @@ -147,7 +106,7 @@ PrefabInstance:
- target: {fileID: 3748028266611161172, guid: bc880b587a9f08e498a8c6de1fcf4650,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3748028266611161172, guid: bc880b587a9f08e498a8c6de1fcf4650,
type: 3}
Expand Down
Expand Up @@ -9,8 +9,8 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6312515010370811259}
- component: {fileID: 6312515010370811263}
- component: {fileID: 5640999407990057317}
- component: {fileID: 1131529251366033892}
m_Layer: 0
m_Name: LoadController
m_TagString: Untagged
Expand All @@ -32,7 +32,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6312515010370811263
--- !u!114 &5640999407990057317
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -41,13 +41,15 @@ MonoBehaviour:
m_GameObject: {fileID: 6312515010370811258}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 91cd6285b69da1e46a0a90d72eab7fc2, type: 3}
m_Script: {fileID: 11500000, guid: 8a8c86c789fa99a4d8bda2ca79ddde59, type: 3}
m_Name:
m_EditorClassIdentifier:
animatorController: {fileID: 9100000, guid: 8274142a1807f5848a5dd1166db7d615, type: 2}
windowStyleController: {fileID: 0}
settingAdjuster: {fileID: 0}
--- !u!114 &5640999407990057317
instanceUpdater: {fileID: 1131529251366033892}
vrmPreviewCanvasPrefab: {fileID: 4226044117769235611, guid: 4821f596a86990e47ae70722be7ac5ae,
type: 3}
vrm10MetaViewPrefab: {fileID: 3214800444371663839, guid: 21497207a08420447a1d5a5bd3d44747,
type: 3}
--- !u!114 &1131529251366033892
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand All @@ -56,11 +58,6 @@ MonoBehaviour:
m_GameObject: {fileID: 6312515010370811258}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a8c86c789fa99a4d8bda2ca79ddde59, type: 3}
m_Script: {fileID: 11500000, guid: d2e37b3175f700840974083a3e50fd9b, type: 3}
m_Name:
m_EditorClassIdentifier:
loadController: {fileID: 6312515010370811263}
settingAutoAdjuster: {fileID: 0}
vrmPreviewLanguage: {fileID: 0}
vrmPreviewCanvasPrefab: {fileID: 4226044117769235611, guid: 4821f596a86990e47ae70722be7ac5ae,
type: 3}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4353405852794295506
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4353405852794295532}
- component: {fileID: 4353405852794295533}
m_Layer: 0
m_Name: ControlRigVisualizer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4353405852794295532
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353405852794295506}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4353405852794295533
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353405852794295506}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a78ab5a4bb325864687b571bd9146473, type: 3}
m_Name:
m_EditorClassIdentifier:
bonePrefab: {fileID: 890151008131320554, guid: 743b3f53f6da21145b5107d306df47e5,
type: 3}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.