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

Merge pull request #1904 from Santarh/suppressPreprocessor

Browse Source 
Use static getter instead of preprocessors.
This commit is contained in:
ousttrue 2022-11-04 14:06:37 +09:00 committed by GitHub
commit 1ca2d14100
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 119 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/UniGLTF/Editor/UniGLTF/ExportDialog/ExportDialogState.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
using VRMShaders;
namespace UniGLTF
{
@ -58,9 +59,10 @@ namespace UniGLTF
}
if (m_root.IsPrefab)
{
#if VRM_DEVELOP
Debug.Log($"PrefabUtility.UnloadPrefabContents({m_root.GameObject})");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.Log($"PrefabUtility.UnloadPrefabContents({m_root.GameObject})");
}
PrefabUtility.UnloadPrefabContents(m_root.GameObject);
}
m_root = (value, isPrefab);

7
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterBase.cs
View File

@ -57,9 +57,10 @@ namespace UniGLTF
/// <param name="reverseAxis"></param>
protected static void Import(ScriptedImporter scriptedImporter, AssetImportContext context, Axes reverseAxis, RenderPipelineTypes renderPipeline)
{
#if VRM_DEVELOP
Debug.Log("OnImportAsset to " + scriptedImporter.assetPath);
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.Log("OnImportAsset to " + scriptedImporter.assetPath);
}
//
// Import(create unity objects)

3
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/TextureExtractor.cs
View File

@ -92,9 +92,6 @@ namespace UniGLTF
{
// remap
var externalObject = targetPath.LoadAsset<Texture2D>();
#if VRM_DEVELOP
// Debug.Log($"remap: {targetPath} => {externalObject}");
#endif
if (externalObject != null)
{
addRemap(key, externalObject);

36
Assets/UniGLTF/Runtime/MeshUtility/BoneNormalizer.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using VRMShaders;
namespace UniGLTF.MeshUtility
@ -307,9 +308,11 @@ namespace UniGLTF.MeshUtility
var meshVertices = mesh.vertices;
var meshNormals = mesh.normals;
#if VRM_NORMALIZE_BLENDSHAPE_TANGENT
var meshTangents = mesh.tangents.Select(x => (Vector3)x).ToArray();
#endif
var meshTangents = Array.Empty<Vector3>();
if (Symbols.VRM_NORMALIZE_BLENDSHAPE_TANGENT)
{
meshTangents = mesh.tangents.Select(x => (Vector3)x).ToArray();
}
var originalBlendShapePositions = new Vector3[meshVertices.Length];
var originalBlendShapeNormals = new Vector3[meshVertices.Length];
@ -323,11 +326,11 @@ namespace UniGLTF.MeshUtility
srcRenderer.sharedMesh.GetBlendShapeFrameVertices(i, 0, originalBlendShapePositions, originalBlendShapeNormals, originalBlendShapeTangents);
var hasVertices = originalBlendShapePositions.Count(x => x != Vector3.zero);
var hasNormals = originalBlendShapeNormals.Count(x => x != Vector3.zero);
#if VRM_NORMALIZE_BLENDSHAPE_TANGENT
var hasTangents = originalBlendShapeTangents.Count(x => x != Vector3.zero);
#else
var hasTangents = 0;
#endif
if (Symbols.VRM_NORMALIZE_BLENDSHAPE_TANGENT)
{
hasTangents = originalBlendShapeTangents.Count(x => x != Vector3.zero);
}
var name = srcMesh.GetBlendShapeName(i);
if (string.IsNullOrEmpty(name))
{
@ -375,19 +378,20 @@ namespace UniGLTF.MeshUtility
}
Vector3[] tangents = blendShapeMesh.tangents.Select(x => (Vector3)x).ToArray();
#if VRM_NORMALIZE_BLENDSHAPE_TANGENT
for (int j = 0; j < tangents.Length; ++j)
if (Symbols.VRM_NORMALIZE_BLENDSHAPE_TANGENT)
{
if (originalBlendShapeTangents[j] == Vector3.zero)
for (int j = 0; j < tangents.Length; ++j)
{
tangents[j] = Vector3.zero;
}
else
{
tangents[j] = m.MultiplyVector(tangents[j]) - meshTangents[j];
if (originalBlendShapeTangents[j] == Vector3.zero)
{
tangents[j] = Vector3.zero;
}
else
{
tangents[j] = m.MultiplyVector(tangents[j]) - meshTangents[j];
}
}
}
#endif
var frameCount = srcMesh.GetBlendShapeFrameCount(i);
for (int f = 0; f < frameCount; f++)

9
Assets/UniGLTF/Runtime/MeshUtility/MeshExtensions.cs
View File

@ -1,5 +1,6 @@
using UnityEngine;
using System.Linq;
using VRMShaders;
namespace UniGLTF.MeshUtility
@ -53,11 +54,11 @@ namespace UniGLTF.MeshUtility
{
var vertices = src.vertices;
var normals = src.normals;
#if VRM_NORMALIZE_BLENDSHAPE_TANGENT
var tangents = src.tangents.Select(x => (Vector3)x).ToArray();
#else
Vector3[] tangents = null;
#endif
if (Symbols.VRM_NORMALIZE_BLENDSHAPE_TANGENT)
{
tangents = src.tangents.Select(x => (Vector3)x).ToArray();
}
for (int i = 0; i < src.blendShapeCount; ++i)
{

7
Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContextExtensions.cs
View File

@ -22,9 +22,10 @@ namespace UniGLTF
throw new AggregateException(task.Exception);
}
#if VRM_DEVELOP
Debug.Log($"{self.Data.TargetPath}: {meassureTime.GetSpeedLog()}");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.Log($"{self.Data.TargetPath}: {meassureTime.GetSpeedLog()}");
}
return task.Result;
}

8
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfMaterialDescriptorGenerator.cs
View File

@ -16,9 +16,11 @@ namespace UniGLTF
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param;
// fallback
#if VRM_DEVELOP
Debug.LogWarning($"material: {i} out of range. fallback");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,

8
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/GltfURPMaterialDescriptorGenerator.cs
View File

@ -17,9 +17,11 @@ namespace UniGLTF
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out param)) return param;
// fallback
#if VRM_DEVELOP
Debug.LogWarning($"material: {i} out of range. fallback");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,

