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

rename

Browse Source
This commit is contained in:
Masataka SUMI 2022-11-10 21:26:02 +09:00
parent 848dfe4597
commit 9f16a268a6
23 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GlbScriptedImporterEditor.cs
View File

@ -32,7 +32,7 @@ namespace UniGLTF
}
m_data = new GlbFileParser(m_importer.assetPath).Parse();
var materialGenerator = new GltfMaterialDescriptorGenerator();
var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator();
var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);

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

@ -26,7 +26,7 @@ namespace UniGLTF
{
if (m_renderPipeline == UniGLTF.RenderPipelineTypes.UniversalRenderPipeline)
{
if (Shader.Find(UniGLTF.GltfPbrUrpMaterialImporter.ShaderName) == null)
if (Shader.Find(UniGLTF.UrpGltfPbrMaterialImporter.ShaderName) == null)
{
Debug.LogWarning("URP is not installed. Force to BuiltinRenderPipeline");
m_renderPipeline = UniGLTF.RenderPipelineTypes.BuiltinRenderPipeline;
@ -39,10 +39,10 @@ namespace UniGLTF
switch (renderPipeline)
{
case RenderPipelineTypes.BuiltinRenderPipeline:
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
case RenderPipelineTypes.UniversalRenderPipeline:
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
default:
throw new System.NotImplementedException();

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/GltfScriptedImporterEditor.cs
View File

@ -30,7 +30,7 @@ namespace UniGLTF
}
m_data = new AutoGltfFileParser(m_importer.assetPath).Parse();
var materialGenerator = new GltfMaterialDescriptorGenerator();
var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator();
var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);

2
Assets/UniGLTF/Editor/UniGLTF/ScriptedImporter/ZipArchivedGltfScriptedImporterEditor.cs
View File

@ -26,7 +26,7 @@ namespace UniGLTF
m_importer = target as ZipArchivedGltfScriptedImporter;
m_data = new AutoGltfFileParser(m_importer.assetPath).Parse();
var materialGenerator = new GltfMaterialDescriptorGenerator();
var materialGenerator = new BuiltInGltfMaterialDescriptorGenerator();
var materialKeys = m_data.GLTF.materials.Select((_, i) => materialGenerator.Get(m_data, i).SubAssetKey);
var textureKeys = new GltfTextureDescriptorGenerator(m_data).Get().GetEnumerable().Select(x => x.SubAssetKey);
m_materialEditor = new RemapEditorMaterial(materialKeys.Concat(textureKeys), GetEditorMap, SetEditorMap);

2
Assets/UniGLTF/Runtime/UniGLTF/IO/ImporterContext.cs
View File

@ -38,7 +38,7 @@ namespace UniGLTF
{
Data = data;
TextureDescriptorGenerator = new GltfTextureDescriptorGenerator(Data);
MaterialDescriptorGenerator = materialGenerator ?? new GltfMaterialDescriptorGenerator();
MaterialDescriptorGenerator = materialGenerator ?? new BuiltInGltfMaterialDescriptorGenerator();
ExternalObjectMap = externalObjectMap ?? new Dictionary<SubAssetKey, UnityEngine.Object>();
textureDeserializer = textureDeserializer ?? new UnityTextureDeserializer();

8
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs
View File

@ -9,12 +9,12 @@ namespace UniGLTF
/// <summary>
/// GLTF の MaterialImporter
/// </summary>
public sealed class GltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class BuiltInGltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
public MaterialDescriptor Get(GltfData data, int i)
{
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param;
// fallback
if (Symbols.VRM_DEVELOP)
{
@ -23,7 +23,7 @@ namespace UniGLTF
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/GltfMaterialDescriptorGenerator.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/BuiltInGltfMaterialDescriptorGenerator.cs.meta
View File

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs
View File

@ -39,7 +39,7 @@ namespace UniGLTF
/// _ZWrite
///
/// </summary>
public static class GltfPbrMaterialImporter
public static class BuiltInGltfPbrMaterialImporter
{
private static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend");
private static readonly int DstBlend = Shader.PropertyToID("_DstBlend");
@ -206,7 +206,7 @@ namespace UniGLTF
});
matDesc = new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, src),
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src),
ShaderName,
null,
textureSlots,

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfPbrMaterialImporter.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfPbrMaterialImporter.cs.meta
View File

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs
View File

@ -7,7 +7,7 @@ using ColorSpace = VRMShaders.ColorSpace;
namespace UniGLTF
{
public static class GltfUnlitMaterialImporter
public static class BuiltInGltfUnlitMaterialImporter
{
private static readonly int Cutoff = Shader.PropertyToID("_Cutoff");
@ -50,7 +50,7 @@ namespace UniGLTF
}
matDesc = new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, src),
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src),
UniUnlitUtil.ShaderName,
null,
textureSlots,

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/GltfUnlitMaterialImporter.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/BuiltInRP/Import/Materials/BuiltInGltfUnlitMaterialImporter.cs.meta
View File

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs
View File

@ -11,7 +11,7 @@ namespace UniGLTF
///
/// see: https://github.com/Unity-Technologies/Graphics/blob/v7.5.3/com.unity.render-pipelines.universal/Editor/UniversalRenderPipelineMaterialUpgrader.cs#L354-L379
/// </summary>
public static class GltfPbrUrpMaterialImporter
public static class UrpGltfPbrMaterialImporter
{
private static readonly int SrcBlend = Shader.PropertyToID("_SrcBlend");
private static readonly int DstBlend = Shader.PropertyToID("_DstBlend");
@ -181,7 +181,7 @@ namespace UniGLTF
});
matDesc = new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, src),
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, src),
ShaderName,
null,
textureSlots,

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/GltfPbrURPMaterialImporter.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/Materials/UrpGltfPbrMaterialImporter.cs.meta
View File

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

