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

Clang format everything.

Browse Source
This commit is contained in:
Relintai 2024-07-16 21:23:54 +02:00
parent 4d2e9220c7
commit c7ac1db971
132 changed files with 2642 additions and 2997 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/bind/core_bind.cpp
View File

@ -1597,7 +1597,7 @@ void _OS::_bind_methods() {
BIND_ENUM_CONSTANT(VIDEO_DRIVER_GLES2); BIND_ENUM_CONSTANT(VIDEO_DRIVER_GLES2);
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
BIND_ENUM_CONSTANT(VIDEO_DRIVER_GLES3); BIND_ENUM_CONSTANT(VIDEO_DRIVER_GLES3);
#endif #endif
BIND_ENUM_CONSTANT(DAY_SUNDAY); BIND_ENUM_CONSTANT(DAY_SUNDAY);

4
core/containers/command_queue_mt.h
View File

@ -285,8 +285,8 @@ class CommandQueueMT {
struct CommandBase { struct CommandBase {
virtual void call() = 0; virtual void call() = 0;
virtual void post(){}; virtual void post() {};
virtual ~CommandBase(){}; virtual ~CommandBase() {};
}; };
struct SyncCommand : public CommandBase { struct SyncCommand : public CommandBase {

2
core/containers/rid_handle.h
View File

@ -235,7 +235,7 @@ public:
g_rid_database.handle_free(p_rid); g_rid_database.handle_free(p_rid);
} }
void get_owned_list(List<RID> *p_owned){ void get_owned_list(List<RID> *p_owned) {
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
#endif #endif

2
core/containers/ring_buffer.h
View File

@ -217,7 +217,7 @@ public:
write_pos = 0; write_pos = 0;
resize(p_power); resize(p_power);
}; };
~RingBuffer(){}; ~RingBuffer() {};
}; };
#endif #endif

2
core/containers/vmap.h
View File

