diff --git a/game/scenes/World.tscn b/game/scenes/World.tscn index 3219f6ff..02491943 100644 --- a/game/scenes/World.tscn +++ b/game/scenes/World.tscn @@ -57,7 +57,7 @@ adjustment_enabled = true "save", ]] use_threads = false -max_concurrent_generations = 1 +max_concurrent_generations = 4 library = ExtResource( 2 ) level_generator = SubResource( 1 ) chunk_spawn_range = 3 diff --git a/game/voxelman/transvoxel_mesher/TVVoxelChunk.gd b/game/voxelman/transvoxel_mesher/TVVoxelChunk.gd index 5ed3b85b..55a38af7 100644 --- a/game/voxelman/transvoxel_mesher/TVVoxelChunk.gd +++ b/game/voxelman/transvoxel_mesher/TVVoxelChunk.gd @@ -207,17 +207,12 @@ func _build_phase(phase): if phase == VoxelChunk.BUILD_PHASE_LIGHTS: clear_baked_lights() generate_random_ao() - -# var vl : VoxelLight = VoxelLight.new() - bake_lights() - set_physics_process_internal(true) elif phase == VoxelChunk.BUILD_PHASE_PROP_MESH: set_physics_process_internal(true) elif phase == VoxelChunk.BUILD_PHASE_FINALIZE: ._build_phase(phase) - notification(NOTIFICATION_TRANSFORM_CHANGED) else: ._build_phase(phase) @@ -253,8 +248,9 @@ func _physics_process(delta): set_physics_process_internal(false) elif current_build_phase == VoxelChunk.BUILD_PHASE_PROP_MESH: - build_phase_prop_mesh() + #build_phase_prop_mesh() set_physics_process_internal(false) + next_phase() func visibility_changed() -> void: if get_mesh_instance_rid() != RID(): diff --git a/vscode-cpp/launch.json b/vscode-cpp/launch.json index f401543e..985eb3e4 100644 --- a/vscode-cpp/launch.json +++ b/vscode-cpp/launch.json @@ -9,11 +9,18 @@ "type": "cppdbg", "request": "launch", "program": "${workspaceFolder}/bin/godot.x11.opt.tools.64", - //"args": ["-e"], - "args": ["--path", "/home/relintai/Projects/broken_seals_3d/game/"], + "args": [ + "--path", + "${workspaceFolder}/../game/" + ], "stopAtEntry": false, "cwd": "${workspaceFolder}", - "environment": [], + "environment": [ + { + "name": "LD_LIBRARY_PATH", + "value": "${workspaceFolder}/bin/" + } + ], "externalConsole": false, "MIMode": "gdb", "setupCommands": [ @@ -32,10 +39,18 @@ "request": "launch", "program": "${workspaceFolder}/bin/godot.x11.opt.tools.64", //"args": ["-e"], - "args": ["--path", "/home/relintai/Projects/broken_seals_3d/game/"], + "args": [ + "--path", + "${workspaceFolder}/../game/", + ], "stopAtEntry": false, "cwd": "${workspaceFolder}", - "environment": [], + "environment": [ + { + "name": "LD_LIBRARY_PATH", + "value": "${workspaceFolder}/bin/" + } + ], "externalConsole": false, "MIMode": "gdb", "setupCommands": [ diff --git a/vscode-cpp/settings.json b/vscode-cpp/settings.json new file mode 100644 index 00000000..9ce7b68f --- /dev/null +++ b/vscode-cpp/settings.json @@ -0,0 +1,6 @@ +{ + "files.associations": { + "functional": "cpp", + }, + "editor.formatOnSave": true +} \ No newline at end of file diff --git a/vscode-cpp/tasks.json b/vscode-cpp/tasks.json index 02f0215c..e53957c6 100644 --- a/vscode-cpp/tasks.json +++ b/vscode-cpp/tasks.json @@ -10,8 +10,15 @@ "group": "build", "args": [ "platform=x11", + "custom_modules_shared=yes", "target=release_debug", - "-j2" + //"bin/libess.x11.opt.tools.64.so", + //"bin/libtexture_packer.x11.opt.tools.64.so", + "bin/libvoxelman.x11.opt.tools.64.so", + //"bin/libworld_generator.x11.opt.tools.64.so", + //"bin/libprocedural_animations.x11.opt.tools.64.so", + //"bin/libfqms.x11.opt.tools.64.so", + "-j3" ], "problemMatcher": "$msCompile" }