Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-11-21 16:37:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clang format everything.

Browse Source
This commit is contained in:
Relintai 2024-09-08 16:52:38 +02:00
parent 5e1ca95e7f
commit 83871fc6e0
18 changed files with 200 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
modules/procedural_tree_3d/procedural_tree_mesh.cpp
View File

@ -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 "procedural_tree_mesh.h"
#include "core/containers/pool_vector.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 { void ProceduralTreeMesh::_update() const {
RenderingServer::get_singleton()->mesh_clear(mesh); RenderingServer::get_singleton()->mesh_clear(mesh);
for (int i = 0; i < TREE_SURFACE_COUNT; ++i) { for (int i = 0; i < TREE_SURFACE_COUNT; ++i) {
@ -307,7 +336,7 @@ void ProceduralTreeMesh::_update() const {
} }
} }
PoolVector<int> indices; PoolVector<int> indices;
int face_count = tree.mTwigFaceCount; int face_count = tree.mTwigFaceCount;
@ -343,7 +372,7 @@ void ProceduralTreeMesh::_update() const {
PoolVector<Vector3>::Read r = verts.read(); PoolVector<Vector3>::Read r = verts.read();
if (vert_count > 0) { if (vert_count > 0) {
aabb.position = r[0]; aabb.position = r[0];
} }
for (int i = 1; i < vert_count; ++i) { for (int i = 1; i < vert_count; ++i) {
@ -405,7 +434,7 @@ void ProceduralTreeMesh::_update() const {
} }
} }
PoolVector<int> indices; PoolVector<int> indices;
int face_count = tree.mFaceCount; int face_count = tree.mFaceCount;
@ -445,7 +474,7 @@ void ProceduralTreeMesh::_update() const {
} }
for (int i = 0; i < vert_count; ++i) { 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_NORMAL] = normals;
arr[RS::ARRAY_INDEX] = indices; arr[RS::ARRAY_INDEX] = indices;
RenderingServer::get_singleton()->mesh_add_surface_from_arrays(mesh, RenderingServer::PRIMITIVE_TRIANGLES, arr); RenderingServer::get_singleton()->mesh_add_surface_from_arrays(mesh, RenderingServer::PRIMITIVE_TRIANGLES, arr);
int sc = RenderingServer::get_singleton()->mesh_get_surface_count(mesh) - 1; int sc = RenderingServer::get_singleton()->mesh_get_surface_count(mesh) - 1;
_surfaces[TREE_SURFACE_TRUNK].surface_index = sc; _surfaces[TREE_SURFACE_TRUNK].surface_index = sc;
@ -742,7 +770,7 @@ ProceduralTreeMesh::~ProceduralTreeMesh() {
} }
void ProceduralTreeMesh::_bind_methods() { 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("get_seed"), &ProceduralTreeMesh::get_seed);
ClassDB::bind_method(D_METHOD("set_seed", "value"), &ProceduralTreeMesh::set_seed); ClassDB::bind_method(D_METHOD("set_seed", "value"), &ProceduralTreeMesh::set_seed);
ADD_PROPERTY(PropertyInfo(Variant::INT, "seed"), "set_seed", "get_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); 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_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_get_initial_length"), &ProceduralTreeMesh::branching_get_initial_length);
ClassDB::bind_method(D_METHOD("branching_set_initial_length", "value"), &ProceduralTreeMesh::branching_set_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"); 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); 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_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_get_radius"), &ProceduralTreeMesh::trunk_get_radius);
ClassDB::bind_method(D_METHOD("trunk_set_radius", "value"), &ProceduralTreeMesh::trunk_set_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"); 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); 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_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); ClassDB::bind_method(D_METHOD("_update"), &ProceduralTreeMesh::_update);

31
modules/procedural_tree_3d/procedural_tree_mesh.h
View File

@ -1,6 +1,37 @@
#ifndef PROCEDURAL_TREE_3D_MESH_H #ifndef PROCEDURAL_TREE_3D_MESH_H
#define 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" #include "scene/resources/mesh/mesh.h"
class ProceduralTreeMesh : public Mesh { class ProceduralTreeMesh : public Mesh {

30
modules/procedural_tree_3d/register_types.cpp
View File

@ -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" #include "register_types.h"

31
modules/procedural_tree_3d/register_types.h
View File

@ -1,6 +1,37 @@
#ifndef PROCEDURAL_TREE_3D_REGISTER_TYPES_H #ifndef PROCEDURAL_TREE_3D_REGISTER_TYPES_H
#define 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" #include "modules/register_module_types.h"
void register_procedural_tree_3d_types(ModuleRegistrationLevel p_level); void register_procedural_tree_3d_types(ModuleRegistrationLevel p_level);

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

@ -40,10 +40,10 @@ import org.pandemoniumengine.pandemonium.io.directory.DirectoryAccessHandler;
import org.pandemoniumengine.pandemonium.io.file.FileAccessHandler; import org.pandemoniumengine.pandemonium.io.file.FileAccessHandler;
import org.pandemoniumengine.pandemonium.plugin.PandemoniumPlugin; import org.pandemoniumengine.pandemonium.plugin.PandemoniumPlugin;
import org.pandemoniumengine.pandemonium.plugin.PandemoniumPluginRegistry; import org.pandemoniumengine.pandemonium.plugin.PandemoniumPluginRegistry;
import org.pandemoniumengine.pandemonium.tts.PandemoniumTTS;
import org.pandemoniumengine.pandemonium.utils.BenchmarkUtils; import org.pandemoniumengine.pandemonium.utils.BenchmarkUtils;
import org.pandemoniumengine.pandemonium.utils.PandemoniumNetUtils; import org.pandemoniumengine.pandemonium.utils.PandemoniumNetUtils;
import org.pandemoniumengine.pandemonium.utils.PermissionsUtil; import org.pandemoniumengine.pandemonium.utils.PermissionsUtil;
import org.pandemoniumengine.pandemonium.tts.PandemoniumTTS;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;

11
platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumTTS.java
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* PandemoniumTTS.java */ /* PandemoniumTTS.java */
/*************************************************************************/ /*************************************************************************/
/* 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 */

11
platform/android/java/lib/src/org/pandemoniumengine/pandemonium/tts/PandemoniumUtterance.java
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* PandemoniumUtterance.java */ /* PandemoniumUtterance.java */
/*************************************************************************/ /*************************************************************************/
/* 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 */

9
platform/android/tts_android.cpp
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_android.cpp */ /* tts_android.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) 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 */

13
platform/android/tts_android.h
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_android.h */ /* tts_android.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 */
@ -31,10 +32,10 @@
#ifndef TTS_ANDROID_H #ifndef TTS_ANDROID_H
#define 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/config/project_settings.h"
#include "core/os/os.h"
#include "core/string/ustring.h" #include "core/string/ustring.h"
#include "core/variant/array.h"
#include <jni.h> #include <jni.h>

11
platform/iphone/tts_ios.h
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_ios.h */ /* tts_ios.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 */
@ -37,11 +38,11 @@
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>
#endif #endif
#include "core/variant/array.h"
#include "core/containers/list.h" #include "core/containers/list.h"
#include "core/containers/rb_map.h" #include "core/containers/rb_map.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/string/ustring.h" #include "core/string/ustring.h"
#include "core/variant/array.h"
@interface TTS_IOS : NSObject <AVSpeechSynthesizerDelegate> { @interface TTS_IOS : NSObject <AVSpeechSynthesizerDelegate> {
bool speaking; bool speaking;

9
platform/iphone/tts_ios.mm
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_ios.mm */ /* tts_ios.mm */
/*************************************************************************/ /*************************************************************************/
/* 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
platform/javascript/os_javascript.cpp
View File

@ -31,8 +31,8 @@
#include "os_javascript.h" #include "os_javascript.h"
#include "core/io/json.h"
#include "core/config/project_settings.h" #include "core/config/project_settings.h"
#include "core/io/json.h"
#include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles2/rasterizer_gles2.h"
#ifndef GLES3_DISABLED #ifndef GLES3_DISABLED
#include "drivers/gles3/rasterizer_gles3.h" #include "drivers/gles3/rasterizer_gles3.h"

11
platform/osx/tts_osx.h
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_osx.h */ /* tts_osx.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 */
@ -31,11 +32,11 @@
#ifndef TTS_OSX_H #ifndef TTS_OSX_H
#define TTS_OSX_H #define TTS_OSX_H
#include "core/variant/array.h"
#include "core/containers/list.h" #include "core/containers/list.h"
#include "core/containers/rb_map.h" #include "core/containers/rb_map.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/string/ustring.h" #include "core/string/ustring.h"
#include "core/variant/array.h"
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>

9
platform/osx/tts_osx.mm
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_osx.mm */ /* tts_osx.mm */
/*************************************************************************/ /*************************************************************************/
/* 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 */

9
platform/windows/tts_windows.cpp
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_windows.cpp */ /* tts_windows.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) 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 */

11
platform/windows/tts_windows.h
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_windows.h */ /* tts_windows.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 */
@ -31,11 +32,11 @@
#ifndef TTS_WINDOWS_H #ifndef TTS_WINDOWS_H
#define TTS_WINDOWS_H #define TTS_WINDOWS_H
#include "core/variant/array.h"
#include "core/containers/list.h" #include "core/containers/list.h"
#include "core/containers/rb_map.h" #include "core/containers/rb_map.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/string/ustring.h" #include "core/string/ustring.h"
#include "core/variant/array.h"
#include <objbase.h> #include <objbase.h>
#include <sapi.h> #include <sapi.h>

9
platform/x11/tts_linux.cpp
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_linux.cpp */ /* tts_linux.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) 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 */

11
platform/x11/tts_linux.h
View File

@ -1,12 +1,13 @@
/*************************************************************************/ /*************************************************************************/
/* tts_linux.h */ /* tts_linux.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 */
@ -31,13 +32,13 @@
#ifndef TTS_LINUX_H #ifndef TTS_LINUX_H
#define TTS_LINUX_H #define TTS_LINUX_H
#include "core/variant/array.h"
#include "core/containers/list.h" #include "core/containers/list.h"
#include "core/containers/rb_map.h" #include "core/containers/rb_map.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "core/os/thread.h" #include "core/os/thread.h"
#include "core/os/thread_safe.h" #include "core/os/thread_safe.h"
#include "core/string/ustring.h" #include "core/string/ustring.h"
#include "core/variant/array.h"
#include "speechd-so_wrap.h" #include "speechd-so_wrap.h"