slapin/streaming_world
1
0
Fork 0
Code Issues 32 Pull Requests Packages Projects 2 Releases Wiki Activity

Returned missing scenes

Browse Source
This commit is contained in:
Sergey Lapin
2025-03-19 04:47:26 +03:00
parent f4e551f053
commit 7f87876cd5
12 changed files with 399 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@@ -1,19 +1,23 @@
ARCH=$(patsubst aarch64,arm64,$(shell uname -m))
BLENDER = ../../blender-3.6.20-linux-x64/blender BLENDER = ../../blender-3.6.20-linux-x64/blender
SERVER = src/godot/bin/godot_server.x11.opt.tools.64 SERVER = src/godot/bin/godot_server.x11.opt.tools.$(ARCH)
.PHONY: all godot-editor-main export export-models export-clothes \ .PHONY: all godot-editor-main export export-models export-clothes \
export-clean export-linux-demo export-windows-demo \ export-clean export-linux-demo export-windows-demo \
export-binaries patch tests import-vrm export-buildings export-binaries patch tests import-vrm export-buildings
all: godot-editor-main godot-main all: godot-editor-main godot-main
ARCH=$(patsubst aarch64,arm64,$(shell uname -m))
godot-main: patch godot-main: patch
cd src/godot; \ cd src/godot; \
scons platform=x11 arch=$(ARCH) target=release tools=no custom_modules=../modules -j16; \ scons platform=x11 arch=$(ARCH) target=release tools=no custom_modules=../modules -j16; \
scons platform=x11 arch=$(ARCH) target=release_debug tools=no custom_modules=../modules -j16; scons platform=x11 arch=$(ARCH) target=release_debug tools=no custom_modules=../modules -j16;
cd src/godot; \ cd src/godot; \
scons platform=x11 arch=$(ARCH) target=release tools=no custom_modules=../modules -j16; \ scons platform=x11 arch=$(ARCH) target=release tools=no custom_modules=../modules -j16; \
scons platform=server target=release_debug tools=yes custom_modules=../modules -j16
godot-editor-main: patch godot-server-main: $(SERVER)
$(SERVER): patch
cd src/godot; \
scons platform=server arch=$(ARCH) target=release_debug tools=yes custom_modules=../modules -j16
godot-editor-main:
cd src/godot; \ cd src/godot; \
scons platform=x11 arch=$(ARCH) verbose=yes target=release_debug tools=yes custom_modules=../modules -j24; scons platform=x11 arch=$(ARCH) verbose=yes target=release_debug tools=yes custom_modules=../modules -j24;
patch: ./src/godot/scene/animation/skeleton_ik.cpp patch: ./src/godot/scene/animation/skeleton_ik.cpp
@@ -83,6 +87,11 @@ export-binaries:
$(SERVER) --path godot --export windows_demo ../export/office-demo-windows.x86_64.exe $(SERVER) --path godot --export windows_demo ../export/office-demo-windows.x86_64.exe
$(SERVER) --path godot --export-debug windows_demo ../export/office-demo-debug-windows.x86_64.exe $(SERVER) --path godot --export-debug windows_demo ../export/office-demo-debug-windows.x86_64.exe
pack-terrain: godot-server-main
$(SERVER) --path ./godot --import --quit
$(SERVER) --path ./godot -s make_terrain_pck.gd --quit
tests: tests:
make -C tests all make -C tests all

BIN
godot/astream/terrain/details/business-bar1.bin
View File

Binary file not shown.

982
godot/astream/terrain/details/business-bar1.gltf
View File

File diff suppressed because it is too large Load Diff

BIN
godot/astream/terrain/details/business-cafe1.bin
View File

Binary file not shown.

281
godot/astream/terrain/details/business-cafe1.gltf
View File

