Added SQLite

.gitignore

@@ -1,5 +1,6 @@
 .import
 godot/logs
+godot/character-data/*
 assets/blender/**/*.blend1
 assets/blender/**/*.blend2
 assets/blender/**/*.blend3
@@ -10,3 +11,5 @@ assets/blender/scripts/*.blend*
 .*.swp
 *.kra~
 *.png~
+godot/astream/road_lines.json.*
+

.gitmodules

@@ -1,10 +1,10 @@
 [submodule "src/godot"]
 	path = src/godot
-	url = git@github.com:godotengine/godot
+	url = https://github.com/godotengine/godot
 	branch = 3.x
 [submodule "src/modules/voxel"]
 	path = src/modules/voxel
-	url = git@github.com:Zylann/godot_voxel
+	url = https://github.com/Zylann/godot_voxel
 	branch = godot3.x
 [submodule "src/flecs"]
 	path = src/flecs
@@ -17,3 +17,6 @@
 	path = tests/flecs-systems-sokol
 	url = https://github.com/flecs-hub/flecs-systems-sokol
 	branch = master
+[submodule "src/sqlite"]
+	path = src/sqlite
+	url = https://github.com/sqlite/sqlite

.vscode/settings.json

@@ -71,7 +71,11 @@
         "future": "cpp",
         "cassert": "cpp",
         "bitset": "cpp",
-        "unordered_set": "cpp"
+        "unordered_set": "cpp",
+        "strstream": "cpp",
+        "typeindex": "cpp",
+        "shared_mutex": "cpp",
+        "any": "cpp"
     },
     "cmake.ignoreCMakeListsMissing": true
 }

Makefile

@@ -1,23 +1,49 @@
-BLENDER = ../../blender-4.3.2-linux-x64/blender
-SERVER = src/godot/bin/godot_server.x11.opt.tools.64
+ARCH=$(patsubst aarch64,arm64,$(shell uname -m))
+BLENDER = ../../blender-3.6.20-linux-x64/blender
+SERVER = src/godot/bin/godot_server.x11.opt.tools.$(ARCH)
+EDITOR_PLATFORM=x11es
+EDITOR2_PLATFORM=x11
+DEMO_PLATFORMS=x11 x11es
+EDITOR = src/godot/bin/godot.$(EDITOR_PLATFORM).opt.tools.$(ARCH)
+EDITOR_DBG = src/godot/bin/godot.$(EDITOR_PLATFORM).tools.$(ARCH)
+EDITOR2 = src/godot/bin/godot.$(EDITOR2_PLATFORM).opt.tools.$(ARCH)
+EDITOR2_DBG = src/godot/bin/godot.$(EDITOR2_PLATFORM).tools.$(ARCH)
 
-.PHONY: all godot-editor-main export export-models export-clothes \
+.PHONY: all godot-editor-main godot-editor-debug export export-models export-clothes \
 	export-clean export-linux-demo export-windows-demo \
-	export-binaries patch tests import-vrm
-all: godot-editor-main godot-main
-ARCH=$(patsubst aarch64,arm64,$(shell uname -i))
-godot-main: patch
+	export-binaries patch tests import-vrm export-buildings
+all: godot-editor-main godot-editor-debug godot-main
+SCONS_EXTRA=-j16
+define build_godot
+$(4): $(5)
+	@echo Building $(4)
 	cd src/godot; \
-	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;
-	cd src/godot; \
-	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
-	cd src/godot; \
-	scons platform=x11 arch=$(ARCH) target=release_debug tools=yes custom_modules=../modules -j16;
+	scons platform=$(1) arch=$(ARCH) target=$(2) tools=$(3) custom_modules=../modules $(SCONS_EXTRA)
+endef
+
+define build_godot_platform
+$(eval $(call build_godot,$(1),release,no,godot-main-release-$(1),patch))
+$(eval $(call build_godot,$(1),debug,no,godot-main-debug-$(1),patch))
+$(eval $(call build_godot,$(1),release_debug,no,godot-main-rdebug-$(1),patch))
+GODOT_MAIN_TARGETS += godot-main-release-$(1) godot-main-debug-$(1) godot-main-rdebug-$(1)
+endef
+
+$(foreach pt,$(DEMO_PLATFORMS),$(eval $(call build_godot_platform,$(pt))))
+
+godot-main: $(GODOT_MAIN_TARGETS) godot-editor-main godot-server-main
+godot-server-main: $(SERVER)
+godot-editor-main: $(EDITOR) $(EDITOR2)
+godot-editor-debug: $(EDITOR_DBG) $(EDITOR2_DBG)
+#$(SERVER): patch
+#	cd src/godot; \
+#	scons platform=server arch=$(ARCH) target=release_debug tools=yes custom_modules=../modules -j16
+$(eval $(call build_godot,server,release_debug,yes,$(SERVER),patch))
+$(eval $(call build_godot,x11es,release_debug,yes,$(EDITOR),patch))
+$(eval $(call build_godot,x11es,debug,yes,$(EDITOR_DBG),patch))
+$(eval $(call build_godot,x11,release_debug,yes,$(EDITOR2),patch))
+$(eval $(call build_godot,x11,debug,yes,$(EDITOR2_DBG),patch))
 patch: ./src/godot/scene/animation/skeleton_ik.cpp
-	cd ./src/godot && git reset --hard HEAD && for p in ../patches/*.patch; do git apply $$p; done
+	cd ./src/godot && git reset --hard HEAD && rm -Rf platform/x11es && for p in ../patches/*.patch; do git apply $$p; done
 	sed -e 's/ERR_FAIL_COND_V(-1 == p_task->root_bone, false);//g' -i ./src/godot/scene/animation/skeleton_ik.cpp
 	cd ./src/modules/voxel && git reset --hard HEAD  && for p in ../../patches/voxel/*.patch; do git apply $$p; done
 
@@ -28,9 +54,50 @@ export-clean:
 	rm -Rf godot/character-data/*
 	rm -f assets/blender/scripts/tmp-*.blend
 
-import-vrm: export-clean
+install-addons:
+	$(BLENDER) -b -Y -P assets/blender/scripts/install_addons.py
+
+import-vrm: install-addons export-clean
+	mkdir -p  assets/blender/scripts/shapes/male assets/blender/scripts/shapes/female
 	$(BLENDER) -b -Y -P assets/blender/scripts/import_vrm.py
 
+export2edit: import-vrm
+	$(BLENDER) -b -Y -P assets/blender/scripts/export_for_modelling.py
+
+BLENDDIR_BUILDINGS=assets/blender/buildings
+GLTFDIR_BUILDINGS=godot/astream/terrain/details
+BUILDINGS_BUSINESS=business-bar1 business-cafe1 business-office1 business-store1
+BUILDINGS_RESIDENTAL=residental-house1 residental-house2 residental-house3 \
+		     residental-house4 residental-house5 residental-house6 \
+		     residental-house7 residental-house8 residental-house9 \
+		     residental-house10 residental-house11 residental-house13 \
+		     residental-hut1 residental-hut1-lod \
+		     residental-garage-door \
+		     residental-garage-enterance residental-garage \
+		     residental-parking residental-wall1 \
+		     residental-wall-corner residental-garage-roof1
+BUILDINGS_MAIN=gym-exterior home-exterior \
+	logistics-center-exterior office-exterior townhall-exterior
+
+BUILDINGS=bus-stop power-in-box power-pole power-pole-wire $(BUILDINGS_BUSINESS) \
+	  $(BUILDINGS_RESIDENTAL) $(BUILDINGS_MAIN) \
+	  zebra
+
+define export_building
+$(GLTFDIR_BUILDINGS)/$(1).gltf: $(BLENDDIR_BUILDINGS)/$(1).blend assets/blender/scripts/export_buildings.py
+	$(BLENDER) -b $(BLENDDIR_BUILDINGS)/$(1).blend -Y -P ./assets/blender/scripts/export_buildings.py -- $(GLTFDIR_BUILDINGS)/$(1).gltf
+ALL_BUILDINGS += $(GLTFDIR_BUILDINGS)/$(1).gltf
+CLEAN_BUILDINGS += $(GLTFDIR_BUILDINGS)/$(1).gltf \
+		   $(GLTFDIR_BUILDINGS)/$(1).bin
+endef
+
+$(foreach prog,$(BUILDINGS),$(eval $(call export_building,$(prog))))
+
+export-buildings: $(ALL_BUILDINGS)
+	@echo $(ALL_BUILDINGS)
+clean-buildings:
+	rm -f $(CLEAN_BUILDINGS) $(GLTFDIR_BUILDINGS)/material_atlas*.material
+
 export-models: export-clean import-vrm
 	$(BLENDER) -b -Y -P assets/blender/scripts/export_models.py
 
@@ -44,6 +111,11 @@ export-binaries:
 	$(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
 
+pack-terrain: godot-server-main
+	$(SERVER) --path ./godot --import --quit
+	$(SERVER) --path ./godot -s make_terrain_pck.gd --quit
+
+
 tests:
 	make -C tests all
 

assets/blender/.gitignore

@@ -0,0 +1,2 @@
+vrm-*.blend*
+modelling-*.blend*

assets/blender/buildings/terrain-lot1.gltf

@@ -0,0 +1,153 @@
+{
+	"asset":{
+		"generator":"Khronos glTF Blender I/O v3.6.28",
+		"version":"2.0"
+	},
+	"extensionsUsed":[
+		"KHR_materials_specular",
+		"KHR_materials_ior"
+	],
+	"scene":0,
+	"scenes":[
+		{
+			"name":"Scene",
+			"nodes":[
+				0
+			]
+		}
+	],
+	"nodes":[
+		{
+			"mesh":0,
+			"name":"terrain-parking-lot-col"
+		}
+	],
+	"materials":[
+		{
+			"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_36953_1",
+			"pbrMetallicRoughness":{
+				"baseColorTexture":{
+					"index":0
+				},
+				"metallicFactor":0
+			}
+		}
+	],
+	"meshes":[
+		{
+			"name":"Plane",
+			"primitives":[
+				{
+					"attributes":{
+						"POSITION":0,
+						"NORMAL":1,
+						"TEXCOORD_0":2
+					},
+					"indices":3,
+					"material":0
+				}
+			]
+		}
+	],
+	"textures":[
+		{
+			"sampler":0,
+			"source":0
+		}
+	],
+	"images":[
+		{
+			"mimeType":"image/png",
+			"name":"Atlas_36953",
+			"uri":"Atlas_36953.png"
+		}
+	],
+	"accessors":[
+		{
+			"bufferView":0,
+			"componentType":5126,
+			"count":250,
+			"max":[
+				25.032987594604492,
+				0.3288002610206604,
+				49.057586669921875
+			],
+			"min":[
+				-25.032987594604492,
+				-4.005487442016602,
+				-37.008201599121094
+			],
+			"type":"VEC3"
+		},
+		{
+			"bufferView":1,
+			"componentType":5126,
+			"count":250,
+			"type":"VEC3"
+		},
+		{
+			"bufferView":2,
+			"componentType":5126,
+			"count":250,
+			"type":"VEC2"
+		},
+		{
+			"bufferView":3,
+			"componentType":5123,
+			"count":474,
+			"type":"SCALAR"
+		}
+	],
+	"bufferViews":[
+		{
+			"buffer":0,
+			"byteLength":3000,
+			"byteOffset":0,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":3000,
+			"byteOffset":3000,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":2000,
+			"byteOffset":6000,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":948,
+			"byteOffset":8000,
+			"target":34963
+		}
+	],
+	"samplers":[
+		{
+			"magFilter":9729,
+			"minFilter":9987
+		}
+	],
+	"buffers":[
+		{
+			"byteLength":8948,
+			"uri":"terrain-lot1.bin"
+		}
+	]
+}