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

Rename to UniUnlitUtil and Use UniUnlitUtil.ShaderName

Browse Source
This commit is contained in:
ousttrue 2021-09-27 21:00:26 +09:00
parent 024dadf9b3
commit 68094b54aa
8 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Assets/UniGLTF/Runtime/UniGLTF/IO/MaterialIO/GltfUnlitMaterialImporter.cs
View File

@ -1,4 +1,4 @@
using UnityEngine;
using UniGLTF.UniUnlit;
using VRMShaders;
using ColorSpace = VRMShaders.ColorSpace;
@ -6,8 +6,6 @@ namespace UniGLTF
{
public static class GltfUnlitMaterialImporter
{
public const string ShaderName = "UniGLTF/UniUnlit";
public static bool TryCreateParam(GltfData data, int i, out MaterialDescriptor matDesc)
{
if (i < 0 || i >= data.GLTF.materials.Count)
@ -23,7 +21,7 @@ namespace UniGLTF
return false;
}
matDesc = new MaterialDescriptor(GltfMaterialDescriptorGenerator.GetMaterialName(i, src), ShaderName);
matDesc = new MaterialDescriptor(GltfMaterialDescriptorGenerator.GetMaterialName(i, src), UniUnlitUtil.ShaderName);
// texture
if (src.pbrMetallicRoughness.baseColorTexture != null)
@ -46,41 +44,41 @@ namespace UniGLTF
{
if (src.alphaMode == "OPAQUE")
{
UniUnlit.Utils.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Opaque);
UniUnlitUtil.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Opaque);
}
else if (src.alphaMode == "BLEND")
{
UniUnlit.Utils.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Transparent);
UniUnlitUtil.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Transparent);
}
else if (src.alphaMode == "MASK")
{
UniUnlit.Utils.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Cutout);
UniUnlitUtil.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Cutout);
material.SetFloat("_Cutoff", src.alphaCutoff);
}
else
{
// default OPAQUE
UniUnlit.Utils.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Opaque);
UniUnlitUtil.SetRenderMode(material, UniUnlit.UniUnlitRenderMode.Opaque);
}
// culling
if (src.doubleSided)
{
UniUnlit.Utils.SetCullMode(material, UniUnlit.UniUnlitCullMode.Off);
UniUnlitUtil.SetCullMode(material, UniUnlit.UniUnlitCullMode.Off);
}
else
{
UniUnlit.Utils.SetCullMode(material, UniUnlit.UniUnlitCullMode.Back);
UniUnlitUtil.SetCullMode(material, UniUnlit.UniUnlitCullMode.Back);
}
// VColor
var hasVertexColor = data.GLTF.MaterialHasVertexColor(i);
if (hasVertexColor)
{
UniUnlit.Utils.SetVColBlendMode(material, UniUnlit.UniUnlitVertexColorBlendOp.Multiply);
UniUnlitUtil.SetVColBlendMode(material, UniUnlit.UniUnlitVertexColorBlendOp.Multiply);
}
UniUnlit.Utils.ValidateProperties(material, true);
UniUnlitUtil.ValidateProperties(material, true);
});
return true;

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

