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

Merge pull request #1902 from Santarh/removeWarnings

Browse Source 
Remove warnings
This commit is contained in:
ousttrue
2022-11-04 13:57:37 +09:00
committed by GitHub
parent 56f041b077 5dbb9c25ab
commit 5f850eefb1
23 changed files with 4359 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/UniGLTF/Runtime/UniHumanoid/HumanPoseClip.cs
View File

@@ -5,7 +5,7 @@ namespace UniHumanoid
{
public class HumanPoseClip : ScriptableObject
{
public const string TPoseResourcePath = "T-Pose.pose";
public const string TPoseResourcePath = "UniHumanoid/T-Pose.pose";
public Vector3 bodyPosition;

4
Assets/UniGLTF/Runtime/Resources.meta → Assets/UniGLTF/Runtime/UniHumanoid/Resources.meta
View File

@@ -1,8 +1,6 @@
fileFormatVersion: 2
guid: c61106d290c827b49b7a6e3f6497bd3f
guid: b4f2ed33f96cfdd4ab1057fccbe1d9e1
folderAsset: yes
timeCreated: 1519379142
licenseType: Free
DefaultImporter:
externalObjects: {}
userData:

8
Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3c8d7024b7589844a9bbd3d632b5853e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset → Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid/T-Pose.pose.asset
View File

0
Assets/UniGLTF/Runtime/Resources/T-Pose.pose.asset.meta → Assets/UniGLTF/Runtime/UniHumanoid/Resources/UniHumanoid/T-Pose.pose.asset.meta
View File

10
Assets/UniGLTF/Runtime/Utils/CachedEnum/CachedEnum.cs
View File

@@ -33,16 +33,6 @@ namespace UniGLTF.Utils
}
}
/// <summary>
/// bool を返して out 変数に結果を返すのが TryXXX なので、Try ではない。
/// </summary>
[Obsolete("use ParseOrDefault")]
public static T TryParseOrDefault<T>(string name, bool ignoreCase = false, T defaultValue = default)
where T : struct, Enum
{
return ParseOrDefault<T>(name, ignoreCase: ignoreCase);
}
public static T[] GetValues<T>() where T : struct, Enum
{
return CachedEnumType<T>.Values;

4
Assets/UniGLTF/Tests/UniGLTF/4x4_gray_import_as_linear.png.meta
View File

@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -54,9 +55,12 @@ TextureImporter:
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3

4
Assets/UniGLTF/Tests/UniGLTF/4x4_gray_import_as_normal_map.png.meta
View File

@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -54,9 +55,12 @@ TextureImporter:
textureType: 1
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3

4
Assets/UniGLTF/Tests/UniGLTF/4x4_gray_import_as_srgb.png.meta
View File

@@ -23,6 +23,7 @@ TextureImporter:
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -54,9 +55,12 @@ TextureImporter:
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3

4
Assets/UniGLTF/Tests/UniGLTF/CacheEnumTest.cs
View File

@@ -11,8 +11,8 @@ namespace UniGLTF
[Test]
public void CacheEnumTestSimplePasses()
{
Assert.AreEqual(default(HumanBodyBones), CachedEnum.TryParseOrDefault<HumanBodyBones>("xxx"));
Assert.AreEqual(HumanBodyBones.UpperChest, CachedEnum.TryParseOrDefault<HumanBodyBones>("upperchest", true));
Assert.AreEqual(default(HumanBodyBones), CachedEnum.ParseOrDefault<HumanBodyBones>("xxx"));
Assert.AreEqual(HumanBodyBones.UpperChest, CachedEnum.ParseOrDefault<HumanBodyBones>("upperchest", true));
Assert.AreEqual(CachedEnum.GetValues<HumanBodyBones>().First(x => x == HumanBodyBones.Hips), HumanBodyBones.Hips);
}
}

2
Assets/VRM/Runtime/FirstPerson/VRMFirstPerson.cs
View File

@@ -127,7 +127,7 @@ namespace VRM
{
if (x.mesh == index)
{
return CachedEnum.TryParseOrDefault<FirstPersonFlag>(x.firstPersonFlag, true);
return CachedEnum.ParseOrDefault<FirstPersonFlag>(x.firstPersonFlag, true);
}
}

2
Assets/VRM/Runtime/Format/glTF_VRM_FirstPerson.cs
View File

@@ -72,7 +72,7 @@ namespace VRM
{
get
{
return CachedEnum.TryParseOrDefault<LookAtType>(lookAtTypeName, true);
return CachedEnum.ParseOrDefault<LookAtType>(lookAtTypeName, true);
}
set { lookAtTypeName = value.ToString(); }
}

6
Assets/VRM/Runtime/Format/glTF_VRM_Meta.cs
View File

