diff --git a/autoload/streaming.gd b/autoload/streaming.gd index 530ecd2..96fa9ed 100644 --- a/autoload/streaming.gd +++ b/autoload/streaming.gd @@ -272,7 +272,7 @@ func _ready(): # Traffic.set_deny_physics() # Traffic.set_physics_distance(Vector3(30, -10, 40)) # Traffic.set_debug(true) - Traffic.set_spawn_cooldown(1, 5) + Traffic.set_spawn_cooldown(2, 5) Traffic.set_default_speed(8.5) Traffic.add_traffic_vehicle(car) var water_mat = load("res://water/Water.material") diff --git a/terrain-objects/terrain-grass.bin b/terrain-objects/terrain-grass.bin index 78c4c85..cc0c641 100644 Binary files a/terrain-objects/terrain-grass.bin and b/terrain-objects/terrain-grass.bin differ diff --git a/terrain-objects/terrain-grass.gltf b/terrain-objects/terrain-grass.gltf index b9c4914..2616677 100644 --- a/terrain-objects/terrain-grass.gltf +++ b/terrain-objects/terrain-grass.gltf @@ -32,27 +32,27 @@ "mesh" : 0, "name" : "g4_l0", "translation" : [ - 14, + 7.195415496826172, 0, - -7 + -2.0565922260284424 ] }, { "mesh" : 1, "name" : "g2_l0", "translation" : [ - 14, + 4.437046051025391, 0, - -12 + -3.986639976501465 ] }, { "mesh" : 2, "name" : "g6_l0", "translation" : [ - 14, + 10.368897438049316, 0, - -3 + -2.029006004333496 ] }, { @@ -70,30 +70,25 @@ "translation" : [ 2, 0, - -3 + -4 ] }, { "mesh" : 5, "name" : "g3_l0", - "scale" : [ - 0.5, - 0.5, - 0.5 - ], "translation" : [ - 14, + 6, 0, - -9 + -2 ] }, { "mesh" : 6, "name" : "g5_l0", "translation" : [ - 14, + 9.008338928222656, 0, - -5 + -2.098602533340454 ] }, { @@ -111,66 +106,61 @@ "translation" : [ 2, 0, - -1 + 0 ] }, { "mesh" : 9, "name" : "g2_l1", "translation" : [ - 14, + 4.437046051025391, 0, - -11 + -1.9866399765014648 ] }, { "mesh" : 10, "name" : "g2_l2", "translation" : [ - 14, + 4.437046051025391, 0, - -10 + 0.013360023498535156 ] }, { "mesh" : 11, "name" : "g3_l1", - "scale" : [ - 0.5, - 0.5, - 0.5 - ], "translation" : [ - 14, + 6, 0, - -8 + 0 ] }, { "mesh" : 12, "name" : "g4_l1", "translation" : [ - 14, + 7.195415496826172, 0, - -6 + -0.05659228563308716 ] }, { "mesh" : 13, "name" : "g5_l1", "translation" : [ - 14, + 9.008338928222656, 0, - -4 + -0.0986025333404541 ] }, { "mesh" : 14, "name" : "g6_l1", "translation" : [ - 14, + 10.368897438049316, 0, - -2 + -0.02900594472885132 ] }, { @@ -510,14 +500,14 @@ "componentType" : 5126, "count" : 402, "max" : [ - 0.17688600718975067, + 0.35377201437950134, 0.9969210028648376, - 0.16302502155303955 + 0.3260500431060791 ], "min" : [ - -0.1969520002603531, + -0.3939040005207062, -0.015862006694078445, - -0.16419197618961334 + -0.3283839523792267 ], "type" : "VEC3" }, @@ -538,14 +528,14 @@ "componentType" : 5126, "count" : 404, "max" : [ - 0.06260350346565247, + 0.12520700693130493, 0.5927000045776367, - 0.09240099787712097 + 0.18480199575424194 ], "min" : [ - -0.09550149738788605, + -0.1910029947757721, -0.007931003347039223, - -0.12846699357032776 + -0.2569339871406555 ], "type" : "VEC3" }, @@ -566,14 +556,14 @@ "componentType" : 5126, "count" : 406, "max" : [ - 0.12520700693130493, + 0.25041401386260986, 0.39923399686813354, - 0.18480199575424194 + 0.3696039915084839 ], "min" : [ - -0.1910029947757721, + -0.3820059895515442, -0.005342008080333471, - -0.2569339871406555 + -0.513867974281311 ], "type" : "VEC3" }, @@ -678,14 +668,14 @@ "componentType" : 5126, "count" : 404, "max" : [ - 0.12520700693130493, + 0.25041401386260986, 1.1854000091552734, - 0.18480199575424194 + 0.3696039915084839 ], "min" : [ - -0.1910029947757721, + -0.3820059895515442, -0.015862006694078445, - -0.2569339871406555 + -0.513867974281311 ], "type" : "VEC3" }, @@ -701,12 +691,12 @@ "count" : 402, "max" : [ 0.17688600718975067, - 0.9969210028648376, + 0.4984605014324188, 0.16302502155303955 ], "min" : [ -0.1969520002603531, - -0.015862006694078445, + -0.007931003347039223, -0.16419197618961334 ], "type" : "VEC3" @@ -722,14 +712,14 @@ "componentType" : 5126, "count" : 406, "max" : [ - 0.06260350346565247, + 0.12520700693130493, 0.19961699843406677, - 0.09240099787712097 + 0.18480199575424194 ], "min" : [ - -0.09550149738788605, + -0.1910029947757721, -0.0026710040401667356, - -0.12846699357032776 + -0.2569339871406555 ], "type" : "VEC3" }, @@ -744,14 +734,14 @@ "componentType" : 5126, "count" : 92, "max" : [ - 0.11431631445884705, + 0.2286326289176941, 1.184173583984375, - 0.17981891334056854 + 0.3596378266811371 ], "min" : [ - -0.1824284791946411, + -0.3648569583892822, -0.015646880492568016, - -0.25449562072753906 + -0.5089912414550781 ], "type" : "VEC3" }, @@ -772,14 +762,14 @@ "componentType" : 5126, "count" : 83, "max" : [ - 0.14642763137817383, + 0.29285526275634766, 1.2219200134277344, - 0.19901400804519653 + 0.39802801609039307 ], "min" : [ - -0.1925097107887268, + -0.3850194215774536, -0.02427912876009941, - -0.28994613885879517 + -0.5798922777175903 ], "type" : "VEC3" }, @@ -800,14 +790,14 @@ "componentType" : 5126, "count" : 85, "max" : [ - 0.05715815722942352, + 0.11431631445884705, 0.5664859414100647, - 0.08990945667028427 + 0.17981891334056854 ], "min" : [ - -0.09121423959732056, + -0.1824284791946411, -0.007823440246284008, - -0.12724781036376953 + -0.25449562072753906 ], "type" : "VEC3" }, @@ -828,14 +818,14 @@ "componentType" : 5126, "count" : 51, "max" : [ - 0.05428806319832802, + 0.10857612639665604, 0.5071278214454651, - 0.09419887512922287 + 0.18839775025844574 ], "min" : [ - -0.09121423959732056, + -0.1824284791946411, -0.007823437452316284, - -0.12232115864753723 + -0.24464231729507446 ], "type" : "VEC3" }, @@ -863,12 +853,12 @@ "count" : 402, "max" : [ 0.17688600718975067, - 0.9969210028648376, + 0.4984605014324188, 0.16302502155303955 ], "min" : [ -0.1969520002603531, - -0.015862006694078445, + -0.007931003347039223, -0.16419197618961334 ], "type" : "VEC3" @@ -884,14 +874,14 @@ "componentType" : 5126, "count" : 67, "max" : [ - 0.16182564198970795, + 0.3236512839794159, 0.9958338141441345, - 0.16302502155303955 + 0.3260500431060791 ], "min" : [ - -0.1907951533794403, + -0.3815903067588806, -0.01564687490463257, - -0.16409344971179962 + -0.32818689942359924 ], "type" : "VEC3" }, @@ -912,14 +902,14 @@ "componentType" : 5126, "count" : 75, "max" : [ - 0.06260350346565247, + 0.12520700693130493, 0.1706152707338333, - 0.08990944176912308 + 0.17981888353824615 ], "min" : [ - -0.09264495223760605, + -0.1852899044752121, -0.0026277038268744946, - -0.1266387552022934 + -0.2532775104045868 ], "type" : "VEC3" }, @@ -940,14 +930,14 @@ "componentType" : 5126, "count" : 86, "max" : [ - 0.12520700693130493, + 0.25041401386260986, 0.3990340828895569, - 0.17981888353824615 + 0.3596377670764923 ], "min" : [ - -0.1852899044752121, + -0.3705798089504242, -0.005255407653748989, - -0.2532775104045868 + -0.5065550208091736 ], "type" : "VEC3" }, diff --git a/terrain-objects/terrain-grass_g1_l0.mesh b/terrain-objects/terrain-grass_g1_l0.mesh index 675c51d..ccbeed6 100644 Binary files a/terrain-objects/terrain-grass_g1_l0.mesh and b/terrain-objects/terrain-grass_g1_l0.mesh differ diff --git a/terrain-objects/terrain-grass_g1_l1.mesh b/terrain-objects/terrain-grass_g1_l1.mesh index afa0782..ae8a6d7 100644 Binary files a/terrain-objects/terrain-grass_g1_l1.mesh and b/terrain-objects/terrain-grass_g1_l1.mesh differ diff --git a/terrain-objects/terrain-grass_g1_l2.mesh b/terrain-objects/terrain-grass_g1_l2.mesh index a452133..5593ba4 100644 Binary files a/terrain-objects/terrain-grass_g1_l2.mesh and b/terrain-objects/terrain-grass_g1_l2.mesh differ diff --git a/terrain-objects/terrain-grass_g2_l0.mesh b/terrain-objects/terrain-grass_g2_l0.mesh index 79869ba..a5bfe58 100644 Binary files a/terrain-objects/terrain-grass_g2_l0.mesh and b/terrain-objects/terrain-grass_g2_l0.mesh differ diff --git a/terrain-objects/terrain-grass_g2_l1.mesh b/terrain-objects/terrain-grass_g2_l1.mesh index 0a3b6a7..c44b7df 100644 Binary files a/terrain-objects/terrain-grass_g2_l1.mesh and b/terrain-objects/terrain-grass_g2_l1.mesh differ diff --git a/terrain-objects/terrain-grass_g2_l2.mesh b/terrain-objects/terrain-grass_g2_l2.mesh index 0b06f7e..2991093 100644 Binary files a/terrain-objects/terrain-grass_g2_l2.mesh and b/terrain-objects/terrain-grass_g2_l2.mesh differ diff --git a/terrain-objects/terrain-grass_g3_l0.mesh b/terrain-objects/terrain-grass_g3_l0.mesh index dea6631..fb3414c 100644 Binary files a/terrain-objects/terrain-grass_g3_l0.mesh and b/terrain-objects/terrain-grass_g3_l0.mesh differ diff --git a/terrain-objects/terrain-grass_g3_l1.mesh b/terrain-objects/terrain-grass_g3_l1.mesh index c68ec16..d1a9b53 100644 Binary files a/terrain-objects/terrain-grass_g3_l1.mesh and b/terrain-objects/terrain-grass_g3_l1.mesh differ diff --git a/terrain-objects/terrain-grass_g4_l0.mesh b/terrain-objects/terrain-grass_g4_l0.mesh index e3de900..13faf21 100644 Binary files a/terrain-objects/terrain-grass_g4_l0.mesh and b/terrain-objects/terrain-grass_g4_l0.mesh differ diff --git a/terrain-objects/terrain-grass_g4_l1.mesh b/terrain-objects/terrain-grass_g4_l1.mesh index 70fc041..0fa761e 100644 Binary files a/terrain-objects/terrain-grass_g4_l1.mesh and b/terrain-objects/terrain-grass_g4_l1.mesh differ diff --git a/terrain-objects/terrain-grass_g5_l0.mesh b/terrain-objects/terrain-grass_g5_l0.mesh index 6c4b3bc..6444e3d 100644 Binary files a/terrain-objects/terrain-grass_g5_l0.mesh and b/terrain-objects/terrain-grass_g5_l0.mesh differ diff --git a/terrain-objects/terrain-grass_g5_l1.mesh b/terrain-objects/terrain-grass_g5_l1.mesh index a276c68..2cd3a6b 100644 Binary files a/terrain-objects/terrain-grass_g5_l1.mesh and b/terrain-objects/terrain-grass_g5_l1.mesh differ diff --git a/terrain-objects/terrain-grass_g6_l0.mesh b/terrain-objects/terrain-grass_g6_l0.mesh index 371506b..5cafe35 100644 Binary files a/terrain-objects/terrain-grass_g6_l0.mesh and b/terrain-objects/terrain-grass_g6_l0.mesh differ diff --git a/terrain-objects/terrain-grass_g6_l1.mesh b/terrain-objects/terrain-grass_g6_l1.mesh index c0cbb65..44dfac7 100644 Binary files a/terrain-objects/terrain-grass_g6_l1.mesh and b/terrain-objects/terrain-grass_g6_l1.mesh differ diff --git a/world.tscn b/world.tscn index 295f42b..5410af3 100644 --- a/world.tscn +++ b/world.tscn @@ -64,7 +64,7 @@ height = 2.25014 radius = 1.4 [sub_resource type="TreeInstanceGenerator" id=19] -step = 8 +step = 128 [sub_resource type="VoxelInstanceLibraryItem" id=17] name = "tree1" @@ -85,6 +85,7 @@ generator = SubResource( 43 ) mesh = ExtResource( 23 ) mesh_lod1 = ExtResource( 22 ) mesh_lod2 = ExtResource( 24 ) +mesh_lod3 = ExtResource( 24 ) [sub_resource type="TreeInstanceGenerator" id=45] item = 1 @@ -95,6 +96,7 @@ generator = SubResource( 45 ) mesh = ExtResource( 26 ) mesh_lod1 = ExtResource( 25 ) mesh_lod2 = ExtResource( 27 ) +mesh_lod3 = ExtResource( 27 ) [sub_resource type="TreeInstanceGenerator" id=47] step = 1 @@ -104,6 +106,8 @@ name = "grass3" generator = SubResource( 47 ) mesh = ExtResource( 29 ) mesh_lod1 = ExtResource( 28 ) +mesh_lod2 = ExtResource( 28 ) +mesh_lod3 = ExtResource( 28 ) [sub_resource type="CylinderShape" id=21] radius = 0.3 @@ -113,12 +117,12 @@ height = 2.25014 radius = 1.4 [sub_resource type="TreeInstanceGenerator" id=25] -step = 8 -item = 4 +step = 128 +item = 64 [sub_resource type="VoxelInstanceLibraryItem" id=24] name = "tree2" -lod_index = 2 +lod_index = 1 generator = SubResource( 25 ) mesh = ExtResource( 11 ) mesh_lod1 = ExtResource( 10 ) @@ -134,11 +138,11 @@ height = 2.25014 radius = 1.4 [sub_resource type="TreeInstanceGenerator" id=30] -step = 8 -item = 6 +step = 128 +item = 96 [sub_resource type="VoxelInstanceLibraryItem" id=29] -lod_index = 2 +lod_index = 1 generator = SubResource( 30 ) mesh = ExtResource( 12 ) mesh_lod1 = ExtResource( 13 ) @@ -155,6 +159,9 @@ name = "bush1" lod_index = 1 generator = SubResource( 31 ) mesh = ExtResource( 15 ) +mesh_lod1 = ExtResource( 15 ) +mesh_lod2 = ExtResource( 15 ) +mesh_lod3 = ExtResource( 15 ) [sub_resource type="TreeInstanceGenerator" id=33] step = 16 @@ -165,6 +172,9 @@ name = "bush2" lod_index = 1 generator = SubResource( 33 ) mesh = ExtResource( 16 ) +mesh_lod1 = ExtResource( 16 ) +mesh_lod2 = ExtResource( 16 ) +mesh_lod3 = ExtResource( 16 ) [sub_resource type="TreeInstanceGenerator" id=35] step = 16 @@ -174,6 +184,9 @@ item = 10 lod_index = 2 generator = SubResource( 35 ) mesh = ExtResource( 17 ) +mesh_lod1 = ExtResource( 17 ) +mesh_lod2 = ExtResource( 17 ) +mesh_lod3 = ExtResource( 17 ) [sub_resource type="TreeInstanceGenerator" id=37] step = 16 @@ -184,6 +197,9 @@ name = "bush4" lod_index = 1 generator = SubResource( 37 ) mesh = ExtResource( 18 ) +mesh_lod1 = ExtResource( 18 ) +mesh_lod2 = ExtResource( 18 ) +mesh_lod3 = ExtResource( 18 ) [sub_resource type="TreeInstanceGenerator" id=39] step = 16 @@ -194,6 +210,9 @@ name = "bush5" lod_index = 1 generator = SubResource( 39 ) mesh = ExtResource( 19 ) +mesh_lod1 = ExtResource( 19 ) +mesh_lod2 = ExtResource( 19 ) +mesh_lod3 = ExtResource( 19 ) [sub_resource type="TreeInstanceGenerator" id=41] step = 64 @@ -204,6 +223,8 @@ name = "flower1" generator = SubResource( 41 ) mesh = ExtResource( 20 ) mesh_lod1 = ExtResource( 21 ) +mesh_lod2 = ExtResource( 21 ) +mesh_lod3 = ExtResource( 21 ) [sub_resource type="VoxelInstanceLibrary" id=18] item_1 = SubResource( 17 ) @@ -227,7 +248,7 @@ _data = [ Vector2( 0, -259.615 ), 0.0, 0.0, 0, 0, Vector2( 0.291262, -300 ), 0.0 [sub_resource type="FastNoiseLite" id=8] seed = 36800 -period = 256.0 +period = 1024.0 [sub_resource type="DetourNavigationMesh" id=9] cell_size = 0.15