diff --git a/.gitignore b/.gitignore index 6ad8187..dd810a8 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ TexturesUnlimited/Library TexturesUnlimited/Shaders TexturesUnlimited/Assets/Shaders* TexturesUnlimited/Assets/Build +TexturesUnlimited/.vs \ No newline at end of file diff --git a/CustomShaders/Effects.meta b/CustomShaders/Effects.meta new file mode 100644 index 0000000..c119052 --- /dev/null +++ b/CustomShaders/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fbf084b5c373c3a49a95354795d38eda +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/CustomShaders/Surface/TU-Icon-Legacy.shader b/CustomShaders/Surface/TU-Icon-Legacy.shader index e93227c..d6cafe9 100644 --- a/CustomShaders/Surface/TU-Icon-Legacy.shader +++ b/CustomShaders/Surface/TU-Icon-Legacy.shader @@ -48,11 +48,11 @@ Shader "TU/Icon/Legacy" _TemperatureColor("Temperature Color", Color) = (0,0,0,0) _BurnColor ("Burn Color", Color) = (1,1,1,1) - _MinX ("MinX", Range(0.000000,1.000000)) = 0.500000 - _MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000 - _MinY ("MinY", Range(0.000000,1.000000)) = 0.500000 - _MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000 - _Multiplier("Multiplier", Float) = 2 + _MinX ("MinX", Range(0.000000,1.000000)) = 0.000000 + _MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000 + _MinY ("MinY", Range(0.000000,1.000000)) = 0.000000 + _MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000 + _Multiplier("Multiplier", Float) = 2.25 } SubShader diff --git a/CustomShaders/Surface/TU-Icon-Metallic.shader b/CustomShaders/Surface/TU-Icon-Metallic.shader index 0784000..69bbda7 100644 --- a/CustomShaders/Surface/TU-Icon-Metallic.shader +++ b/CustomShaders/Surface/TU-Icon-Metallic.shader @@ -49,11 +49,11 @@ Shader "TU/Icon/Metallic" _TemperatureColor("Temperature Color", Color) = (0,0,0,0) _BurnColor ("Burn Color", Color) = (1,1,1,1) - _MinX ("MinX", Range(0.000000,1.000000)) = 0.500000 - _MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000 - _MinY ("MinY", Range(0.000000,1.000000)) = 0.500000 - _MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000 - _Multiplier("Multiplier", Float) = 2 + _MinX ("MinX", Range(0.000000,1.000000)) = 0.000000 + _MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000 + _MinY ("MinY", Range(0.000000,1.000000)) = 0.000000 + _MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000 + _Multiplier("Multiplier", Float) = 2.25 } SubShader diff --git a/CustomShaders/Surface/TU-Icon-Specular.shader b/CustomShaders/Surface/TU-Icon-Specular.shader index bd3dc60..c9359c4 100644 --- a/CustomShaders/Surface/TU-Icon-Specular.shader +++ b/CustomShaders/Surface/TU-Icon-Specular.shader @@ -46,11 +46,11 @@ Shader "TU/Icon/Specular" _TemperatureColor("Temperature Color", Color) = (0,0,0,0) _BurnColor ("Burn Color", Color) = (1,1,1,1) - _MinX ("MinX", Range(0.000000,1.000000)) = 0.500000 - _MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000 - _MinY ("MinY", Range(0.000000,1.000000)) = 0.500000 - _MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000 - _Multiplier("Multiplier", Float) = 2 + _MinX ("MinX", Range(0.000000,1.000000)) = 0.000000 + _MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000 + _MinY ("MinY", Range(0.000000,1.000000)) = 0.000000 + _MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000 + _Multiplier("Multiplier", Float) = 2.25 } SubShader diff --git a/CustomShaders/Surface/TU-Icon-StockSpecular.shader b/CustomShaders/Surface/TU-Icon-StockSpecular.shader index 349e24c..cc5f7f8 100644 --- a/CustomShaders/Surface/TU-Icon-StockSpecular.shader +++ b/CustomShaders/Surface/TU-Icon-StockSpecular.shader @@ -20,11 +20,11 @@ Shader "TU/Icon/StockSpecular" _TemperatureColor("Temperature Color", Color) = (0,0,0,0) _BurnColor ("Burn Color", Color) = (1,1,1,1) - _MinX ("MinX", Range(0.000000,1.000000)) = 0.500000 - _MaxX ("MaxX", Range(0.000000,1.000000)) = 0.800000 - _MinY ("MinY", Range(0.000000,1.000000)) = 0.500000 - _MaxY ("MaxY", Range(0.000000,1.000000)) = 0.800000 - _Multiplier("Multiplier", Float) = 2 + _MinX ("MinX", Range(0.000000,1.000000)) = 0.000000 + _MaxX ("MaxX", Range(0.000000,1.000000)) = 1.000000 + _MinY ("MinY", Range(0.000000,1.000000)) = 0.000000 + _MaxY ("MaxY", Range(0.000000,1.000000)) = 1.000000 + _Multiplier("Multiplier", Float) = 2.25 } SubShader diff --git a/CustomShaders/Surface/TU-Include-Lighting.cginc b/CustomShaders/Surface/TU-Include-Lighting.cginc index b29a5fe..2ca6517 100644 --- a/CustomShaders/Surface/TU-Include-Lighting.cginc +++ b/CustomShaders/Surface/TU-Include-Lighting.cginc @@ -26,6 +26,9 @@ #if TU_SUBSURF c.rgb += subsurf(_SubSurfScale, _SubSurfPower, _SubSurfDistort, _SubSurfAtten, s.Backlight.a, s.Albedo, s.Backlight.rgb, s.Normal, viewDir, gi.light.color, gi.light.dir); #endif + #if TU_ICON + //c.rgb *= _Multiplier.rrr; + #endif return c; } @@ -75,6 +78,9 @@ #if TU_SUBSURF c.rgb += subsurf(_SubSurfScale, _SubSurfPower, _SubSurfDistort, _SubSurfAtten, s.Backlight.a, s.Albedo, s.Backlight.rgb, s.Normal, viewDir, gi.light.color, gi.light.dir); #endif + #if TU_ICON + //c.rgb *= _Multiplier.rrr; + #endif return c; } @@ -130,7 +136,10 @@ #if TU_SUBSURF c.rgb += subsurf(_SubSurfScale, _SubSurfPower, _SubSurfDistort, _SubSurfAtten, s.Backlight.a, s.Albedo, s.Backlight.rgb, s.Normal, viewDir, _LightColor0.rgb, lightDir); - #endif + #endif + #if TU_ICON + //c.rgb *= _Multiplier.rrr; + #endif return c; } diff --git a/CustomShaders/Surface/TU-Include-Surfaces.cginc b/CustomShaders/Surface/TU-Include-Surfaces.cginc index 4288b1b..ccb9646 100644 --- a/CustomShaders/Surface/TU-Include-Surfaces.cginc +++ b/CustomShaders/Surface/TU-Include-Surfaces.cginc @@ -100,6 +100,9 @@ //apply the standard shader param multipliers to the sampled/computed values. o.Albedo *= _Color.rgb; + #if TU_ICON + o.Albedo *= _Multiplier.rrr; + #endif fixed4 fog = UnderwaterFog(IN.worldPos, o.Albedo); o.Albedo = fog.rgb; o.Emission *= fog.a; @@ -207,6 +210,9 @@ //apply the standard shader param multipliers to the sampled/computed values. o.Albedo *= _Color.rgb; + #if TU_ICON + o.Albedo *= _Multiplier.rrr; + #endif fixed4 fog = UnderwaterFog(IN.worldPos, o.Albedo); o.Albedo = fog.rgb; o.Emission *= fog.a; diff --git a/GameData/000_TexturesUnlimited/EVECompat.cfg b/GameData/000_TexturesUnlimited/EVECompat.cfg deleted file mode 100644 index fa9b840..0000000 --- a/GameData/000_TexturesUnlimited/EVECompat.cfg +++ /dev/null @@ -1,7 +0,0 @@ -@TEXTURES_UNLIMITED[default]:NEEDS[EnvironmentalVisualEnhancements] -{ - @REFLECTION_CONFIG,0 - { - %eveInstalled = true - } -} \ No newline at end of file diff --git a/GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll b/GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll index 8fbb7a7..e1b17b0 100644 Binary files a/GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll and b/GameData/000_TexturesUnlimited/Plugins/TexturesUnlimited.dll differ diff --git a/GameData/000_TexturesUnlimited/Shaders/TUShaders.cfg b/GameData/000_TexturesUnlimited/Shaders/TUShaders.cfg index 1f5fc22..6ad6532 100644 --- a/GameData/000_TexturesUnlimited/Shaders/TUShaders.cfg +++ b/GameData/000_TexturesUnlimited/Shaders/TUShaders.cfg @@ -29,12 +29,14 @@ KSP_SHADER_DATA name = TU/Metallic shader = TU/Metallic iconShader = TU/Icon/Metallic + //iconShader = KSP/ScreenSpaceMaskSpecular } KSP_SHADER_DATA { name = TU/Specular shader = TU/Specular - iconShader = TU/Icon/Specular + //iconShader = TU/Icon/Specular + iconShader = KSP/ScreenSpaceMaskSpecular } KSP_SHADER_DATA { diff --git a/GameData/000_TexturesUnlimited/Shaders/tushaders-icons.ssf b/GameData/000_TexturesUnlimited/Shaders/tushaders-icons.ssf index 7cdd509..954c710 100644 Binary files a/GameData/000_TexturesUnlimited/Shaders/tushaders-icons.ssf and b/GameData/000_TexturesUnlimited/Shaders/tushaders-icons.ssf differ diff --git a/GameData/000_TexturesUnlimited/Shaders/tushaders-icons.ssf.manifest b/GameData/000_TexturesUnlimited/Shaders/tushaders-icons.ssf.manifest new file mode 100644 index 0000000..deabfb1 --- /dev/null +++ b/GameData/000_TexturesUnlimited/Shaders/tushaders-icons.ssf.manifest @@ -0,0 +1,25 @@ +ManifestFileVersion: 0 +CRC: 1099231473 +Hashes: + AssetFileHash: + serializedVersion: 2 + Hash: 03e0188f67ae05c1ce25fd8cd9ba972e + TypeTreeHash: + serializedVersion: 2 + Hash: 6872b87c561f08cfccb851e91fe48bfa +HashAppended: 0 +ClassTypes: +- Class: 48 + Script: {instanceID: 0} +- Class: 109 + Script: {instanceID: 0} +Assets: +- Assets/Shaders/Surface/TU-Icon-Metallic.shader +- Assets/Shaders/Surface/TU-Include-Surfaces.cginc +- Assets/Shaders/Surface/TU-Include-Functions.cginc +- Assets/Shaders/Surface/TU-Include-Lighting.cginc +- Assets/Shaders/Surface/TU-Include-Structs.cginc +- Assets/Shaders/Surface/TU-Icon-StockSpecular.shader +- Assets/Shaders/Surface/TU-Icon-Legacy.shader +- Assets/Shaders/Surface/TU-Icon-Specular.shader +Dependencies: [] diff --git a/GameData/000_TexturesUnlimited/TexturesUnlimited.version b/GameData/000_TexturesUnlimited/TexturesUnlimited.version index 66d86c2..0c1ed3f 100644 --- a/GameData/000_TexturesUnlimited/TexturesUnlimited.version +++ b/GameData/000_TexturesUnlimited/TexturesUnlimited.version @@ -1,31 +1,31 @@ { "NAME":"TexturesUnlimited", "URL":"http://ksp-avc.cybutek.net/version.php?id=532", - "DOWNLOAD":"https://github.com/shadowmage45/TexturesUnlimited/releases/tag/1.5.8.23", - "CHANGE_LOG_URL":"https://github.com/shadowmage45/TexturesUnlimited/releases/tag/1.5.8.23", + "DOWNLOAD":"https://github.com/shadowmage45/TexturesUnlimited/releases/tag/1.5.9.24", + "CHANGE_LOG_URL":"https://github.com/shadowmage45/TexturesUnlimited/releases/tag/1.5.9.24", "VERSION": { "MAJOR":1, "MINOR":5, - "PATCH":8, - "BUILD":23 + "PATCH":9, + "BUILD":24 }, "KSP_VERSION": { "MAJOR":1, - "MINOR":7, - "PATCH":2 + "MINOR":8, + "PATCH":1 }, "KSP_VERSION_MIN": { "MAJOR":1, - "MINOR":7, + "MINOR":8, "PATCH":0 }, "KSP_VERSION_MAX": { "MAJOR":1, - "MINOR":7, + "MINOR":8, "PATCH":9 } } diff --git a/TexturesUnlimited/Assembly-CSharp-Editor.csproj b/TexturesUnlimited/Assembly-CSharp-Editor.csproj index e8a0445..6c30c11 100644 --- a/TexturesUnlimited/Assembly-CSharp-Editor.csproj +++ b/TexturesUnlimited/Assembly-CSharp-Editor.csproj @@ -57,46 +57,46 @@ - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEditor.TestRunner.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEditor.TestRunner.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEngine.TestRunner.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEngine.TestRunner.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEngine.UI.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Rider.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEditor.UI.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEditor.UI.dll C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll @@ -285,22 +285,22 @@ C:/Program Files/Unity/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.ads@2.0.8/Editor/UnityEditor.Advertisements.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.ads@2.0.8/Editor/UnityEditor.Advertisements.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.purchasing@2.0.6/Editor/UnityEditor.Purchasing.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.purchasing@2.0.6/Editor/UnityEditor.Purchasing.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/TexturesUnlimited/Assembly-CSharp.csproj b/TexturesUnlimited/Assembly-CSharp.csproj index 2bc169c..fe7e851 100644 --- a/TexturesUnlimited/Assembly-CSharp.csproj +++ b/TexturesUnlimited/Assembly-CSharp.csproj @@ -66,7 +66,6 @@ - @@ -119,40 +118,40 @@ - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEngine.UI.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEngine.UI.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Timeline.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Rider.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Rider.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.2D.Tilemap.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.TextMeshPro.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEditor.UI.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/ScriptAssemblies/UnityEditor.UI.dll C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll @@ -332,13 +331,13 @@ C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll - C:/git_source/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll + F:/git_source/git/TexturesUnlimited/TexturesUnlimited/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll diff --git a/TexturesUnlimited/Assets/Editor/AssetBundleCompiler.cs b/TexturesUnlimited/Assets/Editor/AssetBundleCompiler.cs index 8f2667d..fac44c5 100644 --- a/TexturesUnlimited/Assets/Editor/AssetBundleCompiler.cs +++ b/TexturesUnlimited/Assets/Editor/AssetBundleCompiler.cs @@ -35,8 +35,10 @@ private static void exportAssetBundle(BuildTarget target) for (int i = 0; i < len; i++) { build.assetNames[i] = AssetDatabase.GetAssetPath((UnityEngine.Object)selection[i]); + MonoBehaviour.print("Building asset: " + build.assetNames[i]); } BuildPipeline.BuildAssetBundles(directory, new AssetBundleBuild[] { build }, BuildAssetBundleOptions.None, target); + MonoBehaviour.print("Renaming from: " + path + " to: " + path.Replace(".assetbundle", "")); System.IO.File.Move(path, path.Replace(".assetbundle", "")); } diff --git a/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs b/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.disabled similarity index 100% rename from TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs rename to TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.disabled diff --git a/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.disabled.meta b/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.disabled.meta new file mode 100644 index 0000000..4ce8821 --- /dev/null +++ b/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.disabled.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e6840218fd465a47835e0cecbbde367 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.meta b/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.meta deleted file mode 100644 index 86d4bc2..0000000 --- a/TexturesUnlimited/Assets/Scripts/TU-Metallic-UI.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 39d6f06a1af299d458642b3cddb7e04a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/TexturesUnlimited/Assets/TestingMaterials/TestMaterial1.mat b/TexturesUnlimited/Assets/TestingMaterials/TestMaterial1.mat index 864e5d2..6c8c3b4 100644 --- a/TexturesUnlimited/Assets/TestingMaterials/TestMaterial1.mat +++ b/TexturesUnlimited/Assets/TestingMaterials/TestMaterial1.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: TestMaterial1 - m_Shader: {fileID: 4800000, guid: df9d10f735f9e2243931a07014a9de57, type: 3} + m_Shader: {fileID: 4800000, guid: 289c40f633cbe6a4d9d7a87bc4208596, type: 3} m_ShaderKeywords: TU_RECOLOR TU_SUBSURF m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -87,9 +87,14 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _MaxX: 0.8 + - _MaxY: 0.8 - _Metal: 1 - _Metallic: 0 + - _MinX: 0.5 + - _MinY: 0.5 - _Mode: 0 + - _Multiplier: 2 - _NormalFlipX: 1 - _NormalFlipY: 1 - _OcclusionStrength: 1 diff --git a/TexturesUnlimited/ProjectSettings/GraphicsSettings.asset b/TexturesUnlimited/ProjectSettings/GraphicsSettings.asset index 59cb841..4cdffb1 100644 --- a/TexturesUnlimited/ProjectSettings/GraphicsSettings.asset +++ b/TexturesUnlimited/ProjectSettings/GraphicsSettings.asset @@ -36,6 +36,8 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/TexturesUnlimited/ProjectSettings/PresetManager.asset b/TexturesUnlimited/ProjectSettings/PresetManager.asset index ea5ad95..636a595 100644 Binary files a/TexturesUnlimited/ProjectSettings/PresetManager.asset and b/TexturesUnlimited/ProjectSettings/PresetManager.asset differ diff --git a/TexturesUnlimited/ProjectSettings/VFXManager.asset b/TexturesUnlimited/ProjectSettings/VFXManager.asset index a163fa0..6e0eaca 100644 Binary files a/TexturesUnlimited/ProjectSettings/VFXManager.asset and b/TexturesUnlimited/ProjectSettings/VFXManager.asset differ