@@ -36,7 +36,7 @@ namespace VRM
{
static UssageLicense FromString(string src)
{
return CachedEnum.TryParseOrDefault<UssageLicense>(src, true);
return CachedEnum.ParseOrDefault<UssageLicense>(src, true);
}
[JsonSchema(Description = "Title of VRM model")]
@@ -69,7 +69,7 @@ namespace VRM
{
get
{
return CachedEnum.TryParseOrDefault<AllowedUser>(allowedUserName, true);
return CachedEnum.ParseOrDefault<AllowedUser>(allowedUserName, true);
}
set
{
@@ -135,7 +135,7 @@ namespace VRM
{
get
{
return CachedEnum.TryParseOrDefault<LicenseType>(licenseName, true);
return CachedEnum.ParseOrDefault<LicenseType>(licenseName, true);
}
set
{

4
Assets/VRM/Runtime/IO/VRMImporterContext.cs
View File

@@ -153,12 +153,12 @@ namespace VRM
if (group != null)
{
asset.BlendShapeName = groupName;
asset.Preset = CachedEnum.TryParseOrDefault<BlendShapePreset>(group.presetName, true);
asset.Preset = CachedEnum.ParseOrDefault<BlendShapePreset>(group.presetName, true);
asset.IsBinary = group.isBinary;
if (asset.Preset == BlendShapePreset.Unknown)
{
// fallback
asset.Preset = CachedEnum.TryParseOrDefault<BlendShapePreset>(group.name, true);
asset.Preset = CachedEnum.ParseOrDefault<BlendShapePreset>(group.name, true);
}
asset.Values = group.binds.Select(x =>
{

8
Assets/VRM10_Samples/VRM10Viewer/Motions.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b092f2ba86c6ec247afd37d38108bf03
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/UniGLTF/Runtime/Resources/test_motion.txt → Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt
View File

8
Assets/VRM10_Samples/VRM10Viewer/Motions/vrm10viewer_test_motion.txt.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 08df5151e71aed748b13547492fb8b9a
timeCreated: 1546851178
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

3
Assets/VRM10_Samples/VRM10Viewer/VRM10Viewer.unity
View File

@@ -5572,7 +5572,7 @@ MonoBehaviour:
m_src: {fileID: 0}
m_target: {fileID: 802105000}
Root: {fileID: 0}
m_motion: {fileID: 4900000, guid: 7d2617171adc40b41ac50228f101e178, type: 3}
m_motion: {fileID: 4900000, guid: 08df5151e71aed748b13547492fb8b9a, type: 3}
m_texts:
m_textModelTitle: {fileID: 1111491925}
m_textModelVersion: {fileID: 1045380263}
@@ -5591,7 +5591,6 @@ MonoBehaviour:
ToggleMotionTPose: {fileID: 1791103380}
ToggleMotionBVH: {fileID: 1311520910}
ToggleMotion: {fileID: 224350194}
m_pose: {fileID: 11400000, guid: 879e332f84a378c4da3b87af13da3e85, type: 2}
--- !u!1 &1791103378
GameObject:
m_ObjectHideFlags: 0

3
Assets/VRM10_Samples/VRM10Viewer/VRM10ViewerUI.cs
View File

@@ -168,9 +168,6 @@ namespace UniVRM10.VRM10Viewer
[SerializeField]
UIFields m_ui = default;
[SerializeField]
HumanPoseClip m_pose = default;
private void Reset()
{
var buttons = GameObject.FindObjectsOfType<Button>();

8
Assets/VRM_Samples/SimpleViewer/Motions.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 79cea8265d53aaf47b16fff91ee9a5d6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4136
Assets/VRM_Samples/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt Normal file
View File

File diff suppressed because it is too large Load Diff

0
Assets/UniGLTF/Runtime/Resources/test_motion.txt.meta → Assets/VRM_Samples/SimpleViewer/Motions/vrm_simpleviewer_test_motion.txt.meta
View File

167
ProjectSettings/SceneTemplateSettings.json Normal file
View File

@@ -0,0 +1,167 @@
{
"templatePinStates": [],
"dependencyTypeInfos": [
{
"userAdded": false,
"type": "UnityEngine.AnimationClip",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEditor.Animations.AnimatorController",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.AnimatorOverrideController",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEditor.Audio.AudioMixerController",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.ComputeShader",
"ignore": true,
"defaultInstantiationMode": 1,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Cubemap",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.GameObject",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEditor.LightingDataAsset",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": false
},
{
"userAdded": false,
"type": "UnityEngine.LightingSettings",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Material",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEditor.MonoScript",
"ignore": true,
"defaultInstantiationMode": 1,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.PhysicMaterial",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.PhysicsMaterial2D",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Rendering.VolumeProfile",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEditor.SceneAsset",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": false
},
{
"userAdded": false,
"type": "UnityEngine.Shader",
"ignore": true,
"defaultInstantiationMode": 1,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.ShaderVariantCollection",
"ignore": true,
"defaultInstantiationMode": 1,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Texture",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Texture2D",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
},
{
"userAdded": false,
"type": "UnityEngine.Timeline.TimelineAsset",
"ignore": false,
"defaultInstantiationMode": 0,
"supportsModification": true
}
],
"defaultDependencyTypeInfo": {
"userAdded": false,
"type": "<default_scene_template_dependencies>",
"ignore": false,
"defaultInstantiationMode": 1,
"supportsModification": true
},
"newSceneOverride": 0
}