From acba22b62cf03bef61f36e5c121ccc7e8ea95698 Mon Sep 17 00:00:00 2001 From: soupday <79094830+soupday@users.noreply.github.com> Date: Fri, 23 Jul 2021 17:48:14 +0100 Subject: [PATCH] 0.1.0 update --- Editor/Pipeline.cs | 16 ++++++---------- ...=> com.soupday.cc3_unity_tools.editor.asmdef} | 0 ...m.soupday.cc3_unity_tools.editor.asmdef.meta} | 0 3 files changed, 6 insertions(+), 10 deletions(-) rename Editor/{com.soupday.cc3_unity_tools_prototype.editor.asmdef => com.soupday.cc3_unity_tools.editor.asmdef} (100%) rename Editor/{com.soupday.cc3_unity_tools_prototype.editor.asmdef.meta => com.soupday.cc3_unity_tools.editor.asmdef.meta} (100%) diff --git a/Editor/Pipeline.cs b/Editor/Pipeline.cs index d7c37d9..e8c2f57 100644 --- a/Editor/Pipeline.cs +++ b/Editor/Pipeline.cs @@ -16,8 +16,6 @@ * along with CC3_Unity_Tools. If not, see . */ -#define PIPELINE_HDRP - using System.Collections.Generic; using UnityEngine; @@ -35,7 +33,7 @@ public enum MaterialQuality { Default, High, Baked } public static class Pipeline { -#if PIPELINE_HDRP +#if HDRP_10_5_0_OR_NEWER // Shaders // public const string SHADER_DEFAULT = "HDRP/Lit"; @@ -113,7 +111,7 @@ public static class Pipeline public const string MATERIAL_BAKED_HAIR_CUSTOM = "RL_Template_Baked_HairCustom_HDRP"; // for gamebase single material or actor core... public const string MATERIAL_DEFAULT_SINGLE_MATERIAL = "RL_Template_Default_SingleMaterial_HDRP"; -#elif PIPELINE_URP +#elif URP_10_5_0_OR_NEWER // Shaders // public const string SHADER_DEFAULT = "Universal Render Pipeline/Lit"; @@ -188,7 +186,7 @@ public static class Pipeline public const string MATERIAL_BAKED_CORNEA_REFRACTIVE = "RL_Template_Baked_CorneaRef_URP"; public const string MATERIAL_BAKED_EYE_CUSTOM = "RL_Template_Baked_EyeCustom_URP"; public const string MATERIAL_BAKED_HAIR_CUSTOM = "RL_Template_Baked_HairCustom_URP"; -#elif PIPELINE_3D +#else // Shaders // public const string SHADER_DEFAULT = "3D/Lit"; @@ -336,14 +334,12 @@ public static class Pipeline public static RenderPipeline GetRenderPipeline() { -#if PIPELINE_HDRP +#if HDRP_10_5_0_OR_NEWER return RenderPipeline.HDRP; -#elif PIPELINE_URP +#elif URP_10_5_0_OR_NEWER return RenderPipeline.URP; -#elif PIPELINE_3D - return RenderPipeline.Builtin; #else - return RenderPipeline.Unknown; + return RenderPipeline.Builtin; #endif } diff --git a/Editor/com.soupday.cc3_unity_tools_prototype.editor.asmdef b/Editor/com.soupday.cc3_unity_tools.editor.asmdef similarity index 100% rename from Editor/com.soupday.cc3_unity_tools_prototype.editor.asmdef rename to Editor/com.soupday.cc3_unity_tools.editor.asmdef diff --git a/Editor/com.soupday.cc3_unity_tools_prototype.editor.asmdef.meta b/Editor/com.soupday.cc3_unity_tools.editor.asmdef.meta similarity index 100% rename from Editor/com.soupday.cc3_unity_tools_prototype.editor.asmdef.meta rename to Editor/com.soupday.cc3_unity_tools.editor.asmdef.meta