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

Merge pull request #2083 from ousttrue/version/v0_112_0

Browse Source 
UniVRM-0.112.0
This commit is contained in:
ousttrue 2023-06-12 12:51:43 +09:00 committed by GitHub
commit 6a46afde77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 128 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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 = 47;
public const int MINOR = 48;
public const int PATCH = 0;
public const string VERSION = "2.47.0";
public const string VERSION = "2.48.0";
}
}

4
Assets/UniGLTF/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.gltf",
"version": "0.111.0",
"version": "0.112.0",
"displayName": "UniGLTF",
"description": "GLTF importer and exporter",
"unity": "2019.4",
@ -11,7 +11,7 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.111.0",
"com.vrmc.vrmshaders": "0.112.0",
"com.unity.modules.animation": "1.0.0"
},
"samples": [

4
Assets/VRM/Runtime/Format/VRMVersion.cs
View File

@ -4,8 +4,8 @@ namespace VRM
public static partial class VRMVersion
{
public const int MAJOR = 0;
public const int MINOR = 111;
public const int MINOR = 112;
public const int PATCH = 0;
public const string VERSION = "0.111.0";
public const string VERSION = "0.112.0";
}
}

60
Assets/VRM/Samples~/SimpleViewer/ViewerUI.cs
View File

@ -195,6 +195,61 @@ namespace VRM.SimpleViewer
Loaded m_loaded;
static class ArgumentChecker
{
static string[] Supported = {
".gltf",
".glb",
".vrm",
".zip",
};
static string UnityHubPath => System.Environment.GetEnvironmentVariable("ProgramFiles") + "\\Unity\\Hub";
public static bool IsLoadable(string path)
{
if (!File.Exists(path))
{
// not exists
return false;
}
if (Application.isEditor)
{
// skip editor argument
// {UnityHub_Resources}\PackageManager\ProjectTemplates\com.unity.template.3d-5.0.4.tgz
if (path.StartsWith(UnityHubPath))
{
return false;
}
}
var ext = Path.GetExtension(path).ToLower();
if (!Supported.Contains(ext))
{
// unknown extension
return false;
}
return true;
}
public static bool TryGetFirstLoadable(out string cmd)
{
foreach (var arg in System.Environment.GetCommandLineArgs())
{
if (ArgumentChecker.IsLoadable(arg))
{
cmd = arg;
return true;
}
}
cmd = default;
return false;
}
}
private void Start()
{
m_version.text = string.Format("VRMViewer {0}.{1}",
@ -211,10 +266,9 @@ namespace VRM.SimpleViewer
LoadMotion("tmp.bvh", m_motion.text);
}
string[] cmds = System.Environment.GetCommandLineArgs();
if (cmds.Length > 1)
if (ArgumentChecker.TryGetFirstLoadable(out var cmd))
{
LoadPathAsync(cmds[1]);
LoadPathAsync(cmd);
}
m_texts.Start();

6
Assets/VRM/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.univrm",
"version": "0.111.0",
"version": "0.112.0",
"displayName": "VRM",
"description": "VRM importer",
"unity": "2019.4",
@ -14,8 +14,8 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.111.0",
"com.vrmc.gltf": "0.111.0",
"com.vrmc.vrmshaders": "0.112.0",
"com.vrmc.gltf": "0.112.0",
"com.unity.ugui": "1.0.0"
},
"samples": [

64
Assets/VRM10/Samples~/VRM10Viewer/VRM10ViewerUI.cs
View File

@ -244,6 +244,61 @@ namespace UniVRM10.VRM10Viewer
Loaded m_loaded;
static class ArgumentChecker
{
static string[] Supported = {
".gltf",
".glb",
".vrm",
".zip",
};
static string UnityHubPath => System.Environment.GetEnvironmentVariable("ProgramFiles") + "\\Unity\\Hub";
public static bool IsLoadable(string path)
{
if (!File.Exists(path))
{
// not exists
return false;
}
if (Application.isEditor)
{
// skip editor argument
// {UnityHub_Resources}\PackageManager\ProjectTemplates\com.unity.template.3d-5.0.4.tgz
if (path.StartsWith(UnityHubPath))
{
return false;
}
}
var ext = Path.GetExtension(path).ToLower();
if (!Supported.Contains(ext))
{
// unknown extension
return false;
}
return true;
}
public static bool TryGetFirstLoadable(out string cmd)
{
foreach (var arg in System.Environment.GetCommandLineArgs())
{
if (ArgumentChecker.IsLoadable(arg))
{
cmd = arg;
return true;
}
}
cmd = default;
return false;
}
}
private void Start()
{
m_version.text = string.Format("VRMViewer {0}.{1}",
@ -259,13 +314,9 @@ namespace UniVRM10.VRM10Viewer
Motion = BvhMotion.LoadBvhFromText(m_motion.text);
}
string[] cmds = System.Environment.GetCommandLineArgs();
for (int i = 1; i < cmds.Length; ++i)
if (ArgumentChecker.TryGetFirstLoadable(out var cmd))
{
if (File.Exists(cmds[i]))
{
LoadModel(cmds[i]);
}
LoadModel(cmd);
}
m_texts.Start();
@ -431,6 +482,7 @@ namespace UniVRM10.VRM10Viewer
instance.ShowMeshes();
instance.EnableUpdateWhenOffscreen();
m_loaded = new Loaded(instance, m_target.transform);
m_showBoxMan.isOn = false;
}
catch (Exception ex)
{

6
Assets/VRM10/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrm",
"version": "0.111.0",
"version": "0.112.0",
"displayName": "VRM-1.0",
"description": "VRM-1.0 importer",
"unity": "2019.4",
@ -14,8 +14,8 @@
"name": "VRM Consortium"
},
"dependencies": {
"com.vrmc.vrmshaders": "0.111.0",
"com.vrmc.gltf": "0.111.0"
"com.vrmc.vrmshaders": "0.112.0",
"com.vrmc.gltf": "0.112.0"
},
"samples": [
{

2
Assets/VRMShaders/package.json
View File

@ -1,6 +1,6 @@
{
"name": "com.vrmc.vrmshaders",
"version": "0.111.0",
"version": "0.112.0",
"displayName": "VRM Shaders",
"description": "VRM Shaders",
"unity": "2019.4",