@@ -12,25 +12,13 @@
{ {
"name":"Scene", "name":"Scene",
"nodes":[ "nodes":[
1 0
] ]
} }
], ],
"nodes":[ "nodes":[
{ {
"mesh":0, "mesh":0,
"name":"flat3-1-noimp",
"translation":[
0,
1,
0
]
},
{
"children":[
0
],
"mesh":1,
"name":"cafe1-col" "name":"cafe1-col"
} }
], ],
@@ -40,53 +28,29 @@
"alphaMode":"MASK", "alphaMode":"MASK",
"extensions":{ "extensions":{
"KHR_materials_specular":{ "KHR_materials_specular":{
"specularColorFactor":[ "specularColorTexture":{
0.474271529955476, "index":0
0.474271529955476, }
0.474271529955476
]
}, },
"KHR_materials_ior":{ "KHR_materials_ior":{
"ior":1.4500000476837158 "ior":1.4500000476837158
} }
}, },
"name":"material_atlas_73934_1", "name":"material_joint_atlas_1",
"pbrMetallicRoughness":{ "pbrMetallicRoughness":{
"baseColorTexture":{ "baseColorTexture":{
"index":0 "index":1
}, },
"metallicFactor":0 "metallicFactor":0,
} "metallicRoughnessTexture":{
}, "index":2
{
"doubleSided":true,
"emissiveFactor":[
0.42920592427253723,
0.42920592427253723,
0.42920592427253723
],
"extensions":{
"KHR_materials_specular":{
"specularColorFactor":[
1.9512351200761842,
1.9512351200761842,
1.9512351200761842
]
},
"KHR_materials_ior":{
"ior":1.4500000476837158
} }
},
"name":"window",
"pbrMetallicRoughness":{
"metallicFactor":0.20000000298023224,
"roughnessFactor":0.019999999552965164
} }
} }
], ],
"meshes":[ "meshes":[
{ {
"name":"Plane.003", "name":"Cube.003",
"primitives":[ "primitives":[
{ {
"attributes":{ "attributes":{
@@ -99,91 +63,44 @@
"material":0 "material":0
} }
] ]
},
{
"name":"Cube.003",
"primitives":[
{
"attributes":{
"POSITION":5,
"NORMAL":6,
"TEXCOORD_0":7,
"TANGENT":8
},
"indices":9,
"material":0
},
{
"attributes":{
"POSITION":10,
"NORMAL":11,
"TEXCOORD_0":12,
"TANGENT":13
},
"indices":14,
"material":1
}
]
} }
], ],
"textures":[ "textures":[
{ {
"sampler":0, "sampler":0,
"source":0 "source":0
},
{
"sampler":0,
"source":1
},
{
"sampler":0,
"source":2
} }
], ],
"images":[ "images":[
{ {
"mimeType":"image/png", "mimeType":"image/png",
"name":"Atlas_73934", "name":"Image",
"uri":"textures/Atlas_73934.png" "uri":"textures/Image.png"
},
{
"mimeType":"image/png",
"name":"joint-atlas-1",
"uri":"textures/joint-atlas-1.png"
},
{
"mimeType":"image/png",
"name":"joint-atlas-1-roughness",
"uri":"textures/joint-atlas-1-roughness.png"
} }
], ],
"accessors":[ "accessors":[
{ {
"bufferView":0, "bufferView":0,
"componentType":5126, "componentType":5126,
"count":28, "count":753,
"max":[
11,
4,
11
],
"min":[
-11,
0,
-8
],
"type":"VEC3"
},
{
"bufferView":1,
"componentType":5126,
"count":28,
"type":"VEC3"
},
{
"bufferView":2,
"componentType":5126,
"count":28,
"type":"VEC2"
},
{
"bufferView":3,
"componentType":5126,
"count":28,
"type":"VEC4"
},
{
"bufferView":4,
"componentType":5123,
"count":72,
"type":"SCALAR"
},
{
"bufferView":5,
"componentType":5126,
"count":746,
"max":[ "max":[
12, 12,
8, 8,
@@ -197,159 +114,59 @@
"type":"VEC3" "type":"VEC3"
}, },
{ {
"bufferView":6, "bufferView":1,
"componentType":5126, "componentType":5126,
"count":746, "count":753,
"type":"VEC3" "type":"VEC3"
}, },
{ {
"bufferView":7, "bufferView":2,
"componentType":5126, "componentType":5126,
"count":746, "count":753,
"type":"VEC2" "type":"VEC2"
}, },
{ {
"bufferView":8, "bufferView":3,
"componentType":5126, "componentType":5126,
"count":746, "count":753,
"type":"VEC4" "type":"VEC4"
}, },
{ {
"bufferView":9, "bufferView":4,
"componentType":5123, "componentType":5123,
"count":1938, "count":1962,
"type":"SCALAR"
},
{
"bufferView":10,
"componentType":5126,
"count":16,
"max":[
11.449999809265137,
5,
2
],
"min":[
-11.449999809265137,
1.272276520729065,
-8.181105613708496
],
"type":"VEC3"
},
{
"bufferView":11,
"componentType":5126,
"count":16,
"type":"VEC3"
},
{
"bufferView":12,
"componentType":5126,
"count":16,
"type":"VEC2"
},
{
"bufferView":13,
"componentType":5126,
"count":16,
"type":"VEC4"
},
{
"bufferView":14,
"componentType":5123,
"count":24,
"type":"SCALAR" "type":"SCALAR"
} }
], ],
"bufferViews":[ "bufferViews":[
{ {
"buffer":0, "buffer":0,
"byteLength":336, "byteLength":9036,
"byteOffset":0, "byteOffset":0,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":336, "byteLength":9036,
"byteOffset":336, "byteOffset":9036,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":224, "byteLength":6024,
"byteOffset":672, "byteOffset":18072,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":448, "byteLength":12048,
"byteOffset":896, "byteOffset":24096,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":144, "byteLength":3924,
"byteOffset":1344, "byteOffset":36144,
"target":34963
},
{
"buffer":0,
"byteLength":8952,
"byteOffset":1488,
"target":34962
},
{
"buffer":0,
"byteLength":8952,
"byteOffset":10440,
"target":34962
},
{
"buffer":0,
"byteLength":5968,
"byteOffset":19392,
"target":34962
},
{
"buffer":0,
"byteLength":11936,
"byteOffset":25360,
"target":34962
},
{
"buffer":0,
"byteLength":3876,
"byteOffset":37296,
"target":34963
},
{
"buffer":0,
"byteLength":192,
"byteOffset":41172,
"target":34962
},
{
"buffer":0,
"byteLength":192,
"byteOffset":41364,
"target":34962
},
{
"buffer":0,
"byteLength":128,
"byteOffset":41556,
"target":34962
},
{
"buffer":0,
"byteLength":256,
"byteOffset":41684,
"target":34962
},
{
"buffer":0,
"byteLength":48,
"byteOffset":41940,
"target":34963 "target":34963
} }
], ],
@@ -361,7 +178,7 @@
], ],
"buffers":[ "buffers":[
{ {
"byteLength":41988, "byteLength":40068,
"uri":"business-cafe1.bin" "uri":"business-cafe1.bin"
} }
] ]

17
godot/astream/terrain/details/business-office1.tscn Normal file
View File

@@ -0,0 +1,17 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://astream/terrain/details/business-office1.gltf" type="PackedScene" id=1]
[node name="business-office1" type="Spatial"]
[node name="LOD" type="LOD" parent="."]
[node name="0" type="Spatial" parent="LOD"]
lod_range = 150.0
[node name="MergeGroup" type="MergeGroup" parent="LOD/0"]
[node name="business-office1" parent="LOD/0/MergeGroup" instance=ExtResource( 1 )]
[node name="1" type="Spatial" parent="LOD"]
visible = false

BIN
godot/astream/terrain/details/business-store1.bin
View File

Binary file not shown.

300
godot/astream/terrain/details/business-store1.gltf
View File

@@ -12,25 +12,13 @@
{ {
"name":"Scene", "name":"Scene",
"nodes":[ "nodes":[
1 0
] ]
} }
], ],
"nodes":[ "nodes":[
{ {
"mesh":0, "mesh":0,
"name":"flat3-1-noimp",
"translation":[
0,
1,
0
]
},
{
"children":[
0
],
"mesh":1,
"name":"store1-col" "name":"store1-col"
} }
], ],
@@ -40,76 +28,29 @@
"alphaMode":"MASK", "alphaMode":"MASK",
"extensions":{ "extensions":{
"KHR_materials_specular":{ "KHR_materials_specular":{
"specularColorFactor":[ "specularColorTexture":{
0.474271529955476, "index":0
0.474271529955476, }
0.474271529955476
]
}, },
"KHR_materials_ior":{ "KHR_materials_ior":{
"ior":1.4500000476837158 "ior":1.4500000476837158
} }
}, },
"name":"material_atlas_73934_1", "name":"material_joint_atlas_1",
"pbrMetallicRoughness":{
"baseColorTexture":{
"index":0
},
"metallicFactor":0
}
},
{
"alphaCutoff":0.5,
"alphaMode":"MASK",
"extensions":{
"KHR_materials_specular":{
"specularColorFactor":[
0.474271529955476,
0.474271529955476,
0.474271529955476
]
},
"KHR_materials_ior":{
"ior":1.4500000476837158
}
},
"name":"material_atlas_73934_1.001",
"pbrMetallicRoughness":{ "pbrMetallicRoughness":{
"baseColorTexture":{ "baseColorTexture":{
"index":1 "index":1
}, },
"metallicFactor":0 "metallicFactor":0,
} "metallicRoughnessTexture":{
}, "index":2
{
"doubleSided":true,
"emissiveFactor":[
0.42920592427253723,
0.42920592427253723,
0.42920592427253723
],
"extensions":{
"KHR_materials_specular":{
"specularColorFactor":[
1.9512351200761842,
1.9512351200761842,
1.9512351200761842
]
},
"KHR_materials_ior":{
"ior":1.4500000476837158
} }
},
"name":"window",
"pbrMetallicRoughness":{
"metallicFactor":0.20000000298023224,
"roughnessFactor":0.019999999552965164
} }
} }
], ],
"meshes":[ "meshes":[
{ {
"name":"Plane.003", "name":"Cube.003",
"primitives":[ "primitives":[
{ {
"attributes":{ "attributes":{
@@ -122,31 +63,6 @@
"material":0 "material":0
} }
] ]
},
{
"name":"Cube.003",
"primitives":[
{
"attributes":{
"POSITION":5,
"NORMAL":6,
"TEXCOORD_0":7,
"TANGENT":8
},
"indices":9,
"material":1
},
{
"attributes":{
"POSITION":10,
"NORMAL":11,
"TEXCOORD_0":12,
"TANGENT":13
},
"indices":14,
"material":2
}
]
} }
], ],
"textures":[ "textures":[
@@ -156,61 +72,35 @@
}, },
{ {
"sampler":0, "sampler":0,
"source":0 "source":1
},
{
"sampler":0,
"source":2
} }
], ],
"images":[ "images":[
{ {
"mimeType":"image/png", "mimeType":"image/png",
"name":"Atlas_73934", "name":"Image",
"uri":"textures/Atlas_73934.png" "uri":"textures/Image.png"
},
{
"mimeType":"image/png",
"name":"joint-atlas-1",
"uri":"textures/joint-atlas-1.png"
},
{
"mimeType":"image/png",
"name":"joint-atlas-1-roughness",
"uri":"textures/joint-atlas-1-roughness.png"
} }
], ],
"accessors":[ "accessors":[
{ {
"bufferView":0, "bufferView":0,
"componentType":5126, "componentType":5126,
"count":28, "count":763,
"max":[
11,
4,
11
],
"min":[
-11,
0,
-8
],
"type":"VEC3"
},
{
"bufferView":1,
"componentType":5126,
"count":28,
"type":"VEC3"
},
{
"bufferView":2,
"componentType":5126,
"count":28,
"type":"VEC2"
},
{
"bufferView":3,
"componentType":5126,
"count":28,
"type":"VEC4"
},
{
"bufferView":4,
"componentType":5123,
"count":72,
"type":"SCALAR"
},
{
"bufferView":5,
"componentType":5126,
"count":749,
"max":[ "max":[
12, 12,
8, 8,
@@ -224,159 +114,59 @@
"type":"VEC3" "type":"VEC3"
}, },
{ {
"bufferView":6, "bufferView":1,
"componentType":5126, "componentType":5126,
"count":749, "count":763,
"type":"VEC3" "type":"VEC3"
}, },
{ {
"bufferView":7, "bufferView":2,
"componentType":5126, "componentType":5126,
"count":749, "count":763,
"type":"VEC2" "type":"VEC2"
}, },
{ {
"bufferView":8, "bufferView":3,
"componentType":5126, "componentType":5126,
"count":749, "count":763,
"type":"VEC4" "type":"VEC4"
}, },
{ {
"bufferView":9, "bufferView":4,
"componentType":5123, "componentType":5123,
"count":2130, "count":2154,
"type":"SCALAR"
},
{
"bufferView":10,
"componentType":5126,
"count":16,
"max":[
11.449999809265137,
5,
2
],
"min":[
-11.449999809265137,
2,
-8.181105613708496
],
"type":"VEC3"
},
{
"bufferView":11,
"componentType":5126,
"count":16,
"type":"VEC3"
},
{
"bufferView":12,
"componentType":5126,
"count":16,
"type":"VEC2"
},
{
"bufferView":13,
"componentType":5126,
"count":16,
"type":"VEC4"
},
{
"bufferView":14,
"componentType":5123,
"count":24,
"type":"SCALAR" "type":"SCALAR"
} }
], ],
"bufferViews":[ "bufferViews":[
{ {
"buffer":0, "buffer":0,
"byteLength":336, "byteLength":9156,
"byteOffset":0, "byteOffset":0,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":336, "byteLength":9156,
"byteOffset":336, "byteOffset":9156,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":224, "byteLength":6104,
"byteOffset":672, "byteOffset":18312,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":448, "byteLength":12208,
"byteOffset":896, "byteOffset":24416,
"target":34962 "target":34962
}, },
{ {
"buffer":0, "buffer":0,
"byteLength":144, "byteLength":4308,
"byteOffset":1344, "byteOffset":36624,
"target":34963
},
{
"buffer":0,
"byteLength":8988,
"byteOffset":1488,
"target":34962
},
{
"buffer":0,
"byteLength":8988,
"byteOffset":10476,
"target":34962
},
{
"buffer":0,
"byteLength":5992,
"byteOffset":19464,
"target":34962
},
{
"buffer":0,
"byteLength":11984,
"byteOffset":25456,
"target":34962
},
{
"buffer":0,
"byteLength":4260,
"byteOffset":37440,
"target":34963
},
{
"buffer":0,
"byteLength":192,
"byteOffset":41700,
"target":34962
},
{
"buffer":0,
"byteLength":192,
"byteOffset":41892,
"target":34962
},
{
"buffer":0,
"byteLength":128,
"byteOffset":42084,
"target":34962
},
{
"buffer":0,
"byteLength":256,
"byteOffset":42212,
"target":34962
},
{
"buffer":0,
"byteLength":48,
"byteOffset":42468,
"target":34963 "target":34963
} }
], ],
@@ -388,7 +178,7 @@
], ],
"buffers":[ "buffers":[
{ {
"byteLength":42516, "byteLength":40932,
"uri":"business-store1.bin" "uri":"business-store1.bin"
} }
] ]