@ -193,7 +193,7 @@ public:
return _cowdata.get_m(pos).value; return _cowdata.get_m(pos).value;
} }
_FORCE_INLINE_ VMap(){}; _FORCE_INLINE_ VMap() {};
_FORCE_INLINE_ VMap(const VMap &p_from) { _cowdata._ref(p_from._cowdata); } _FORCE_INLINE_ VMap(const VMap &p_from) { _cowdata._ref(p_from._cowdata); }
inline VMap &operator=(const VMap &p_from) { inline VMap &operator=(const VMap &p_from) {
_cowdata._ref(p_from._cowdata); _cowdata._ref(p_from._cowdata);

2
core/error/error_macros.cpp
View File

@ -36,8 +36,8 @@
#include "core/string/ustring.h" #include "core/string/ustring.h"
#if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED) #if defined(DEBUG_ENABLED) && defined(TOOLS_ENABLED)
#include "scene/main/node.h"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "scene/main/node.h"
#endif #endif
static ErrorHandlerList *error_handler_list = nullptr; static ErrorHandlerList *error_handler_list = nullptr;

3
core/error/error_macros.h
View File

@ -32,8 +32,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "core/os/safe_refcount.h"
#include "core/object/object_id.h" #include "core/object/object_id.h"
#include "core/os/safe_refcount.h"
#include "core/typedefs.h" #include "core/typedefs.h"
/** /**
@ -573,4 +573,3 @@ void _physics_interpolation_warning(const char *p_function, const char *p_file,
_physics_interpolation_warning(FUNCTION_STR, __FILE__, __LINE__, UINT64_MAX, m_string) _physics_interpolation_warning(FUNCTION_STR, __FILE__, __LINE__, UINT64_MAX, m_string)
#endif // ERROR_MACROS_H #endif // ERROR_MACROS_H

2
core/math/geometry.cpp
View File

@ -569,7 +569,7 @@ static inline void _build_faces(uint8_t ***p_cell_status, int x, int y, int z, i
return; return;
} }
#define vert(m_idx) Vector3(((m_idx)&4) >> 2, ((m_idx)&2) >> 1, (m_idx)&1) #define vert(m_idx) Vector3(((m_idx) & 4) >> 2, ((m_idx) & 2) >> 1, (m_idx) & 1)
static const uint8_t indices[6][4] = { static const uint8_t indices[6][4] = {
{ 7, 6, 4, 5 }, { 7, 6, 4, 5 },

6
core/object/object.h
View File

@ -542,7 +542,7 @@ protected:
return false; return false;
}; };
virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const {}; virtual void _get_property_listv(List<PropertyInfo> *p_list, bool p_reversed) const {};
virtual void _notificationv(int p_notification, bool p_reversed){}; virtual void _notificationv(int p_notification, bool p_reversed) {};
static String _get_category() { static String _get_category() {
return ""; return "";
@ -555,7 +555,7 @@ protected:
return false; return false;
}; };
void _get_property_list(List<PropertyInfo> *p_list) const {}; void _get_property_list(List<PropertyInfo> *p_list) const {};
void _notification(int p_notification){}; void _notification(int p_notification) {};
_FORCE_INLINE_ static void (*_get_bind_methods())() { _FORCE_INLINE_ static void (*_get_bind_methods())() {
return &Object::_bind_methods; return &Object::_bind_methods;
@ -604,7 +604,7 @@ protected:
public: //should be protected, but bug in clang++ public: //should be protected, but bug in clang++
static void initialize_class(); static void initialize_class();
_FORCE_INLINE_ static void register_custom_data_to_otdb(){}; _FORCE_INLINE_ static void register_custom_data_to_otdb() {};
public: public:
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

4
core/os/os.cpp
View File

@ -880,8 +880,8 @@ const char *OS::get_video_driver_name(int p_driver) const {
case VIDEO_DRIVER_GLES2: case VIDEO_DRIVER_GLES2:
return "GLES2"; return "GLES2";
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
case VIDEO_DRIVER_GLES3: case VIDEO_DRIVER_GLES3:
return "GLES3"; return "GLES3";
#endif #endif
default: default:
return "GLES2"; return "GLES2";

14
core/os/os.h
View File

@ -156,10 +156,10 @@ public:
static OS *get_singleton(); static OS *get_singleton();
virtual void global_menu_add_item(const String &p_menu, const String &p_label, const Variant &p_signal, const Variant &p_meta){}; virtual void global_menu_add_item(const String &p_menu, const String &p_label, const Variant &p_signal, const Variant &p_meta) {};
virtual void global_menu_add_separator(const String &p_menu){}; virtual void global_menu_add_separator(const String &p_menu) {};
virtual void global_menu_remove_item(const String &p_menu, int p_idx){}; virtual void global_menu_remove_item(const String &p_menu, int p_idx) {};
virtual void global_menu_clear(const String &p_menu){}; virtual void global_menu_clear(const String &p_menu) {};
void print_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, Logger::ErrorType p_type = Logger::ERR_ERROR); void print_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, Logger::ErrorType p_type = Logger::ERR_ERROR);
void print(const char *p_format, ...) _PRINTF_FORMAT_ATTRIBUTE_2_3; void print(const char *p_format, ...) _PRINTF_FORMAT_ATTRIBUTE_2_3;
@ -182,7 +182,7 @@ public:
virtual Point2 get_mouse_position() const = 0; virtual Point2 get_mouse_position() const = 0;
virtual int get_mouse_button_state() const = 0; virtual int get_mouse_button_state() const = 0;
virtual void set_window_title(const String &p_title) = 0; virtual void set_window_title(const String &p_title) = 0;
virtual void set_window_mouse_passthrough(const PoolVector2Array &p_region){}; virtual void set_window_mouse_passthrough(const PoolVector2Array &p_region) {};
virtual void set_clipboard(const String &p_text); virtual void set_clipboard(const String &p_text);
virtual String get_clipboard() const; virtual String get_clipboard() const;
@ -215,7 +215,7 @@ public:
virtual int get_tablet_driver_count() const { return 0; }; virtual int get_tablet_driver_count() const { return 0; };
virtual String get_tablet_driver_name(int p_driver) const { return ""; }; virtual String get_tablet_driver_name(int p_driver) const { return ""; };
virtual String get_current_tablet_driver() const { return ""; }; virtual String get_current_tablet_driver() const { return ""; };
virtual void set_current_tablet_driver(const String &p_driver){}; virtual void set_current_tablet_driver(const String &p_driver) {};
virtual PoolStringArray get_connected_midi_inputs(); virtual PoolStringArray get_connected_midi_inputs();
virtual void open_midi_inputs(); virtual void open_midi_inputs();
@ -653,7 +653,7 @@ public:
virtual int get_power_seconds_left(); virtual int get_power_seconds_left();
virtual int get_power_percent_left(); virtual int get_power_percent_left();
virtual void force_process_input(){}; virtual void force_process_input() {};
bool has_feature(const String &p_feature); bool has_feature(const String &p_feature);
void set_has_server_feature_callback(HasServerFeatureCallback p_callback); void set_has_server_feature_callback(HasServerFeatureCallback p_callback);

2
drivers/coreaudio/audio_driver_coreaudio.cpp
View File

@ -681,6 +681,6 @@ AudioDriverCoreAudio::AudioDriverCoreAudio() :
samples_in.clear(); samples_in.clear();
} }
AudioDriverCoreAudio::~AudioDriverCoreAudio(){}; AudioDriverCoreAudio::~AudioDriverCoreAudio() {};
#endif #endif

10
drivers/dummy/rasterizer_dummy.h
View File

@ -778,7 +778,7 @@ public:
static RasterizerStorage *base_singleton; static RasterizerStorage *base_singleton;
RasterizerStorageDummy(){}; RasterizerStorageDummy() {};
~RasterizerStorageDummy() {} ~RasterizerStorageDummy() {}
}; };
@ -788,11 +788,11 @@ public:
void light_internal_update(RID p_rid, Light *p_light) {} void light_internal_update(RID p_rid, Light *p_light) {}
void light_internal_free(RID p_rid) {} void light_internal_free(RID p_rid) {}
void canvas_begin(){}; void canvas_begin() {};
void canvas_end(){}; void canvas_end() {};
void canvas_render_items(Item *p_item_list, int p_z, const Color &p_modulate, Light *p_light, const Transform2D &p_transform){}; void canvas_render_items(Item *p_item_list, int p_z, const Color &p_modulate, Light *p_light, const Transform2D &p_transform) {};
void canvas_debug_viewport_shadows(Light *p_lights_with_shadow){}; void canvas_debug_viewport_shadows(Light *p_lights_with_shadow) {};
void canvas_light_shadow_buffer_update(RID p_buffer, const Transform2D &p_light_xform, int p_light_mask, float p_near, float p_far, LightOccluderInstance *p_occluders, Projection *p_xform_cache) {} void canvas_light_shadow_buffer_update(RID p_buffer, const Transform2D &p_light_xform, int p_light_mask, float p_near, float p_far, LightOccluderInstance *p_occluders, Projection *p_xform_cache) {}

2
drivers/gles2/rasterizer_scene_gles2.cpp
View File

@ -990,8 +990,6 @@ void RasterizerSceneGLES2::gi_probe_instance_set_transform_to_data(RID p_probe,
void RasterizerSceneGLES2::gi_probe_instance_set_bounds(RID p_probe, const Vector3 &p_bounds) { void RasterizerSceneGLES2::gi_probe_instance_set_bounds(RID p_probe, const Vector3 &p_bounds) {
} }
//////////////////////////// ////////////////////////////
//////////////////////////// ////////////////////////////
//////////////////////////// ////////////////////////////

2
drivers/gles2/rasterizer_scene_gles2.h
View File

@ -560,8 +560,6 @@ public:
virtual void gi_probe_instance_set_transform_to_data(RID p_probe, const Transform &p_xform); virtual void gi_probe_instance_set_transform_to_data(RID p_probe, const Transform &p_xform);
virtual void gi_probe_instance_set_bounds(RID p_probe, const Vector3 &p_bounds); virtual void gi_probe_instance_set_bounds(RID p_probe, const Vector3 &p_bounds);
/* RENDER LIST */ /* RENDER LIST */
enum LightMode { enum LightMode {

1
drivers/gles2/rasterizer_storage_gles2.cpp
View File

@ -6731,4 +6731,3 @@ RasterizerStorageGLES2::RasterizerStorageGLES2() {
RasterizerStorageGLES2::system_fbo = 0; RasterizerStorageGLES2::system_fbo = 0;
config.should_orphan = true; config.should_orphan = true;
} }

1
drivers/gles2/shaders/scene.glsl
View File

@ -1042,7 +1042,6 @@ vec4 texture2D_bicubic(sampler2D tex, vec2 uv) {
uniform mediump vec4 lightmap_captures[12]; uniform mediump vec4 lightmap_captures[12];
#endif #endif
#ifdef USE_RADIANCE_MAP #ifdef USE_RADIANCE_MAP
uniform samplerCube radiance_map; // texunit:-2 uniform samplerCube radiance_map; // texunit:-2

61
drivers/gles3/rasterizer_canvas_base_gles3.cpp
View File

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

59
drivers/gles3/rasterizer_canvas_base_gles3.h
View File

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

59
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

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

59
drivers/gles3/rasterizer_canvas_gles3.h
View File

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

61
drivers/gles3/rasterizer_gles3.cpp
View File

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

59
drivers/gles3/rasterizer_gles3.h
View File

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

61
drivers/gles3/rasterizer_scene_gles3.cpp
View File

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

59
drivers/gles3/rasterizer_scene_gles3.h
View File

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

61
drivers/gles3/rasterizer_storage_gles3.cpp
View File

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

59
drivers/gles3/rasterizer_storage_gles3.h
View File

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

63
drivers/gles3/shader_cache_gles3.cpp
View File

@ -1,40 +1,41 @@
/**************************************************************************/ /*************************************************************************/
/* shader_cache_gles3.cpp */ /* shader_cache_gles3.cpp */
/**************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* GODOT ENGINE */ /* PANDEMONIUM ENGINE */
/* https://godotengine.org */ /* https://github.com/Relintai/pandemonium_engine */
/**************************************************************************/ /*************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* 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 */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* "Software"), to deal in the Software without restriction, including */ /* a copy of this software and associated documentation files (the */
/* without limitation the rights to use, copy, modify, merge, publish, */ /* "Software"), to deal in the Software without restriction, including */
/* distribute, sublicense, and/or sell copies of the Software, and to */ /* without limitation the rights to use, copy, modify, merge, publish, */
/* permit persons to whom the Software is furnished to do so, subject to */ /* distribute, sublicense, and/or sell copies of the Software, and to */
/* the following conditions: */ /* 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 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 */ /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/**************************************************************************/ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "shader_cache_gles3.h" #include "shader_cache_gles3.h"
#include "core/config/project_settings.h"
#include "core/containers/sort_array.h"
#include "core/crypto/crypto_core.h" #include "core/crypto/crypto_core.h"
#include "core/os/dir_access.h" #include "core/os/dir_access.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/config/project_settings.h"
#include "core/containers/sort_array.h"
#include "core/string/ustring.h" #include "core/string/ustring.h"
String ShaderCacheGLES3::hash_program(const char *const *p_strings_platform, const LocalVector<const char *> &p_vertex_strings, const LocalVector<const char *> &p_fragment_strings) { String ShaderCacheGLES3::hash_program(const char *const *p_strings_platform, const LocalVector<const char *> &p_vertex_strings, const LocalVector<const char *> &p_fragment_strings) {

59
drivers/gles3/shader_cache_gles3.h
View File

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

61
drivers/gles3/shader_compiler_gles3.cpp
View File

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

59
drivers/gles3/shader_compiler_gles3.h
View File

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

61
drivers/gles3/shader_gles3.cpp
View File

@ -1,39 +1,40 @@
/**************************************************************************/ /*************************************************************************/
/* shader_gles3.cpp */ /* shader_gles3.cpp */
/**************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* GODOT ENGINE */ /* PANDEMONIUM ENGINE */
/* https://godotengine.org */ /* https://github.com/Relintai/pandemonium_engine */
/**************************************************************************/ /*************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* 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 */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* "Software"), to deal in the Software without restriction, including */ /* a copy of this software and associated documentation files (the */
/* without limitation the rights to use, copy, modify, merge, publish, */ /* "Software"), to deal in the Software without restriction, including */
/* distribute, sublicense, and/or sell copies of the Software, and to */ /* without limitation the rights to use, copy, modify, merge, publish, */
/* permit persons to whom the Software is furnished to do so, subject to */ /* distribute, sublicense, and/or sell copies of the Software, and to */
/* the following conditions: */ /* 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 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 */ /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/**************************************************************************/ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "shader_gles3.h" #include "shader_gles3.h"
#include "core/containers/local_vector.h" #include "core/containers/local_vector.h"
#include "core/containers/threaded_callable_queue.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/string/print_string.h" #include "core/string/print_string.h"
#include "core/containers/threaded_callable_queue.h"
#include "drivers/gles3/rasterizer_storage_gles3.h" #include "drivers/gles3/rasterizer_storage_gles3.h"
#include "drivers/gles3/shader_cache_gles3.h" #include "drivers/gles3/shader_cache_gles3.h"
#include "servers/rendering_server.h" #include "servers/rendering_server.h"

63
drivers/gles3/shader_gles3.h
View File

@ -1,43 +1,44 @@
/**************************************************************************/ /*************************************************************************/
/* shader_gles3.h */ /* shader_gles3.h */
/**************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* GODOT ENGINE */ /* PANDEMONIUM ENGINE */
/* https://godotengine.org */ /* https://github.com/Relintai/pandemonium_engine */
/**************************************************************************/ /*************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* 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 */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* "Software"), to deal in the Software without restriction, including */ /* a copy of this software and associated documentation files (the */
/* without limitation the rights to use, copy, modify, merge, publish, */ /* "Software"), to deal in the Software without restriction, including */
/* distribute, sublicense, and/or sell copies of the Software, and to */ /* without limitation the rights to use, copy, modify, merge, publish, */
/* permit persons to whom the Software is furnished to do so, subject to */ /* distribute, sublicense, and/or sell copies of the Software, and to */
/* the following conditions: */ /* 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 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 */ /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/**************************************************************************/ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef SHADER_GLES3_H #ifndef SHADER_GLES3_H
#define SHADER_GLES3_H #define SHADER_GLES3_H
#include "core/containers/hash_map.h" #include "core/containers/hash_map.h"
#include "core/containers/local_vector.h" #include "core/containers/local_vector.h"
#include "core/containers/rb_map.h"
#include "core/containers/og_hash_map.h" #include "core/containers/og_hash_map.h"
#include "core/containers/rb_map.h"
#include "core/containers/self_list.h"
#include "core/math/projection.h" #include "core/math/projection.h"
#include "core/os/safe_refcount.h" #include "core/os/safe_refcount.h"
#include "core/containers/self_list.h"
#include "core/variant/variant.h" #include "core/variant/variant.h"
#include "platform_config.h" #include "platform_config.h"

4
drivers/gles3/shaders/canvas.glsl
View File

@ -430,7 +430,7 @@ void light_compute(
#if defined(SCREEN_UV_USED) #if defined(SCREEN_UV_USED)
vec2 screen_uv, vec2 screen_uv,
#endif #endif
vec4 color) { vec4 color){
#if defined(USE_LIGHT_SHADER_CODE) #if defined(USE_LIGHT_SHADER_CODE)
@ -438,7 +438,7 @@ void light_compute(
LIGHT_SHADER_CODE LIGHT_SHADER_CODE
/* clang-format on */ /* clang-format on */
#endif #endif
} }

4
drivers/unix/file_access_unix.cpp
View File

@ -50,11 +50,11 @@
#endif #endif
#ifdef MSVC #ifdef MSVC
#define S_ISREG(m) ((m)&_S_IFREG) #define S_ISREG(m) ((m) & _S_IFREG)
#include <io.h> #include <io.h>
#endif #endif
#ifndef S_ISREG #ifndef S_ISREG
#define S_ISREG(m) ((m)&S_IFREG) #define S_ISREG(m) ((m) & S_IFREG)
#endif #endif
#ifndef NO_FCNTL #ifndef NO_FCNTL

2
drivers/windows/file_access_windows.cpp
View File

@ -48,7 +48,7 @@
#include <wchar.h> #include <wchar.h>
#ifdef _MSC_VER #ifdef _MSC_VER
#define S_ISREG(m) ((m)&_S_IFREG) #define S_ISREG(m) ((m) & _S_IFREG)
#endif #endif
void FileAccessWindows::check_errors() const { void FileAccessWindows::check_errors() const {

2
editor/editor_node.cpp
View File

@ -121,6 +121,7 @@
#include "editor/plugins/curve_editor_plugin.h" #include "editor/plugins/curve_editor_plugin.h"
#include "editor/plugins/editor_preview_plugins.h" #include "editor/plugins/editor_preview_plugins.h"
#include "editor/plugins/gi_probe_editor_plugin.h" #include "editor/plugins/gi_probe_editor_plugin.h"
#include "editor/plugins/gpu_particles_2d_editor_plugin.h"
#include "editor/plugins/gradient_editor_plugin.h" #include "editor/plugins/gradient_editor_plugin.h"
#include "editor/plugins/gradient_texture_2d_editor_plugin.h" #include "editor/plugins/gradient_texture_2d_editor_plugin.h"
#include "editor/plugins/item_list_editor_plugin.h" #include "editor/plugins/item_list_editor_plugin.h"
@ -135,7 +136,6 @@
#include "editor/plugins/navigation_obstacle_2d_editor_plugin.h" #include "editor/plugins/navigation_obstacle_2d_editor_plugin.h"
#include "editor/plugins/navigation_obstacle_3d_editor_plugin.h" #include "editor/plugins/navigation_obstacle_3d_editor_plugin.h"
#include "editor/plugins/packed_scene_editor_plugin.h" #include "editor/plugins/packed_scene_editor_plugin.h"
#include "editor/plugins/gpu_particles_2d_editor_plugin.h"
#include "editor/plugins/particles_editor_plugin.h" #include "editor/plugins/particles_editor_plugin.h"
#include "editor/plugins/path_2d_editor_plugin.h" #include "editor/plugins/path_2d_editor_plugin.h"
#include "editor/plugins/path_editor_plugin.h" #include "editor/plugins/path_editor_plugin.h"

2
editor/filesystem_dock.cpp
View File

@ -2116,7 +2116,7 @@ void FileSystemDock::on_editor_save_and_restart() {
set_split_mode(new_split_mode); set_split_mode(new_split_mode);
if (split_box->get_split_offset() < 100 * EDSCALE) { if (split_box->get_split_offset() < 100 * EDSCALE) {
split_box->set_split_offset(100 * EDSCALE); split_box->set_split_offset(100 * EDSCALE);
} }
} }
} }

59
editor/plugins/baked_lightmap_editor_plugin.cpp
View File

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

59
editor/plugins/baked_lightmap_editor_plugin.h
View File

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

2
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -65,8 +65,8 @@
#include "editor/plugins/animation_player_editor_plugin.h" #include "editor/plugins/animation_player_editor_plugin.h"
#include "editor/scene_tree_dock.h" #include "editor/scene_tree_dock.h"
#include "editor/script_editor_debugger.h" #include "editor/script_editor_debugger.h"
#include "scene/2d/light_2d.h"
#include "scene/2d/gpu_particles_2d.h" #include "scene/2d/gpu_particles_2d.h"
#include "scene/2d/light_2d.h"
#include "scene/2d/polygon_2d.h" #include "scene/2d/polygon_2d.h"
#include "scene/main/node_2d.h" #include "scene/main/node_2d.h"

59
editor/plugins/gi_probe_editor_plugin.cpp
View File

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

59
editor/plugins/gi_probe_editor_plugin.h
View File

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

69
editor/plugins/gpu_particles_2d_editor_plugin.cpp
View File

@ -1,48 +1,49 @@
/**************************************************************************/ /*************************************************************************/
/* particles_2d_editor_plugin.cpp */ /* gpu_particles_2d_editor_plugin.cpp */
/**************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* GODOT ENGINE */ /* PANDEMONIUM ENGINE */
/* https://godotengine.org */ /* https://github.com/Relintai/pandemonium_engine */
/**************************************************************************/ /*************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* 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 */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* "Software"), to deal in the Software without restriction, including */ /* a copy of this software and associated documentation files (the */
/* without limitation the rights to use, copy, modify, merge, publish, */ /* "Software"), to deal in the Software without restriction, including */
/* distribute, sublicense, and/or sell copies of the Software, and to */ /* without limitation the rights to use, copy, modify, merge, publish, */
/* permit persons to whom the Software is furnished to do so, subject to */ /* distribute, sublicense, and/or sell copies of the Software, and to */
/* the following conditions: */ /* 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 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 */ /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/**************************************************************************/ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "gpu_particles_2d_editor_plugin.h" #include "gpu_particles_2d_editor_plugin.h"
#include "canvas_item_editor_plugin.h" #include "canvas_item_editor_plugin.h"
#include "core/io/image_loader.h" #include "core/io/image_loader.h"
#include "editor/editor_file_dialog.h"
#include "scene/2d/cpu_particles_2d.h" #include "scene/2d/cpu_particles_2d.h"
#include "scene/gui/separator.h"
#include "scene/resources/material/particles_material.h"
#include "scene/2d/gpu_particles_2d.h" #include "scene/2d/gpu_particles_2d.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/gui/file_dialog.h"
#include "editor/editor_file_dialog.h"
#include "scene/gui/option_button.h"
#include "scene/gui/check_box.h" #include "scene/gui/check_box.h"
#include "scene/gui/file_dialog.h"
#include "scene/gui/option_button.h"
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/separator.h"
#include "scene/gui/spin_box.h" #include "scene/gui/spin_box.h"
#include "scene/resources/material/particles_material.h"
void GPUParticles2DEditorPlugin::edit(Object *p_object) { void GPUParticles2DEditorPlugin::edit(Object *p_object) {
particles = Object::cast_to<GPUParticles2D>(p_object); particles = Object::cast_to<GPUParticles2D>(p_object);

59
editor/plugins/gpu_particles_2d_editor_plugin.h
View File

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

9
editor/plugins/particles_editor_plugin.cpp
View File

@ -49,20 +49,20 @@
#include "core/variant/variant.h" #include "core/variant/variant.h"
#include "editor/editor_file_dialog.h" #include "editor/editor_file_dialog.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/plugins/spatial_editor_plugin.h"
#include "editor/scene_tree_editor.h" #include "editor/scene_tree_editor.h"
#include "scene/3d/cpu_particles.h"
#include "scene/3d/gpu_particles.h"
#include "scene/3d/visual_instance.h" #include "scene/3d/visual_instance.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/gui/button.h" #include "scene/gui/button.h"
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/option_button.h" #include "scene/gui/option_button.h"
#include "scene/gui/spin_box.h"
#include "scene/gui/popup_menu.h" #include "scene/gui/popup_menu.h"
#include "scene/gui/spin_box.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/spatial.h" #include "scene/main/spatial.h"
#include "scene/3d/gpu_particles.h"
#include "scene/3d/cpu_particles.h"
#include "scene/resources/material/particles_material.h" #include "scene/resources/material/particles_material.h"
#include "editor/plugins/spatial_editor_plugin.h"
bool ParticlesEditorBase::_generate(PoolVector<Vector3> &points, PoolVector<Vector3> &normals) { bool ParticlesEditorBase::_generate(PoolVector<Vector3> &points, PoolVector<Vector3> &normals) {
bool use_normals = emission_fill->get_selected() == 1; bool use_normals = emission_fill->get_selected() == 1;
@ -528,4 +528,3 @@ GPUParticlesEditorPlugin::GPUParticlesEditorPlugin(EditorNode *p_node) {
GPUParticlesEditorPlugin::~GPUParticlesEditorPlugin() { GPUParticlesEditorPlugin::~GPUParticlesEditorPlugin() {
} }

1
editor/plugins/particles_editor_plugin.h
View File

@ -133,5 +133,4 @@ public:
~GPUParticlesEditorPlugin(); ~GPUParticlesEditorPlugin();
}; };
#endif // PARTICLES_EDITOR_PLUGIN_H #endif // PARTICLES_EDITOR_PLUGIN_H

2
editor/plugins/spatial_editor_plugin.cpp
View File

@ -92,8 +92,8 @@
#include "scene/resources/environment_3d.h" #include "scene/resources/environment_3d.h"
#include "scene/resources/font/font.h" #include "scene/resources/font/font.h"
#include "scene/resources/gradient.h" #include "scene/resources/gradient.h"
#include "scene/resources/mesh/surface_tool.h"
#include "scene/resources/mesh/multimesh.h" #include "scene/resources/mesh/multimesh.h"
#include "scene/resources/mesh/surface_tool.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "scene/resources/shader.h" #include "scene/resources/shader.h"
#include "scene/resources/shapes/shape.h" #include "scene/resources/shapes/shape.h"

4
editor/project_manager.cpp
View File

@ -920,7 +920,7 @@ public:
l->set_text(TTR("Lower visual quality\nSome features not available\nWorks on most hardware\nRecommended for web games")); l->set_text(TTR("Lower visual quality\nSome features not available\nWorks on most hardware\nRecommended for web games"));
rvb->add_child(l); rvb->add_child(l);
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
rvb->add_child(memnew(HSeparator)); rvb->add_child(memnew(HSeparator));
@ -940,7 +940,7 @@ public:
l->set_text(TTR("Higher visual quality\nAll features available\nIncompatible with older hardware\nNot recommended for web games")); l->set_text(TTR("Higher visual quality\nAll features available\nIncompatible with older hardware\nNot recommended for web games"));
rvb->add_child(l); rvb->add_child(l);
#endif #endif
l = memnew(Label); l = memnew(Label);
l->set_text(TTR("Renderer can be changed later, but scenes may need to be adjusted.")); l->set_text(TTR("Renderer can be changed later, but scenes may need to be adjusted."));

6
editor/rename_dialog.h
View File

@ -66,7 +66,7 @@ class RenameDialog : public ConfirmationDialog {
GDCLASS(RenameDialog, ConfirmationDialog); GDCLASS(RenameDialog, ConfirmationDialog);
virtual void ok_pressed() { rename(); }; virtual void ok_pressed() { rename(); };
void _cancel_pressed(){}; void _cancel_pressed() {};
void _features_toggled(bool pressed); void _features_toggled(bool pressed);
void _insert_text(String text); void _insert_text(String text);
void _update_substitute(); void _update_substitute();
@ -121,7 +121,7 @@ class RenameDialog : public ConfirmationDialog {
bool has_errors; bool has_errors;
protected: protected:
void _notification(int p_what){}; void _notification(int p_what) {};
static void _bind_methods(); static void _bind_methods();
virtual void _post_popup(); virtual void _post_popup();
@ -130,7 +130,7 @@ public:
void rename(); void rename();
RenameDialog(SceneTreeEditor *p_scene_tree_editor, UndoRedo *p_undo_redo = nullptr); RenameDialog(SceneTreeEditor *p_scene_tree_editor, UndoRedo *p_undo_redo = nullptr);
~RenameDialog(){}; ~RenameDialog() {};
}; };
#endif // MODULE_REGEX_ENABLED #endif // MODULE_REGEX_ENABLED

3
editor/spatial_editor_gizmos.cpp
View File

@ -63,6 +63,7 @@
#include "scene/3d/collision_shape.h" #include "scene/3d/collision_shape.h"
#include "scene/3d/cpu_particles.h" #include "scene/3d/cpu_particles.h"
#include "scene/3d/gi_probe.h" #include "scene/3d/gi_probe.h"
#include "scene/3d/gpu_particles.h"
#include "scene/3d/label_3d.h" #include "scene/3d/label_3d.h"
#include "scene/3d/light.h" #include "scene/3d/light.h"
#include "scene/3d/listener.h" #include "scene/3d/listener.h"
@ -83,7 +84,6 @@
#include "scene/3d/sprite_3d.h" #include "scene/3d/sprite_3d.h"
#include "scene/3d/vehicle_body.h" #include "scene/3d/vehicle_body.h"
#include "scene/3d/visibility_notifier.h" #include "scene/3d/visibility_notifier.h"
#include "scene/3d/gpu_particles.h"
#include "scene/main/control.h" #include "scene/main/control.h"
#include "scene/main/node.h" #include "scene/main/node.h"
#include "scene/main/scene_tree.h" #include "scene/main/scene_tree.h"
@ -3184,7 +3184,6 @@ void GIProbeGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
p_gizmo->add_handles(handles, get_material("handles")); p_gizmo->add_handles(handles, get_material("handles"));
} }
//// ////
BakedIndirectLightGizmoPlugin::BakedIndirectLightGizmoPlugin() { BakedIndirectLightGizmoPlugin::BakedIndirectLightGizmoPlugin() {

59
editor_modules/denoise/denoise_wrapper.cpp
View File

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

59
editor_modules/denoise/denoise_wrapper.h
View File

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

59
editor_modules/denoise/lightmap_denoiser.cpp
View File

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

59
editor_modules/denoise/lightmap_denoiser.h
View File

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

59
editor_modules/denoise/register_types.cpp
View File

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

59
editor_modules/denoise/register_types.h
View File

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

61
editor_modules/lightmapper_cpu/lightmapper_cpu.cpp
View File

@ -1,39 +1,40 @@
/**************************************************************************/ /*************************************************************************/
/* lightmapper_cpu.cpp */ /* lightmapper_cpu.cpp */
/**************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* GODOT ENGINE */ /* PANDEMONIUM ENGINE */
/* https://godotengine.org */ /* https://github.com/Relintai/pandemonium_engine */
/**************************************************************************/ /*************************************************************************/
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2022-present Péter Magyar. */
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* 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 */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* "Software"), to deal in the Software without restriction, including */ /* a copy of this software and associated documentation files (the */
/* without limitation the rights to use, copy, modify, merge, publish, */ /* "Software"), to deal in the Software without restriction, including */
/* distribute, sublicense, and/or sell copies of the Software, and to */ /* without limitation the rights to use, copy, modify, merge, publish, */
/* permit persons to whom the Software is furnished to do so, subject to */ /* distribute, sublicense, and/or sell copies of the Software, and to */
/* the following conditions: */ /* 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 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 */ /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/**************************************************************************/ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "lightmapper_cpu.h" #include "lightmapper_cpu.h"
#include "core/config/project_settings.h"
#include "core/math/geometry.h" #include "core/math/geometry.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/os/threaded_array_processor.h" #include "core/os/threaded_array_processor.h"
#include "core/config/project_settings.h"
#include "editor_modules/raycast/lightmap_raycaster.h" #include "editor_modules/raycast/lightmap_raycaster.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED

59
editor_modules/lightmapper_cpu/lightmapper_cpu.h
View File

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

59
editor_modules/lightmapper_cpu/register_types.cpp
View File

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

59
editor_modules/lightmapper_cpu/register_types.h
View File

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

59
editor_modules/raycast/lightmap_raycaster.cpp
View File

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

59
editor_modules/raycast/lightmap_raycaster.h
View File

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

59
editor_modules/raycast/register_types.cpp
View File

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

59
editor_modules/raycast/register_types.h
View File

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

6
main/main.cpp
View File

@ -1205,11 +1205,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
GLOBAL_DEF_RST("rendering/quality/driver/driver_name", "GLES2"); GLOBAL_DEF_RST("rendering/quality/driver/driver_name", "GLES2");
ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/driver/driver_name", ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/driver/driver_name",
PropertyInfo(Variant::STRING, "rendering/quality/driver/driver_name", PROPERTY_HINT_ENUM, "GLES2" PropertyInfo(Variant::STRING, "rendering/quality/driver/driver_name", PROPERTY_HINT_ENUM, "GLES2"
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
",GLES3" ",GLES3"
#endif #endif
)); ));
if (video_driver == "") { if (video_driver == "") {
video_driver = GLOBAL_GET("rendering/quality/driver/driver_name"); video_driver = GLOBAL_GET("rendering/quality/driver/driver_name");
} }

9
misc/dist/ios_xcode/godot_ios/dummy.h vendored
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* dummy.h */ /* dummy.h */
/*************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* GODOT ENGINE */ /* PANDEMONIUM ENGINE */
/* https://godotengine.org */ /* 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) 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 */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

2
modules/database/prepared_statement.cpp
View File

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

2
modules/database/prepared_statement.h
View File

@ -2,7 +2,7 @@
#define PREPARED_STATEMENT_H #define PREPARED_STATEMENT_H
/*************************************************************************/ /*************************************************************************/
/* query_result.h */ /* prepared_statement.h */
/*************************************************************************/ /*************************************************************************/
/* This file is part of: */ /* This file is part of: */
/* PANDEMONIUM ENGINE */ /* PANDEMONIUM ENGINE */

2
modules/database/register_types.cpp
View File

@ -36,10 +36,10 @@
#include "database_manager.h" #include "database_manager.h"
#include "database_multi_threaded.h" #include "database_multi_threaded.h"
#include "database_single_threaded.h" #include "database_single_threaded.h"
#include "prepared_statement.h"
#include "query_builder.h" #include "query_builder.h"
#include "query_result.h" #include "query_result.h"
#include "table_builder.h" #include "table_builder.h"
#include "prepared_statement.h"
#include "core/config/engine.h" #include "core/config/engine.h"

2
modules/database/table_builder.h
View File

@ -32,8 +32,8 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/ /*************************************************************************/
#include "core/string/ustring.h"
#include "core/string/string_builder.h" #include "core/string/string_builder.h"
#include "core/string/ustring.h"
#include "core/object/reference.h" #include "core/object/reference.h"

2
modules/gdscript/language_server/gdscript_extend_parser.h
View File

@ -37,7 +37,7 @@
#include "lsp.hpp" #include "lsp.hpp"
#ifndef LINE_NUMBER_TO_INDEX #ifndef LINE_NUMBER_TO_INDEX
#define LINE_NUMBER_TO_INDEX(p_line) ((p_line)-1) #define LINE_NUMBER_TO_INDEX(p_line) ((p_line) - 1)
#endif #endif
#ifndef SYMBOL_SEPERATOR #ifndef SYMBOL_SEPERATOR

2
modules/layered_tile_map/editor/layered_tile_data_editors.cpp
View File

@ -1083,7 +1083,7 @@ void TileDataDefaultEditor::forward_draw_over_atlas(LayeredTileAtlasView *p_tile
} }
}; };
void TileDataDefaultEditor::forward_draw_over_alternatives(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_set_atlas_source, CanvasItem *p_canvas_item, Transform2D p_transform){ void TileDataDefaultEditor::forward_draw_over_alternatives(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_set_atlas_source, CanvasItem *p_canvas_item, Transform2D p_transform) {
}; };

