diff --git a/game/data/models/Material_003.material b/game/data/models/Material_003.material index 1ad62c75..a49488d4 100644 Binary files a/game/data/models/Material_003.material and b/game/data/models/Material_003.material differ diff --git a/game/data/voxel_libraries/merger_prop_mat.tres b/game/data/voxel_libraries/merger_prop_mat.tres index f3a6f624..6544dd68 100644 --- a/game/data/voxel_libraries/merger_prop_mat.tres +++ b/game/data/voxel_libraries/merger_prop_mat.tres @@ -1,6 +1,7 @@ [gd_resource type="SpatialMaterial" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/grass_albedo.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=1] + [resource] resource_name = "Material.003" diff --git a/game/data/voxel_surfaces/2_test.tres b/game/data/voxel_surfaces/2_test.tres index cddd68df..6c24b704 100644 --- a/game/data/voxel_surfaces/2_test.tres +++ b/game/data/voxel_surfaces/2_test.tres @@ -1,6 +1,6 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/Rock24_col2.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_textures/stone_1_albedo.png" type="Texture" id=1] [resource] resource_name = "Test" diff --git a/game/data/voxel_surfaces/3_test2.tres b/game/data/voxel_surfaces/3_test2.tres index 08954e6d..c1cd78bd 100644 --- a/game/data/voxel_surfaces/3_test2.tres +++ b/game/data/voxel_surfaces/3_test2.tres @@ -1,6 +1,7 @@ [gd_resource type="VoxelSurfaceMerger" load_steps=2 format=2] -[ext_resource path="res://data/voxel_textures/Ground03_col2.png" type="Texture" id=1] +[ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=1] + [resource] resource_name = "Test2" diff --git a/game/data/voxel_textures/grass.ptex b/game/data/voxel_textures/grass.ptex index a74bbd19..7abb5f49 100644 --- a/game/data/voxel_textures/grass.ptex +++ b/game/data/voxel_textures/grass.ptex @@ -82,7 +82,7 @@ "metallic": 1, "normal_scale": 1, "roughness": 1, - "size": 6, + "size": 8, "subsurf_scatter_strength": 0 }, "type": "material" @@ -94,8 +94,8 @@ "y": -480 }, "parameters": { - "density": 0.0047, - "size": 6 + "density": 0.00285, + "size": 8 }, "type": "noise" }, @@ -125,17 +125,17 @@ }, { "a": 1, - "b": 0.141351, - "g": 0.21875, + "b": 0.14946, + "g": 0.223958, "pos": 0.667273, - "r": 0.141191 + "r": 0.149306 }, { "a": 1, - "b": 0.228809, - "g": 0.401042, + "b": 0.328234, + "g": 0.520833, "pos": 1, - "r": 0.271866 + "r": 0.376382 } ], "type": "Gradient" @@ -150,7 +150,7 @@ "y": -236 }, "parameters": { - "size": 6, + "size": 8, "suffix": "albedo" }, "type": "export" @@ -239,7 +239,7 @@ "y": 19 }, "parameters": { - "param0": 8, + "param0": 10, "param1": 0.05, "param2": 0 }, diff --git a/game/data/voxel_textures/grass_albedo.png b/game/data/voxel_textures/grass_albedo.png deleted file mode 100644 index f07570b0..00000000 Binary files a/game/data/voxel_textures/grass_albedo.png and /dev/null differ diff --git a/game/data/voxel_textures/grass_mossy.ptex b/game/data/voxel_textures/grass_mossy.ptex new file mode 100644 index 00000000..7abb5f49 --- /dev/null +++ b/game/data/voxel_textures/grass_mossy.ptex @@ -0,0 +1,267 @@ +{ + "connections": [ + { + "from": "noise", + "from_port": 0, + "to": "blend_2", + "to_port": 1 + }, + { + "from": "voronoi", + "from_port": 0, + "to": "blend_2", + "to_port": 0 + }, + { + "from": "blend_2", + "from_port": 0, + "to": "colorize_3", + "to_port": 0 + }, + { + "from": "colorize_3", + "from_port": 0, + "to": "blend_3", + "to_port": 0 + }, + { + "from": "blend_3", + "from_port": 0, + "to": "Material", + "to_port": 0 + }, + { + "from": "blend_3", + "from_port": 0, + "to": "export", + "to_port": 0 + }, + { + "from": "perlin", + "from_port": 0, + "to": "colorize", + "to_port": 0 + }, + { + "from": "colorize", + "from_port": 0, + "to": "gaussian_blur", + "to_port": 0 + }, + { + "from": "colorize", + "from_port": 0, + "to": "blend_3", + "to_port": 1 + } + ], + "label": "Graph", + "name": "2692", + "node_position": { + "x": 0, + "y": 0 + }, + "nodes": [ + { + "name": "Material", + "node_position": { + "x": 128, + "y": -557 + }, + "parameters": { + "albedo_color": { + "a": 1, + "b": 1, + "g": 1, + "r": 1, + "type": "Color" + }, + "ao_light_affect": 1, + "depth_scale": 1, + "emission_energy": 1, + "metallic": 1, + "normal_scale": 1, + "roughness": 1, + "size": 8, + "subsurf_scatter_strength": 0 + }, + "type": "material" + }, + { + "name": "noise", + "node_position": { + "x": -1065, + "y": -480 + }, + "parameters": { + "density": 0.00285, + "size": 8 + }, + "type": "noise" + }, + { + "name": "colorize", + "node_position": { + "x": -621, + "y": -156 + }, + "parameters": { + "gradient": { + "interpolation": 1, + "points": [ + { + "a": 1, + "b": 0.214933, + "g": 0.286458, + "pos": 0, + "r": 0.226109 + }, + { + "a": 1, + "b": 0.093054, + "g": 0.114583, + "pos": 0.309091, + "r": 0.089979 + }, + { + "a": 1, + "b": 0.14946, + "g": 0.223958, + "pos": 0.667273, + "r": 0.149306 + }, + { + "a": 1, + "b": 0.328234, + "g": 0.520833, + "pos": 1, + "r": 0.376382 + } + ], + "type": "Gradient" + } + }, + "type": "colorize" + }, + { + "name": "export", + "node_position": { + "x": 149, + "y": -236 + }, + "parameters": { + "size": 8, + "suffix": "albedo" + }, + "type": "export" + }, + { + "name": "blend_2", + "node_position": { + "x": -757, + "y": -544 + }, + "parameters": { + "amount": 0.221725, + "blend_type": 11 + }, + "type": "blend" + }, + { + "name": "voronoi", + "node_position": { + "x": -1099, + "y": -697 + }, + "parameters": { + "intensity": 1, + "randomness": 0.79, + "scale_x": 4, + "scale_y": 4, + "stretch_x": 1, + "stretch_y": 1 + }, + "type": "voronoi" + }, + { + "name": "colorize_3", + "node_position": { + "x": -489, + "y": -511 + }, + "parameters": { + "gradient": { + "interpolation": 1, + "points": [ + { + "a": 0, + "b": 0, + "g": 0, + "pos": 0, + "r": 0 + }, + { + "a": 1, + "b": 0.20187, + "g": 0.401783, + "pos": 0.709091, + "r": 0.447917 + }, + { + "a": 1, + "b": 0.09838, + "g": 0.885417, + "pos": 1, + "r": 0.811631 + } + ], + "type": "Gradient" + } + }, + "type": "colorize" + }, + { + "name": "blend_3", + "node_position": { + "x": -247, + "y": -382 + }, + "parameters": { + "amount": 0.741575, + "blend_type": 4 + }, + "type": "blend" + }, + { + "name": "gaussian_blur", + "node_position": { + "x": -390.25, + "y": 19 + }, + "parameters": { + "param0": 10, + "param1": 0.05, + "param2": 0 + }, + "type": "gaussian_blur" + }, + { + "name": "perlin", + "node_position": { + "x": -922.75, + "y": -149 + }, + "parameters": { + "iterations": 6, + "persistence": 0.8, + "scale_x": 30, + "scale_y": 30 + }, + "type": "perlin" + } + ], + "parameters": { + + }, + "type": "graph" +} \ No newline at end of file diff --git a/game/data/voxel_textures/grass_mossy_albedo.png b/game/data/voxel_textures/grass_mossy_albedo.png new file mode 100644 index 00000000..d40f991d Binary files /dev/null and b/game/data/voxel_textures/grass_mossy_albedo.png differ diff --git a/game/data/voxel_textures/grass_albedo.png.import b/game/data/voxel_textures/grass_mossy_albedo.png.import similarity index 66% rename from game/data/voxel_textures/grass_albedo.png.import rename to game/data/voxel_textures/grass_mossy_albedo.png.import index 193e7ce9..5f09e61b 100644 --- a/game/data/voxel_textures/grass_albedo.png.import +++ b/game/data/voxel_textures/grass_mossy_albedo.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/grass_albedo.png-796bd8ada2af644af45613a6e89a2163.stex" +path="res://.import/grass_mossy_albedo.png-48dc7381838146b29f2f25837944b973.stex" metadata={ "vram_texture": false } [deps] -source_file="res://data/voxel_textures/grass_albedo.png" -dest_files=[ "res://.import/grass_albedo.png-796bd8ada2af644af45613a6e89a2163.stex" ] +source_file="res://data/voxel_textures/grass_mossy_albedo.png" +dest_files=[ "res://.import/grass_mossy_albedo.png-48dc7381838146b29f2f25837944b973.stex" ] [params] diff --git a/game/data/voxel_textures/stone_1.ptex b/game/data/voxel_textures/stone_1.ptex index 1328266d..4e1a75c4 100644 --- a/game/data/voxel_textures/stone_1.ptex +++ b/game/data/voxel_textures/stone_1.ptex @@ -64,7 +64,7 @@ "metallic": 1, "normal_scale": 1, "roughness": 1, - "size": 6, + "size": 8, "subsurf_scatter_strength": 0 }, "type": "material" @@ -78,8 +78,8 @@ "parameters": { "intensity": 1, "randomness": 0.95, - "scale_x": 7, - "scale_y": 7, + "scale_x": 14, + "scale_y": 14, "stretch_x": 1, "stretch_y": 1 }, @@ -129,7 +129,7 @@ "y": 62.5 }, "parameters": { - "size": 6, + "size": 8, "suffix": "albedo" }, "type": "export" diff --git a/game/data/voxel_textures/stone_1_albedo.png b/game/data/voxel_textures/stone_1_albedo.png index 9d7eb8fb..6ae480cd 100644 Binary files a/game/data/voxel_textures/stone_1_albedo.png and b/game/data/voxel_textures/stone_1_albedo.png differ diff --git a/game/voxelman/TestScene.tscn b/game/voxelman/TestScene.tscn index 4d63d35f..8cfe61be 100644 --- a/game/voxelman/TestScene.tscn +++ b/game/voxelman/TestScene.tscn @@ -4,7 +4,8 @@ [ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3] [ext_resource path="res://voxelman/cubic_mesher/CubicVoxelWorld.tscn" type="PackedScene" id=4] -[ext_resource path="res://data/voxel_textures/grass_albedo.png" type="Texture" id=5] +[ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=5] + [sub_resource type="Environment" id=1] ambient_light_color = Color( 1, 1, 1, 1 ) diff --git a/game/voxelman/world/TVTestScene.tscn b/game/voxelman/world/TVTestScene.tscn index 8c154a32..b435b6d3 100644 --- a/game/voxelman/world/TVTestScene.tscn +++ b/game/voxelman/world/TVTestScene.tscn @@ -4,10 +4,11 @@ [ext_resource path="res://data/materials/voxelman.tres" type="Material" id=2] [ext_resource path="res://voxelman/FPSCounter.gd" type="Script" id=3] [ext_resource path="res://debug/FreeLookCam.tscn" type="PackedScene" id=4] -[ext_resource path="res://data/voxel_textures/grass_albedo.png" type="Texture" id=5] +[ext_resource path="res://data/voxel_textures/grass_mossy_albedo.png" type="Texture" id=5] [ext_resource path="res://scripts/world_generators/MainPlanetGenerator.gd" type="Script" id=6] + [sub_resource type="Environment" id=1] ambient_light_color = Color( 1, 1, 1, 1 )