@ -10,12 +10,12 @@ namespace UniGLTF
/// <summary>
/// GLTF の MaterialImporter
/// </summary>
public sealed class GltfUrpMaterialDescriptorGenerator : IMaterialDescriptorGenerator
public sealed class UrpGltfMaterialDescriptorGenerator : IMaterialDescriptorGenerator
{
public MaterialDescriptor Get(GltfData data, int i)
{
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out param)) return param;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var param)) return param;
if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out param)) return param;
// fallback
if (Symbols.VRM_DEVELOP)
{
@ -24,7 +24,7 @@ namespace UniGLTF
return new MaterialDescriptor(
GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

0
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/GltfURPMaterialDescriptorGenerator.cs.meta → Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/URP/Import/UrpGltfMaterialDescriptorGenerator.cs.meta
View File

2
Assets/UniGLTF/Tests/UniGLTF/GltfLoadTests.cs
View File

@ -226,7 +226,7 @@ namespace UniGLTF
var path = Path.Combine(root.FullName, "DamagedHelmet/glTF-Binary/DamagedHelmet.glb");
using (var data = new AutoGltfFileParser(path).Parse())
{
var matDesc = new GltfMaterialDescriptorGenerator().Get(data, 0);
var matDesc = new BuiltInGltfMaterialDescriptorGenerator().Get(data, 0);
Assert.AreEqual("Standard", matDesc.ShaderName);
Assert.AreEqual(5, matDesc.TextureSlots.Count);
var (key, value) = matDesc.EnumerateSubAssetKeyValue().First();

8
Assets/VRM/Runtime/IO/MaterialIO/BuiltInRP/Import/VRMMaterialDescriptorGenerator.cs
View File

@ -29,13 +29,13 @@ namespace VRM
}
// unlit
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc))
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc))
{
return matDesc;
}
// pbr
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc))
if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc))
{
return matDesc;
}
@ -43,8 +43,8 @@ namespace VRM
// fallback
Debug.LogWarning($"fallback");
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

8
Assets/VRM/Runtime/IO/MaterialIO/URP/Import/VRMURPMaterialDescriptorGenerator.cs
View File

@ -18,17 +18,17 @@ namespace VRM
{
// mtoon URP "MToon" shader is not ready. import fallback to unlit
// unlit "UniUnlit" work in URP
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out var matDesc)) return matDesc;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out var matDesc)) return matDesc;
// pbr "Standard" to "Universal Render Pipeline/Lit"
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

2
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporter.cs
View File

@ -26,7 +26,7 @@ namespace UniVRM10
{
if (RenderPipeline == UniGLTF.RenderPipelineTypes.UniversalRenderPipeline)
{
if (Shader.Find(UniGLTF.GltfPbrUrpMaterialImporter.ShaderName) == null)
if (Shader.Find(UniGLTF.UrpGltfPbrMaterialImporter.ShaderName) == null)
{
Debug.LogWarning("URP is not installed. Force to BuiltinRenderPipeline");
RenderPipeline = UniGLTF.RenderPipelineTypes.BuiltinRenderPipeline;

6
Assets/VRM10/Runtime/IO/Material/BuiltInRP/Import/Vrm10MaterialDescriptorGenerator.cs
View File

@ -13,16 +13,16 @@ namespace UniVRM10
// mtoon
if (Vrm10MToonMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
// unlit
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// pbr
if (GltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (BuiltInGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
if (Symbols.VRM_DEVELOP)
{
Debug.LogWarning($"material: {i} out of range. fallback");
}
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null), GltfPbrMaterialImporter.ShaderName,
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null), BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

8
Assets/VRM10/Runtime/IO/Material/URP/Import/Vrm10UrpMaterialDescriptorGenerator.cs
View File

@ -11,14 +11,14 @@ namespace UniVRM10
public MaterialDescriptor Get(GltfData data, int i)
{
// unlit
if (GltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
if (BuiltInGltfUnlitMaterialImporter.TryCreateParam(data, i, out MaterialDescriptor matDesc)) return matDesc;
// pbr
if (GltfPbrUrpMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
if (UrpGltfPbrMaterialImporter.TryCreateParam(data, i, out matDesc)) return matDesc;
// fallback
Debug.LogWarning($"material: {i} out of range. fallback");
return new MaterialDescriptor(
GltfMaterialDescriptorGenerator.GetMaterialName(i, null),
GltfPbrMaterialImporter.ShaderName,
BuiltInGltfMaterialDescriptorGenerator.GetMaterialName(i, null),
BuiltInGltfPbrMaterialImporter.ShaderName,
null,
new Dictionary<string, TextureDescriptor>(),
new Dictionary<string, float>(),

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

@ -309,11 +309,11 @@ namespace UniVRM10.VRM10Viewer
{
if (useUrp)
{
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
}
else
{
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
}
}

4
Assets/VRM_Samples/SimpleViewer/ViewerUI.cs
View File

@ -332,11 +332,11 @@ namespace VRM.SimpleViewer
{
if (useUrp)
{
return new GltfUrpMaterialDescriptorGenerator();
return new UrpGltfMaterialDescriptorGenerator();
}
else
{
return new GltfMaterialDescriptorGenerator();
return new BuiltInGltfMaterialDescriptorGenerator();
}
}