12
modules/layered_tile_map/editor/layered_tile_data_editors.h
View File

@ -54,7 +54,7 @@ private:
protected: protected:
Ref<LayeredTileSet> tile_set; Ref<LayeredTileSet> tile_set;
LayeredTileData *_get_tile_data(LayeredTileMapCell p_cell); LayeredTileData *_get_tile_data(LayeredTileMapCell p_cell);
virtual void _tile_set_changed(){}; virtual void _tile_set_changed() {};
static void _bind_methods(); static void _bind_methods();
@ -63,13 +63,13 @@ public:
// Input to handle painting. // Input to handle painting.
virtual Control *get_toolbar() { return nullptr; }; virtual Control *get_toolbar() { return nullptr; };
virtual void forward_draw_over_atlas(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, CanvasItem *p_canvas_item, Transform2D p_transform){}; virtual void forward_draw_over_atlas(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, CanvasItem *p_canvas_item, Transform2D p_transform) {};
virtual void forward_draw_over_alternatives(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, CanvasItem *p_canvas_item, Transform2D p_transform){}; virtual void forward_draw_over_alternatives(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, CanvasItem *p_canvas_item, Transform2D p_transform) {};
virtual void forward_painting_atlas_gui_input(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, const Ref<InputEvent> &p_event){}; virtual void forward_painting_atlas_gui_input(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, const Ref<InputEvent> &p_event) {};
virtual void forward_painting_alternatives_gui_input(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, const Ref<InputEvent> &p_event){}; virtual void forward_painting_alternatives_gui_input(LayeredTileAtlasView *p_tile_atlas_view, LayeredTileSetAtlasSource *p_tile_atlas_source, const Ref<InputEvent> &p_event) {};
// Used to draw the tile data property value over a tile. // Used to draw the tile data property value over a tile.
virtual void draw_over_tile(CanvasItem *p_canvas_item, Transform2D p_transform, LayeredTileMapCell p_cell, bool p_selected = false){}; virtual void draw_over_tile(CanvasItem *p_canvas_item, Transform2D p_transform, LayeredTileMapCell p_cell, bool p_selected = false) {};
}; };
class DummyObject : public Object { class DummyObject : public Object {

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

@ -71,9 +71,9 @@ public:
}; };
virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) { return false; }; virtual bool forward_canvas_gui_input(const Ref<InputEvent> &p_event) { return false; };
virtual void forward_canvas_draw_over_viewport(Control *p_overlay){}; virtual void forward_canvas_draw_over_viewport(Control *p_overlay) {};
virtual void tile_set_changed(){}; virtual void tile_set_changed() {};
virtual void edit(ObjectID p_tile_map_layer_id){}; virtual void edit(ObjectID p_tile_map_layer_id) {};
}; };
class LayeredTileMapLayerEditorTilesPlugin : public LayeredTileMapLayerSubEditorPlugin { class LayeredTileMapLayerEditorTilesPlugin : public LayeredTileMapLayerSubEditorPlugin {

2
modules/layered_tile_map/layered_tile_map_layer.h
View File

@ -99,7 +99,7 @@ public:
TerrainConstraint(Ref<LayeredTileSet> p_tile_set, const Vector2i &p_position, int p_terrain); // For the center terrain bit TerrainConstraint(Ref<LayeredTileSet> p_tile_set, const Vector2i &p_position, int p_terrain); // For the center terrain bit
TerrainConstraint(Ref<LayeredTileSet> p_tile_set, const Vector2i &p_position, const LayeredTileSet::CellNeighbor &p_bit, int p_terrain); // For peering bits TerrainConstraint(Ref<LayeredTileSet> p_tile_set, const Vector2i &p_position, const LayeredTileSet::CellNeighbor &p_bit, int p_terrain); // For peering bits
TerrainConstraint(){}; TerrainConstraint() {};
}; };
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED

