Update to the latest Voxelman, and improvements to the .vscode files.

This commit is contained in:
Relintai 2020-02-10 23:42:13 +01:00
parent 373bebe335
commit b41f0a8f00
5 changed files with 37 additions and 13 deletions

View File

@ -57,7 +57,7 @@ adjustment_enabled = true
"save", "save",
]] ]]
use_threads = false use_threads = false
max_concurrent_generations = 1 max_concurrent_generations = 4
library = ExtResource( 2 ) library = ExtResource( 2 )
level_generator = SubResource( 1 ) level_generator = SubResource( 1 )
chunk_spawn_range = 3 chunk_spawn_range = 3

View File

@ -207,17 +207,12 @@ func _build_phase(phase):
if phase == VoxelChunk.BUILD_PHASE_LIGHTS: if phase == VoxelChunk.BUILD_PHASE_LIGHTS:
clear_baked_lights() clear_baked_lights()
generate_random_ao() generate_random_ao()
# var vl : VoxelLight = VoxelLight.new()
bake_lights() bake_lights()
set_physics_process_internal(true) set_physics_process_internal(true)
elif phase == VoxelChunk.BUILD_PHASE_PROP_MESH: elif phase == VoxelChunk.BUILD_PHASE_PROP_MESH:
set_physics_process_internal(true) set_physics_process_internal(true)
elif phase == VoxelChunk.BUILD_PHASE_FINALIZE: elif phase == VoxelChunk.BUILD_PHASE_FINALIZE:
._build_phase(phase) ._build_phase(phase)
notification(NOTIFICATION_TRANSFORM_CHANGED) notification(NOTIFICATION_TRANSFORM_CHANGED)
else: else:
._build_phase(phase) ._build_phase(phase)
@ -253,8 +248,9 @@ func _physics_process(delta):
set_physics_process_internal(false) set_physics_process_internal(false)
elif current_build_phase == VoxelChunk.BUILD_PHASE_PROP_MESH: elif current_build_phase == VoxelChunk.BUILD_PHASE_PROP_MESH:
build_phase_prop_mesh() #build_phase_prop_mesh()
set_physics_process_internal(false) set_physics_process_internal(false)
next_phase()
func visibility_changed() -> void: func visibility_changed() -> void:
if get_mesh_instance_rid() != RID(): if get_mesh_instance_rid() != RID():

View File

@ -9,11 +9,18 @@
"type": "cppdbg", "type": "cppdbg",
"request": "launch", "request": "launch",
"program": "${workspaceFolder}/bin/godot.x11.opt.tools.64", "program": "${workspaceFolder}/bin/godot.x11.opt.tools.64",
//"args": ["-e"], "args": [
"args": ["--path", "/home/relintai/Projects/broken_seals_3d/game/"], "--path",
"${workspaceFolder}/../game/"
],
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
"environment": [], "environment": [
{
"name": "LD_LIBRARY_PATH",
"value": "${workspaceFolder}/bin/"
}
],
"externalConsole": false, "externalConsole": false,
"MIMode": "gdb", "MIMode": "gdb",
"setupCommands": [ "setupCommands": [
@ -32,10 +39,18 @@
"request": "launch", "request": "launch",
"program": "${workspaceFolder}/bin/godot.x11.opt.tools.64", "program": "${workspaceFolder}/bin/godot.x11.opt.tools.64",
//"args": ["-e"], //"args": ["-e"],
"args": ["--path", "/home/relintai/Projects/broken_seals_3d/game/"], "args": [
"--path",
"${workspaceFolder}/../game/",
],
"stopAtEntry": false, "stopAtEntry": false,
"cwd": "${workspaceFolder}", "cwd": "${workspaceFolder}",
"environment": [], "environment": [
{
"name": "LD_LIBRARY_PATH",
"value": "${workspaceFolder}/bin/"
}
],
"externalConsole": false, "externalConsole": false,
"MIMode": "gdb", "MIMode": "gdb",
"setupCommands": [ "setupCommands": [

6
vscode-cpp/settings.json Normal file
View File

@ -0,0 +1,6 @@
{
"files.associations": {
"functional": "cpp",
},
"editor.formatOnSave": true
}

View File

@ -10,8 +10,15 @@
"group": "build", "group": "build",
"args": [ "args": [
"platform=x11", "platform=x11",
"custom_modules_shared=yes",
"target=release_debug", "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" "problemMatcher": "$msCompile"
} }