diff --git a/assets/models/arena/stop_n_go/Stone_block_long_Texture.png.import b/assets/models/arena/stop_n_go/Stone_block_long_Texture.png.import index 049a07a..be731b1 100644 --- a/assets/models/arena/stop_n_go/Stone_block_long_Texture.png.import +++ b/assets/models/arena/stop_n_go/Stone_block_long_Texture.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://7ob0ngjlgtmd" +uid="uid://ljbr7ml77e2u" path.s3tc="res://.godot/imported/Stone_block_long_Texture.png-0916a5c742113eb3be58bac35b1278b3.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/models/arena/stop_n_go/Stone_block_small_Texture.png.import b/assets/models/arena/stop_n_go/Stone_block_small_Texture.png.import index 42091a2..d138f02 100644 --- a/assets/models/arena/stop_n_go/Stone_block_small_Texture.png.import +++ b/assets/models/arena/stop_n_go/Stone_block_small_Texture.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cvi8bb0l0pn0d" +uid="uid://drs3vi2sqdike" path.s3tc="res://.godot/imported/Stone_block_small_Texture.png-5b2cf09ec63234ab1655f2d2ca03a82c.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/models/arena/stop_n_go/Terrain ground tex.png b/assets/models/arena/stop_n_go/Terrain ground tex.png index 3fec6c5..c8f9430 100644 Binary files a/assets/models/arena/stop_n_go/Terrain ground tex.png and b/assets/models/arena/stop_n_go/Terrain ground tex.png differ diff --git a/assets/models/arena/stop_n_go/Terrain ground tex.png.import b/assets/models/arena/stop_n_go/Terrain ground tex.png.import index 02719de..6739c83 100644 --- a/assets/models/arena/stop_n_go/Terrain ground tex.png.import +++ b/assets/models/arena/stop_n_go/Terrain ground tex.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://b2rgdlbnieeul" +uid="uid://bxroklxricx4t" path.s3tc="res://.godot/imported/Terrain ground tex.png-4303acc83134165028ce344cbe26e46b.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/models/arena/stop_n_go/Terrain.bin b/assets/models/arena/stop_n_go/Terrain.bin index 9efb00d..e871e6b 100644 Binary files a/assets/models/arena/stop_n_go/Terrain.bin and b/assets/models/arena/stop_n_go/Terrain.bin differ diff --git a/assets/models/arena/stop_n_go/Terrain.gltf b/assets/models/arena/stop_n_go/Terrain.gltf index 7708f8c..c316ec5 100644 --- a/assets/models/arena/stop_n_go/Terrain.gltf +++ b/assets/models/arena/stop_n_go/Terrain.gltf @@ -26,22 +26,14 @@ 11, 12, 13, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22 + 14 ] } ], "nodes":[ { "mesh":0, - "name":"main arena.004", + "name":"Main Grass", "scale":[ 0.22499999403953552, 1.9959089756011963, @@ -50,376 +42,265 @@ }, { "mesh":1, - "name":"Sphere.001", + "name":"main arena.003", "scale":[ - 0.005803623236715794, - 0.0049767219461500645, - 0.004496674053370953 - ], - "translation":[ - -0.055770393460989, - 0.003608123166486621, - -0.004823249764740467 + 0.22499999403953552, + 1.9959089756011963, + 0.11975452303886414 ] }, { "mesh":2, - "name":"Plane.001", + "name":"Forest_Decor.006", + "rotation":[ + 0, + -0.164804145693779, + 0, + 0.9863263368606567 + ], "scale":[ - 0.0034827415365725756, - 0.004634810145944357, - 0.006916309706866741 + 0.009780792519450188, + 0.009780792519450188, + 0.009780792519450188 ], "translation":[ - -0.04505850002169609, - 0, - 0.0035353871062397957 + 0.0021243239752948284, + -0.00018213782459497452, + -0.07097062468528748 ] }, { "mesh":3, - "name":"Plane.006", + "name":"Forest_Flower.004", "scale":[ - 0.0034827415365725756, - 0.004634810145944357, - 0.006916309706866741 + 0.0059728301130235195, + 0.0059728301130235195, + 0.0059728301130235195 ], "translation":[ - 0.003373265266418457, - 0, - -0.02043066918849945 + -0.006074199452996254, + 0.004448744468390942, + 0.06357934325933456 ] }, { "mesh":4, - "name":"Sphere.002", + "name":"Forest_Flower.005", + "rotation":[ + 0.09268104285001755, + 0.03627822548151016, + -0.021328920498490334, + 0.9948061108589172 + ], "scale":[ - 0.0038787275552749634, - 0.003326085628941655, - 0.003005256177857518 + 0.0059728301130235195, + 0.0059728301130235195, + 0.005972830578684807 ], "translation":[ - 0.00680779293179512, - 0.002815220272168517, - -0.02868368849158287 + -0.08269041031599045, + 0.007447271607816219, + -0.05818251520395279 ] }, { "mesh":5, - "name":"Sphere.003", + "name":"Forest_Tree.007", + "rotation":[ + 0, + 0.6639745235443115, + 0, + 0.747755229473114 + ], "scale":[ - 0.0038787275552749634, - 0.003326085628941655, - 0.003005256177857518 + 0.010684945620596409, + 0.010684946551918983, + 0.010684945620596409 ], "translation":[ - 0.0014904364943504333, - 0.0028152205049991608, - -0.030357349663972855 + 0.08246183395385742, + 0.004327858332544565, + 0.06296717375516891 ] }, { "mesh":6, - "name":"Sphere.004", + "name":"Forest_Tree.006", + "rotation":[ + 0, + 0.6270878314971924, + 0, + 0.7789485454559326 + ], "scale":[ - 0.005359253380447626, - 0.004595666192471981, - 0.004152374807745218 + 0.010684946551918983, + 0.010684946551918983, + 0.010684946551918983 ], "translation":[ - 0.011845184490084648, - 0.002835826948285103, - -0.027879592031240463 + 0.016524460166692734, + 0.004327858332544565, + 0.06315441429615021 ] }, { "mesh":7, - "name":"Sphere.005", + "name":"Forest_Tree.008", + "rotation":[ + 0, + -0.2788839638233185, + 0, + 0.9603248834609985 + ], "scale":[ - 0.0017389787826687098, - 0.0014912086771801114, - 0.0013473688159137964 + 0.00610338943079114, + 0.0061033908277750015, + 0.00610338943079114 ], "translation":[ - 0.008469723165035248, - 0.0007759020081721246, - -0.022855835035443306 + -0.04366317018866539, + 0.0036247833631932735, + 0.07100062072277069 ] }, { "mesh":8, - "name":"Sphere.006", + "name":"Forest_Decor.004", + "rotation":[ + 0, + -0.1677568554878235, + 0, + 0.9858285188674927 + ], "scale":[ - 0.001265876111574471, - 0.001085513737052679, - 0.0009808065369725227 + 0.011769608594477177, + 0.011769612319767475, + 0.011769608594477177 ], "translation":[ - 0.010377485305070877, - 0.0007759020081721246, - -0.02249426394701004 + -0.07450948655605316, + 0.006656754296272993, + 0.0819668173789978 ] }, { "mesh":9, - "name":"Forest_Decor.001", + "name":"Forest_Tree.009", "rotation":[ 0, - -0.164804145693779, + -0.2788839638233185, 0, - 0.9863263368606567 + 0.9603248834609985 ], "scale":[ - 0.005186327267438173, - 0.005186327733099461, - 0.005186327267438173 + 0.00610338943079114, + 0.0061033908277750015, + 0.00610338943079114 ], "translation":[ - -0.012720957398414612, - -0.0001821359619498253, - 0.024246981367468834 + 0.046067994087934494, + 0.0036247833631932735, + 0.06772404909133911 ] }, { "mesh":10, - "name":"Forest_Decor.002", + "name":"Forest_Tree.010", "rotation":[ 0, - -0.164804145693779, + -0.7941311597824097, 0, - 0.9863263368606567 + 0.6077464818954468 ], "scale":[ - 0.005186327267438173, - 0.005186327733099461, - 0.005186327267438173 + 0.010684946551918983, + 0.010684946551918983, + 0.010684946551918983 ], "translation":[ - 0.04886207357048988, - -0.0001821359619498253, - -0.022931696847081184 + -0.016612350940704346, + 0.004327858332544565, + -0.07086807489395142 ] }, { "mesh":11, - "name":"Plane.002", + "name":"Forest_Tree.011", "rotation":[ 0, - -0.5259101986885071, + 0.9531776905059814, 0, - 0.8505401015281677 + 0.3024110794067383 ], "scale":[ - 0.004052003379911184, - 0.0028916909359395504, - 0.004052003379911184 + 0.00610338943079114, + 0.0061033908277750015, + 0.00610338943079114 ], "translation":[ - -0.11124057322740555, - 0.007224146742373705, - 0.06012773886322975 + 0.04388821870088577, + 0.0036247833631932735, + -0.07574605196714401 ] }, { "mesh":12, - "name":"Plane.003", + "name":"Forest_Decor.003", "rotation":[ 0, - -0.6388241648674011, + 0.9814057946205139, 0, - 0.7693527936935425 + 0.19194455444812775 ], "scale":[ - 0.004052003379911184, - 0.0028916909359395504, - 0.004052003379911184 + 0.011769609525799751, + 0.011769612319767475, + 0.011769609525799751 ], "translation":[ - -0.11131810396909714, - 0.002968195825815201, - -0.03941084071993828 + 0.07523632794618607, + 0.006656754296272993, + -0.08518262207508087 ] }, { "mesh":13, - "name":"Plane.004", + "name":"Forest_Tree.012", "rotation":[ 0, - -0.6388241648674011, + 0.9531776905059814, 0, - 0.7693527936935425 + 0.3024110794067383 ], "scale":[ - 0.004052003379911184, - 0.0028916909359395504, - 0.004052003379911184 + 0.00610338943079114, + 0.0061033908277750015, + 0.00610338943079114 ], "translation":[ - 0.10732132196426392, - 0.007224148605018854, - 0.04156006872653961 + -0.0458955317735672, + 0.0036247833631932735, + -0.07688450068235397 ] }, { "mesh":14, - "name":"Plane.005", + "name":"Forest_Decor.005", "rotation":[ 0, - -0.6388241648674011, + 0.9814057946205139, 0, - 0.7693527936935425 + 0.19194455444812775 ], "scale":[ - 0.004052003379911184, - 0.0028916909359395504, - 0.004052003379911184 + 0.011769609525799751, + 0.011769612319767475, + 0.011769609525799751 ], "translation":[ - 0.10845796763896942, - 0.007224149536341429, - -0.058021701872348785 - ] - }, - { - "mesh":15, - "name":"Forest_Tree.002", - "rotation":[ - 0.083919458091259, - 0, - -0.9964725375175476, - 0 - ], - "scale":[ - -0.0032216208055615425, - -0.0032216222025454044, - -0.0032216208055615425 - ], - "translation":[ - 0.014929338358342648, - 0, - 0.015636136755347252 - ] - }, - { - "mesh":16, - "name":"Forest_Tree.003", - "rotation":[ - 0.7215996384620667, - 0, - -0.6923105716705322, - 0 - ], - "scale":[ - -0.003221621038392186, - -0.0032216222025454044, - -0.003221621038392186 - ], - "translation":[ - 0.01378126721829176, - 0, - 0.024845784530043602 - ] - }, - { - "mesh":17, - "name":"Forest_Tree.001", - "rotation":[ - 0.8514568209648132, - 0, - -0.52442467212677, - 0 - ], - "scale":[ - -0.003221620572730899, - -0.0032216222025454044, - -0.003221620572730899 - ], - "translation":[ - -0.021189488470554352, - 0, - -0.014957407489418983 - ] - }, - { - "mesh":18, - "name":"Forest_Tree.004", - "rotation":[ - 0.9855759143829346, - 0, - 0.16923397779464722, - 0 - ], - "scale":[ - -0.003221621038392186, - -0.0032216222025454044, - -0.003221621038392186 - ], - "translation":[ - -0.029653552919626236, - 0, - -0.01876467652618885 - ] - }, - { - "mesh":19, - "name":"Forest_Flower.002", - "scale":[ - 0.0023976201191544533, - 0.0023976201191544533, - 0.0023976201191544533 - ], - "translation":[ - 0.02693251706659794, - 1.740034895192366e-05, - -0.009150011464953423 - ] - }, - { - "mesh":20, - "name":"Forest_Flower.001", - "scale":[ - 0.0023976201191544533, - 0.0023976201191544533, - 0.0023976201191544533 - ], - "translation":[ - -0.026713529601693153, - 1.740034895192366e-05, - -0.0039378199726343155 - ] - }, - { - "mesh":21, - "name":"Forest_Flower.003", - "scale":[ - 0.0023976201191544533, - 0.0023976201191544533, - 0.0023976201191544533 - ], - "translation":[ - 0.0737062320113182, - 1.740034895192366e-05, - -0.013610062189400196 - ] - }, - { - "mesh":22, - "name":"Forest_Tree.005", - "rotation":[ - 0.083919458091259, - 0, - -0.9964725375175476, - 0 - ], - "scale":[ - -0.003391371574252844, - -0.003374690655618906, - -0.003912908956408501 - ], - "translation":[ - 0.04525196552276611, - 0, - -0.002133963629603386 + 0.014871690422296524, + 0.006656754296272993, + -0.08443422615528107 ] } ], @@ -437,7 +318,7 @@ }, { "doubleSided":true, - "name":"Stone Block_1 floor", + "name":"Material.002", "pbrMetallicRoughness":{ "baseColorTexture":{ "index":1 @@ -448,7 +329,7 @@ }, { "doubleSided":true, - "name":"Stone Block_2 floor", + "name":"forest_tekton_statue_1_tex", "pbrMetallicRoughness":{ "baseColorTexture":{ "index":2 @@ -459,7 +340,7 @@ }, { "doubleSided":true, - "name":"forest_tekton_statue_1_tex", + "name":"forest_paving_2_tex", "pbrMetallicRoughness":{ "baseColorTexture":{ "index":3 @@ -470,7 +351,7 @@ }, { "doubleSided":true, - "name":"forest_paving_2_tex", + "name":"forest_flower_1_tex", "pbrMetallicRoughness":{ "baseColorTexture":{ "index":4 @@ -481,7 +362,15 @@ }, { "doubleSided":true, - "name":"Material.004", + "extensions":{ + "KHR_materials_specular":{ + "specularFactor":0.20000000298023224 + }, + "KHR_materials_ior":{ + "ior":1.4500000476837158 + } + }, + "name":"tree_1_tex.001", "pbrMetallicRoughness":{ "baseColorTexture":{ "index":5 @@ -500,7 +389,7 @@ "ior":1.4500000476837158 } }, - "name":"tree_1_tex", + "name":"tree_2_tex", "pbrMetallicRoughness":{ "baseColorTexture":{ "index":6 @@ -511,7 +400,7 @@ }, { "doubleSided":true, - "name":"forest_flower_1_tex", + "name":"forest_paving_1_tex", "pbrMetallicRoughness":{ "baseColorTexture":{ "index":7 @@ -523,7 +412,7 @@ ], "meshes":[ { - "name":"Plane.012", + "name":"Plane.014", "primitives":[ { "attributes":{ @@ -537,7 +426,7 @@ ] }, { - "name":"Sphere.002", + "name":"Plane.006", "primitives":[ { "attributes":{ @@ -551,7 +440,7 @@ ] }, { - "name":"Plane.004", + "name":"Cube.004", "primitives":[ { "attributes":{ @@ -561,81 +450,62 @@ }, "indices":11, "material":2 - } - ] - }, - { - "name":"Plane.010", - "primitives":[ + }, { "attributes":{ "POSITION":12, "NORMAL":13, "TEXCOORD_0":14 }, - "indices":11, - "material":2 + "indices":15, + "material":3 } ] }, { - "name":"Sphere.001", + "name":"Cylinder.008", "primitives":[ { "attributes":{ - "POSITION":15, - "NORMAL":16, - "TEXCOORD_0":17 + "POSITION":16, + "NORMAL":17, + "TEXCOORD_0":18 }, - "indices":7, - "material":1 + "indices":19, + "material":4 } ] }, { - "name":"Sphere.003", + "name":"Cylinder.009", "primitives":[ { "attributes":{ - "POSITION":18, - "NORMAL":19, - "TEXCOORD_0":20 + "POSITION":20, + "NORMAL":21, + "TEXCOORD_0":22 }, - "indices":7, - "material":1 + "indices":19, + "material":4 } ] }, { - "name":"Sphere.004", + "name":"Cylinder.028", "primitives":[ { "attributes":{ - "POSITION":21, - "NORMAL":22, - "TEXCOORD_0":23 + "POSITION":23, + "NORMAL":24, + "TEXCOORD_0":25 }, - "indices":7, - "material":1 + "indices":26, + "material":5 } ] }, { - "name":"Sphere.005", - "primitives":[ - { - "attributes":{ - "POSITION":24, - "NORMAL":25, - "TEXCOORD_0":26 - }, - "indices":7, - "material":1 - } - ] - }, - { - "name":"Sphere.006", + "name":"Cylinder.020", "primitives":[ { "attributes":{ @@ -643,13 +513,13 @@ "NORMAL":28, "TEXCOORD_0":29 }, - "indices":7, - "material":1 + "indices":26, + "material":5 } ] }, { - "name":"Cube.006", + "name":"Cylinder.027", "primitives":[ { "attributes":{ @@ -658,8 +528,13 @@ "TEXCOORD_0":32 }, "indices":33, - "material":3 - }, + "material":6 + } + ] + }, + { + "name":"Cube.007", + "primitives":[ { "attributes":{ "POSITION":34, @@ -667,12 +542,12 @@ "TEXCOORD_0":36 }, "indices":37, - "material":4 + "material":7 } ] }, { - "name":"Cube.001", + "name":"Cylinder.010", "primitives":[ { "attributes":{ @@ -681,21 +556,26 @@ "TEXCOORD_0":40 }, "indices":33, - "material":3 - }, + "material":6 + } + ] + }, + { + "name":"Cylinder.011", + "primitives":[ { "attributes":{ "POSITION":41, "NORMAL":42, "TEXCOORD_0":43 }, - "indices":37, - "material":4 + "indices":26, + "material":5 } ] }, { - "name":"Plane.005", + "name":"Cylinder.012", "primitives":[ { "attributes":{ @@ -703,164 +583,52 @@ "NORMAL":45, "TEXCOORD_0":46 }, - "indices":47, - "material":5 - } - ] - }, - { - "name":"Plane.007", - "primitives":[ - { - "attributes":{ - "POSITION":48, - "NORMAL":49, - "TEXCOORD_0":50 - }, - "indices":47, - "material":5 - } - ] - }, - { - "name":"Plane.008", - "primitives":[ - { - "attributes":{ - "POSITION":51, - "NORMAL":52, - "TEXCOORD_0":53 - }, - "indices":47, - "material":5 - } - ] - }, - { - "name":"Plane.009", - "primitives":[ - { - "attributes":{ - "POSITION":54, - "NORMAL":55, - "TEXCOORD_0":56 - }, - "indices":47, - "material":5 - } - ] - }, - { - "name":"Cylinder.002", - "primitives":[ - { - "attributes":{ - "POSITION":57, - "NORMAL":58, - "TEXCOORD_0":59 - }, - "indices":60, + "indices":33, "material":6 } ] }, { - "name":"Cylinder.003", + "name":"Cube.002", "primitives":[ { "attributes":{ - "POSITION":61, - "NORMAL":62, - "TEXCOORD_0":63 + "POSITION":47, + "NORMAL":48, + "TEXCOORD_0":49 }, - "indices":64, - "material":6 - } - ] - }, - { - "name":"Cylinder.001", - "primitives":[ - { - "attributes":{ - "POSITION":65, - "NORMAL":66, - "TEXCOORD_0":67 - }, - "indices":60, - "material":6 - } - ] - }, - { - "name":"Cylinder.004", - "primitives":[ - { - "attributes":{ - "POSITION":68, - "NORMAL":69, - "TEXCOORD_0":70 - }, - "indices":64, - "material":6 - } - ] - }, - { - "name":"Cylinder.019", - "primitives":[ - { - "attributes":{ - "POSITION":71, - "NORMAL":72, - "TEXCOORD_0":73 - }, - "indices":74, + "indices":37, "material":7 } ] }, { - "name":"Cylinder.005", + "name":"Cylinder.013", "primitives":[ { "attributes":{ - "POSITION":75, - "NORMAL":76, - "TEXCOORD_0":77 + "POSITION":50, + "NORMAL":51, + "TEXCOORD_0":52 }, - "indices":74, - "material":7 - } - ] - }, - { - "name":"Cylinder.006", - "primitives":[ - { - "attributes":{ - "POSITION":78, - "NORMAL":79, - "TEXCOORD_0":80 - }, - "indices":74, - "material":7 - } - ] - }, - { - "name":"Cylinder.007", - "primitives":[ - { - "attributes":{ - "POSITION":81, - "NORMAL":82, - "TEXCOORD_0":83 - }, - "indices":60, + "indices":33, "material":6 } ] + }, + { + "name":"Cube.003", + "primitives":[ + { + "attributes":{ + "POSITION":53, + "NORMAL":54, + "TEXCOORD_0":55 + }, + "indices":37, + "material":7 + } + ] } ], "textures":[ @@ -869,8 +637,8 @@ "source":0 }, { - "sampler":0, - "source":1 + "sampler":1, + "source":0 }, { "sampler":0, @@ -880,10 +648,6 @@ "sampler":0, "source":2 }, - { - "sampler":0, - "source":1 - }, { "sampler":0, "source":3 @@ -895,6 +659,10 @@ { "sampler":0, "source":5 + }, + { + "sampler":0, + "source":6 } ], "images":[ @@ -903,11 +671,6 @@ "name":"Terrain ground tex", "uri":"Terrain%20ground%20tex.png" }, - { - "mimeType":"image/png", - "name":"Stone_block_small_Texture", - "uri":"Stone_block_small_Texture.png" - }, { "mimeType":"image/png", "name":"forest_tekton_statue_UV_tex", @@ -915,8 +678,13 @@ }, { "mimeType":"image/png", - "name":"Stone_block_long_Texture", - "uri":"Stone_block_long_Texture.png" + "name":"Stone_block_small_Texture", + "uri":"Stone_block_small_Texture.png" + }, + { + "mimeType":"image/png", + "name":"forest_flower_1_tex", + "uri":"forest_flower_1_tex.png" }, { "mimeType":"image/png", @@ -925,23 +693,28 @@ }, { "mimeType":"image/png", - "name":"forest_flower_1_tex", - "uri":"forest_flower_1_tex.png" + "name":"tree_2_tex", + "uri":"tree_2_tex.png" + }, + { + "mimeType":"image/png", + "name":"forest_paving_1_tex", + "uri":"forest_paving_1_tex.png" } ], "accessors":[ { "bufferView":0, "componentType":5126, - "count":1738, + "count":1801, "max":[ - 1, + 1.0043694972991943, 0.0036194785498082638, 1 ], "min":[ -1, - 0, + -0.0003990053082816303, -1 ], "type":"VEC3" @@ -949,1245 +722,819 @@ { "bufferView":1, "componentType":5126, - "count":1738, + "count":1801, "type":"VEC3" }, { "bufferView":2, "componentType":5126, - "count":1738, + "count":1801, "type":"VEC2" }, { "bufferView":3, "componentType":5123, - "count":7776, + "count":5640, "type":"SCALAR" }, { "bufferView":4, "componentType":5126, - "count":314, + "count":740, "max":[ - 0.6869632005691528, - 0.5238402485847473, - 1.0634205341339111 + 1, + 0, + 0.6666667461395264 ], "min":[ - -0.7331855297088623, - -0.7147781848907471, - -0.987740695476532 + -1, + 0, + -0.6666666269302368 ], "type":"VEC3" }, { "bufferView":5, "componentType":5126, - "count":314, + "count":740, "type":"VEC3" }, { "bufferView":6, "componentType":5126, - "count":314, + "count":740, "type":"VEC2" }, { "bufferView":7, "componentType":5123, - "count":600, + "count":4068, "type":"SCALAR" }, { "bufferView":8, "componentType":5126, - "count":1763, + "count":737, "max":[ - 1, - 1.1278119087219238, - 1 + 1.1727004051208496, + 2.6721489429473877, + 0.7173086404800415 ], "min":[ - -1, - 0, - -1 + -1.1727005243301392, + 0.7023022174835205, + -0.7459119558334351 ], "type":"VEC3" }, { "bufferView":9, "componentType":5126, - "count":1763, + "count":737, "type":"VEC3" }, { "bufferView":10, "componentType":5126, - "count":1763, + "count":737, "type":"VEC2" }, { "bufferView":11, "componentType":5123, - "count":5028, + "count":3744, "type":"SCALAR" }, { "bufferView":12, "componentType":5126, - "count":1763, + "count":303, "max":[ - 1, - 1.1278119087219238, - 1 + 0.8961244821548462, + 0.7482583522796631, + 0.9588603377342224 ], "min":[ - -1, - 0, - -1 + -0.9713014960289001, + 0.03511708974838257, + -0.9145033955574036 ], "type":"VEC3" }, { "bufferView":13, "componentType":5126, - "count":1763, + "count":303, "type":"VEC3" }, { "bufferView":14, "componentType":5126, - "count":1763, + "count":303, "type":"VEC2" }, { "bufferView":15, - "componentType":5126, - "count":314, - "max":[ - 0.6869632005691528, - 0.5238402485847473, - 1.0634205341339111 - ], - "min":[ - -0.7331855297088623, - -0.7147781848907471, - -0.987740695476532 - ], - "type":"VEC3" + "componentType":5123, + "count":1506, + "type":"SCALAR" }, { "bufferView":16, "componentType":5126, - "count":314, + "count":1282, + "max":[ + 1.3402063846588135, + 2.42311692237854, + 1.169303059577942 + ], + "min":[ + -1.3402063846588135, + -0.007258892059326172, + -1.149379014968872 + ], "type":"VEC3" }, { "bufferView":17, "componentType":5126, - "count":314, - "type":"VEC2" + "count":1282, + "type":"VEC3" }, { "bufferView":18, "componentType":5126, - "count":314, - "max":[ - 0.6869632005691528, - 0.5238402485847473, - 1.0634205341339111 - ], - "min":[ - -0.7331855297088623, - -0.7147781848907471, - -0.987740695476532 - ], - "type":"VEC3" + "count":1282, + "type":"VEC2" }, { "bufferView":19, - "componentType":5126, - "count":314, - "type":"VEC3" + "componentType":5123, + "count":5664, + "type":"SCALAR" }, { "bufferView":20, "componentType":5126, - "count":314, - "type":"VEC2" + "count":1282, + "max":[ + 1.3402063846588135, + 2.42311692237854, + 1.169303059577942 + ], + "min":[ + -1.3402063846588135, + -0.007258892059326172, + -1.149379014968872 + ], + "type":"VEC3" }, { "bufferView":21, "componentType":5126, - "count":314, - "max":[ - 0.6869632005691528, - 0.5238402485847473, - 1.0634205341339111 - ], - "min":[ - -0.7331855297088623, - -0.7147781848907471, - -0.987740695476532 - ], + "count":1282, "type":"VEC3" }, { "bufferView":22, "componentType":5126, - "count":314, - "type":"VEC3" + "count":1282, + "type":"VEC2" }, { "bufferView":23, "componentType":5126, - "count":314, - "type":"VEC2" + "count":1368, + "max":[ + 1.6730365753173828, + 3.953491687774658, + 1.680948257446289 + ], + "min":[ + -1.6658926010131836, + 0.010360966436564922, + -1.6579809188842773 + ], + "type":"VEC3" }, { "bufferView":24, "componentType":5126, - "count":314, - "max":[ - 0.6869632005691528, - 0.5238402485847473, - 1.0634205341339111 - ], - "min":[ - -0.7331855297088623, - -0.7147781848907471, - -0.987740695476532 - ], + "count":1368, "type":"VEC3" }, { "bufferView":25, "componentType":5126, - "count":314, - "type":"VEC3" + "count":1368, + "type":"VEC2" }, { "bufferView":26, - "componentType":5126, - "count":314, - "type":"VEC2" + "componentType":5123, + "count":6144, + "type":"SCALAR" }, { "bufferView":27, "componentType":5126, - "count":314, + "count":1368, "max":[ - 0.6869632005691528, - 0.5238402485847473, - 1.0634205341339111 + 1.6730365753173828, + 3.953491687774658, + 1.680948257446289 ], "min":[ - -0.7331855297088623, - -0.7147781848907471, - -0.987740695476532 + -1.6658926010131836, + 0.010360966436564922, + -1.6579809188842773 ], "type":"VEC3" }, { "bufferView":28, "componentType":5126, - "count":314, + "count":1368, "type":"VEC3" }, { "bufferView":29, "componentType":5126, - "count":314, + "count":1368, "type":"VEC2" }, { "bufferView":30, "componentType":5126, - "count":737, + "count":2965, "max":[ - 1.1727004051208496, - 2.6721489429473877, - 0.7173086404800415 + 3.663944959640503, + 7.648304462432861, + 3.684083938598633 ], "min":[ - -1.1727005243301392, - 0.7023022174835205, - -0.7459119558334351 + -3.658682107925415, + 0.01706753671169281, + -3.638542652130127 ], "type":"VEC3" }, { "bufferView":31, "componentType":5126, - "count":737, + "count":2965, "type":"VEC3" }, { "bufferView":32, "componentType":5126, - "count":737, + "count":2965, "type":"VEC2" }, { "bufferView":33, "componentType":5123, - "count":3744, + "count":13296, "type":"SCALAR" }, { "bufferView":34, "componentType":5126, - "count":303, + "count":89, "max":[ - 0.8961244821548462, + 0.8925353288650513, 0.7482583522796631, - 0.9588603377342224 + 0.9537627100944519 ], "min":[ - -0.9713014960289001, + -0.9676738977432251, 0.03511708974838257, - -0.9145033955574036 + -0.906446635723114 ], "type":"VEC3" }, { "bufferView":35, "componentType":5126, - "count":303, + "count":89, "type":"VEC3" }, { "bufferView":36, "componentType":5126, - "count":303, + "count":89, "type":"VEC2" }, { "bufferView":37, "componentType":5123, - "count":1506, + "count":360, "type":"SCALAR" }, { "bufferView":38, "componentType":5126, - "count":737, + "count":2965, "max":[ - 1.1727004051208496, - 2.6721489429473877, - 0.7173086404800415 + 3.663944959640503, + 7.648304462432861, + 3.684083938598633 ], "min":[ - -1.1727005243301392, - 0.7023022174835205, - -0.7459119558334351 + -3.658682107925415, + 0.01706753671169281, + -3.638542652130127 ], "type":"VEC3" }, { "bufferView":39, "componentType":5126, - "count":737, + "count":2965, "type":"VEC3" }, { "bufferView":40, "componentType":5126, - "count":737, + "count":2965, "type":"VEC2" }, { "bufferView":41, "componentType":5126, - "count":303, + "count":1368, "max":[ - 0.8961244821548462, - 0.7482583522796631, - 0.9588603377342224 + 1.6730365753173828, + 3.953491687774658, + 1.680948257446289 ], "min":[ - -0.9713014960289001, - 0.03511708974838257, - -0.9145033955574036 + -1.6658926010131836, + 0.010360966436564922, + -1.6579809188842773 ], "type":"VEC3" }, { "bufferView":42, "componentType":5126, - "count":303, + "count":1368, "type":"VEC3" }, { "bufferView":43, "componentType":5126, - "count":303, + "count":1368, "type":"VEC2" }, { "bufferView":44, "componentType":5126, - "count":1737, + "count":2965, "max":[ - 1.8604826927185059, - 2.341214418411255, - 1.1608856916427612 + 3.663944959640503, + 7.648304462432861, + 3.684083938598633 ], "min":[ - -1.8689509630203247, - 0, - -1.1515741348266602 + -3.658682107925415, + 0.01706753671169281, + -3.638542652130127 ], "type":"VEC3" }, { "bufferView":45, "componentType":5126, - "count":1737, + "count":2965, "type":"VEC3" }, { "bufferView":46, "componentType":5126, - "count":1737, + "count":2965, "type":"VEC2" }, { "bufferView":47, - "componentType":5123, - "count":3600, - "type":"SCALAR" + "componentType":5126, + "count":89, + "max":[ + 0.8925353288650513, + 0.7482583522796631, + 0.9537627100944519 + ], + "min":[ + -0.9676738977432251, + 0.03511708974838257, + -0.906446635723114 + ], + "type":"VEC3" }, { "bufferView":48, "componentType":5126, - "count":1737, - "max":[ - 1.8604826927185059, - 2.341214418411255, - 1.1608856916427612 - ], - "min":[ - -1.8689509630203247, - 0, - -1.1515741348266602 - ], + "count":89, "type":"VEC3" }, { "bufferView":49, "componentType":5126, - "count":1737, - "type":"VEC3" + "count":89, + "type":"VEC2" }, { "bufferView":50, "componentType":5126, - "count":1737, - "type":"VEC2" + "count":2965, + "max":[ + 3.663944959640503, + 7.648304462432861, + 3.684083938598633 + ], + "min":[ + -3.658682107925415, + 0.01706753671169281, + -3.638542652130127 + ], + "type":"VEC3" }, { "bufferView":51, "componentType":5126, - "count":1737, - "max":[ - 1.8604826927185059, - 2.341214418411255, - 1.1608856916427612 - ], - "min":[ - -1.8689509630203247, - 0, - -1.1515741348266602 - ], + "count":2965, "type":"VEC3" }, { "bufferView":52, "componentType":5126, - "count":1737, - "type":"VEC3" + "count":2965, + "type":"VEC2" }, { "bufferView":53, "componentType":5126, - "count":1737, - "type":"VEC2" + "count":89, + "max":[ + 0.8925353288650513, + 0.7482583522796631, + 0.9537627100944519 + ], + "min":[ + -0.9676738977432251, + 0.03511708974838257, + -0.906446635723114 + ], + "type":"VEC3" }, { "bufferView":54, "componentType":5126, - "count":1737, - "max":[ - 1.8604826927185059, - 2.341214418411255, - 1.1608856916427612 - ], - "min":[ - -1.8689509630203247, - 0, - -1.1515741348266602 - ], + "count":89, "type":"VEC3" }, { "bufferView":55, "componentType":5126, - "count":1737, - "type":"VEC3" - }, - { - "bufferView":56, - "componentType":5126, - "count":1737, - "type":"VEC2" - }, - { - "bufferView":57, - "componentType":5126, - "count":810, - "max":[ - 1.6455037593841553, - 2.6637349128723145, - 1.4824063777923584 - ], - "min":[ - -1.2488160133361816, - -0.046790242195129395, - -2.7289047241210938 - ], - "type":"VEC3" - }, - { - "bufferView":58, - "componentType":5126, - "count":810, - "type":"VEC3" - }, - { - "bufferView":59, - "componentType":5126, - "count":810, - "type":"VEC2" - }, - { - "bufferView":60, - "componentType":5123, - "count":3612, - "type":"SCALAR" - }, - { - "bufferView":61, - "componentType":5126, - "count":1240, - "max":[ - 1.6455037593841553, - 2.6637349128723145, - 1.4824063777923584 - ], - "min":[ - -1.6364567279815674, - -0.046790242195129395, - -2.9283547401428223 - ], - "type":"VEC3" - }, - { - "bufferView":62, - "componentType":5126, - "count":1240, - "type":"VEC3" - }, - { - "bufferView":63, - "componentType":5126, - "count":1240, - "type":"VEC2" - }, - { - "bufferView":64, - "componentType":5123, - "count":5568, - "type":"SCALAR" - }, - { - "bufferView":65, - "componentType":5126, - "count":810, - "max":[ - 1.6455037593841553, - 2.6637349128723145, - 1.4824063777923584 - ], - "min":[ - -1.2488160133361816, - -0.046790242195129395, - -2.7289047241210938 - ], - "type":"VEC3" - }, - { - "bufferView":66, - "componentType":5126, - "count":810, - "type":"VEC3" - }, - { - "bufferView":67, - "componentType":5126, - "count":810, - "type":"VEC2" - }, - { - "bufferView":68, - "componentType":5126, - "count":1240, - "max":[ - 1.6455037593841553, - 2.6637349128723145, - 1.4824063777923584 - ], - "min":[ - -1.6364567279815674, - -0.046790242195129395, - -2.9283547401428223 - ], - "type":"VEC3" - }, - { - "bufferView":69, - "componentType":5126, - "count":1240, - "type":"VEC3" - }, - { - "bufferView":70, - "componentType":5126, - "count":1240, - "type":"VEC2" - }, - { - "bufferView":71, - "componentType":5126, - "count":1282, - "max":[ - 1.3402063846588135, - 2.42311692237854, - 1.169303059577942 - ], - "min":[ - -1.3402063846588135, - -0.007258892059326172, - -1.149379014968872 - ], - "type":"VEC3" - }, - { - "bufferView":72, - "componentType":5126, - "count":1282, - "type":"VEC3" - }, - { - "bufferView":73, - "componentType":5126, - "count":1282, - "type":"VEC2" - }, - { - "bufferView":74, - "componentType":5123, - "count":5664, - "type":"SCALAR" - }, - { - "bufferView":75, - "componentType":5126, - "count":1282, - "max":[ - 1.3402063846588135, - 2.42311692237854, - 1.169303059577942 - ], - "min":[ - -1.3402063846588135, - -0.007258892059326172, - -1.149379014968872 - ], - "type":"VEC3" - }, - { - "bufferView":76, - "componentType":5126, - "count":1282, - "type":"VEC3" - }, - { - "bufferView":77, - "componentType":5126, - "count":1282, - "type":"VEC2" - }, - { - "bufferView":78, - "componentType":5126, - "count":1282, - "max":[ - 1.3402063846588135, - 2.42311692237854, - 1.169303059577942 - ], - "min":[ - -1.3402063846588135, - -0.007258892059326172, - -1.149379014968872 - ], - "type":"VEC3" - }, - { - "bufferView":79, - "componentType":5126, - "count":1282, - "type":"VEC3" - }, - { - "bufferView":80, - "componentType":5126, - "count":1282, - "type":"VEC2" - }, - { - "bufferView":81, - "componentType":5126, - "count":810, - "max":[ - 1.6455037593841553, - 2.6637349128723145, - 1.4824063777923584 - ], - "min":[ - -1.2488160133361816, - -0.046790242195129395, - -2.7289047241210938 - ], - "type":"VEC3" - }, - { - "bufferView":82, - "componentType":5126, - "count":810, - "type":"VEC3" - }, - { - "bufferView":83, - "componentType":5126, - "count":810, + "count":89, "type":"VEC2" } ], "bufferViews":[ { "buffer":0, - "byteLength":20856, + "byteLength":21612, "byteOffset":0, "target":34962 }, { "buffer":0, - "byteLength":20856, - "byteOffset":20856, + "byteLength":21612, + "byteOffset":21612, "target":34962 }, { "buffer":0, - "byteLength":13904, - "byteOffset":41712, + "byteLength":14408, + "byteOffset":43224, "target":34962 }, { "buffer":0, - "byteLength":15552, - "byteOffset":55616, + "byteLength":11280, + "byteOffset":57632, "target":34963 }, { "buffer":0, - "byteLength":3768, - "byteOffset":71168, + "byteLength":8880, + "byteOffset":68912, "target":34962 }, { "buffer":0, - "byteLength":3768, - "byteOffset":74936, + "byteLength":8880, + "byteOffset":77792, "target":34962 }, { "buffer":0, - "byteLength":2512, - "byteOffset":78704, + "byteLength":5920, + "byteOffset":86672, "target":34962 }, { "buffer":0, - "byteLength":1200, - "byteOffset":81216, + "byteLength":8136, + "byteOffset":92592, "target":34963 }, { "buffer":0, - "byteLength":21156, - "byteOffset":82416, - "target":34962 - }, - { - "buffer":0, - "byteLength":21156, - "byteOffset":103572, - "target":34962 - }, - { - "buffer":0, - "byteLength":14104, - "byteOffset":124728, - "target":34962 - }, - { - "buffer":0, - "byteLength":10056, - "byteOffset":138832, - "target":34963 - }, - { - "buffer":0, - "byteLength":21156, - "byteOffset":148888, - "target":34962 - }, - { - "buffer":0, - "byteLength":21156, - "byteOffset":170044, - "target":34962 - }, - { - "buffer":0, - "byteLength":14104, - "byteOffset":191200, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":205304, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":209072, - "target":34962 - }, - { - "buffer":0, - "byteLength":2512, - "byteOffset":212840, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":215352, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":219120, - "target":34962 - }, - { - "buffer":0, - "byteLength":2512, - "byteOffset":222888, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":225400, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":229168, - "target":34962 - }, - { - "buffer":0, - "byteLength":2512, - "byteOffset":232936, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":235448, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":239216, - "target":34962 - }, - { - "buffer":0, - "byteLength":2512, - "byteOffset":242984, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":245496, - "target":34962 - }, - { - "buffer":0, - "byteLength":3768, - "byteOffset":249264, - "target":34962 - }, - { - "buffer":0, - "byteLength":2512, - "byteOffset":253032, + "byteLength":8844, + "byteOffset":100728, "target":34962 }, { "buffer":0, "byteLength":8844, - "byteOffset":255544, - "target":34962 - }, - { - "buffer":0, - "byteLength":8844, - "byteOffset":264388, + "byteOffset":109572, "target":34962 }, { "buffer":0, "byteLength":5896, - "byteOffset":273232, + "byteOffset":118416, "target":34962 }, { "buffer":0, "byteLength":7488, - "byteOffset":279128, + "byteOffset":124312, "target":34963 }, { "buffer":0, "byteLength":3636, - "byteOffset":286616, + "byteOffset":131800, "target":34962 }, { "buffer":0, "byteLength":3636, - "byteOffset":290252, + "byteOffset":135436, "target":34962 }, { "buffer":0, "byteLength":2424, - "byteOffset":293888, + "byteOffset":139072, "target":34962 }, { "buffer":0, "byteLength":3012, - "byteOffset":296312, + "byteOffset":141496, "target":34963 }, { "buffer":0, - "byteLength":8844, - "byteOffset":299324, - "target":34962 - }, - { - "buffer":0, - "byteLength":8844, - "byteOffset":308168, - "target":34962 - }, - { - "buffer":0, - "byteLength":5896, - "byteOffset":317012, - "target":34962 - }, - { - "buffer":0, - "byteLength":3636, - "byteOffset":322908, - "target":34962 - }, - { - "buffer":0, - "byteLength":3636, - "byteOffset":326544, - "target":34962 - }, - { - "buffer":0, - "byteLength":2424, - "byteOffset":330180, - "target":34962 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":332604, - "target":34962 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":353448, - "target":34962 - }, - { - "buffer":0, - "byteLength":13896, - "byteOffset":374292, - "target":34962 - }, - { - "buffer":0, - "byteLength":7200, - "byteOffset":388188, - "target":34963 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":395388, - "target":34962 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":416232, - "target":34962 - }, - { - "buffer":0, - "byteLength":13896, - "byteOffset":437076, - "target":34962 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":450972, - "target":34962 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":471816, - "target":34962 - }, - { - "buffer":0, - "byteLength":13896, - "byteOffset":492660, - "target":34962 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":506556, - "target":34962 - }, - { - "buffer":0, - "byteLength":20844, - "byteOffset":527400, - "target":34962 - }, - { - "buffer":0, - "byteLength":13896, - "byteOffset":548244, - "target":34962 - }, - { - "buffer":0, - "byteLength":9720, - "byteOffset":562140, - "target":34962 - }, - { - "buffer":0, - "byteLength":9720, - "byteOffset":571860, - "target":34962 - }, - { - "buffer":0, - "byteLength":6480, - "byteOffset":581580, - "target":34962 - }, - { - "buffer":0, - "byteLength":7224, - "byteOffset":588060, - "target":34963 - }, - { - "buffer":0, - "byteLength":14880, - "byteOffset":595284, - "target":34962 - }, - { - "buffer":0, - "byteLength":14880, - "byteOffset":610164, - "target":34962 - }, - { - "buffer":0, - "byteLength":9920, - "byteOffset":625044, - "target":34962 - }, - { - "buffer":0, - "byteLength":11136, - "byteOffset":634964, - "target":34963 - }, - { - "buffer":0, - "byteLength":9720, - "byteOffset":646100, - "target":34962 - }, - { - "buffer":0, - "byteLength":9720, - "byteOffset":655820, - "target":34962 - }, - { - "buffer":0, - "byteLength":6480, - "byteOffset":665540, - "target":34962 - }, - { - "buffer":0, - "byteLength":14880, - "byteOffset":672020, - "target":34962 - }, - { - "buffer":0, - "byteLength":14880, - "byteOffset":686900, - "target":34962 - }, - { - "buffer":0, - "byteLength":9920, - "byteOffset":701780, + "byteLength":15384, + "byteOffset":144508, "target":34962 }, { "buffer":0, "byteLength":15384, - "byteOffset":711700, - "target":34962 - }, - { - "buffer":0, - "byteLength":15384, - "byteOffset":727084, + "byteOffset":159892, "target":34962 }, { "buffer":0, "byteLength":10256, - "byteOffset":742468, + "byteOffset":175276, "target":34962 }, { "buffer":0, "byteLength":11328, - "byteOffset":752724, + "byteOffset":185532, "target":34963 }, { "buffer":0, "byteLength":15384, - "byteOffset":764052, + "byteOffset":196860, "target":34962 }, { "buffer":0, "byteLength":15384, - "byteOffset":779436, + "byteOffset":212244, "target":34962 }, { "buffer":0, "byteLength":10256, - "byteOffset":794820, + "byteOffset":227628, "target":34962 }, { "buffer":0, - "byteLength":15384, - "byteOffset":805076, + "byteLength":16416, + "byteOffset":237884, "target":34962 }, { "buffer":0, - "byteLength":15384, - "byteOffset":820460, + "byteLength":16416, + "byteOffset":254300, "target":34962 }, { "buffer":0, - "byteLength":10256, - "byteOffset":835844, + "byteLength":10944, + "byteOffset":270716, "target":34962 }, { "buffer":0, - "byteLength":9720, - "byteOffset":846100, + "byteLength":12288, + "byteOffset":281660, + "target":34963 + }, + { + "buffer":0, + "byteLength":16416, + "byteOffset":293948, "target":34962 }, { "buffer":0, - "byteLength":9720, - "byteOffset":855820, + "byteLength":16416, + "byteOffset":310364, "target":34962 }, { "buffer":0, - "byteLength":6480, - "byteOffset":865540, + "byteLength":10944, + "byteOffset":326780, + "target":34962 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":337724, + "target":34962 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":373304, + "target":34962 + }, + { + "buffer":0, + "byteLength":23720, + "byteOffset":408884, + "target":34962 + }, + { + "buffer":0, + "byteLength":26592, + "byteOffset":432604, + "target":34963 + }, + { + "buffer":0, + "byteLength":1068, + "byteOffset":459196, + "target":34962 + }, + { + "buffer":0, + "byteLength":1068, + "byteOffset":460264, + "target":34962 + }, + { + "buffer":0, + "byteLength":712, + "byteOffset":461332, + "target":34962 + }, + { + "buffer":0, + "byteLength":720, + "byteOffset":462044, + "target":34963 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":462764, + "target":34962 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":498344, + "target":34962 + }, + { + "buffer":0, + "byteLength":23720, + "byteOffset":533924, + "target":34962 + }, + { + "buffer":0, + "byteLength":16416, + "byteOffset":557644, + "target":34962 + }, + { + "buffer":0, + "byteLength":16416, + "byteOffset":574060, + "target":34962 + }, + { + "buffer":0, + "byteLength":10944, + "byteOffset":590476, + "target":34962 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":601420, + "target":34962 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":637000, + "target":34962 + }, + { + "buffer":0, + "byteLength":23720, + "byteOffset":672580, + "target":34962 + }, + { + "buffer":0, + "byteLength":1068, + "byteOffset":696300, + "target":34962 + }, + { + "buffer":0, + "byteLength":1068, + "byteOffset":697368, + "target":34962 + }, + { + "buffer":0, + "byteLength":712, + "byteOffset":698436, + "target":34962 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":699148, + "target":34962 + }, + { + "buffer":0, + "byteLength":35580, + "byteOffset":734728, + "target":34962 + }, + { + "buffer":0, + "byteLength":23720, + "byteOffset":770308, + "target":34962 + }, + { + "buffer":0, + "byteLength":1068, + "byteOffset":794028, + "target":34962 + }, + { + "buffer":0, + "byteLength":1068, + "byteOffset":795096, + "target":34962 + }, + { + "buffer":0, + "byteLength":712, + "byteOffset":796164, "target":34962 } ], @@ -2195,11 +1542,17 @@ { "magFilter":9729, "minFilter":9987 + }, + { + "magFilter":9729, + "minFilter":9987, + "wrapS":33071, + "wrapT":33071 } ], "buffers":[ { - "byteLength":872020, + "byteLength":796876, "uri":"Terrain.bin" } ] diff --git a/assets/models/arena/stop_n_go/Terrain.gltf.import b/assets/models/arena/stop_n_go/Terrain.gltf.import index e72579d..b4c3493 100644 --- a/assets/models/arena/stop_n_go/Terrain.gltf.import +++ b/assets/models/arena/stop_n_go/Terrain.gltf.import @@ -3,7 +3,7 @@ importer="scene" importer_version=1 type="PackedScene" -uid="uid://c8v5ehnf3s1ut" +uid="uid://dkgg3c7conwqb" path="res://.godot/imported/Terrain.gltf-c727a544f574f1f4cd0808dd390e94ae.scn" [deps] diff --git a/assets/models/arena/stop_n_go/forest_flower_1_tex.png.import b/assets/models/arena/stop_n_go/forest_flower_1_tex.png.import index 86e1b13..8c442a3 100644 --- a/assets/models/arena/stop_n_go/forest_flower_1_tex.png.import +++ b/assets/models/arena/stop_n_go/forest_flower_1_tex.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://1pufjwqt2pi" +uid="uid://c4r538kowqwk3" path.s3tc="res://.godot/imported/forest_flower_1_tex.png-87bc2c1fa7ec42b6cb91f92c484c026d.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/models/arena/stop_n_go/forest_paving_1_tex.png b/assets/models/arena/stop_n_go/forest_paving_1_tex.png new file mode 100644 index 0000000..8b7d6c4 Binary files /dev/null and b/assets/models/arena/stop_n_go/forest_paving_1_tex.png differ diff --git a/assets/models/arena/stop_n_go/forest_paving_1_tex.png.import b/assets/models/arena/stop_n_go/forest_paving_1_tex.png.import new file mode 100644 index 0000000..10b8b9e --- /dev/null +++ b/assets/models/arena/stop_n_go/forest_paving_1_tex.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://8uo4ehtpviix" +path.s3tc="res://.godot/imported/forest_paving_1_tex.png-93218734e3cd5fe74ca41af6fa8b9cc1.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/models/arena/stop_n_go/forest_paving_1_tex.png" +dest_files=["res://.godot/imported/forest_paving_1_tex.png-93218734e3cd5fe74ca41af6fa8b9cc1.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/assets/models/arena/stop_n_go/forest_tekton_statue_UV_tex.png.import b/assets/models/arena/stop_n_go/forest_tekton_statue_UV_tex.png.import index e1bfdd6..0638503 100644 --- a/assets/models/arena/stop_n_go/forest_tekton_statue_UV_tex.png.import +++ b/assets/models/arena/stop_n_go/forest_tekton_statue_UV_tex.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://di7vsupgsdis" +uid="uid://dxt5jr4ba0txy" path.s3tc="res://.godot/imported/forest_tekton_statue_UV_tex.png-eca0715f4e0df888d477bdde8ddbb5df.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/models/arena/stop_n_go/tree_1_tex.png.import b/assets/models/arena/stop_n_go/tree_1_tex.png.import index 0f993f2..e9c2cff 100644 --- a/assets/models/arena/stop_n_go/tree_1_tex.png.import +++ b/assets/models/arena/stop_n_go/tree_1_tex.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cyanmglrm5r8k" +uid="uid://bbh73wg8td3lu" path.s3tc="res://.godot/imported/tree_1_tex.png-b3e743f0517baed84d3e6b20b4095f9a.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/assets/models/arena/stop_n_go/tree_2_tex.png b/assets/models/arena/stop_n_go/tree_2_tex.png new file mode 100644 index 0000000..66deb25 Binary files /dev/null and b/assets/models/arena/stop_n_go/tree_2_tex.png differ diff --git a/assets/models/arena/stop_n_go/tree_2_tex.png.import b/assets/models/arena/stop_n_go/tree_2_tex.png.import new file mode 100644 index 0000000..a823769 --- /dev/null +++ b/assets/models/arena/stop_n_go/tree_2_tex.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b4o3b117sonao" +path.s3tc="res://.godot/imported/tree_2_tex.png-a50649b6b46bf94d5eab297d520fa531.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://assets/models/arena/stop_n_go/tree_2_tex.png" +dest_files=["res://.godot/imported/tree_2_tex.png-a50649b6b46bf94d5eab297d520fa531.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/scenes/arena/stop_n_go.scn b/scenes/arena/stop_n_go.scn index 98fc0cc..f207f39 100644 Binary files a/scenes/arena/stop_n_go.scn and b/scenes/arena/stop_n_go.scn differ diff --git a/scenes/main.gd b/scenes/main.gd index 1447621..77a8dfc 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -21,6 +21,12 @@ var portal_mode_manager var _connection_check_timer: float = 0.0 var reserved_static_positions: Array[Vector2i] = [] +func _can_rpc() -> bool: + if not is_inside_tree(): return false + if not multiplayer.has_multiplayer_peer(): return false + if multiplayer.multiplayer_peer.get_class() == "OfflineMultiplayerPeer": return false + if multiplayer.multiplayer_peer.get_connection_status() != MultiplayerPeer.CONNECTION_CONNECTED: return false + return true func _ready(): # Initialize scene managers @@ -93,7 +99,7 @@ func _setup_multiplayer_spawners(): func _apply_arena_background(): var arena_bg = get_node_or_null("ArenaBG") - var selected_area = LobbyManager.get_selected_area() + var selected_area = LobbyManager.selected_area var texture_path = "" match selected_area: @@ -1411,10 +1417,10 @@ func request_full_player_sync(requesting_peer_id: int): "name": player.display_name, "goals": player.goals, "playerboard": player.playerboard, - "is_bot": player.is_bot || player.is_in_group("Bots"), "spawn_point_selected": player.spawn_point_selected } - rpc_id(requesting_peer_id, "create_specific_player", player_data) + if _can_rpc(): + rpc_id(requesting_peer_id, "create_specific_player", player_data) await get_tree().create_timer(0.1).timeout @rpc("reliable") diff --git a/scenes/player.gd b/scenes/player.gd index 4af77a6..614b8be 100644 --- a/scenes/player.gd +++ b/scenes/player.gd @@ -33,7 +33,9 @@ var display_name: String: # Helper to check network status func can_rpc() -> bool: - return multiplayer.has_multiplayer_peer() and multiplayer.multiplayer_peer.get_connection_status() == MultiplayerPeer.CONNECTION_CONNECTED + if not multiplayer.has_multiplayer_peer(): return false + if multiplayer.multiplayer_peer.get_class() == "OfflineMultiplayerPeer": return false + return multiplayer.multiplayer_peer.get_connection_status() == MultiplayerPeer.CONNECTION_CONNECTED # Special effect states var is_frozen: bool = false @@ -1131,7 +1133,8 @@ func _physics_process(delta): # Use a slightly larger threshold (0.05) to ignore micro-vibrations if current_world_pos.distance_to(last_sent_pos) > 0.05: set_meta("_last_sent_pos", current_world_pos) - rpc("remote_set_position", current_world_pos, Time.get_ticks_msec()) + if can_rpc(): + rpc("remote_set_position", current_world_pos, Time.get_ticks_msec()) # NOTE: Finish line checking removed - game uses cycle-based goals system now diff --git a/scripts/managers/stop_n_go_manager.gd b/scripts/managers/stop_n_go_manager.gd index f18a8c4..9bb83c3 100644 --- a/scripts/managers/stop_n_go_manager.gd +++ b/scripts/managers/stop_n_go_manager.gd @@ -348,8 +348,8 @@ func _apply_arena_setup(): gridmap.set_cell_item(Vector3i(x, 1, z), -1) # Paint Static Safe Zones - _paint_static_safe_zone(gridmap, 7, 11, 6, 9) - _paint_static_safe_zone(gridmap, 15, 19, 1, 5) + _paint_static_safe_zone(gridmap, 7, 11, 6, 9, -1, -1, 8, 8) + _paint_static_safe_zone(gridmap, 15, 19, 1, 5, -1, 18, 2, 2) # Note: Specific obstacles removed as per user request to replace with random ones. # MISSION TILES: Moved to start_game_mode() to ensure they spawn AFTER walls. @@ -488,28 +488,32 @@ func check_win_condition(player_id: int, position: Vector2i) -> bool: # Static Safe Zone # ============================================================================= -func _paint_static_safe_zone(gridmap: Node, min_x: int, max_x: int, min_z: int, max_z: int): +func _paint_static_safe_zone(gridmap: Node, min_x: int, max_x: int, min_z: int, max_z: int, north_door_x: int = -1, south_door_x: int = -1, west_door_z: int = -1, east_door_z: int = -1): # Paint safe floor for x in range(min_x, max_x + 1): for z in range(min_z, max_z + 1): gridmap.set_cell_item(Vector3i(x, 0, z), TILE_SAFE) # Get center opening for horizontal walls - var center_x = int(float(min_x + max_x) / 2.0) + var center_n_x = north_door_x if north_door_x != -1 else int(float(min_x + max_x) / 2.0) + var center_s_x = south_door_x if south_door_x != -1 else int(float(min_x + max_x) / 2.0) # Instantiate Top and Bottom horizontal walls for x in range(min_x, max_x + 1): - if x == center_x: continue # Opening - _instantiate_safe_zone_wall(Vector3(x + 0.5, 0.0, min_z), 0) # Bottom/North - _instantiate_safe_zone_wall(Vector3(x + 0.5, 0.0, max_z + 1), 0) # Top/South + if x != center_n_x: + _instantiate_safe_zone_wall(Vector3(x + 0.5, 0.0, min_z), 0) # Bottom/North + if x != center_s_x: + _instantiate_safe_zone_wall(Vector3(x + 0.5, 0.0, max_z + 1), 0) # Top/South # Get center opening for vertical walls - var center_z = int(float(min_z + max_z) / 2.0) + var center_w_z = west_door_z if west_door_z != -1 else int(float(min_z + max_z) / 2.0) + var center_e_z = east_door_z if east_door_z != -1 else int(float(min_z + max_z) / 2.0) for z in range(min_z, max_z + 1): - if z == center_z: continue # Opening - _instantiate_safe_zone_wall(Vector3(min_x, 0.0, z + 0.5), 90) # Left/West - _instantiate_safe_zone_wall(Vector3(max_x + 1, 0.0, z + 0.5), 90) # Right/East + if z != center_w_z: + _instantiate_safe_zone_wall(Vector3(min_x, 0.0, z + 0.5), 90) # Left/West + if z != center_e_z: + _instantiate_safe_zone_wall(Vector3(max_x + 1, 0.0, z + 0.5), 90) # Right/East func _is_in_safe_zone(pos: Vector2i) -> bool: """Check if a position is within ANY of the static safe zones."""