Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-03-21 18:05:03 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UniVRM-0.130.0

Browse Source
This commit is contained in:
ousttrue 2025-06-12 13:06:30 +09:00
parent b54d60576d
commit 736740c157
12 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/UniGLTF/Runtime/UniGLTF/PackageVersion.cs
View File

@ -4,8 +4,8 @@ namespace UniGLTF
public static partial class PackageVersion
{
public const int MAJOR = 0;
public const int MINOR = 129;
public const int PATCH = 1;
public const string VERSION = "0.129.1";
public const int MINOR = 130;
public const int PATCH = 0;
public const string VERSION = "0.130.0";
}
}

6
Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
View File

@ -4,8 +4,8 @@ namespace UniGLTF
public static partial class UniGLTFVersion
{
public const int MAJOR = 2;
public const int MINOR = 65;
public const int PATCH = 1;
public const string VERSION = "2.65.1";
public const int MINOR = 66;
public const int PATCH = 0;
public const string VERSION = "2.66.0";
}
}

2
Assets/UniGLTF/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.129.1",
"version": "0.130.0",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2021.3",

4
Assets/VRM/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.129.1",
"version": "0.130.0",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2021.3",
@ -14,7 +14,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.gltf": "0.129.1",
"com.vrmc.gltf": "0.130.0",
"com.unity.ugui": "1.0.0"
},
"samples": [

2
Assets/VRM10/Samples~/ClothSample/ClothViewer/Motions/BvhMotion.cs
View File

@ -28,7 +28,7 @@ namespace UniVRM10.Cloth.Viewer
// create SkinnedMesh for bone visualize
var animator = m_context.Root.GetComponent<Animator>();
m_boxMan = SkeletonMeshUtility.CreateRenderer(animator);
var shaderName = UnityEngine.Rendering.GraphicsSettings.renderPipelineAsset == null
var shaderName = UnityEngine.Rendering.GraphicsSettings.defaultRenderPipeline == null
? "Standard"
: "Universal Render Pipeline/Lit"
;

5
Assets/VRM10/Samples~/VRM10Viewer/FaceCameraTarget.asset
View File

@ -10,10 +10,8 @@ CustomRenderTexture:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
serializedVersion: 6
m_Width: 300
m_Height: 300
m_AntiAliasing: 1
@ -24,6 +22,7 @@ CustomRenderTexture:
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_UseDynamicScaleExplicit: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_EnableRandomWrite: 0

2
Assets/VRM10/Samples~/VRM10Viewer/UIToolkit/VRM10MainView.cs
View File

@ -106,7 +106,7 @@ namespace UniVRM10.VRM10Viewer
QueryOrAssert(out m_useCustomPbrMaterial, root, "UseCustomPbrMaterial");
QueryOrAssert(out m_useCustomMToonMaterial, root, "UseCustomMToonMaterial");
// URP かつ WebGL で有効にする
m_useCustomMToonMaterial.value = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.renderPipelineAsset != null;
m_useCustomMToonMaterial.value = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.defaultRenderPipeline != null;
QueryOrAssert(out m_motionMode, root, "MotionMode");
QueryOrAssert(out m_springboneExternalX, root, "SpringboneExternalX");
QueryOrAssert(out m_springboneExternalY, root, "SpringboneExternalY");

2
Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerController.cs
View File

@ -115,7 +115,7 @@ namespace UniVRM10.VRM10Viewer
if (m_motion != null)
{
Motion = BvhMotion.LoadBvhFromText(m_motion.text);
if (GraphicsSettings.renderPipelineAsset != null
if (GraphicsSettings.defaultRenderPipeline != null
&& m_pbrAlphaBlendMaterial != null)
{
Motion.SetBoxManMaterial(GameObject.Instantiate(m_pbrOpaqueMaterial));

2
Assets/VRM10/Samples~/VRM10Viewer/VRM10VisualPrimitive.cs
View File

@ -30,7 +30,7 @@ namespace UniVRM10.VRM10Viewer
visual.transform.localScale = Vector3.one;
// URP 判定
if (GraphicsSettings.renderPipelineAsset != null
if (GraphicsSettings.defaultRenderPipeline != null
// WebGL ビルドでは GraphicsSettings.renderPipelineAsset が常に null ?
|| Application.platform == RuntimePlatform.WebGLPlayer)
{

2
Assets/VRM10/Samples~/VRM10Viewer/uGui/VRM10ViewerUI.cs
View File

@ -180,7 +180,7 @@ namespace UniVRM10.VRM10Viewer
private void Start()
{
// URP かつ WebGL で有効にする
m_useCustomMToonMaterial.isOn = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.renderPipelineAsset != null;
m_useCustomMToonMaterial.isOn = Application.platform == RuntimePlatform.WebGLPlayer && GraphicsSettings.defaultRenderPipeline != null;
m_autoEmotion = gameObject.AddComponent<VRM10AutoExpression>();
m_autoBlink = gameObject.AddComponent<VRM10Blinker>();

4
Assets/VRM10/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.129.1",
"version": "0.130.0",
"displayName": "VRM-1.0",
"description": "VRM-1.0 importer",
"unity": "2021.3",
@ -15,7 +15,7 @@
},
"dependencies": {
"com.unity.timeline": "1.7.6",
"com.vrmc.gltf": "0.129.1"
"com.vrmc.gltf": "0.130.0"
},
"samples": [
{

15
ProjectSettings/Vrm10ProjectEditorSettings.asset Normal file
View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &1
MonoBehaviour:
m_ObjectHideFlags: 53
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: 2b096596ea97420ca637d240bc264e28, type: 3}
m_Name:
m_EditorClassIdentifier:
materialDescriptorGeneratorFactory: {fileID: 0}