Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-02-01 13:57:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clang-format everything.

Browse Source
This commit is contained in:
Relintai 2024-04-21 15:27:36 +02:00
parent 3dcdcf0467
commit f09ab537e0
65 changed files with 275 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/locales.h
View File

@ -1,12 +1,13 @@
/*************************************************************************/
/* locales.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/* This file is part of: */
/* PANDEMONIUM ENGINE */
/* https://github.com/Relintai/pandemonium_engine */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */

2
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -699,7 +699,6 @@ public:
return bdata.vertices.request();
}
protected:
virtual void _update_texture_rect_animation(RasterizerCanvas::Item::CommandRectAnimation *p_item) {}
@ -3247,7 +3246,6 @@ PREAMBLE(bool)::_sort_items_match(const BSortItem &p_a, const BSortItem &p_b) co
// if (a->commands.size() != 1)
// return false;
// p_a's type is already checked outside to be these
//const RasterizerCanvas::Item::Command &cb = *b->commands[0];
//if ((cb.type != RasterizerCanvas::Item::Command::TYPE_RECT) && (cb.type != RasterizerCanvas::Item::Command::TYPE_MULTIRECT) && (cb.type != RasterizerCanvas::Item::Command::TYPE_RECT_ANIMATION)) {

11
editor/editor_locale_dialog.cpp
View File

