From d9b7702e7dadeba7eb092a2715fdf4efc2fd5cf3 Mon Sep 17 00:00:00 2001 From: cryham Date: Mon, 12 Aug 2024 16:46:37 +0200 Subject: [PATCH] rem old mat --- data/materials/Pbs/bush.material.json | 63 --- data/materials/Pbs/tree.material.json | 640 +------------------------- docs/Roadmap.md | 1 + 3 files changed, 2 insertions(+), 702 deletions(-) diff --git a/data/materials/Pbs/bush.material.json b/data/materials/Pbs/bush.material.json index 4e9a78fa..1f37836c 100644 --- a/data/materials/Pbs/bush.material.json +++ b/data/materials/Pbs/bush.material.json @@ -95,69 +95,6 @@ "pbs" : { - "3D-Diggers/farn01" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "grass" : true, - "tree_wind" : true, - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "diffuse" : - { - "value" : [0.7, 0.7, 0.7], - "background" : [1, 1, 1, 1], - "texture" : "farn01.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.03, - "mode" : "coeff" - }, - "roughness" : - { - "value" : 0.03 - } - }, - - "3D-Diggers/farn02" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "grass" : true, - "tree_wind" : true, - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "diffuse" : - { - "value" : [0.7, 0.7, 0.7], - "background" : [1, 1, 1, 1], - "texture" : "farn02.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.03, - "mode" : "coeff" - }, - "roughness" : - { - "value" : 0.03 - } - }, - - "3D-Diggers/shroom1" : { "macroblock" : "Macroblock_0", diff --git a/data/materials/Pbs/tree.material.json b/data/materials/Pbs/tree.material.json index 6c660baa..e7df4d3a 100644 --- a/data/materials/Pbs/tree.material.json +++ b/data/materials/Pbs/tree.material.json @@ -212,42 +212,6 @@ }, - "Palm" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.31, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [0.9, 0.9, 0.9], - "background" : [1, 1, 1, 1], - "texture" : "palm.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.4, 0.4, 0.4] - }, - "fresnel" : - { - "value" : 0.2, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "palm_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.4 - } - }, - "branches_01" : { "macroblock" : "Macroblock_0", @@ -675,41 +639,6 @@ } }, - "jungle_tree" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "jungle_tree.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.2, 0.2, 0.2] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "jungle_tree_normal.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.5 - } - }, "jungle_tree_alien" : { @@ -747,42 +676,6 @@ } }, - "palm2" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [0.9, 0.9, 0.9], - "background" : [1, 1, 1, 1], - "texture" : "palm2_diffuse.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.2, 0.2, 0.2] - }, - "fresnel" : - { - "value" : 0.3, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "palm2_normal.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.3 - } - }, - "pine1full" : { @@ -1107,538 +1000,7 @@ "value" : 0.1 } }, - - - "tree.07.branch1.mat/ALPHA/TEX/tree.07.png/VertCol/TWOSIDE" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.75, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.07.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.07_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.7 - } - }, - - "tree.07.branch2.mat/ALPHA/TEX/tree.07.png/VertCol/TWOSIDE" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.75, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.07.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.07_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.7 - } - }, - - "tree.07.leaves.mat/ALPHA/TEX/tree.07.png/VertCol/TWOSIDE" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.75, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.07.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.07_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.7 - } - }, - - "tree.07.mat/SOLID/TEX/tree.07.png/VertCol" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.07.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.07_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - "leaves.09.mat/ALPHA/TEX/tree.09.png/VertCol/TWOSIDE" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.75, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.09.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.09_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - "tree.09.branch1.mat/ALPHA/TEX/tree.09.png/VertCol/TWOSIDE" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.75, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.09.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.09_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - "tree.09.mat/ALPHA/TEX/tree.09.png/VertCol/TWOSIDE" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.75, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.09.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.09_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - "tree.09.mat/SOLID/TEX/tree.09.png/VertCol" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.09.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.09_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - "tree.09.moss.mat/ALPHA/TEX/tree.09.png/VertCol/TWOSIDE" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.75, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "tree.09.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.1, 0.1, 0.1] - }, - "fresnel" : - { - "value" : 0.1, - "mode" : "coeff" - }, - "normal" : - { - "value" : 1, - "texture" : "tree.09_norm.png", - "sampler" : "Sampler_10" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - - "BanyanTreeLeaves_1" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1.1, 1.1, 1.1], - "background" : [1, 1, 1, 1], - "texture" : "twig21g1.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.2, 0.2, 0.2] - }, - "fresnel" : - { - "value" : [0, 0, 0], - "mode" : "coloured" - }, - "roughness" : - { - "value" : 0.6 - } - }, - - "BanyanTreeLeaves_2" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1.1, 1.1, 1.1], - "background" : [1, 1, 1, 1], - "texture" : "twig21g1.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.2, 0.2, 0.2] - }, - "fresnel" : - { - "value" : [0, 0, 0], - "mode" : "coloured" - }, - "roughness" : - { - "value" : 0.6 - } - }, - - "BanyanTreeBark" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "trunk2m.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [1, 1, 1] - }, - "fresnel" : - { - "value" : 0, - "mode" : "coeff" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - "j1" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1.1, 1.1, 1.1], - "background" : [1, 1, 1, 1], - "texture" : "twig21g1.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.2, 0.2, 0.2] - }, - "fresnel" : - { - "value" : [0, 0, 0], - "mode" : "coloured" - }, - "roughness" : - { - "value" : 0.6 - } - }, - - "j2" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "trunk2m.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [1, 1, 1] - }, - "fresnel" : - { - "value" : 0, - "mode" : "coeff" - }, - "roughness" : - { - "value" : 0.5 - } - }, - - - "jungle03leaves" : - { - "macroblock" : "Macroblock_2", - "blendblock" : "Blendblock_0", - "alpha_test" : ["greater", 0.5, false], - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1.1, 1.1, 1.1], - "background" : [1, 1, 1, 1], - "texture" : "twig21g1.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [0.2, 0.2, 0.2] - }, - "fresnel" : - { - "value" : [0, 0, 0], - "mode" : "coloured" - }, - "roughness" : - { - "value" : 0.6 - } - }, - - "jungle03trunk" : - { - "macroblock" : "Macroblock_0", - "blendblock" : "Blendblock_0", - "shadow_const_bias" : 0.01, - "workflow" : "specular_ogre", - "tree_wind" : true, - "diffuse" : - { - "value" : [1, 1, 1], - "background" : [1, 1, 1, 1], - "texture" : "trunk2m.png", - "sampler" : "Sampler_10" - }, - "specular" : - { - "value" : [1, 1, 1] - }, - "fresnel" : - { - "value" : 0, - "mode" : "coeff" - }, - "roughness" : - { - "value" : 0.5 - } - }, - + "tree10okyTrunk" : { diff --git a/docs/Roadmap.md b/docs/Roadmap.md index 8cd150f9..009a96fd 100644 --- a/docs/Roadmap.md +++ b/docs/Roadmap.md @@ -19,6 +19,7 @@ Marked: `crucial`, **Next or Big**, _Important_. 🌪️**wind scale** params in json, for all trees, bushes, grass sway own- wind anim *shadow caster* too, ed prv obj no wind- +**limit** horizon trees 🌳new [trees](https://groups.f-hub.org/d/4n0bTwmC/-trees-to-do), *shrooms*, etc 💎Add **gems** to tracks, more types 3d