17
godot/astream/terrain/details/power-in-box.tscn Normal file
View File

@@ -0,0 +1,17 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://astream/terrain/details/power-in-box.gltf" type="PackedScene" id=1]
[node name="power-in-box" type="Spatial"]
[node name="LOD" type="LOD" parent="."]
[node name="0" type="Spatial" parent="LOD"]
lod_range = 50.0
[node name="MergeGroup" type="MergeGroup" parent="LOD/0"]
[node name="power-in-box" parent="LOD/0/MergeGroup" instance=ExtResource( 1 )]
[node name="1" type="Spatial" parent="LOD"]
visible = false

28
godot/astream/terrain/details/power-pole-wire.tscn Normal file
View File

@@ -0,0 +1,28 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://astream/terrain/details/power-pole-wire.gltf" type="PackedScene" id=1]
[ext_resource path="res://astream/terrain/details/power-pole.gltf" type="PackedScene" id=2]
[node name="power-pole-wire" type="Spatial"]
[node name="LOD" type="LOD" parent="."]
[node name="0" type="Spatial" parent="LOD"]
lod_range = 60.0
[node name="MergeGroup" type="MergeGroup" parent="LOD/0"]
[node name="power-pole" parent="LOD/0/MergeGroup" instance=ExtResource( 2 )]
[node name="power-pole-wire" parent="LOD/0/MergeGroup" instance=ExtResource( 1 )]
[node name="1" type="Spatial" parent="LOD"]
visible = false
lod_range = 150.0
[node name="MergeGroup" type="MergeGroup" parent="LOD/1"]
[node name="power-pole" parent="LOD/1/MergeGroup" instance=ExtResource( 2 )]
[node name="2" type="Spatial" parent="LOD"]
visible = false

17
godot/astream/terrain/details/power-pole.tscn Normal file
View File

@@ -0,0 +1,17 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://astream/terrain/details/power-pole.gltf" type="PackedScene" id=1]
[node name="power-pole" type="Spatial"]
[node name="LOD" type="LOD" parent="."]
[node name="0" type="Spatial" parent="LOD"]
lod_range = 80.0
[node name="MergeGroup" type="MergeGroup" parent="LOD/0"]
[node name="power-pole" parent="LOD/0/MergeGroup" instance=ExtResource( 1 )]
[node name="1" type="Spatial" parent="LOD"]
visible = false

2
src/modules/stream/base_data.cpp
View File

@@ -47,6 +47,8 @@ protected:
} }
void setup() void setup()
{ {
if (!SceneTree::get_singleton())
return;
assert(SceneTree::get_singleton()); assert(SceneTree::get_singleton());
SceneTree::get_singleton()->connect("physics_frame", this, SceneTree::get_singleton()->connect("physics_frame", this,
"update"); "update");