Skip to content

Commit

Permalink
Merge pull request #1831 from ousttrue/version/v0_104_1
Browse files Browse the repository at this point in the history
sample 更新あり
  • Loading branch information
ousttrue authored Sep 26, 2022
2 parents ef7c819 + e563a33 commit 4a9bafb
Show file tree
Hide file tree
Showing 129 changed files with 10,404 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public static partial class UniGLTFVersion
{
public const int MAJOR = 2;
public const int MINOR = 40;
public const int PATCH = 0;
public const string VERSION = "2.40.0";
public const int PATCH = 1;
public const string VERSION = "2.40.1";
}
}
4 changes: 2 additions & 2 deletions Assets/UniGLTF/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.104.0",
"version": "0.104.1",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2019.4",
Expand All @@ -11,7 +11,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.104.0",
"com.vrmc.vrmshaders": "0.104.1",
"com.unity.modules.animation": "1.0.0"
}
}
4 changes: 2 additions & 2 deletions Assets/VRM/Runtime/Format/VRMVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public static partial class VRMVersion
{
public const int MAJOR = 0;
public const int MINOR = 104;
public const int PATCH = 0;
public const string VERSION = "0.104.0";
public const int PATCH = 1;
public const string VERSION = "0.104.1";
}
}
8 changes: 8 additions & 0 deletions Assets/VRM/Samples~/SimpleViewer/Plugins.meta

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

21 changes: 21 additions & 0 deletions Assets/VRM/Samples~/SimpleViewer/Plugins/OpenFile.jslib
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
mergeInto(LibraryManager.library, {
WebGLFileDialog: function () {
const file_input_id = "file-input";
var file_input = document.getElementById(file_input_id);
if (!file_input) {
file_input = document.createElement('input');
file_input.setAttribute('type', 'file');
file_input.setAttribute('id', file_input_id);
// file_input.setAttribute('accept', '.vrm')
file_input.style.visibility = 'hidden';
file_input.onclick = function (event) {
event.target.value = null;
};
file_input.onchange = function (event) {
SendMessage('Canvas', 'FileSelected', URL.createObjectURL(event.target.files[0]));
}
document.body.appendChild(file_input);
}
file_input.click();
},
});
32 changes: 32 additions & 0 deletions Assets/VRM/Samples~/SimpleViewer/Plugins/OpenFile.jslib.meta

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

6 changes: 3 additions & 3 deletions Assets/VRM/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.104.0",
"version": "0.104.1",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2019.4",
Expand All @@ -14,8 +14,8 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.104.0",
"com.vrmc.gltf": "0.104.0",
"com.vrmc.vrmshaders": "0.104.1",
"com.vrmc.gltf": "0.104.1",
"com.unity.ugui": "1.0.0"
},
"samples": [
Expand Down
8 changes: 8 additions & 0 deletions Assets/VRM10/Samples~/ModelSetup_SeedSan.meta

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

8 changes: 8 additions & 0 deletions Assets/VRM10/Samples~/ModelSetup_SeedSan/Expressions.meta

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

26 changes: 26 additions & 0 deletions Assets/VRM10/Samples~/ModelSetup_SeedSan/Expressions/aa.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c8b2024ae0d0944eb878d90212bf21b, type: 3}
m_Name: aa
m_EditorClassIdentifier:
m_prefab: {fileID: 1671074158738710493, guid: a99b93c790025db42ae8499df5178ef9,
type: 3}
MorphTargetBindings:
- RelativePath: head
Index: 25
Weight: 1
MaterialColorBindings: []
MaterialUVBindings: []
IsBinary: 0
OverrideBlink: 0
OverrideLookAt: 0
OverrideMouth: 0

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

29 changes: 29 additions & 0 deletions Assets/VRM10/Samples~/ModelSetup_SeedSan/Expressions/angry.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c8b2024ae0d0944eb878d90212bf21b, type: 3}
m_Name: angry
m_EditorClassIdentifier:
m_prefab: {fileID: 1671074158738710493, guid: a99b93c790025db42ae8499df5178ef9,
type: 3}
MorphTargetBindings:
- RelativePath: head
Index: 34
Weight: 1
MaterialColorBindings: []
MaterialUVBindings:
- MaterialName: robo_face
Scaling: {x: 1, y: 1}
Offset: {x: 0.5, y: 0}
IsBinary: 1
OverrideBlink: 0
OverrideLookAt: 0
OverrideMouth: 0

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

29 changes: 29 additions & 0 deletions Assets/VRM10/Samples~/ModelSetup_SeedSan/Expressions/blink.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c8b2024ae0d0944eb878d90212bf21b, type: 3}
m_Name: blink
m_EditorClassIdentifier:
m_prefab: {fileID: 1671074158738710493, guid: a99b93c790025db42ae8499df5178ef9,
type: 3}
MorphTargetBindings:
- RelativePath: head
Index: 1
Weight: 1
- RelativePath: head
Index: 2
Weight: 1
MaterialColorBindings: []
MaterialUVBindings: []
IsBinary: 0
OverrideBlink: 0
OverrideLookAt: 0
OverrideMouth: 0

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c8b2024ae0d0944eb878d90212bf21b, type: 3}
m_Name: blinkLeft
m_EditorClassIdentifier:
m_prefab: {fileID: 1671074158738710493, guid: a99b93c790025db42ae8499df5178ef9,
type: 3}
MorphTargetBindings:
- RelativePath: head
Index: 1
Weight: 1
MaterialColorBindings: []
MaterialUVBindings: []
IsBinary: 0
OverrideBlink: 0
OverrideLookAt: 0
OverrideMouth: 0

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c8b2024ae0d0944eb878d90212bf21b, type: 3}
m_Name: blinkRight
m_EditorClassIdentifier:
m_prefab: {fileID: 1671074158738710493, guid: a99b93c790025db42ae8499df5178ef9,
type: 3}
MorphTargetBindings:
- RelativePath: head
Index: 2
Weight: 1
MaterialColorBindings: []
MaterialUVBindings: []
IsBinary: 0
OverrideBlink: 0
OverrideLookAt: 0
OverrideMouth: 0

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

26 changes: 26 additions & 0 deletions Assets/VRM10/Samples~/ModelSetup_SeedSan/Expressions/ee.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c8b2024ae0d0944eb878d90212bf21b, type: 3}
m_Name: ee
m_EditorClassIdentifier:
m_prefab: {fileID: 1671074158738710493, guid: a99b93c790025db42ae8499df5178ef9,
type: 3}
MorphTargetBindings:
- RelativePath: head
Index: 28
Weight: 1
MaterialColorBindings: []
MaterialUVBindings: []
IsBinary: 0
OverrideBlink: 0
OverrideLookAt: 0
OverrideMouth: 0

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

29 changes: 29 additions & 0 deletions Assets/VRM10/Samples~/ModelSetup_SeedSan/Expressions/happy.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c8b2024ae0d0944eb878d90212bf21b, type: 3}
m_Name: happy
m_EditorClassIdentifier:
m_prefab: {fileID: 1671074158738710493, guid: a99b93c790025db42ae8499df5178ef9,
type: 3}
MorphTargetBindings:
- RelativePath: head
Index: 33
Weight: 1
MaterialColorBindings: []
MaterialUVBindings:
- MaterialName: robo_face
Scaling: {x: 1, y: 1}
Offset: {x: 0.25, y: 0}
IsBinary: 1
OverrideBlink: 2
OverrideLookAt: 0
OverrideMouth: 0
Loading

0 comments on commit 4a9bafb

Please sign in to comment.