Update - fixed lots generation, now can save lots polygons

This commit is contained in:
2025-02-26 08:02:41 +03:00
parent 66838892d5
commit d79222c86c
36 changed files with 4055 additions and 2823 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@@ -16,7 +16,9 @@
1,
2,
3,
4
4,
5,
6
]
}
],
@@ -47,27 +49,34 @@
"mesh":3,
"name":"roadd-sidewalk_end",
"translation":[
3.3000001907348633,
4.8000006675720215,
0,
0
]
},
{
"mesh":4,
"name":"roadd-sidewalk_start",
"rotation":[
0,
0,
-1,
0
],
"scale":[
-1,
-1,
-1
],
"name":"road-lane-sidwalk-sideroad",
"translation":[
4.55145263671875,
6.099999904632568,
0,
0
]
},
{
"mesh":5,
"name":"roadd-sidewalk_start",
"translation":[
3.500000238418579,
0,
0
]
},
{
"mesh":6,
"name":"road-lane-lot",
"translation":[
8,
0,
0
]
@@ -78,9 +87,9 @@
"extensions":{
"KHR_materials_specular":{
"specularColorFactor":[
0.474271529955476,
0.474271529955476,
0.474271529955476
0.118567882488869,
0.118567882488869,
0.118567882488869
]
},
"KHR_materials_ior":{
@@ -92,7 +101,10 @@
"baseColorTexture":{
"index":0
},
"metallicFactor":0.20000000298023224
"metallicFactor":0.05000000074505806,
"metallicRoughnessTexture":{
"index":1
}
}
}
],
@@ -140,7 +152,7 @@
]
},
{
"name":"road-sidewalk.001",
"name":"road-sidewalk-end",
"primitives":[
{
"attributes":{
@@ -154,7 +166,7 @@
]
},
{
"name":"road-sidewalk.006",
"name":"road-sidewalk-sideroad",
"primitives":[
{
"attributes":{
@@ -162,7 +174,36 @@
"NORMAL":17,
"TEXCOORD_0":18
},
"indices":15,
"indices":19,
"material":0
}
]
},
{
"name":"road-sidewalk-start",
"primitives":[
{
"attributes":{
"POSITION":20,
"NORMAL":21,
"TEXCOORD_0":22
},
"indices":23,
"material":0
}
]
},
{
"name":"road-lot",
"primitives":[
{
"attributes":{
"COLOR_0":24,
"POSITION":25,
"NORMAL":26,
"TEXCOORD_0":27
},
"indices":28,
"material":0
}
]
@@ -172,6 +213,10 @@
{
"sampler":0,
"source":0
},
{
"sampler":0,
"source":1
}
],
"images":[
@@ -179,6 +224,11 @@
"mimeType":"image/png",
"name":"road",
"uri":"road.png"
},
{
"mimeType":"image/png",
"name":"roughness",
"uri":"roughness.png"
}
],
"accessors":[
@@ -187,12 +237,12 @@
"componentType":5126,
"count":32,
"max":[
-8.847564458847046e-09,
0.12099996209144592,
0,
0.12867334485054016,
5.960464477539063e-08
],
"min":[
-0.9999999403953552,
-1,
-0.09999995678663254,
-0.5
],
@@ -219,11 +269,11 @@
{
"bufferView":4,
"componentType":5126,
"count":74,
"count":76,
"max":[
9.921204764395952e-07,
0.1214386522769928,
-6.735790520906448e-07
1.0132789611816406e-06,
0.12219604849815369,
-6.705522537231445e-07
],
"min":[
-0.9999990463256836,
@@ -235,13 +285,13 @@
{
"bufferView":5,
"componentType":5126,
"count":74,
"count":76,
"type":"VEC3"
},
{
"bufferView":6,
"componentType":5126,
"count":74,
"count":76,
"type":"VEC2"
},
{
@@ -253,9 +303,9 @@
{
"bufferView":8,
"componentType":5126,
"count":40,
"count":42,
"max":[
2.5033950805664062e-05,
0.0032810475677251816,
0.19999995827674866,
0
],
@@ -269,13 +319,13 @@
{
"bufferView":9,
"componentType":5126,
"count":40,
"count":42,
"type":"VEC3"
},
{
"bufferView":10,
"componentType":5126,
"count":40,
"count":42,
"type":"VEC2"
},
{
@@ -287,64 +337,145 @@
{
"bufferView":12,
"componentType":5126,
"count":418,
"count":433,
"max":[
0.00867057777941227,
0.008670568466186523,
0.19999998807907104,
0
2.6469779601696886e-23
],
"min":[
-1.100000023841858,
-0.10000000149011612,
-0.5000007152557373
-1.1999990940093994,
-0.10000000894069672,
-0.5
],
"type":"VEC3"
},
{
"bufferView":13,
"componentType":5126,
"count":418,
"count":433,
"type":"VEC3"
},
{
"bufferView":14,
"componentType":5126,
"count":418,
"count":433,
"type":"VEC2"
},
{
"bufferView":15,
"componentType":5123,
"count":975,
"count":972,
"type":"SCALAR"
},
{
"bufferView":16,
"componentType":5126,
"count":418,
"count":29,
"max":[
0.00867057777941227,
0.19999998807907104,
0.5
0.008670799434185028,
0.12041480839252472,
5.960464477539063e-08
],
"min":[
-1.100000023841858,
-0.10000000149011612,
-7.152557373046875e-07
-1.1999988555908203,
-0.09999999403953552,
-0.5
],
"type":"VEC3"
},
{
"bufferView":17,
"componentType":5126,
"count":418,
"count":29,
"type":"VEC3"
},
{
"bufferView":18,
"componentType":5126,
"count":418,
"count":29,
"type":"VEC2"
},
{
"bufferView":19,
"componentType":5123,
"count":60,
"type":"SCALAR"
},
{
"bufferView":20,
"componentType":5126,
"count":429,
"max":[
0.008670568466186523,
0.19999998807907104,
0
],
"min":[
-1.1999990940093994,
-0.10000000894069672,
-0.5
],
"type":"VEC3"
},
{
"bufferView":21,
"componentType":5126,
"count":429,
"type":"VEC3"
},
{
"bufferView":22,
"componentType":5126,
"count":429,
"type":"VEC2"
},
{
"bufferView":23,
"componentType":5123,
"count":972,
"type":"SCALAR"
},
{
"bufferView":24,
"componentType":5123,
"count":259,
"normalized":true,
"type":"VEC4"
},
{
"bufferView":25,
"componentType":5126,
"count":259,
"max":[
4.4345855712890625e-05,
0.11039861291646957,
3.874301910400391e-06
],
"min":[
-1.000115156173706,
-0.036179300397634506,
-0.45530906319618225
],
"type":"VEC3"
},
{
"bufferView":26,
"componentType":5126,
"count":259,
"type":"VEC3"
},
{
"bufferView":27,
"componentType":5126,
"count":259,
"type":"VEC2"
},
{
"bufferView":28,
"componentType":5123,
"count":1101,
"type":"SCALAR"
}
],
"bufferViews":[
@@ -374,93 +505,153 @@
},
{
"buffer":0,
"byteLength":888,
"byteLength":912,
"byteOffset":1120,
"target":34962
},
{
"buffer":0,
"byteLength":888,
"byteOffset":2008,
"byteLength":912,
"byteOffset":2032,
"target":34962
},
{
"buffer":0,
"byteLength":592,
"byteOffset":2896,
"byteLength":608,
"byteOffset":2944,
"target":34962
},
{
"buffer":0,
"byteLength":252,
"byteOffset":3488,
"byteOffset":3552,
"target":34963
},
{
"buffer":0,
"byteLength":480,
"byteOffset":3740,
"byteLength":504,
"byteOffset":3804,
"target":34962
},
{
"buffer":0,
"byteLength":480,
"byteOffset":4220,
"byteLength":504,
"byteOffset":4308,
"target":34962
},
{
"buffer":0,
"byteLength":320,
"byteOffset":4700,
"byteLength":336,
"byteOffset":4812,
"target":34962
},
{
"buffer":0,
"byteLength":132,
"byteOffset":5020,
"byteOffset":5148,
"target":34963
},
{
"buffer":0,
"byteLength":5016,
"byteOffset":5152,
"byteLength":5196,
"byteOffset":5280,
"target":34962
},
{
"buffer":0,
"byteLength":5016,
"byteOffset":10168,
"byteLength":5196,
"byteOffset":10476,
"target":34962
},
{
"buffer":0,
"byteLength":3344,
"byteOffset":15184,
"byteLength":3464,
"byteOffset":15672,
"target":34962
},
{
"buffer":0,
"byteLength":1950,
"byteOffset":18528,
"byteLength":1944,
"byteOffset":19136,
"target":34963
},
{
"buffer":0,
"byteLength":5016,
"byteOffset":20480,
"byteLength":348,
"byteOffset":21080,
"target":34962
},
{
"buffer":0,
"byteLength":5016,
"byteOffset":25496,
"byteLength":348,
"byteOffset":21428,
"target":34962
},
{
"buffer":0,
"byteLength":3344,
"byteOffset":30512,
"byteLength":232,
"byteOffset":21776,
"target":34962
},
{
"buffer":0,
"byteLength":120,
"byteOffset":22008,
"target":34963
},
{
"buffer":0,
"byteLength":5148,
"byteOffset":22128,
"target":34962
},
{
"buffer":0,
"byteLength":5148,
"byteOffset":27276,
"target":34962
},
{
"buffer":0,
"byteLength":3432,
"byteOffset":32424,
"target":34962
},
{
"buffer":0,
"byteLength":1944,
"byteOffset":35856,
"target":34963
},
{
"buffer":0,
"byteLength":2072,
"byteOffset":37800,
"target":34962
},
{
"buffer":0,
"byteLength":3108,
"byteOffset":39872,
"target":34962
},
{
"buffer":0,
"byteLength":3108,
"byteOffset":42980,
"target":34962
},
{
"buffer":0,
"byteLength":2072,
"byteOffset":46088,
"target":34962
},
{
"buffer":0,
"byteLength":2202,
"byteOffset":48160,
"target":34963
}
],
"samplers":[
@@ -471,7 +662,7 @@
],
"buffers":[
{
"byteLength":33856,
"byteLength":50364,
"uri":"road-lanes.bin"
}
]

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View File

@@ -2,28 +2,30 @@
importer="texture"
type="StreamTexture"
path="res://.import/road.png-fffb0f4010c0e3e4e2d8a7ecd084e72d.stex"
path.s3tc="res://.import/road.png-fffb0f4010c0e3e4e2d8a7ecd084e72d.s3tc.stex"
path.etc2="res://.import/road.png-fffb0f4010c0e3e4e2d8a7ecd084e72d.etc2.stex"
metadata={
"vram_texture": false
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://astream/road/road.png"
dest_files=[ "res://.import/road.png-fffb0f4010c0e3e4e2d8a7ecd084e72d.stex" ]
dest_files=[ "res://.import/road.png-fffb0f4010c0e3e4e2d8a7ecd084e72d.s3tc.stex", "res://.import/road.png-fffb0f4010c0e3e4e2d8a7ecd084e72d.etc2.stex" ]
[params]
compress/mode=0
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/repeat=true
flags/filter=true
flags/mipmaps=false
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=2
flags/srgb=1
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
@@ -31,5 +33,5 @@ process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
detect_3d=false
svg/scale=1.0

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -0,0 +1,37 @@
[remap]
importer="texture"
type="StreamTexture"
path.s3tc="res://.import/roughness.png-d2a962b97bf129a7543624215e5981e2.s3tc.stex"
path.etc2="res://.import/roughness.png-d2a962b97bf129a7543624215e5981e2.etc2.stex"
metadata={
"imported_formats": [ "s3tc", "etc2" ],
"vram_texture": true
}
[deps]
source_file="res://astream/road/roughness.png"
dest_files=[ "res://.import/roughness.png-d2a962b97bf129a7543624215e5981e2.s3tc.stex", "res://.import/roughness.png-d2a962b97bf129a7543624215e5981e2.etc2.stex" ]
[params]
compress/mode=2
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=true
flags/filter=true
flags/mipmaps=true
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
svg/scale=1.0

View File

File diff suppressed because it is too large Load Diff

View File

@@ -57,6 +57,10 @@ road_lines_path = "res://astream/road_lines.json"
center_mesh = "res://astream/road/road-lanes_road-lane-center.mesh"
mid_mesh = "res://astream/road/road-lanes_road-lane-mid.mesh"
sidewalk_mesh = "res://astream/road/road-lanes_road-sidewalk.mesh"
sidewalk_start_mesh = "res://astream/road/road-lanes_road-sidewalk-start.mesh"
sidewalk_end_mesh = "res://astream/road/road-lanes_road-sidewalk-end.mesh"
sidewalk_sideroad_mesh = "res://astream/road/road-lanes_road-sidewalk-sideroad.mesh"
lot_mesh = "res://astream/road/road-lanes_road-lot.mesh"
[lines]
road_lines_path = "res://astream/road_lines.json"
gen_prefixes = ["empty", "foundation30", "foundation60", "sideroad-start",