@ -220,7 +220,7 @@ namespace UniGLTF
case "Unlit/Texture":
case "Unlit/Transparent":
case "Unlit/Transparent Cutout":
case "UniGLTF/UniUnlit":
case UniUnlit.UniUnlitUtil.ShaderName:
return true;
default:
@ -244,7 +244,7 @@ namespace UniGLTF
case "Unlit/Transparent Cutout":
return Export_UnlitCutout(m);
case "UniGLTF/UniUnlit":
case UniUnlit.UniUnlitUtil.ShaderName:
return Export_UniUnlit(m);
default:
@ -285,7 +285,7 @@ namespace UniGLTF
{
var material = glTF_KHR_materials_unlit.CreateDefault();
var renderMode = UniUnlit.Utils.GetRenderMode(m);
var renderMode = UniUnlit.UniUnlitUtil.GetRenderMode(m);
if (renderMode == UniUnlitRenderMode.Opaque)
{
material.alphaMode = glTFBlendMode.OPAQUE.ToString();
@ -304,7 +304,7 @@ namespace UniGLTF
material.alphaMode = glTFBlendMode.OPAQUE.ToString();
}
var cullMode = UniUnlit.Utils.GetCullMode(m);
var cullMode = UniUnlit.UniUnlitUtil.GetCullMode(m);
if (cullMode == UniUnlitCullMode.Off)
{
material.doubleSided = true;

4
Assets/UniGLTF/Runtime/UniGLTF/IO/MeshIO/VertexColorState.cs
View File

@ -26,11 +26,11 @@ namespace UniGLTF
{
return false;
}
if (m.shader.name != UniGLTF.UniUnlit.Utils.ShaderName)
if (m.shader.name != UniGLTF.UniUnlit.UniUnlitUtil.ShaderName)
{
return false;
}
if (UniGLTF.UniUnlit.Utils.GetVColBlendMode(m) != UniGLTF.UniUnlit.UniUnlitVertexColorBlendOp.Multiply)
if (UniGLTF.UniUnlit.UniUnlitUtil.GetVColBlendMode(m) != UniGLTF.UniUnlit.UniUnlitVertexColorBlendOp.Multiply)
{
return false;
}

2
Assets/VRMShaders/GLTF/IO/Runtime/MaterialFactory.cs
View File

@ -24,7 +24,7 @@ namespace VRMShaders
{"VRM/UnlitCutout", "Unlit/Transparent Cutout"},
// 互換性は無いがとりあえず、
{"VRM/UnlitTransparentZWrite", "VRM/MToon"},
{"UniGLTF/StandardVColor", UniGLTF.UniUnlit.Utils.ShaderName},
{"UniGLTF/StandardVColor", UniGLTF.UniUnlit.UniUnlitUtil.ShaderName},
};
public struct MaterialLoadInfo

22
Assets/VRMShaders/GLTF/UniUnlit/Editor/UniUnlitEditor.cs
View File

@ -22,12 +22,12 @@ namespace UniGLTF.UniUnlit
public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] properties)
{
_mainTex = FindProperty(Utils.PropNameMainTex, properties);
_color = FindProperty(Utils.PropNameColor, properties);
_cutoff = FindProperty(Utils.PropNameCutoff, properties);
_blendMode = FindProperty(Utils.PropNameBlendMode, properties);
_cullMode = FindProperty(Utils.PropNameCullMode, properties);
_vColBlendMode = FindProperty(Utils.PropNameVColBlendMode, properties);
_mainTex = FindProperty(UniUnlitUtil.PropNameMainTex, properties);
_color = FindProperty(UniUnlitUtil.PropNameColor, properties);
_cutoff = FindProperty(UniUnlitUtil.PropNameCutoff, properties);
_blendMode = FindProperty(UniUnlitUtil.PropNameBlendMode, properties);
_cullMode = FindProperty(UniUnlitUtil.PropNameCullMode, properties);
_vColBlendMode = FindProperty(UniUnlitUtil.PropNameVColBlendMode, properties);
// _srcBlend = FindProperty(PropNameSrcBlend, properties);
// _dstBlend = FindProperty(PropNameDstBlend, properties);
// _zWrite = FindProperty(PropNameZWrite, properties);
@ -46,18 +46,18 @@ namespace UniGLTF.UniUnlit
public override void AssignNewShaderToMaterial(Material material, Shader oldShader, Shader newShader)
{
var blendMode = UniUnlitRenderMode.Opaque;
if (material.HasProperty(Utils.PropNameStandardShadersRenderMode)) // from Standard shader
if (material.HasProperty(UniUnlitUtil.PropNameStandardShadersRenderMode)) // from Standard shader
{
blendMode = (UniUnlitRenderMode) Math.Min(2f, material.GetFloat(Utils.PropNameStandardShadersRenderMode));
blendMode = (UniUnlitRenderMode) Math.Min(2f, material.GetFloat(UniUnlitUtil.PropNameStandardShadersRenderMode));
}
// assigns UniUnlit's properties...
base.AssignNewShaderToMaterial(material, oldShader, newShader);
// take over old value
material.SetFloat(Utils.PropNameBlendMode, (float) blendMode);
material.SetFloat(UniUnlitUtil.PropNameBlendMode, (float) blendMode);
Utils.ValidateProperties(material, isRenderModeChangedByUser: true);
UniUnlitUtil.ValidateProperties(material, isRenderModeChangedByUser: true);
}
private void DrawRenderingBox(MaterialEditor materialEditor, Material[] materials)
@ -152,7 +152,7 @@ namespace UniGLTF.UniUnlit
{
foreach (var material in materials)
{
Utils.ValidateProperties(material, isRenderModeChangedByUser);
UniUnlitUtil.ValidateProperties(material, isRenderModeChangedByUser);
}
}
}

2
Assets/VRMShaders/GLTF/UniUnlit/Runtime/Utils.cs → Assets/VRMShaders/GLTF/UniUnlit/Runtime/UniUnlitUtil.cs
View File

@ -24,7 +24,7 @@ namespace UniGLTF.UniUnlit
Multiply = 1,
}
public static class Utils
public static class UniUnlitUtil
{
public const string ShaderName = "UniGLTF/UniUnlit";
public const string PropNameMainTex = "_MainTex";

11
Assets/VRMShaders/GLTF/UniUnlit/Runtime/UniUnlitUtil.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 318c9e903f457f94589b2c5513d7d914
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/VRMShaders/GLTF/UniUnlit/Runtime/Utils.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: e96cbbd810384352a6799dd731533178
timeCreated: 1537534399