44
modules/layered_tile_map/layered_tile_set.h
View File

@ -590,35 +590,35 @@ public:
virtual void set_tile_set(const LayeredTileSet *p_tile_set); virtual void set_tile_set(const LayeredTileSet *p_tile_set);
LayeredTileSet *get_tile_set() const; LayeredTileSet *get_tile_set() const;
virtual void notify_tile_data_properties_should_change(){}; virtual void notify_tile_data_properties_should_change() {};
virtual void add_occlusion_layer(int p_index){}; virtual void add_occlusion_layer(int p_index) {};
virtual void move_occlusion_layer(int p_from_index, int p_to_pos){}; virtual void move_occlusion_layer(int p_from_index, int p_to_pos) {};
virtual void remove_occlusion_layer(int p_index){}; virtual void remove_occlusion_layer(int p_index) {};
virtual void add_physics_layer(int p_index){}; virtual void add_physics_layer(int p_index) {};
virtual void move_physics_layer(int p_from_index, int p_to_pos){}; virtual void move_physics_layer(int p_from_index, int p_to_pos) {};
virtual void remove_physics_layer(int p_index){}; virtual void remove_physics_layer(int p_index) {};
virtual void add_terrain_set(int p_index){}; virtual void add_terrain_set(int p_index) {};
virtual void move_terrain_set(int p_from_index, int p_to_pos){}; virtual void move_terrain_set(int p_from_index, int p_to_pos) {};
virtual void remove_terrain_set(int p_index){}; virtual void remove_terrain_set(int p_index) {};
virtual void add_terrain(int p_terrain_set, int p_index){}; virtual void add_terrain(int p_terrain_set, int p_index) {};
virtual void move_terrain(int p_terrain_set, int p_from_index, int p_to_pos){}; virtual void move_terrain(int p_terrain_set, int p_from_index, int p_to_pos) {};
virtual void remove_terrain(int p_terrain_set, int p_index){}; virtual void remove_terrain(int p_terrain_set, int p_index) {};
virtual void add_navigation_layer(int p_index){}; virtual void add_navigation_layer(int p_index) {};
virtual void move_navigation_layer(int p_from_index, int p_to_pos){}; virtual void move_navigation_layer(int p_from_index, int p_to_pos) {};
virtual void remove_navigation_layer(int p_index){}; virtual void remove_navigation_layer(int p_index) {};
virtual void add_avoidance_layer(int p_index){}; virtual void add_avoidance_layer(int p_index) {};
virtual void move_avoidance_layer(int p_from_index, int p_to_pos){}; virtual void move_avoidance_layer(int p_from_index, int p_to_pos) {};
virtual void remove_avoidance_layer(int p_index){}; virtual void remove_avoidance_layer(int p_index) {};
virtual void add_custom_data_layer(int p_index){}; virtual void add_custom_data_layer(int p_index) {};
virtual void move_custom_data_layer(int p_from_index, int p_to_pos){}; virtual void move_custom_data_layer(int p_from_index, int p_to_pos) {};
virtual void remove_custom_data_layer(int p_index){}; virtual void remove_custom_data_layer(int p_index) {};
virtual void reset_state(); virtual void reset_state();

