asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #41123 from lawnjelly/octree_fix

Browse source 
Optimize octree and fix leak
This commit is contained in:
Rémi Verschelde 2020-09-30 23:11:31 +02:00 committed by GitHub
commit 66cbcc1b7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1799 additions and 1352 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1377
core/math/octree.h
View file

File diff suppressed because it is too large Load diff

1763
core/math/octree_definition.inc Normal file
View file

File diff suppressed because it is too large Load diff

4
doc/classes/ProjectSettings.xml
View file

@ -1174,6 +1174,10 @@
<member name="rendering/quality/shadows/filter_mode.mobile" type="int" setter="" getter="" default="0"> <member name="rendering/quality/shadows/filter_mode.mobile" type="int" setter="" getter="" default="0">
Lower-end override for [member rendering/quality/shadows/filter_mode] on mobile devices, due to performance concerns or driver support. Lower-end override for [member rendering/quality/shadows/filter_mode] on mobile devices, due to performance concerns or driver support.
</member> </member>
<member name="rendering/quality/spatial_partitioning/render_tree_balance" type="float" setter="" getter="" default="0.17">
The rendering octree balance can be changed to favor smaller ([code]0[/code]), or larger ([code]1[/code]) branches.
Larger branches can increase performance significantly in some projects.
</member>
<member name="rendering/quality/subsurface_scattering/follow_surface" type="bool" setter="" getter="" default="false"> <member name="rendering/quality/subsurface_scattering/follow_surface" type="bool" setter="" getter="" default="false">
Improves quality of subsurface scattering, but cost significantly increases. Improves quality of subsurface scattering, but cost significantly increases.
</member> </member>

1
servers/visual/visual_server_scene.cpp
View file

@ -260,6 +260,7 @@ RID VisualServerScene::scenario_create() {
RID scenario_rid = scenario_owner.make_rid(scenario); RID scenario_rid = scenario_owner.make_rid(scenario);
scenario->self = scenario_rid; scenario->self = scenario_rid;
scenario->octree.set_balance(GLOBAL_GET("rendering/quality/spatial_partitioning/render_tree_balance"));
scenario->octree.set_pair_callback(_instance_pair, this); scenario->octree.set_pair_callback(_instance_pair, this);
scenario->octree.set_unpair_callback(_instance_unpair, this); scenario->octree.set_unpair_callback(_instance_unpair, this);
scenario->reflection_probe_shadow_atlas = VSG::scene_render->shadow_atlas_create(); scenario->reflection_probe_shadow_atlas = VSG::scene_render->shadow_atlas_create();

2
servers/visual/visual_server_scene.h
View file

@ -108,7 +108,7 @@ public:
VS::ScenarioDebugMode debug; VS::ScenarioDebugMode debug;
RID self; RID self;
Octree<Instance, true> octree; Octree_CL<Instance, true> octree;
List<Instance *> directional_lights; List<Instance *> directional_lights;
RID environment; RID environment;

4
servers/visual_server.cpp
View file

@ -2432,6 +2432,10 @@ VisualServer::VisualServer() {
GLOBAL_DEF("rendering/quality/filters/use_nearest_mipmap_filter", false); GLOBAL_DEF("rendering/quality/filters/use_nearest_mipmap_filter", false);
const char *sz_balance_render_tree = "rendering/quality/spatial_partitioning/render_tree_balance";
GLOBAL_DEF(sz_balance_render_tree, 0.17f);
ProjectSettings::get_singleton()->set_custom_property_info(sz_balance_render_tree, PropertyInfo(Variant::REAL, sz_balance_render_tree, PROPERTY_HINT_RANGE, "0.0,1.0,0.01"));
GLOBAL_DEF("rendering/batching/options/use_batching", true); GLOBAL_DEF("rendering/batching/options/use_batching", true);
GLOBAL_DEF_RST("rendering/batching/options/use_batching_in_editor", true); GLOBAL_DEF_RST("rendering/batching/options/use_batching_in_editor", true);
GLOBAL_DEF("rendering/batching/options/single_rect_fallback", false); GLOBAL_DEF("rendering/batching/options/single_rect_fallback", false);