From 83871fc6e056c06aefa551f035756dc3710d3cb5 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 8 Sep 2024 16:52:38 +0200 Subject: [PATCH] Clang format everything. --- .../procedural_tree_mesh.cpp | 48 +++++++++++++++---- .../procedural_tree_3d/procedural_tree_mesh.h | 31 ++++++++++++ modules/procedural_tree_3d/register_types.cpp | 30 ++++++++++++ modules/procedural_tree_3d/register_types.h | 31 ++++++++++++ .../pandemonium/Pandemonium.java | 2 +- .../pandemonium/tts/PandemoniumTTS.java | 11 +++-- .../pandemonium/tts/PandemoniumUtterance.java | 11 +++-- platform/android/tts_android.cpp | 9 ++-- platform/android/tts_android.h | 13 ++--- platform/iphone/tts_ios.h | 11 +++-- platform/iphone/tts_ios.mm | 9 ++-- platform/javascript/os_javascript.cpp | 2 +- platform/osx/tts_osx.h | 11 +++-- platform/osx/tts_osx.mm | 9 ++-- platform/windows/tts_windows.cpp | 9 ++-- platform/windows/tts_windows.h | 11 +++-- platform/x11/tts_linux.cpp | 9 ++-- platform/x11/tts_linux.h | 11 +++-- 18 files changed, 200 insertions(+), 68 deletions(-) diff --git a/modules/procedural_tree_3d/procedural_tree_mesh.cpp b/modules/procedural_tree_3d/procedural_tree_mesh.cpp index 856612b12..ed2fbeaa0 100644 --- a/modules/procedural_tree_3d/procedural_tree_mesh.cpp +++ b/modules/procedural_tree_3d/procedural_tree_mesh.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* procedural_tree_mesh.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ +/*************************************************************************/ +/* Copyright (c) 2022-present Péter Magyar. */ +/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "procedural_tree_mesh.h" #include "core/containers/pool_vector.h" @@ -221,7 +251,6 @@ void ProceduralTreeMesh::set_flip_twig_mesh_faces(const bool p_value) { } void ProceduralTreeMesh::_update() const { - RenderingServer::get_singleton()->mesh_clear(mesh); for (int i = 0; i < TREE_SURFACE_COUNT; ++i) { @@ -307,7 +336,7 @@ void ProceduralTreeMesh::_update() const { } } - PoolVector indices; + PoolVector indices; int face_count = tree.mTwigFaceCount; @@ -343,7 +372,7 @@ void ProceduralTreeMesh::_update() const { PoolVector::Read r = verts.read(); if (vert_count > 0) { - aabb.position = r[0]; + aabb.position = r[0]; } for (int i = 1; i < vert_count; ++i) { @@ -405,7 +434,7 @@ void ProceduralTreeMesh::_update() const { } } - PoolVector indices; + PoolVector indices; int face_count = tree.mFaceCount; @@ -445,7 +474,7 @@ void ProceduralTreeMesh::_update() const { } for (int i = 0; i < vert_count; ++i) { - aabb.expand_to(r[i]); + aabb.expand_to(r[i]); } } @@ -456,7 +485,6 @@ void ProceduralTreeMesh::_update() const { arr[RS::ARRAY_NORMAL] = normals; arr[RS::ARRAY_INDEX] = indices; - RenderingServer::get_singleton()->mesh_add_surface_from_arrays(mesh, RenderingServer::PRIMITIVE_TRIANGLES, arr); int sc = RenderingServer::get_singleton()->mesh_get_surface_count(mesh) - 1; _surfaces[TREE_SURFACE_TRUNK].surface_index = sc; @@ -742,7 +770,7 @@ ProceduralTreeMesh::~ProceduralTreeMesh() { } void ProceduralTreeMesh::_bind_methods() { - ADD_GROUP("General", ""); + ADD_GROUP("General", ""); ClassDB::bind_method(D_METHOD("get_seed"), &ProceduralTreeMesh::get_seed); ClassDB::bind_method(D_METHOD("set_seed", "value"), &ProceduralTreeMesh::set_seed); ADD_PROPERTY(PropertyInfo(Variant::INT, "seed"), "set_seed", "get_seed"); @@ -767,7 +795,7 @@ void ProceduralTreeMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_twig_scale", "value"), &ProceduralTreeMesh::set_twig_scale); ADD_PROPERTY(PropertyInfo(Variant::REAL, "twig_scale", PROPERTY_HINT_RANGE, "0.01,2,0.01"), "set_twig_scale", "get_twig_scale"); - ADD_GROUP("Branching", "branching"); + ADD_GROUP("Branching", "branching"); ClassDB::bind_method(D_METHOD("branching_get_initial_length"), &ProceduralTreeMesh::branching_get_initial_length); ClassDB::bind_method(D_METHOD("branching_set_initial_length", "value"), &ProceduralTreeMesh::branching_set_initial_length); ADD_PROPERTY(PropertyInfo(Variant::REAL, "branching_initial_length", PROPERTY_HINT_RANGE, "0.01,5,0.001"), "branching_set_initial_length", "branching_get_initial_length"); @@ -804,7 +832,7 @@ void ProceduralTreeMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("branching_set_sweep", "value"), &ProceduralTreeMesh::branching_set_sweep); ADD_PROPERTY(PropertyInfo(Variant::REAL, "branching_sweep", PROPERTY_HINT_RANGE, "-1,1,0.001"), "branching_set_sweep", "branching_get_sweep"); - ADD_GROUP("Trunk", "trunk"); + ADD_GROUP("Trunk", "trunk"); ClassDB::bind_method(D_METHOD("trunk_get_radius"), &ProceduralTreeMesh::trunk_get_radius); ClassDB::bind_method(D_METHOD("trunk_set_radius", "value"), &ProceduralTreeMesh::trunk_set_radius); ADD_PROPERTY(PropertyInfo(Variant::REAL, "trunk_radius", PROPERTY_HINT_RANGE, "0.01,0.5,0.001"), "trunk_set_radius", "trunk_get_radius"); @@ -833,7 +861,7 @@ void ProceduralTreeMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("trunk_set_length", "value"), &ProceduralTreeMesh::trunk_set_length); ADD_PROPERTY(PropertyInfo(Variant::REAL, "trunk_length", PROPERTY_HINT_RANGE, "0.01,50,0.001"), "trunk_set_length", "trunk_get_length"); - ADD_GROUP("Mesh", ""); + ADD_GROUP("Mesh", ""); ClassDB::bind_method(D_METHOD("_update"), &ProceduralTreeMesh::_update); diff --git a/modules/procedural_tree_3d/procedural_tree_mesh.h b/modules/procedural_tree_3d/procedural_tree_mesh.h index ba7911e21..70a31ab7d 100644 --- a/modules/procedural_tree_3d/procedural_tree_mesh.h +++ b/modules/procedural_tree_3d/procedural_tree_mesh.h @@ -1,6 +1,37 @@ #ifndef PROCEDURAL_TREE_3D_MESH_H #define PROCEDURAL_TREE_3D_MESH_H +/*************************************************************************/ +/* procedural_tree_mesh.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. */ +/*************************************************************************/ + #include "scene/resources/mesh/mesh.h" class ProceduralTreeMesh : public Mesh { diff --git a/modules/procedural_tree_3d/register_types.cpp b/modules/procedural_tree_3d/register_types.cpp index 9624d6fb8..3066fd93e 100644 --- a/modules/procedural_tree_3d/register_types.cpp +++ b/modules/procedural_tree_3d/register_types.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* register_types.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ +/*************************************************************************/ +/* Copyright (c) 2022-present Péter Magyar. */ +/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #include "register_types.h" diff --git a/modules/procedural_tree_3d/register_types.h b/modules/procedural_tree_3d/register_types.h index ac00a231c..abc89898c 100644 --- a/modules/procedural_tree_3d/register_types.h +++ b/modules/procedural_tree_3d/register_types.h @@ -1,6 +1,37 @@ #ifndef PROCEDURAL_TREE_3D_REGISTER_TYPES_H #define PROCEDURAL_TREE_3D_REGISTER_TYPES_H +/*************************************************************************/ +/* register_types.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. */ +/*************************************************************************/ + #include "modules/register_module_types.h" void register_procedural_tree_3d_types(ModuleRegistrationLevel p_level); diff --git a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Pandemonium.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Pandemonium.java index 9f43461f8..5f85cba09 100644 --- a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Pandemonium.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/Pandemonium.java @@ -40,10 +40,10 @@ import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler; import org.pandemoniumengine.pandemonium.io.file.FileAccessHandler; import org.pandemoniumengine.pandemonium.plugin.PandemoniumPlugin; import org.pandemoniumengine.pandemonium.plugin.PandemoniumPluginRegistry; +import org.pandemoniumengine.pandemonium.tts.PandemoniumTTS; import org.pandemoniumengine.pandemonium.utils.BenchmarkUtils; import org.pandemoniumengine.pandemonium.utils.PandemoniumNetUtils; import org.pandemoniumengine.pandemonium.utils.PermissionsUtil; -import org.pandemoniumengine.pandemonium.tts.PandemoniumTTS; import android.annotation.SuppressLint; import android.app.Activity; diff --git a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumTTS.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumTTS.java index 7e646c405..2a0d79ff7 100644 --- a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumTTS.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumTTS.java @@ -1,12 +1,13 @@ /*************************************************************************/ -/* PandemoniumTTS.java */ +/* PandemoniumTTS.java */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumUtterance.java b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumUtterance.java index 8b710cae9..61367b89b 100644 --- a/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumUtterance.java +++ b/platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumUtterance.java @@ -1,12 +1,13 @@ /*************************************************************************/ -/* PandemoniumUtterance.java */ +/* PandemoniumUtterance.java */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/android/tts_android.cpp b/platform/android/tts_android.cpp index 175ab106d..e9c785876 100644 --- a/platform/android/tts_android.cpp +++ b/platform/android/tts_android.cpp @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_android.cpp */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/android/tts_android.h b/platform/android/tts_android.h index 5a1cde260..31a23b21c 100644 --- a/platform/android/tts_android.h +++ b/platform/android/tts_android.h @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_android.h */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -31,10 +32,10 @@ #ifndef TTS_ANDROID_H #define TTS_ANDROID_H -#include "core/variant/array.h" -#include "core/os/os.h" #include "core/config/project_settings.h" +#include "core/os/os.h" #include "core/string/ustring.h" +#include "core/variant/array.h" #include diff --git a/platform/iphone/tts_ios.h b/platform/iphone/tts_ios.h index 2ce98db14..4fa60e075 100644 --- a/platform/iphone/tts_ios.h +++ b/platform/iphone/tts_ios.h @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_ios.h */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -37,11 +38,11 @@ #import #endif -#include "core/variant/array.h" #include "core/containers/list.h" #include "core/containers/rb_map.h" #include "core/os/os.h" #include "core/string/ustring.h" +#include "core/variant/array.h" @interface TTS_IOS : NSObject { bool speaking; diff --git a/platform/iphone/tts_ios.mm b/platform/iphone/tts_ios.mm index e867094d2..4e64a1505 100644 --- a/platform/iphone/tts_ios.mm +++ b/platform/iphone/tts_ios.mm @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_ios.mm */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 4795237b3..b7c671334 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -31,8 +31,8 @@ #include "os_javascript.h" -#include "core/io/json.h" #include "core/config/project_settings.h" +#include "core/io/json.h" #include "drivers/gles2/rasterizer_gles2.h" #ifndef GLES3_DISABLED #include "drivers/gles3/rasterizer_gles3.h" diff --git a/platform/osx/tts_osx.h b/platform/osx/tts_osx.h index b4103f964..ca41e1f5c 100644 --- a/platform/osx/tts_osx.h +++ b/platform/osx/tts_osx.h @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_osx.h */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -31,11 +32,11 @@ #ifndef TTS_OSX_H #define TTS_OSX_H -#include "core/variant/array.h" #include "core/containers/list.h" #include "core/containers/rb_map.h" #include "core/os/os.h" #include "core/string/ustring.h" +#include "core/variant/array.h" #import diff --git a/platform/osx/tts_osx.mm b/platform/osx/tts_osx.mm index 10149cdba..ff3a13f59 100644 --- a/platform/osx/tts_osx.mm +++ b/platform/osx/tts_osx.mm @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_osx.mm */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/windows/tts_windows.cpp b/platform/windows/tts_windows.cpp index d9a0d29b9..b29e2646e 100644 --- a/platform/windows/tts_windows.cpp +++ b/platform/windows/tts_windows.cpp @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_windows.cpp */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/windows/tts_windows.h b/platform/windows/tts_windows.h index 881731e74..0cd5f6dbc 100644 --- a/platform/windows/tts_windows.h +++ b/platform/windows/tts_windows.h @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_windows.h */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -31,11 +32,11 @@ #ifndef TTS_WINDOWS_H #define TTS_WINDOWS_H -#include "core/variant/array.h" #include "core/containers/list.h" #include "core/containers/rb_map.h" #include "core/os/os.h" #include "core/string/ustring.h" +#include "core/variant/array.h" #include #include diff --git a/platform/x11/tts_linux.cpp b/platform/x11/tts_linux.cpp index dc8c79c6f..ba7d3102f 100644 --- a/platform/x11/tts_linux.cpp +++ b/platform/x11/tts_linux.cpp @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_linux.cpp */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/x11/tts_linux.h b/platform/x11/tts_linux.h index e24c0a639..3e55fd067 100644 --- a/platform/x11/tts_linux.h +++ b/platform/x11/tts_linux.h @@ -1,12 +1,13 @@ /*************************************************************************/ /* tts_linux.h */ /*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* This file is part of: */ +/* PANDEMONIUM ENGINE */ +/* https://github.com/Relintai/pandemonium_engine */ /*************************************************************************/ -/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2022-present Péter Magyar. */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -31,13 +32,13 @@ #ifndef TTS_LINUX_H #define TTS_LINUX_H -#include "core/variant/array.h" #include "core/containers/list.h" #include "core/containers/rb_map.h" #include "core/os/os.h" #include "core/os/thread.h" #include "core/os/thread_safe.h" #include "core/string/ustring.h" +#include "core/variant/array.h" #include "speechd-so_wrap.h"