2
modules/navigation/nav_base.h
View File

@ -69,7 +69,7 @@ public:
enter_cost = 0.0; enter_cost = 0.0;
travel_cost = 1.0; travel_cost = 1.0;
}; };
virtual ~NavBase(){}; virtual ~NavBase() {};
}; };
#endif // NAV_BASE_H #endif // NAV_BASE_H

6
modules/navigation_dummy/dummy_navigation_server.h
View File

@ -153,11 +153,11 @@ public:
virtual void obstacle_set_vertices(RID p_obstacle, const Vector<Vector3> &p_vertices) {} virtual void obstacle_set_vertices(RID p_obstacle, const Vector<Vector3> &p_vertices) {}
virtual void obstacle_set_avoidance_layers(RID p_obstacle, uint32_t p_layers) {} virtual void obstacle_set_avoidance_layers(RID p_obstacle, uint32_t p_layers) {}
virtual void free(RID p_object){}; virtual void free(RID p_object) {};
virtual void set_active(bool p_active){}; virtual void set_active(bool p_active) {};
virtual void process(real_t delta_time){}; virtual void process(real_t delta_time) {};
virtual int get_process_info(ProcessInfo p_info) const { return 0; }; virtual int get_process_info(ProcessInfo p_info) const { return 0; };

4
modules/network_synchronizer/compat_object_id.h
View File

