diff --git a/Materials/WOTilemapTextureArrayMat.mat b/Materials/WOTilemapTextureArrayMat.mat new file mode 100644 index 0000000..76823db --- /dev/null +++ b/Materials/WOTilemapTextureArrayMat.mat @@ -0,0 +1,115 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WOTilemapTextureArrayMat + m_Shader: {fileID: 4800000, guid: 3f08c91455dba801bac70cee95333901, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Control: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SplatTex0: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SplatTex1: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SplatTex2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SplatTex3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TileMetallicGlossMapTexArr: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TileNormalMapTexArr: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TileTexArr: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _TilemapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _MaxIndex: 255 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _TilemapDim: 128 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Materials/WOTilemapTextureArrayMat.mat.meta b/Materials/WOTilemapTextureArrayMat.mat.meta new file mode 100644 index 0000000..8f18a64 --- /dev/null +++ b/Materials/WOTilemapTextureArrayMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99ab6b354e21f2f4eb639745319a7716 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Scripts/WOTerrainMaterialProvider.cs b/Scripts/WOTerrainMaterialProvider.cs index a8edcc9..baf78e2 100644 --- a/Scripts/WOTerrainMaterialProvider.cs +++ b/Scripts/WOTerrainMaterialProvider.cs @@ -1,4 +1,4 @@ -// Project: Daggerfall Tools For Unity +// Project: Daggerfall Tools For Unity // Copyright: Copyright (C) 2009-2020 Daggerfall Workshop // Web Site: http://www.dfworkshop.net // License: MIT License (http://www.opensource.org/licenses/mit-license.php) @@ -29,7 +29,7 @@ public class WOTerrainMaterialProvider : TerrainMaterialProvider } - private readonly Shader shader = Shader.Find("WildernessOverhaul/TilemapTextureArray"); + //private readonly Shader shader = Shader.Find("WildernessOverhaul/TilemapTextureArray"); //private readonly Shader shader = Shader.Find("Daggerfall/TilemapTextureArray"); internal static bool IsSupported @@ -39,7 +39,7 @@ internal static bool IsSupported public sealed override Material CreateMaterial() { - return new Material(shader); + return mod.GetAsset("WOTilemapTextureArrayMat", true); } public override void PromoteMaterial(DaggerfallTerrain daggerfallTerrain, TerrainMaterialData terrainMaterialData) @@ -113,7 +113,7 @@ public Material GetTerrainTextureArrayMaterial(int archive) Texture2DArray textureArrayTerrainTilesMetallicGloss = null; // = GetTerrainMetallicGlossMapTextureArray(archive); textureArrayTerrainTiles.filterMode = FilterMode.Point; - material = new Material(shader); + material = CreateMaterial(); material.name = string.Format("TEXTURE.{0:000} [TilemapTextureArray]", archive); material.SetTexture(TileTexArrUniforms.TileTexArr, textureArrayTerrainTiles); diff --git a/WildernessOverhaul.dfmod.json b/WildernessOverhaul.dfmod.json index 109cf80..1e6aa89 100644 --- a/WildernessOverhaul.dfmod.json +++ b/WildernessOverhaul.dfmod.json @@ -1,62 +1,63 @@ -{ - "ModTitle": "Wilderness Overhaul", - "ModVersion": "0.2", - "ModAuthor": "Daniel Schmidt", - "ContactInfo": "https://forums.dfworkshop.net/memberlist.php?mode=viewprofile&u=2094", - "DFUnity_Version": "0.13.3", - "ModDescription": "Overhaul of the nature billboard distribution in Daggerfalls Wilderness", - "GUID": "153a082a-c594-4d5d-8093-5376a17c22b9", - "Files": [ - "Assets/Game/Mods/WildernessOverhaul/Textures/302-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/103-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/404-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/304-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/102-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/403-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/303-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/402-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/002-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/104-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/003-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Textures/004-TexArray.asset", - "Assets/Game/Mods/WildernessOverhaul/Shaders/WOTilemapTextureArray.shader", - "Assets/Game/Mods/WildernessOverhaul/Scripts/BaseDataObject.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WOStochasticChances.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WODistanceChecker.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WOVegetationList.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WORandomMover.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WOShootingStarController.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/ExtensionMethods.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WOVegetationChance.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WildernessOverhaulMod.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WOTerrainNature.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WOTerrainTexturing.cs", - "Assets/Game/Mods/WildernessOverhaul/Scripts/WOTerrainMaterialProvider.cs", - "Assets/Game/Mods/WildernessOverhaul/Materials/Firefly.mat", - "Assets/Game/Mods/WildernessOverhaul/Materials/ShootingStarTrail.mat", - "Assets/Game/Mods/WildernessOverhaul/Images/firefly.png", - "Assets/Game/Mods/WildernessOverhaul/Assets/Presets/RealGrass.json", - "Assets/Game/Mods/WildernessOverhaul/modsettings.json", - "Assets/Game/Mods/WildernessOverhaul/WildernessOverhaul.dfmod.json", - "Assets/Game/Mods/WildernessOverhaul/Firefly.prefab", - "Assets/Game/Mods/WildernessOverhaul/ShootingStars.prefab" - ], - "Dependencies": [ - { - "Name": "basicroads", - "IsOptional": true, - "IsPeer": false, - "Version": "1.0.0" - }, - { - "Name": "interesting-eroded-terrains", - "IsOptional": true, - "IsPeer": false - }, - { - "Name": "realgrass", - "IsOptional": true, - "IsPeer": true - } - ] -} \ No newline at end of file +{ + "ModTitle": "Wilderness Overhaul", + "ModVersion": "0.2", + "ModAuthor": "Daniel Schmidt", + "ContactInfo": "https://forums.dfworkshop.net/memberlist.php?mode=viewprofile&u=2094", + "DFUnity_Version": "0.13.3", + "ModDescription": "Overhaul of the nature billboard distribution in Daggerfalls Wilderness", + "GUID": "153a082a-c594-4d5d-8093-5376a17c22b9", + "Files": [ + "Assets/Game/Mods/WildernessOverhaul/Firefly.prefab", + "Assets/Game/Mods/WildernessOverhaul/ShootingStars.prefab", + "Assets/Game/Mods/WildernessOverhaul/README.md", + "Assets/Game/Mods/WildernessOverhaul/modsettings.json", + "Assets/Game/Mods/WildernessOverhaul/Assets/Presets/RealGrass.json", + "Assets/Game/Mods/WildernessOverhaul/Images/firefly.png", + "Assets/Game/Mods/WildernessOverhaul/Materials/ShootingStarTrail.mat", + "Assets/Game/Mods/WildernessOverhaul/Materials/Firefly.mat", + "Assets/Game/Mods/WildernessOverhaul/Scripts/BaseDataObject.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WOStochasticChances.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WOVegetationList.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WORandomMover.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WOShootingStarController.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/ExtensionMethods.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WOTerrainNature.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WOVegetationChance.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WildernessOverhaulMod.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WODistanceChecker.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WOTerrainTexturing.cs", + "Assets/Game/Mods/WildernessOverhaul/Scripts/WOTerrainMaterialProvider.cs", + "Assets/Game/Mods/WildernessOverhaul/Shaders/WOTilemapTextureArray.shader", + "Assets/Game/Mods/WildernessOverhaul/Textures/403-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/404-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/104-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/103-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/102-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/304-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/402-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/302-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/303-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/003-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/004-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Textures/002-TexArray.asset", + "Assets/Game/Mods/WildernessOverhaul/Materials/WOTilemapTextureArrayMat.mat" + ], + "Dependencies": [ + { + "Name": "basicroads", + "IsOptional": true, + "IsPeer": false, + "Version": "1.0.0" + }, + { + "Name": "interesting-eroded-terrains", + "IsOptional": true, + "IsPeer": false + }, + { + "Name": "realgrass", + "IsOptional": true, + "IsPeer": true + } + ] +}