9
Assets/VRM/Editor/Format/VRMEditorImporterContext.cs
View File

@ -118,10 +118,11 @@ namespace VRM
{
if (!string.IsNullOrEmpty(AssetDatabase.GetAssetPath(o)))
{
#if VRM_DEVELOP
// 来ない？
Debug.LogWarning($"{o} already exists. skip write");
#endif
if (Symbols.VRM_DEVELOP)
{
// 来ない？
Debug.LogWarning($"{o} already exists. skip write");
}
return;
}

28
Assets/VRM/Runtime/BlendShape/PreviewSceneManager.cs
View File

@ -1,15 +1,10 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using System.Reflection;
using System;
#if UNITY_EDITOR
using UnityEditor;
#endif
using VRMShaders;
using UniGLTF;
namespace VRM
{
/// <summary>
@ -56,14 +51,17 @@ namespace VRM
// HideFlags are special editor-only settings that let you have *secret* GameObjects in a scene, or to tell Unity not to save that temporary GameObject as part of the scene
foreach (var x in go.transform.Traverse())
{
x.gameObject.hideFlags = HideFlags.None
| HideFlags.DontSave
//| HideFlags.DontSaveInBuild
#if VRM_DEVELOP
#else
| HideFlags.HideAndDontSave
#endif
;
if (Symbols.VRM_DEVELOP)
{
x.gameObject.hideFlags = HideFlags.None |
HideFlags.DontSave;
}
else
{
x.gameObject.hideFlags = HideFlags.None |
HideFlags.DontSave |
HideFlags.HideAndDontSave;
}
}
return manager;

7
Assets/VRM/Runtime/IO/VRMURPMaterialDescriptorGenerator.cs
View File

@ -22,9 +22,10 @@ namespace VRM
// pbr "Standard" to "Universal Render Pipeline/Lit"
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
#if VRM_DEVELOP
Debug.LogWarning($"material: {i} out of range. fallback");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,

7
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterImpl.cs
View File

@ -73,9 +73,10 @@ namespace UniVRM10
/// <param name="doNormalize">normalize する</param>
public static void Import(ScriptedImporter scriptedImporter, AssetImportContext context, bool doMigrate, RenderPipelineTypes renderPipeline)
{
#if VRM_DEVELOP
Debug.Log("OnImportAsset to " + scriptedImporter.assetPath);
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.Log("OnImportAsset to " + scriptedImporter.assetPath);
}
// 1st parse as vrm1
using (var data = new GlbFileParser(scriptedImporter.assetPath).Parse())

9
Assets/VRM10/Editor/Vrm10TopMenu.cs
View File

@ -7,19 +7,18 @@ namespace UniVRM10
private const string UserMenuPrefix = VRMVersion.MENU;
private const string DevelopmentMenuPrefix = VRMVersion.MENU + "/Development";
const string CONVERT_HUMANOID_KEY = VRMVersion.MENU + "/Export VRM-1.0";
[MenuItem(UserMenuPrefix + "/Export VRM-1.0", priority = 1)]
static void OpenExportDialog() => VRM10ExportDialog.Open();
private static void OpenExportDialog() => VRM10ExportDialog.Open();
#if VRM_DEVELOP
[MenuItem(UserMenuPrefix + "/VRM1 Window", false, 2)]
static void OpenWindow() => VRM10Window.Open();
private static void OpenWindow() => VRM10Window.Open();
[MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema")]
public static void Generate() => Vrm10SerializerGenerator.Run(false);
private static void Generate() => Vrm10SerializerGenerator.Run(false);
[MenuItem(DevelopmentMenuPrefix + "/Generate from JsonSchema(debug)")]
public static void Parse() => Vrm10SerializerGenerator.Run(true);
private static void Parse() => Vrm10SerializerGenerator.Run(true);
#endif
}
}

20
Assets/VRM10/Runtime/Components/Expression/Preview/PreviewSceneManager.cs
View File

@ -2,6 +2,7 @@
using System.Linq;
using UnityEngine;
using System;
using VRMShaders;
namespace UniVRM10
@ -52,14 +53,17 @@ namespace UniVRM10
// HideFlags are special editor-only settings that let you have *secret* GameObjects in a scene, or to tell Unity not to save that temporary GameObject as part of the scene
foreach (var x in go.transform.Traverse())
{
x.gameObject.hideFlags = HideFlags.None
| HideFlags.DontSave
//| HideFlags.DontSaveInBuild
#if VRM_DEVELOP
#else
| HideFlags.HideAndDontSave
#endif
;
if (Symbols.VRM_DEVELOP)
{
x.gameObject.hideFlags = HideFlags.None |
HideFlags.DontSave;
}
else
{
x.gameObject.hideFlags = HideFlags.None |
HideFlags.DontSave |
HideFlags.HideAndDontSave;
}
}
return manager;

7
Assets/VRM10/Runtime/IO/Material/Vrm10MaterialDescriptorGenerator.cs
View File

@ -17,9 +17,10 @@ namespace UniVRM10
// pbr
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
#if VRM_DEVELOP
Debug.LogWarning($"material: {i} out of range. fallback");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName,
null,

22
Assets/VRM10/Runtime/Migration/Materials/Vrm0XMToonValue.cs
View File

@ -3,6 +3,7 @@ using System.Linq;
using UniGLTF;
using UniJSON;
using UnityEngine;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
namespace UniVRM10
@ -84,9 +85,10 @@ namespace UniVRM10
break;
default:
#if VRM_DEVELOP
Debug.LogWarning($"vectorProperties: {kv.Key}: {kv.Value}");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"vectorProperties: {kv.Key}: {kv.Value}");
}
break;
}
}
@ -187,9 +189,10 @@ namespace UniVRM10
break;
default:
#if VRM_DEVELOP
Debug.LogWarning($"floatProperties: {kv.Key} is unknown");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"floatProperties: {kv.Key} is unknown");
}
break;
}
}
@ -217,9 +220,10 @@ namespace UniVRM10
// UV Animation
case "_UvAnimMaskTexture": map.UvAnimMaskTexture = index; break;
default:
#if VRM_DEVELOP
Debug.LogWarning($"textureProperties: {kv.Key} is unknown");
#endif
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"textureProperties: {kv.Key} is unknown");
}
break;
}
}

3
Assets/VRMShaders/GLTF/IO/Runtime/Material/Importer/MaterialFactory.cs
View File

@ -55,9 +55,6 @@ namespace VRMShaders
if (!x.UseExternal)
{
// 外部の '.asset' からロードしていない
#if VRM_DEVELOP
// Debug.Log($"Destroy {x.Asset}");
#endif
UnityObjectDestroyer.DestroyRuntimeOrEditor(x.Asset);
}
}

12
Assets/VRMShaders/GLTF/IO/Runtime/Util/Symbols.cs
View File

@ -15,6 +15,18 @@ namespace VRMShaders
return true;
#else
return false;
#endif
}
}
public static bool VRM_NORMALIZE_BLENDSHAPE_TANGENT
{
get
{
#if VRM_NORMALIZE_BLENDSHAPE_TANGENT
return true;
#else
return false;
#endif
}
}