@ -1,12 +1,13 @@
/*************************************************************************/
/* editor_locale_dialog.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/* This file is part of: */
/* PANDEMONIUM ENGINE */
/* https://github.com/Relintai/pandemonium_engine */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
@ -34,10 +35,10 @@
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "scene/gui/check_button.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/option_button.h"
#include "scene/gui/tree.h"
#include "scene/gui/label.h"
void EditorLocaleDialog::_bind_methods() {
ClassDB::bind_method(D_METHOD("_filter_mode_changed"), &EditorLocaleDialog::_filter_mode_changed);

9
editor/editor_locale_dialog.h
View File

@ -1,12 +1,13 @@
/*************************************************************************/
/* editor_locale_dialog.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/* This file is part of: */
/* PANDEMONIUM ENGINE */
/* https://github.com/Relintai/pandemonium_engine */
/*************************************************************************/
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */

2
editor/editor_properties.cpp
View File

@ -57,13 +57,13 @@
#include "editor/create_dialog.h"
#include "editor/editor_data.h"
#include "editor/editor_file_dialog.h"
#include "editor/editor_locale_dialog.h"
#include "editor/editor_plugin.h"
#include "editor/editor_resource_picker.h"
#include "editor/editor_settings.h"
#include "editor/editor_spin_slider.h"
#include "editor/property_selector.h"
#include "editor/scene_tree_editor.h"
#include "editor/editor_locale_dialog.h"
#include "editor_node.h"
#include "editor_properties_array_dict.h"
#include "editor_scale.h"

2
editor/project_settings_editor.cpp
View File

@ -56,8 +56,8 @@
#include "editor/editor_export.h"
#include "editor/editor_file_dialog.h"
#include "editor/editor_inspector.h"
#include "editor/editor_node.h"
#include "editor/editor_locale_dialog.h"
#include "editor/editor_node.h"
#include "editor/editor_plugin_settings.h"
#include "editor/editor_scale.h"
#include "editor/editor_sectioned_inspector.h"

2
editor/property_editor.cpp
View File

@ -68,9 +68,9 @@
#include "editor/dictionary_property_edit.h"
#include "editor/editor_data.h"
#include "editor/editor_file_dialog.h"
#include "editor/editor_locale_dialog.h"
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "editor/editor_locale_dialog.h"
#include "editor/editor_settings.h"
#include "editor/filesystem_dock.h"
#include "editor/property_selector.h"

2
editor/scene_tree_editor.cpp
View File

@ -52,9 +52,9 @@
#include "editor/node_dock.h"
#include "editor/plugins/animation_player_editor_plugin.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "scene/3d/lod_manager.h"
#include "scene/animation/animation_player.h"
#include "scene/gui/box_container.h"
#include "scene/3d/lod_manager.h"
#include "scene/gui/label.h"
#include "scene/gui/line_edit.h"
#include "scene/gui/texture_rect.h"

2
modules/entity_spell_system/singletons/ess.cpp
View File

@ -262,7 +262,7 @@ void ESS::stat_set_main_stat_count(const int index) {
}
// Entity Resources
real_t ESS::entity_resource_get_base_world_speed() const {
real_t ESS::entity_resource_get_base_world_speed() const {
return _entity_resource_base_world_speed;
}
void ESS::entity_resource_set_base_world_speed(const real_t value) {

6
modules/layered_tile_map/editor/layered_tile_map_layer_editor.cpp
View File

@ -37,8 +37,8 @@
#include "editor/editor_resource_preview.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "editor/multi_node_edit.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "core/object/undo_redo.h"
@ -3793,11 +3793,10 @@ void LayeredTileMapLayerEditor::_update_tile_map_layers_in_scene_list_cache() {
}
void LayeredTileMapLayerEditor::_node_change(Node *p_node) {
if (!layers_in_scene_list_cache_needs_update && Engine::get_singleton()->is_editor_hint() &&
if (!layers_in_scene_list_cache_needs_update && Engine::get_singleton()->is_editor_hint() &&
p_node->is_inside_tree() && p_node->get_tree()->get_edited_scene_root() &&
p_node->get_tree()->get_edited_scene_root()->get_parent()->is_a_parent_of(p_node) &&
Object::cast_to<LayeredTileMapLayer>(p_node)) {
layers_in_scene_list_cache_needs_update = true;
}
}
@ -4311,7 +4310,6 @@ void LayeredTileMapLayerEditor::_layers_select_next_or_previous(bool p_next) {
en->get_editor_selection()->clear();
en->get_editor_selection()->add_node(new_selected_layer);
} else {
edit(new_selected_layer);
}
}

4
modules/layered_tile_map/editor/layered_tiles_editor_plugin.cpp
View File

@ -41,6 +41,7 @@
#include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "editor/multi_node_edit.h"
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "scene/gui/box_container.h"
#include "scene/gui/button.h"
@ -49,7 +50,6 @@
#include "scene/main/control.h"
#include "scene/main/viewport.h"
#include "scene/resources/texture.h"
#include "editor/multi_node_edit.h"
LayeredTilesEditorUtils *LayeredTilesEditorUtils::singleton = nullptr;
LayeredTileMapEditorPlugin *tile_map_plugin_singleton = nullptr;
@ -450,7 +450,7 @@ void LayeredTileMapEditorPlugin::edit(Object *p_object) {
if (tile_map) {
_edit_tile_map(tile_map);
} else if (tile_map_layer) {
_edit_tile_map_layer(tile_map_layer, false);
_edit_tile_map_layer(tile_map_layer, false);
} else if (multi_node_edit) {
editor->edit(multi_node_edit);
} else {

1
modules/layered_tile_map/geometry_parser/layered_tilemap_navigation_geometry_parser_2d.cpp
View File

@ -46,7 +46,6 @@ bool LayeredTileMap2DNavigationGeometryParser2D::parses_node(Node *p_node) {
}
void LayeredTileMap2DNavigationGeometryParser2D::parse_geometry(Node *p_node, Ref<NavigationPolygon> p_navigation_polygon, Ref<NavigationMeshSourceGeometryData2D> p_source_geometry) {
LayeredTileMap *tilemap = Object::cast_to<LayeredTileMap>(p_node);
NavigationPolygon::ParsedGeometryType parsed_geometry_type = p_navigation_polygon->get_parsed_geometry_type();
uint32_t navigation_polygon_collision_mask = p_navigation_polygon->get_collision_mask();

2
modules/layered_tile_map/layered_tile_map.cpp
View File

@ -33,9 +33,9 @@
#include "core/config/engine.h"
#include "core/core_string_names.h"
#include "core/io/marshalls.h"
#include "layered_tile_map_layer.h"
#include "scene/main/control.h"
#include "core/io/marshalls.h"
#define TILEMAP_CALL_FOR_LAYER(layer, function, ...) \
if (layer < 0) { \

4
modules/layered_tile_map/layered_tile_map_layer.cpp
View File

@ -1883,7 +1883,6 @@ void LayeredTileMapLayer::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_navigation_visibility_mode", "show_navigation"), &LayeredTileMapLayer::set_navigation_visibility_mode);
ClassDB::bind_method(D_METHOD("get_navigation_visibility_mode"), &LayeredTileMapLayer::get_navigation_visibility_mode);
BIND_VMETHOD(MethodInfo(Variant::BOOL, "_use_tile_data_runtime_update",
PropertyInfo(Variant::VECTOR2I, "coords")));
@ -2307,7 +2306,7 @@ HashMap<Vector2i, LayeredTileSet::TerrainsPattern> LayeredTileMapLayer::terrain_
}
LayeredTileMapCell LayeredTileMapLayer::get_cell(const Vector2i &p_coords) const {
const HashMap<Vector2i, CellData>::Element* E = tile_map_layer_data.find(p_coords);
const HashMap<Vector2i, CellData>::Element *E = tile_map_layer_data.find(p_coords);
if (!E) {
return LayeredTileMapCell();
@ -2498,7 +2497,6 @@ Rect2i LayeredTileMapLayer::get_used_rect() const {
return used_rect_cache;
}
Ref<LayeredTileMapPattern> LayeredTileMapLayer::get_pattern(PoolVector2iArray p_coords_array) {
ERR_FAIL_COND_V(!tile_set.is_valid(), nullptr);

7
modules/layered_tile_map/layered_tile_set.cpp
View File

@ -1436,7 +1436,7 @@ int LayeredTileSet::get_patterns_count() {
RBSet<LayeredTileSet::TerrainsPattern> LayeredTileSet::get_terrains_pattern_set(int p_terrain_set) const {
ERR_FAIL_INDEX_V(p_terrain_set, terrain_sets.size(), RBSet<LayeredTileSet::TerrainsPattern>());
const_cast<LayeredTileSet*>(this)->_update_terrains_cache();
const_cast<LayeredTileSet *>(this)->_update_terrains_cache();
RBSet<LayeredTileSet::TerrainsPattern> output;
@ -1452,7 +1452,7 @@ RBSet<LayeredTileSet::TerrainsPattern> LayeredTileSet::get_terrains_pattern_set(
RBSet<LayeredTileMapCell> LayeredTileSet::get_tiles_for_terrains_pattern(int p_terrain_set, TerrainsPattern p_terrain_tile_pattern) const {
ERR_FAIL_INDEX_V(p_terrain_set, terrain_sets.size(), RBSet<LayeredTileMapCell>());
const_cast<LayeredTileSet*>(this)->_update_terrains_cache();
const_cast<LayeredTileSet *>(this)->_update_terrains_cache();
return per_terrain_pattern_tiles[p_terrain_set][p_terrain_tile_pattern];
}
@ -1460,7 +1460,7 @@ RBSet<LayeredTileMapCell> LayeredTileSet::get_tiles_for_terrains_pattern(int p_t
LayeredTileMapCell LayeredTileSet::get_random_tile_from_terrains_pattern(int p_terrain_set, LayeredTileSet::TerrainsPattern p_terrain_tile_pattern) const {
ERR_FAIL_INDEX_V(p_terrain_set, terrain_sets.size(), LayeredTileMapCell());
const_cast<LayeredTileSet*>(this)->_update_terrains_cache();
const_cast<LayeredTileSet *>(this)->_update_terrains_cache();
// Count the sum of probabilities.
double sum = 0.0;
@ -1509,7 +1509,6 @@ LayeredTileMapCell LayeredTileSet::get_random_tile_from_terrains_pattern(int p_t
ERR_FAIL_V(LayeredTileMapCell());
}
Vector<Vector2> LayeredTileSet::get_tile_shape_polygon() const {
Vector<Vector2> points;
if (tile_shape == LayeredTileSet::TILE_SHAPE_SQUARE) {

2
modules/layered_tile_map/register_types.cpp
View File

@ -34,8 +34,8 @@
#include "geometry_parser/layered_tilemap_navigation_geometry_parser_2d.h"
#include "servers/navigation/navigation_mesh_generator.h"
#include "layered_tile_map_layer.h"
#include "layered_tile_map.h"
#include "layered_tile_map_layer.h"
#include "layered_tile_set.h"
#ifdef TOOLS_ENABLED

2
modules/props/lights/prop_light.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* prop.cpp */
/* prop_light.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_2d/vertex_light_2d.h
View File

@ -2,7 +2,7 @@
#define VERTEX_LIGHT_2D_H
/*************************************************************************/
/* vertex_2d.h */
/* vertex_light_2d.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_2d/vertex_light_2d_environment.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* vertex_light_2d.cpp */
/* vertex_light_2d_environment.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_2d/vertex_light_2d_environment.h
View File

@ -2,7 +2,7 @@
#define VERTEX_LIGHT_2D_ENVIRONMENT_H
/*************************************************************************/
/* vertex_2d.h */
/* vertex_light_2d_environment.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_2d/vertex_lights_2d_server.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* vertex_lights_2d.cpp */
/* vertex_lights_2d_server.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_2d/vertex_lights_2d_server.h
View File

@ -2,7 +2,7 @@
#define VERTEX_LIGHT_2D_SERVER_H
/*************************************************************************/
/* vertex_lights_2d.h */
/* vertex_lights_2d_server.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_3d/vertex_light_3d.h
View File

@ -2,7 +2,7 @@
#define VERTEX_LIGHT_3D_H
/*************************************************************************/
/* vertex_3d.h */
/* vertex_light_3d.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_3d/vertex_light_3d_environment.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* vertex_light_3d.cpp */
/* vertex_light_3d_environment.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_3d/vertex_light_3d_environment.h
View File

@ -2,7 +2,7 @@
#define VERTEX_LIGHT_3D_ENVIRONMENT_H
/*************************************************************************/
/* vertex_3d.h */
/* vertex_light_3d_environment.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

1
modules/vertex_lights_3d/vertex_light_data.cpp
View File

@ -57,7 +57,6 @@ Color VertexLights3DServer::VertexLightQuadrant3D::sample_light_value(const Colo
continue;
}
Vector3 light_to_pos = p_position - l->position;
Vector3 light_to_pos_normal_space = light_to_pos;

2
modules/vertex_lights_3d/vertex_lights_3d_server.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* vertex_lights_3d.cpp */
/* vertex_lights_3d_server.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
modules/vertex_lights_3d/vertex_lights_3d_server.h
View File

@ -2,7 +2,7 @@
#define VERTEX_LIGHT_3D_SERVER_H
/*************************************************************************/
/* vertex_lights_3d.h */
/* vertex_lights_3d_server.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

12
platform/frt/export/export.cpp
View File

@ -36,7 +36,6 @@
#include "platform/frt/logo.gen.h"
#include "scene/resources/texture.h"
class EditorExportPlatformFRT : public EditorExportPlatform {
GDCLASS(EditorExportPlatformFRT, EditorExportPlatform);
@ -103,7 +102,6 @@ public:
EditorExportPlatformFRT();
};
//////////
void EditorExportPlatformFRT::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {
@ -338,8 +336,8 @@ String EditorExportPlatformFRT::get_preset_arch(const Ref<EditorExportPreset> &p
if (arch != "arm32v6" && arch != "arm32v7" && arch != "arm64v8") {
ERR_PRINT(vformat("Invalid value \"%s\" for \"binary_format/architecture\" in export preset \"%s\". Defaulting to \"arm32v6\".",
arch,
p_preset->get_name()));
arch,
p_preset->get_name()));
arch = "arm32v6";
}
@ -352,9 +350,9 @@ void EditorExportPlatformFRT::add_platform_feature(const String &p_feature) {
}
void EditorExportPlatformFRT::get_platform_features(List<String> *r_features) {
r_features->push_back("pc"); //all pcs support "pc"
r_features->push_back("s3tc"); //all pcs support "s3tc" compression
r_features->push_back(get_os_name()); //OS name is a feature
r_features->push_back("pc"); // all pcs support "pc"
r_features->push_back("s3tc"); // all pcs support "s3tc" compression
r_features->push_back(get_os_name()); // OS name is a feature
for (RBSet<String>::Element *E = extra_features.front(); E; E = E->next()) {
r_features->push_back(E->get());

2
platform/frt/pandemonium_frt.cpp
View File

@ -1,5 +1,5 @@
/*************************************************************************/
/* pandemonium_frt.cpp */
/* pandemonium_frt.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */

2
platform/frt_sdl/export/export.cpp
View File

@ -36,7 +36,6 @@
#include "platform/frt_sdl/logo.gen.h"
#include "scene/resources/texture.h"
class EditorExportPlatformFRTSDL : public EditorExportPlatform {
GDCLASS(EditorExportPlatformFRTSDL, EditorExportPlatform);
@ -103,7 +102,6 @@ public:
EditorExportPlatformFRTSDL();
};
//////////
void EditorExportPlatformFRTSDL::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) {

59
scene/3d/lod.cpp
View File

@ -1,32 +1,33 @@
/**************************************************************************/
/* lod.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
/*************************************************************************/
/* lod.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */
/* https://github.com/Relintai/pandemonium_engine */
/*************************************************************************/
/* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "lod.h"

59
scene/3d/lod.h
View File

@ -1,32 +1,33 @@
/**************************************************************************/
/* lod.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
/*************************************************************************/
/* lod.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */
/* https://github.com/Relintai/pandemonium_engine */
/*************************************************************************/
/* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef LOD_H
#define LOD_H

59
scene/3d/lod_manager.cpp
View File

@ -1,32 +1,33 @@
/**************************************************************************/
/* lod_manager.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
/*************************************************************************/
/* lod_manager.cpp */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */
/* https://github.com/Relintai/pandemonium_engine */
/*************************************************************************/
/* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "lod_manager.h"

59
scene/3d/lod_manager.h
View File

@ -1,32 +1,33 @@
/**************************************************************************/
/* lod_manager.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/**************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
/*************************************************************************/
/* lod_manager.h */
/*************************************************************************/
/* This file is part of: */
/* PANDEMONIUM ENGINE */
/* https://github.com/Relintai/pandemonium_engine */
/*************************************************************************/
/* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef LOD_MANAGER_H
#define LOD_MANAGER_H

1
scene/resources/material/spatial_material.cpp
View File

@ -605,7 +605,6 @@ void SpatialMaterial::_update_shader() {
}
code += "\tALBEDO = albedo.rgb * albedo_tex.rgb;\n";
if (orm) {
if (textures[TEXTURE_ORM] != nullptr) {
if (flags[FLAG_UV1_USE_TRIPLANAR]) {

2
scene/resources/world_3d.cpp
View File

@ -364,8 +364,6 @@ void World3D::notify_saving(bool p_active) {
}
void World3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_space"), &World3D::get_space);
ClassDB::bind_method(D_METHOD("get_scenario"), &World3D::get_scenario);
ClassDB::bind_method(D_METHOD("get_navigation_map"), &World3D::get_navigation_map);