@ -38,9 +38,9 @@ struct CompatObjectID {
uint64_t id; uint64_t id;
CompatObjectID() : CompatObjectID() :
id(0){}; id(0) {};
CompatObjectID(uint64_t p_id) : CompatObjectID(uint64_t p_id) :
id(p_id){}; id(p_id) {};
operator uint64_t() const { return id; } operator uint64_t() const { return id; }

4
modules/pvr/texture_loader_pvr.cpp
View File

@ -205,14 +205,14 @@ ResourceFormatPVR::ResourceFormatPVR() {
#define BLK_X_2BPP 8 #define BLK_X_2BPP 8
#define BLK_X_4BPP 4 #define BLK_X_4BPP 4
#define WRAP_COORD(Val, Size) ((Val) & ((Size)-1)) #define WRAP_COORD(Val, Size) ((Val) & ((Size) - 1))
/* /*
Define an expression to either wrap or clamp large or small vals to the Define an expression to either wrap or clamp large or small vals to the
legal coordinate range legal coordinate range
*/ */
#define LIMIT_COORD(Val, Size, p_tiled) \ #define LIMIT_COORD(Val, Size, p_tiled) \
((p_tiled) ? WRAP_COORD((Val), (Size)) : CLAMP((Val), 0, (Size)-1)) ((p_tiled) ? WRAP_COORD((Val), (Size)) : CLAMP((Val), 0, (Size) - 1))
struct PVRTCBlock { struct PVRTCBlock {
//blocks are 64 bits //blocks are 64 bits

4
modules/skeleton_2d/nodes/skeleton_2d.cpp
View File

@ -34,9 +34,8 @@
#include "../resources/skeleton_modification_2d.h" #include "../resources/skeleton_modification_2d.h"
#include "../resources/skeleton_modification_stack_2d.h" #include "../resources/skeleton_modification_stack_2d.h"
#include "core/config/engine.h" #include "core/config/engine.h"
#include "scene/main/scene_string_names.h"
#include "core/config/engine.h"
#include "core/math/transform_interpolator.h" #include "core/math/transform_interpolator.h"
#include "scene/main/scene_string_names.h"
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
#include "editor/editor_data.h" #include "editor/editor_data.h"
@ -749,7 +748,6 @@ void Skeleton2D::_notification(int p_what) {
} }
} }
RID Skeleton2D::get_skeleton() const { RID Skeleton2D::get_skeleton() const {
return skeleton; return skeleton;
} }

2
modules/theora/video_stream_theora.cpp
View File

@ -578,7 +578,7 @@ bool VideoStreamPlaybackTheora::is_paused() const {
return paused; return paused;
}; };
void VideoStreamPlaybackTheora::set_loop(bool p_enable){ void VideoStreamPlaybackTheora::set_loop(bool p_enable) {
}; };

