diff --git a/game/characters/Character.tscn b/game/characters/Character.tscn index 6399c4d..a22a48d 100644 --- a/game/characters/Character.tscn +++ b/game/characters/Character.tscn @@ -46,7 +46,7 @@ texture = ExtResource( 6 ) slots = [ null, SubResource( 1 ), null, null, null, null, null, null, null, null, null, null, null, null, SubResource( 2 ), null ] [node name="Character" type="CharacterSkeleton2D"] -modulate = Color( 0.745098, 0.745098, 0.745098, 1 ) +modulate = Color( 0.929412, 0.929412, 0.929412, 1 ) entity_type = 1 attach_point_paths/0_left_hand = NodePath("") attach_point_paths/1_right_hand = NodePath("") diff --git a/game/scenes/terra_2d_world/Terrain2DWorldBlockyGD.gd b/game/scenes/terra_2d_world/Terrain2DWorldBlockyGD.gd index 0396329..e9ae8cb 100644 --- a/game/scenes/terra_2d_world/Terrain2DWorldBlockyGD.gd +++ b/game/scenes/terra_2d_world/Terrain2DWorldBlockyGD.gd @@ -75,7 +75,7 @@ func _create_chunk(x, y, chunk): var pj : Terrain2DProp2DJob = Terrain2DProp2DJob.new() var mesher : Terrain2DMesherBlocky = Terrain2DMesherBlocky.new() - mesher.texture_scale = 8 + mesher.texture_scale = 4 tj.set_mesher(mesher) diff --git a/game/scenes/terra_2d_world/levelgen.gd b/game/scenes/terra_2d_world/levelgen.gd index d1edf09..5875b96 100644 --- a/game/scenes/terra_2d_world/levelgen.gd +++ b/game/scenes/terra_2d_world/levelgen.gd @@ -5,4 +5,4 @@ extends Terrain2DLevelGenerator func _generate_chunk(chunk : Terrain2DChunk): chunk.channel_ensure_allocated(Terrain2DChunkDefault.DEFAULT_CHANNEL_TYPE, 1) - #chunk.set_voxel(2, 1, 1, Terrain2DChunkDefault.DEFAULT_CHANNEL_TYPE) + chunk.set_voxel(2, 0, 0, Terrain2DChunkDefault.DEFAULT_CHANNEL_TYPE) diff --git a/game/scenes/terra_2d_world/new_terrain2dlibrarymergerpcm.tres b/game/scenes/terra_2d_world/new_terrain2dlibrarymergerpcm.tres index c1ffa7d..9adfcda 100644 --- a/game/scenes/terra_2d_world/new_terrain2dlibrarymergerpcm.tres +++ b/game/scenes/terra_2d_world/new_terrain2dlibrarymergerpcm.tres @@ -23,4 +23,5 @@ texture = ExtResource( 3 ) [resource] texture_flags = 0 +max_atlas_size = 2048 terra_surfaces = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ] diff --git a/game/textures/world/bricks/test_brick.tres b/game/textures/world/bricks/test_brick.tres index 3ee0bf0..8fefc86 100644 --- a/game/textures/world/bricks/test_brick.tres +++ b/game/textures/world/bricks/test_brick.tres @@ -312,7 +312,6 @@ default_float = 0.0 default_vector2 = Vector2( 0, 0 ) default_vector3 = Vector3( 0, 0, 0 ) default_color = Color( 0, 0, 0, 1 ) -input_property = SubResource( 27 ) [sub_resource type="Resource" id=33] script = ExtResource( 5 ) @@ -322,5 +321,5 @@ postfix = "_albedo" [resource] script = ExtResource( 1 ) -image_size = Vector2( 256, 256 ) +image_size = Vector2( 128, 128 ) nodes = [ SubResource( 11 ), SubResource( 14 ), SubResource( 19 ), SubResource( 21 ), SubResource( 24 ), SubResource( 26 ), SubResource( 31 ), SubResource( 33 ) ] diff --git a/game/textures/world/bricks/test_brick_albedo.png b/game/textures/world/bricks/test_brick_albedo.png index 1242411..7bd173f 100644 Binary files a/game/textures/world/bricks/test_brick_albedo.png and b/game/textures/world/bricks/test_brick_albedo.png differ diff --git a/game/textures/world/dirt/dirt.tres b/game/textures/world/dirt/dirt.tres index 3224135..b1ee4c5 100644 --- a/game/textures/world/dirt/dirt.tres +++ b/game/textures/world/dirt/dirt.tres @@ -387,21 +387,6 @@ points = PoolRealArray( 0, 0, 0, 0, 0, 0.59322, 0, 0, 0, 0, 0.635593, 0.0823529, image = SubResource( 23 ) input = SubResource( 43 ) -[sub_resource type="Resource" id=53] -script = ExtResource( 2 ) -default_type = 5 -default_int = 0 -default_float = 0.0 -default_vector2 = Vector2( 0, 0 ) -default_vector3 = Vector3( 0, 0, 0 ) -default_color = Color( 0, 0, 0, 1 ) - -[sub_resource type="Resource" id=38] -script = ExtResource( 7 ) -graph_position = Vector2( 980, 540 ) -image = SubResource( 53 ) -postfix = "_albedo" - [sub_resource type="Resource" id=45] script = ExtResource( 2 ) default_type = 5 @@ -411,6 +396,22 @@ default_vector2 = Vector2( 0, 0 ) default_vector3 = Vector3( 0, 0, 0 ) default_color = Color( 0, 0, 0, 1 ) +[sub_resource type="Resource" id=53] +script = ExtResource( 2 ) +default_type = 5 +default_int = 0 +default_float = 0.0 +default_vector2 = Vector2( 0, 0 ) +default_vector3 = Vector3( 0, 0, 0 ) +default_color = Color( 0, 0, 0, 1 ) +input_property = SubResource( 45 ) + +[sub_resource type="Resource" id=38] +script = ExtResource( 7 ) +graph_position = Vector2( 1000, 540 ) +image = SubResource( 53 ) +postfix = "_albedo" + [sub_resource type="Resource" id=49] script = ExtResource( 2 ) default_type = 5 @@ -466,5 +467,5 @@ channel = 3 [resource] script = ExtResource( 1 ) -image_size = Vector2( 256, 256 ) +image_size = Vector2( 128, 128 ) nodes = [ SubResource( 2 ), SubResource( 4 ), SubResource( 7 ), SubResource( 9 ), SubResource( 11 ), SubResource( 13 ), SubResource( 18 ), SubResource( 26 ), SubResource( 28 ), SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 38 ), SubResource( 47 ), SubResource( 52 ) ] diff --git a/game/textures/world/dirt/dirt_albedo.png b/game/textures/world/dirt/dirt_albedo.png index 1c5e4fe..b6e5c07 100644 Binary files a/game/textures/world/dirt/dirt_albedo.png and b/game/textures/world/dirt/dirt_albedo.png differ diff --git a/game/textures/world/grass/grass.tres b/game/textures/world/grass/grass.tres index 5af0416..cf5c1ff 100644 --- a/game/textures/world/grass/grass.tres +++ b/game/textures/world/grass/grass.tres @@ -250,7 +250,7 @@ default_vector2 = Vector2( 0, 0 ) default_vector3 = Vector3( 0, 0, 0 ) default_color = Color( 0, 0, 0, 1 ) -[sub_resource type="Resource" id=26] +[sub_resource type="Resource" id=31] script = ExtResource( 3 ) default_type = 5 default_int = 0 @@ -263,7 +263,7 @@ input_property = SubResource( 28 ) [sub_resource type="Resource" id=27] script = ExtResource( 8 ) graph_position = Vector2( 900, 340 ) -image = SubResource( 26 ) +image = SubResource( 31 ) postfix = "_albedo" [sub_resource type="Resource" id=29] @@ -285,5 +285,5 @@ width = 0.1 [resource] script = ExtResource( 1 ) -image_size = Vector2( 256, 256 ) +image_size = Vector2( 128, 128 ) nodes = [ SubResource( 5 ), SubResource( 7 ), SubResource( 10 ), SubResource( 13 ), SubResource( 18 ), SubResource( 20 ), SubResource( 25 ), SubResource( 27 ), SubResource( 30 ) ] diff --git a/game/textures/world/grass/grass_albedo.png b/game/textures/world/grass/grass_albedo.png index e5bac02..32f84dd 100644 Binary files a/game/textures/world/grass/grass_albedo.png and b/game/textures/world/grass/grass_albedo.png differ diff --git a/game/textures/world/grass/grass_albedo.png.import b/game/textures/world/grass/grass_albedo.png.import index 6f7d9bc..c52dad1 100644 --- a/game/textures/world/grass/grass_albedo.png.import +++ b/game/textures/world/grass/grass_albedo.png.import @@ -19,7 +19,7 @@ compress/lossy_quality=0.7 compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 -flags/repeat=1 +flags/repeat=0 flags/filter=false flags/mipmaps=false flags/anisotropic=false diff --git a/game/textures/world/grass/grass_mossy.tres b/game/textures/world/grass/grass_mossy.tres index ff95b56..ecf59a4 100644 --- a/game/textures/world/grass/grass_mossy.tres +++ b/game/textures/world/grass/grass_mossy.tres @@ -258,6 +258,7 @@ default_float = 0.0 default_vector2 = Vector2( 0, 0 ) default_vector3 = Vector3( 0, 0, 0 ) default_color = Color( 0, 0, 0, 1 ) +input_property = SubResource( 21 ) [sub_resource type="Resource" id=27] script = ExtResource( 8 ) @@ -284,5 +285,5 @@ width = 0.01 [resource] script = ExtResource( 1 ) -image_size = Vector2( 256, 256 ) +image_size = Vector2( 128, 128 ) nodes = [ SubResource( 5 ), SubResource( 7 ), SubResource( 10 ), SubResource( 13 ), SubResource( 18 ), SubResource( 20 ), SubResource( 25 ), SubResource( 27 ), SubResource( 30 ) ] diff --git a/game/textures/world/grass/grass_mossy_albedo.png b/game/textures/world/grass/grass_mossy_albedo.png index 9949d88..5155508 100644 Binary files a/game/textures/world/grass/grass_mossy_albedo.png and b/game/textures/world/grass/grass_mossy_albedo.png differ diff --git a/game/textures/world/stone/stone_1.tres b/game/textures/world/stone/stone_1.tres index 90b38a9..836056b 100644 --- a/game/textures/world/stone/stone_1.tres +++ b/game/textures/world/stone/stone_1.tres @@ -176,7 +176,7 @@ points = PoolRealArray( 0, 0, 0, 0, 1, 0.0911017, 0, 0, 0, 1, 0.472458, 0.129412 image = SubResource( 16 ) input = SubResource( 17 ) -[sub_resource type="Resource" id=19] +[sub_resource type="Resource" id=21] script = ExtResource( 2 ) default_type = 5 default_int = 0 @@ -184,15 +184,14 @@ default_float = 0.0 default_vector2 = Vector2( 0, 0 ) default_vector3 = Vector3( 0, 0, 0 ) default_color = Color( 0, 0, 0, 1 ) -input_property = SubResource( 16 ) [sub_resource type="Resource" id=20] script = ExtResource( 4 ) graph_position = Vector2( 1120, 100 ) -image = SubResource( 19 ) +image = SubResource( 21 ) postfix = "_albedo" [resource] script = ExtResource( 1 ) -image_size = Vector2( 256, 256 ) +image_size = Vector2( 128, 128 ) nodes = [ SubResource( 5 ), SubResource( 7 ), SubResource( 10 ), SubResource( 15 ), SubResource( 18 ), SubResource( 20 ) ] diff --git a/game/textures/world/stone/stone_1_albedo.png b/game/textures/world/stone/stone_1_albedo.png index 3bc5cb7..a730e98 100644 Binary files a/game/textures/world/stone/stone_1_albedo.png and b/game/textures/world/stone/stone_1_albedo.png differ diff --git a/game/textures/world/stone/stone_dungeon_1.tres b/game/textures/world/stone/stone_dungeon_1.tres index 33f3bf1..84304d5 100644 --- a/game/textures/world/stone/stone_dungeon_1.tres +++ b/game/textures/world/stone/stone_dungeon_1.tres @@ -259,5 +259,5 @@ opacity = SubResource( 26 ) [resource] script = ExtResource( 1 ) -image_size = Vector2( 256, 256 ) +image_size = Vector2( 128, 128 ) nodes = [ SubResource( 5 ), SubResource( 8 ), SubResource( 13 ), SubResource( 15 ), SubResource( 17 ), SubResource( 20 ), SubResource( 22 ), SubResource( 27 ) ] diff --git a/game/textures/world/stone/stone_dungeon_1_albedo.png b/game/textures/world/stone/stone_dungeon_1_albedo.png index c25928a..5a6d944 100644 Binary files a/game/textures/world/stone/stone_dungeon_1_albedo.png and b/game/textures/world/stone/stone_dungeon_1_albedo.png differ