diff options
| -rw-r--r-- | doc/classes/BakedLightmap.xml | 16 | ||||
| -rw-r--r-- | doc/classes/BakedLightmapData.xml | 2 | ||||
| -rw-r--r-- | doc/classes/Dictionary.xml | 6 | ||||
| -rw-r--r-- | editor/settings_config_dialog.cpp | 2 | ||||
| -rw-r--r-- | modules/gridmap/doc_classes/GridMap.xml | 30 | ||||
| -rw-r--r-- | scene/3d/baked_lightmap.cpp | 2 |
6 files changed, 51 insertions, 7 deletions
diff --git a/doc/classes/BakedLightmap.xml b/doc/classes/BakedLightmap.xml index 8084af3817..b351aeac05 100644 --- a/doc/classes/BakedLightmap.xml +++ b/doc/classes/BakedLightmap.xml @@ -57,11 +57,7 @@ </constant> <constant name="SUBDIV_1024" value="3" enum="Subdiv"> </constant> - <constant name="SUBDIV_2048" value="4" enum="Subdiv"> - </constant> - <constant name="SUBDIV_4096" value="5" enum="Subdiv"> - </constant> - <constant name="SUBDIV_MAX" value="6" enum="Subdiv"> + <constant name="SUBDIV_MAX" value="4" enum="Subdiv"> </constant> <constant name="BAKE_QUALITY_LOW" value="0" enum="BakeQuality"> </constant> @@ -73,5 +69,15 @@ </constant> <constant name="BAKE_MODE_RAY_TRACE" value="1" enum="BakeMode"> </constant> + <constant name="BAKE_ERROR_OK" value="0" enum="BakeError"> + </constant> + <constant name="BAKE_ERROR_NO_SAVE_PATH" value="1" enum="BakeError"> + </constant> + <constant name="BAKE_ERROR_NO_MESHES" value="2" enum="BakeError"> + </constant> + <constant name="BAKE_ERROR_CANT_CREATE_IMAGE" value="3" enum="BakeError"> + </constant> + <constant name="BAKE_ERROR_USER_ABORTED" value="4" enum="BakeError"> + </constant> </constants> </class> diff --git a/doc/classes/BakedLightmapData.xml b/doc/classes/BakedLightmapData.xml index 6997dcb0b2..2b95cff136 100644 --- a/doc/classes/BakedLightmapData.xml +++ b/doc/classes/BakedLightmapData.xml @@ -16,6 +16,8 @@ </argument> <argument index="1" name="lightmap" type="Texture"> </argument> + <argument index="2" name="instance" type="int"> + </argument> <description> </description> </method> diff --git a/doc/classes/Dictionary.xml b/doc/classes/Dictionary.xml index 40b60f00cf..08c01c1d85 100644 --- a/doc/classes/Dictionary.xml +++ b/doc/classes/Dictionary.xml @@ -16,6 +16,12 @@ Clear the dictionary, removing all key/value pairs. </description> </method> + <method name="duplicate"> + <return type="Dictionary"> + </return> + <description> + </description> + </method> <method name="empty"> <return type="bool"> </return> diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index cc70a48f6f..2bdc824248 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -352,7 +352,7 @@ void EditorSettingsDialog::_tabs_tab_changed(int p_tab) { void EditorSettingsDialog::_focus_current_search_box() { Control *tab = tabs->get_current_tab_control(); - LineEdit* current_search_box; + LineEdit *current_search_box; if (tab == tab_general) current_search_box = search_box; else if (tab == tab_shortcuts) diff --git a/modules/gridmap/doc_classes/GridMap.xml b/modules/gridmap/doc_classes/GridMap.xml index 8c862b52e8..e9bb90631d 100644 --- a/modules/gridmap/doc_classes/GridMap.xml +++ b/modules/gridmap/doc_classes/GridMap.xml @@ -21,6 +21,26 @@ Clear all cells. </description> </method> + <method name="clear_baked_meshes"> + <return type="void"> + </return> + <description> + </description> + </method> + <method name="get_bake_mesh_instance"> + <return type="RID"> + </return> + <argument index="0" name="idx" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_bake_meshes"> + <return type="Array"> + </return> + <description> + </description> + </method> <method name="get_cell_item" qualifiers="const"> <return type="int"> </return> @@ -103,6 +123,16 @@ Array of [Vector3] with the non empty cell coordinates in the grid map. </description> </method> + <method name="make_baked_meshes"> + <return type="void"> + </return> + <argument index="0" name="gen_lightmap_uv" type="bool" default="false"> + </argument> + <argument index="1" name="lightmap_uv_texel_size" type="float" default="0.1"> + </argument> + <description> + </description> + </method> <method name="map_to_world" qualifiers="const"> <return type="Vector3"> </return> diff --git a/scene/3d/baked_lightmap.cpp b/scene/3d/baked_lightmap.cpp index ae9834d95f..754dcd9a6c 100644 --- a/scene/3d/baked_lightmap.cpp +++ b/scene/3d/baked_lightmap.cpp @@ -133,7 +133,7 @@ void BakedLightmapData::_bind_methods() { ClassDB::bind_method(D_METHOD("set_energy", "energy"), &BakedLightmapData::set_energy); ClassDB::bind_method(D_METHOD("get_energy"), &BakedLightmapData::get_energy); - ClassDB::bind_method(D_METHOD("add_user", "path", "lightmap"), &BakedLightmapData::add_user); + ClassDB::bind_method(D_METHOD("add_user", "path", "lightmap", "instance"), &BakedLightmapData::add_user); ClassDB::bind_method(D_METHOD("get_user_count"), &BakedLightmapData::get_user_count); ClassDB::bind_method(D_METHOD("get_user_path", "user_idx"), &BakedLightmapData::get_user_path); ClassDB::bind_method(D_METHOD("get_user_lightmap", "user_idx"), &BakedLightmapData::get_user_lightmap); |