59
modules/xatlas_unwrap/register_types.cpp
View File

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

59
modules/xatlas_unwrap/register_types.h
View File

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

2143
modules/xatlas_unwrap/xatlas/xatlas.cpp
View File

File diff suppressed because it is too large Load Diff

67
modules/xatlas_unwrap/xatlas/xatlas.h
View File

@ -1,3 +1,34 @@
/*************************************************************************/
/* xatlas.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. */
/*************************************************************************/
/* /*
MIT License MIT License
@ -36,8 +67,7 @@ Copyright NVIDIA Corporation 2006 -- Ignacio Castano <icastano@nvidia.com>
namespace xatlas { namespace xatlas {
enum class ChartType enum class ChartType {
{
Planar, Planar,
Ortho, Ortho,
LSCM, LSCM,
@ -46,8 +76,7 @@ enum class ChartType
}; };
// A group of connected faces, belonging to a single atlas. // A group of connected faces, belonging to a single atlas.
struct Chart struct Chart {
{
uint32_t *faceArray; uint32_t *faceArray;
uint32_t atlasIndex; // Sub-atlas index. uint32_t atlasIndex; // Sub-atlas index.
uint32_t faceCount; uint32_t faceCount;
@ -56,8 +85,7 @@ struct Chart
}; };
// Output vertex. // Output vertex.
struct Vertex struct Vertex {
{
int32_t atlasIndex; // Sub-atlas index. -1 if the vertex doesn't exist in any atlas. int32_t atlasIndex; // Sub-atlas index. -1 if the vertex doesn't exist in any atlas.
int32_t chartIndex; // -1 if the vertex doesn't exist in any chart. int32_t chartIndex; // -1 if the vertex doesn't exist in any chart.
float uv[2]; // Not normalized - values are in Atlas width and height range. float uv[2]; // Not normalized - values are in Atlas width and height range.
@ -65,8 +93,7 @@ struct Vertex
}; };
// Output mesh. // Output mesh.
struct Mesh struct Mesh {
{
Chart *chartArray; Chart *chartArray;
uint32_t *indexArray; uint32_t *indexArray;
Vertex *vertexArray; Vertex *vertexArray;
@ -81,8 +108,7 @@ static const uint32_t kImageIsBilinearBit = 0x40000000;
static const uint32_t kImageIsPaddingBit = 0x20000000; static const uint32_t kImageIsPaddingBit = 0x20000000;
// Empty on creation. Populated after charts are packed. // Empty on creation. Populated after charts are packed.
struct Atlas struct Atlas {
{
uint32_t *image; uint32_t *image;
Mesh *meshes; // The output meshes, corresponding to each AddMesh call. Mesh *meshes; // The output meshes, corresponding to each AddMesh call.
float *utilization; // Normalized atlas texel utilization array. E.g. a value of 0.8 means 20% empty space. atlasCount in length. float *utilization; // Normalized atlas texel utilization array. E.g. a value of 0.8 means 20% empty space. atlasCount in length.
@ -99,15 +125,13 @@ Atlas *Create();
void Destroy(Atlas *atlas); void Destroy(Atlas *atlas);
enum class IndexFormat enum class IndexFormat {
{
UInt16, UInt16,
UInt32 UInt32
}; };
// Input mesh declaration. // Input mesh declaration.
struct MeshDecl struct MeshDecl {
{
const void *vertexPositionData = nullptr; const void *vertexPositionData = nullptr;
const void *vertexNormalData = nullptr; // optional const void *vertexNormalData = nullptr; // optional
const void *vertexUvData = nullptr; // optional. The input UVs are provided as a hint to the chart generator. const void *vertexUvData = nullptr; // optional. The input UVs are provided as a hint to the chart generator.
@ -138,8 +162,7 @@ struct MeshDecl
float epsilon = 1.192092896e-07F; float epsilon = 1.192092896e-07F;
}; };
enum class AddMeshError enum class AddMeshError {
{
Success, // No error. Success, // No error.
Error, // Unspecified error. Error, // Unspecified error.
IndexOutOfRange, // An index is >= MeshDecl vertexCount. IndexOutOfRange, // An index is >= MeshDecl vertexCount.
@ -153,8 +176,7 @@ AddMeshError AddMesh(Atlas *atlas, const MeshDecl &meshDecl, uint32_t meshCountH
// Wait for AddMesh async processing to finish. ComputeCharts / Generate call this internally. // Wait for AddMesh async processing to finish. ComputeCharts / Generate call this internally.
void AddMeshJoin(Atlas *atlas); void AddMeshJoin(Atlas *atlas);
struct UvMeshDecl struct UvMeshDecl {
{
const void *vertexUvData = nullptr; const void *vertexUvData = nullptr;
const void *indexData = nullptr; // optional const void *indexData = nullptr; // optional
const uint32_t *faceMaterialData = nullptr; // Optional. Overlapping UVs should be assigned a different material. Must be indexCount / 3 in length. const uint32_t *faceMaterialData = nullptr; // Optional. Overlapping UVs should be assigned a different material. Must be indexCount / 3 in length.
@ -170,8 +192,7 @@ AddMeshError AddUvMesh(Atlas *atlas, const UvMeshDecl &decl);
// Custom parameterization function. texcoords initial values are an orthogonal parameterization. // Custom parameterization function. texcoords initial values are an orthogonal parameterization.
typedef void (*ParameterizeFunc)(const float *positions, float *texcoords, uint32_t vertexCount, const uint32_t *indices, uint32_t indexCount); typedef void (*ParameterizeFunc)(const float *positions, float *texcoords, uint32_t vertexCount, const uint32_t *indices, uint32_t indexCount);
struct ChartOptions struct ChartOptions {
{
ParameterizeFunc paramFunc = nullptr; ParameterizeFunc paramFunc = nullptr;
float maxChartArea = 0.0f; // Don't grow charts to be larger than this. 0 means no limit. float maxChartArea = 0.0f; // Don't grow charts to be larger than this. 0 means no limit.
@ -194,8 +215,7 @@ struct ChartOptions
// Call after all AddMesh calls. Can be called multiple times to recompute charts with different options. // Call after all AddMesh calls. Can be called multiple times to recompute charts with different options.
void ComputeCharts(Atlas *atlas, ChartOptions options = ChartOptions()); void ComputeCharts(Atlas *atlas, ChartOptions options = ChartOptions());
struct PackOptions struct PackOptions {
{
// Charts larger than this will be scaled down. 0 means no limit. // Charts larger than this will be scaled down. 0 means no limit.
uint32_t maxChartSize = 0; uint32_t maxChartSize = 0;
@ -238,8 +258,7 @@ void PackCharts(Atlas *atlas, PackOptions packOptions = PackOptions());
void Generate(Atlas *atlas, ChartOptions chartOptions = ChartOptions(), PackOptions packOptions = PackOptions()); void Generate(Atlas *atlas, ChartOptions chartOptions = ChartOptions(), PackOptions packOptions = PackOptions());
// Progress tracking. // Progress tracking.
enum class ProgressCategory enum class ProgressCategory {
{
AddMesh, AddMesh,
ComputeCharts, ComputeCharts,
PackCharts, PackCharts,

2
platform/android/export/export_plugin.cpp
View File

@ -357,7 +357,7 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
d.description += "Chipset: " + p.get_slice("=", 1).strip_edges() + "\n"; d.description += "Chipset: " + p.get_slice("=", 1).strip_edges() + "\n";
} else if (p.begins_with("ro.opengles.version=")) { } else if (p.begins_with("ro.opengles.version=")) {
uint32_t opengl = p.get_slice("=", 1).to_int(); uint32_t opengl = p.get_slice("=", 1).to_int();
d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl)&0xFF) + "\n"; d.description += "OpenGL: " + itos(opengl >> 16) + "." + itos((opengl >> 8) & 0xFF) + "." + itos((opengl) & 0xFF) + "\n";
} }
} }

2
platform/android/java/lib/src/org/pandemoniumengine/pandemonium/plugin/SignalInfo.java
View File

@ -51,7 +51,7 @@ public final class SignalInfo {
} }
this.name = signalName; this.name = signalName;
this.paramTypes = paramTypes == null ? new Class<?>[ 0 ] : paramTypes; this.paramTypes = paramTypes == null ? new Class<?>[0] : paramTypes;
this.paramTypesNames = new String[this.paramTypes.length]; this.paramTypesNames = new String[this.paramTypes.length];
for (int i = 0; i < this.paramTypes.length; i++) { for (int i = 0; i < this.paramTypes.length; i++) {
this.paramTypesNames[i] = this.paramTypes[i].getName(); this.paramTypesNames[i] = this.paramTypes[i].getName();

6
platform/android/os_android.cpp
View File

@ -159,7 +159,7 @@ Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int
bool gl_initialization_error = false; bool gl_initialization_error = false;
while (true) { while (true) {
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
if (use_gl3) { if (use_gl3) {
if (RasterizerGLES3::is_viable() == OK) { if (RasterizerGLES3::is_viable() == OK) {
RasterizerGLES3::register_config(); RasterizerGLES3::register_config();
@ -185,7 +185,7 @@ Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int
break; break;
} }
} }
#else #else
if (use_gl2) { if (use_gl2) {
if (RasterizerGLES2::is_viable() == OK) { if (RasterizerGLES2::is_viable() == OK) {
pandemonium_java->gfx_init(true); pandemonium_java->gfx_init(true);
@ -199,7 +199,7 @@ Error OS_Android::initialize(const VideoMode &p_desired, int p_video_driver, int
} else { } else {
break; break;
} }
#endif #endif
} }
transparency_enabled = p_desired.layered; transparency_enabled = p_desired.layered;

2
platform/frt/import/key_mapping_x11.h
View File

@ -45,7 +45,7 @@
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
class KeyMappingX11 { class KeyMappingX11 {
KeyMappingX11(){}; KeyMappingX11() {};
public: public:
static unsigned int get_keycode(KeySym p_keysym); static unsigned int get_keycode(KeySym p_keysym);

3
platform/frt_sdl/frt.h
View File

@ -51,7 +51,6 @@ void warn(const char *format, ...);
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
[[noreturn]] [[noreturn]]
#endif #endif
void void fatal(const char *format, ...);
fatal(const char *format, ...);
} // namespace frt } // namespace frt

2
platform/iphone/ios.mm
View File

@ -179,4 +179,4 @@ String iOS::get_rate_url(int p_app_id) const {
return ret; return ret;
}; };
iOS::iOS(){}; iOS::iOS() {};

5
platform/javascript/os_javascript.cpp
View File

@ -761,8 +761,8 @@ const char *OS_JavaScript::get_video_driver_name(int p_driver) const {
case VIDEO_DRIVER_GLES2: case VIDEO_DRIVER_GLES2:
return "GLES2"; return "GLES2";
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
case VIDEO_DRIVER_GLES3: case VIDEO_DRIVER_GLES3:
return "GLES3"; return "GLES3";
#endif #endif
} }
ERR_FAIL_V_MSG(NULL, "Invalid video driver index: " + itos(p_driver) + "."); ERR_FAIL_V_MSG(NULL, "Invalid video driver index: " + itos(p_driver) + ".");
@ -827,7 +827,6 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver,
set_window_per_pixel_transparency_enabled(true); set_window_per_pixel_transparency_enabled(true);
} }
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
bool gles3 = true; bool gles3 = true;
if (p_video_driver == VIDEO_DRIVER_GLES2) { if (p_video_driver == VIDEO_DRIVER_GLES2) {

59
platform/javascript/pandemonium_webgl2.cpp
View File

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

59
platform/javascript/pandemonium_webgl2.h
View File

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

1
platform/javascript/platform_config.h
View File

@ -34,4 +34,3 @@
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
#define GLES3_INCLUDE_H "platform/javascript/godot_webgl2.h" #define GLES3_INCLUDE_H "platform/javascript/godot_webgl2.h"
#endif #endif

4
platform/osx/os_osx.mm
View File

@ -1759,7 +1759,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
if (p_desired.fullscreen) if (p_desired.fullscreen)
zoomed = true; zoomed = true;
/*** END OSX INITIALIZATION ***/ /*** END OSX INITIALIZATION ***/
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
bool gles3 = true; bool gles3 = true;
@ -2155,7 +2155,7 @@ void OS_OSX::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, c
uint8_t alpha = (color >> 24) & 0xFF; uint8_t alpha = (color >> 24) & 0xFF;
pixels[i * 4 + 0] = ((color >> 16) & 0xFF) * alpha / 255; pixels[i * 4 + 0] = ((color >> 16) & 0xFF) * alpha / 255;
pixels[i * 4 + 1] = ((color >> 8) & 0xFF) * alpha / 255; pixels[i * 4 + 1] = ((color >> 8) & 0xFF) * alpha / 255;
pixels[i * 4 + 2] = ((color)&0xFF) * alpha / 255; pixels[i * 4 + 2] = ((color) & 0xFF) * alpha / 255;
pixels[i * 4 + 3] = alpha; pixels[i * 4 + 3] = alpha;
} }

1
platform/uwp/os_uwp.cpp
View File

@ -200,7 +200,6 @@ Error OS_UWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
} }
while (true) { while (true) {
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
if (opengl_api_type == ContextEGL_UWP::GLES_3_0) { if (opengl_api_type == ContextEGL_UWP::GLES_3_0) {
if (RasterizerGLES3::is_viable() == OK) { if (RasterizerGLES3::is_viable() == OK) {

2
platform/windows/key_mapping_windows.h
View File

@ -39,7 +39,7 @@
#include <winuser.h> #include <winuser.h>
class KeyMappingWindows { class KeyMappingWindows {
KeyMappingWindows(){}; KeyMappingWindows() {};
public: public:
static unsigned int get_keysym(unsigned int p_code); static unsigned int get_keysym(unsigned int p_code);

Some files were not shown because too many files have changed in this diff Show More