From 0a613ff9707634fcb93a009813bbbad040a4d6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2017 20:04:09 +0200 Subject: [PATCH 1/4] Add a few missing copyright headers --- editor/export_template_manager.cpp | 33 +++++++++++++++++-- editor/export_template_manager.h | 29 ++++++++++++++++ editor/plugins/curve_editor_plugin.cpp | 30 +++++++++++++++++ editor/plugins/curve_editor_plugin.h | 29 ++++++++++++++++ .../gradient_texture_editor_plugin.cpp | 33 +++++++++++++++++-- .../plugins/gradient_texture_editor_plugin.h | 29 ++++++++++++++++ 6 files changed, 179 insertions(+), 4 deletions(-) diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 83ada90144c..e6f15d17120 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -1,11 +1,40 @@ +/*************************************************************************/ +/* export_template_manager.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* 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 "export_template_manager.h" + #include "editor_node.h" #include "editor_scale.h" +#include "io/zip_io.h" #include "os/dir_access.h" #include "version.h" -#include "io/zip_io.h" - void ExportTemplateManager::_update_template_list() { while (current_hb->get_child_count()) { diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h index c3834ec6432..480c73e123a 100644 --- a/editor/export_template_manager.h +++ b/editor/export_template_manager.h @@ -1,3 +1,32 @@ +/*************************************************************************/ +/* export_template_manager.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef EXPORT_TEMPLATE_MANAGER_H #define EXPORT_TEMPLATE_MANAGER_H diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 52edc75bc0b..f3ad5c0fd1e 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -1,8 +1,38 @@ +/*************************************************************************/ +/* curve_editor_plugin.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* 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 "curve_editor_plugin.h" #include "canvas_item_editor_plugin.h" #include "os/keyboard.h" #include "spatial_editor_plugin.h" + void CurveTextureEdit::_gui_input(const InputEvent &p_event) { if (p_event.type == InputEvent::KEY && p_event.key.pressed && p_event.key.scancode == KEY_DELETE && grabbed != -1) { diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h index e98cec27278..ebe05539aa4 100644 --- a/editor/plugins/curve_editor_plugin.h +++ b/editor/plugins/curve_editor_plugin.h @@ -1,3 +1,32 @@ +/*************************************************************************/ +/* curve_editor_plugin.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef CURVE_EDITOR_PLUGIN_H #define CURVE_EDITOR_PLUGIN_H diff --git a/editor/plugins/gradient_texture_editor_plugin.cpp b/editor/plugins/gradient_texture_editor_plugin.cpp index 9551fe19fa4..41dd64d9317 100644 --- a/editor/plugins/gradient_texture_editor_plugin.cpp +++ b/editor/plugins/gradient_texture_editor_plugin.cpp @@ -1,10 +1,39 @@ +/*************************************************************************/ +/* gradient_texture_editor_plugin.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* 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 "gradient_texture_editor_plugin.h" #include "canvas_item_editor_plugin.h" -#include "spatial_editor_plugin.h" - #include "os/keyboard.h" #include "scene/resources/default_theme/theme_data.h" +#include "spatial_editor_plugin.h" + #define POINT_WIDTH 8 GradientTextureEdit::GradientTextureEdit() { diff --git a/editor/plugins/gradient_texture_editor_plugin.h b/editor/plugins/gradient_texture_editor_plugin.h index 5af828f17c6..cb2f6b4061a 100644 --- a/editor/plugins/gradient_texture_editor_plugin.h +++ b/editor/plugins/gradient_texture_editor_plugin.h @@ -1,3 +1,32 @@ +/*************************************************************************/ +/* gradient_texture_editor_plugin.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ #ifndef GRADIENT_TEXTURE_EDITOR_PLUGIN_H #define GRADIENT_TEXTURE_EDITOR_PLUGIN_H From 2398eb6ed4832fd7b8eec778981cbd974b89634f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2017 18:29:15 +0200 Subject: [PATCH 2/4] Move core thirdparty files to thirdparty/{minizip,misc} --- core/SCsub | 45 ++++++++++++++-- core/bind/core_bind.cpp | 4 +- core/image.cpp | 3 +- core/io/SCsub | 2 - core/io/compression.cpp | 8 +-- core/io/file_access_encrypted.cpp | 13 +++-- core/io/file_access_zip.h | 4 +- core/io/sha-README.md | 5 -- core/io/zip_io.h | 5 +- core/math/math_funcs.h | 3 +- core/os/file_access.cpp | 6 ++- core/ustring.cpp | 5 +- editor/editor_export.cpp | 4 +- .../editor_texture_import_plugin.cpp | 4 +- platform/uwp/export/export.cpp | 9 ++-- scene/2d/collision_polygon_2d.cpp | 5 +- scene/2d/navigation_polygon.cpp | 4 +- thirdparty/README.md | 52 +++++++++++++++++++ .../minizip}/LICENSE-InfoZip.txt | 0 .../minizip}/LICENSE-MiniZip.txt | 0 {core/io => thirdparty/minizip}/crypt.h | 0 {core/io => thirdparty/minizip}/ioapi.c | 0 {core/io => thirdparty/minizip}/ioapi.h | 0 {core/io => thirdparty/minizip}/unzip.c | 0 {core/io => thirdparty/minizip}/unzip.h | 0 {core/io => thirdparty/minizip}/zip.c | 0 {core/io => thirdparty/minizip}/zip.h | 0 {core/io => thirdparty/misc}/aes256.cpp | 0 {core/io => thirdparty/misc}/aes256.h | 0 {core/io => thirdparty/misc}/base64.c | 0 {core/io => thirdparty/misc}/base64.h | 0 {core/io => thirdparty/misc}/fastlz.c | 0 {core/io => thirdparty/misc}/fastlz.h | 0 {core => thirdparty/misc}/hq2x.cpp | 0 {core => thirdparty/misc}/hq2x.h | 0 {core/io => thirdparty/misc}/md5.cpp | 4 +- {core/io => thirdparty/misc}/md5.h | 0 {core/math => thirdparty/misc}/pcg.cpp | 0 {core/math => thirdparty/misc}/pcg.h | 0 {core/io => thirdparty/misc}/sha256.c | 0 {core/io => thirdparty/misc}/sha256.h | 0 .../math => thirdparty/misc}/triangulator.cpp | 0 {core/math => thirdparty/misc}/triangulator.h | 0 43 files changed, 146 insertions(+), 39 deletions(-) delete mode 100644 core/io/sha-README.md rename {core/io => thirdparty/minizip}/LICENSE-InfoZip.txt (100%) rename {core/io => thirdparty/minizip}/LICENSE-MiniZip.txt (100%) rename {core/io => thirdparty/minizip}/crypt.h (100%) rename {core/io => thirdparty/minizip}/ioapi.c (100%) rename {core/io => thirdparty/minizip}/ioapi.h (100%) rename {core/io => thirdparty/minizip}/unzip.c (100%) rename {core/io => thirdparty/minizip}/unzip.h (100%) rename {core/io => thirdparty/minizip}/zip.c (100%) rename {core/io => thirdparty/minizip}/zip.h (100%) rename {core/io => thirdparty/misc}/aes256.cpp (100%) rename {core/io => thirdparty/misc}/aes256.h (100%) rename {core/io => thirdparty/misc}/base64.c (100%) rename {core/io => thirdparty/misc}/base64.h (100%) rename {core/io => thirdparty/misc}/fastlz.c (100%) rename {core/io => thirdparty/misc}/fastlz.h (100%) rename {core => thirdparty/misc}/hq2x.cpp (100%) rename {core => thirdparty/misc}/hq2x.h (100%) rename {core/io => thirdparty/misc}/md5.cpp (99%) rename {core/io => thirdparty/misc}/md5.h (100%) rename {core/math => thirdparty/misc}/pcg.cpp (100%) rename {core/math => thirdparty/misc}/pcg.h (100%) rename {core/io => thirdparty/misc}/sha256.c (100%) rename {core/io => thirdparty/misc}/sha256.h (100%) rename {core/math => thirdparty/misc}/triangulator.cpp (100%) rename {core/math => thirdparty/misc}/triangulator.h (100%) diff --git a/core/SCsub b/core/SCsub index 77c8288846e..52403f3ad97 100644 --- a/core/SCsub +++ b/core/SCsub @@ -5,6 +5,7 @@ Import('env') env.core_sources = [] +# Generate global defaults gd_call = "" gd_inc = "" @@ -21,6 +22,8 @@ f = open("global_defaults.cpp", "wb") f.write(gd_cpp) f.close() + +# Generate AES256 script encryption key import os txt = "0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0" if ("SCRIPT_AES256_ENCRYPTION_KEY" in os.environ): @@ -49,20 +52,56 @@ f.write("#include \"global_config.h\"\nuint8_t script_encryption_key[32]={" + tx f.close() +# Add required thirdparty code. Header paths are hardcoded, we don't need to append +# to the include path (saves a few chars on the compiler invocation for touchy MSVC...) +thirdparty_dir = "#thirdparty/misc/" +thirdparty_sources = [ + # C sources + "base64.c", + "fastlz.c", + "sha256.c", + + # C++ sources + "aes256.cpp", + "hq2x.cpp", + "md5.cpp", + "pcg.cpp", + "triangulator.cpp", +] +thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] +env.add_source_files(env.core_sources, thirdparty_sources) + +# Minizip library, can be unbundled in theory +# However, our version has some custom modifications, so it won't compile with the system one +thirdparty_minizip_dir = "#thirdparty/minizip/" +thirdparty_minizip_sources = [ + "ioapi.c", + "unzip.c", + "zip.c", +] +thirdparty_minizip_sources = [thirdparty_minizip_dir + file for file in thirdparty_minizip_sources] +env.add_source_files(env.core_sources, thirdparty_minizip_sources) + + +# Godot's own source env.add_source_files(env.core_sources, "*.cpp") -Export('env') - +# Make binders import make_binders env.Command(['method_bind.inc', 'method_bind_ext.inc'], 'make_binders.py', make_binders.run) + +# Chain load SCsubs SConscript('os/SCsub') SConscript('math/SCsub') SConscript('io/SCsub') SConscript('bind/SCsub') SConscript('helper/SCsub') -lib = env.Library("core", env.core_sources) +# Build it all as a library +lib = env.Library("core", env.core_sources) env.Prepend(LIBS=[lib]) + +Export('env') diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index bd41e48a306..7a03ceb64ce 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -28,14 +28,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "core_bind.h" + #include "core/global_config.h" #include "geometry.h" -#include "io/base64.h" #include "io/file_access_encrypted.h" #include "io/marshalls.h" #include "os/keyboard.h" #include "os/os.h" +#include "thirdparty/misc/base64.h" + /** * Time constants borrowed from loc_time.h */ diff --git a/core/image.cpp b/core/image.cpp index 8a09dc1a8c9..b81d92fa33e 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -32,9 +32,10 @@ #include "core/io/image_loader.h" #include "core/os/copymem.h" #include "hash_map.h" -#include "hq2x.h" #include "print_string.h" +#include "thirdparty/misc/hq2x.h" + #include const char *Image::format_names[Image::FORMAT_MAX] = { diff --git a/core/io/SCsub b/core/io/SCsub index 6789aa8bc6f..4efc9027176 100644 --- a/core/io/SCsub +++ b/core/io/SCsub @@ -3,7 +3,5 @@ Import('env') env.add_source_files(env.core_sources, "*.cpp") -env.add_source_files(env.core_sources, "*.c") -# env.core_sources.append("io/fastlz.c") Export('env') diff --git a/core/io/compression.cpp b/core/io/compression.cpp index c26bd7cdcd2..662411a62e3 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -28,12 +28,14 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "compression.h" -#include "os/copymem.h" -#include "zlib.h" -#include "fastlz.h" +#include "os/copymem.h" #include "zip_io.h" +#include "thirdparty/misc/fastlz.h" + +#include + int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode) { switch (p_mode) { diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index 2625e5fe344..f2b33a01bb6 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -28,15 +28,18 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "file_access_encrypted.h" -#include "aes256.h" -#include "md5.h" -#include "os/copymem.h" -#include "print_string.h" -#define COMP_MAGIC 0x43454447 #include "core/variant.h" +#include "os/copymem.h" +#include "print_string.h" + +#include "thirdparty/misc/aes256.h" +#include "thirdparty/misc/md5.h" + #include +#define COMP_MAGIC 0x43454447 + Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector &p_key, Mode p_mode) { //print_line("open and parse!"); diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h index 8c3cd3ae672..c9cc2dac79e 100644 --- a/core/io/file_access_zip.h +++ b/core/io/file_access_zip.h @@ -34,7 +34,9 @@ #include "core/io/file_access_pack.h" #include "map.h" -#include "unzip.h" + +#include "thirdparty/minizip/unzip.h" + #include class ZipArchive : public PackSource { diff --git a/core/io/sha-README.md b/core/io/sha-README.md deleted file mode 100644 index 27a73cffe73..00000000000 --- a/core/io/sha-README.md +++ /dev/null @@ -1,5 +0,0 @@ -SHA256 -====== - -SHA-256 implementation to compliment a portable byte-oriented AES-256 -implementation in C at http://www.literatecode.com/aes256 diff --git a/core/io/zip_io.h b/core/io/zip_io.h index d5af0424999..88e680c0e0e 100644 --- a/core/io/zip_io.h +++ b/core/io/zip_io.h @@ -30,11 +30,12 @@ #ifndef ZIP_IO_H #define ZIP_IO_H -#include "io/unzip.h" -#include "io/zip.h" #include "os/copymem.h" #include "os/file_access.h" +#include "thirdparty/minizip/unzip.h" +#include "thirdparty/minizip/zip.h" + static void *zipio_open(void *data, const char *p_fname, int mode) { FileAccess *&f = *(FileAccess **)data; diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 5bfbc1005fd..06ec77daae5 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -31,9 +31,10 @@ #define MATH_FUNCS_H #include "math_defs.h" -#include "pcg.h" #include "typedefs.h" +#include "thirdparty/misc/pcg.h" + #include #include diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index f344525d1ed..375121c0ccd 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -28,13 +28,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "file_access.h" + #include "core/io/file_access_pack.h" #include "core/io/marshalls.h" #include "global_config.h" -#include "io/md5.h" -#include "io/sha256.h" #include "os/os.h" +#include "thirdparty/misc/md5.h" +#include "thirdparty/misc/sha256.h" + FileAccess::CreateFunc FileAccess::create_func[ACCESS_MAX] = { 0, 0 }; FileAccess::FileCloseFailNotify FileAccess::close_fail_notify = NULL; diff --git a/core/ustring.cpp b/core/ustring.cpp index b01f680dd60..dcb6545bd1a 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -30,14 +30,15 @@ #include "ustring.h" #include "color.h" -#include "io/md5.h" -#include "io/sha256.h" #include "math_funcs.h" #include "os/memory.h" #include "print_string.h" #include "ucaps.h" #include "variant.h" +#include "thirdparty/misc/md5.h" +#include "thirdparty/misc/sha256.h" + #include #ifndef NO_USE_STDLIB diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 7dc5db4c7dd..b719e4a487d 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -28,13 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "editor_export.h" + #include "editor/editor_file_system.h" #include "editor/plugins/script_editor_plugin.h" #include "editor_node.h" #include "editor_settings.h" #include "global_config.h" #include "io/config_file.h" -#include "io/md5.h" #include "io/resource_loader.h" #include "io/resource_saver.h" #include "io/zip_io.h" @@ -43,6 +43,8 @@ #include "script_language.h" #include "version.h" +#include "thirdparty/misc/md5.h" + static int _get_pad(int p_alignment, int p_n) { int rest = p_n % p_alignment; diff --git a/editor/io_plugins/editor_texture_import_plugin.cpp b/editor/io_plugins/editor_texture_import_plugin.cpp index ba380f03341..d9b4a950453 100644 --- a/editor/io_plugins/editor_texture_import_plugin.cpp +++ b/editor/io_plugins/editor_texture_import_plugin.cpp @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "editor_texture_import_plugin.h" + #if 0 #include "editor/editor_node.h" #include "editor/editor_settings.h" @@ -35,13 +36,14 @@ #include "global_config.h" #include "io/image_loader.h" #include "io/marshalls.h" -#include "io/md5.h" #include "io/resource_saver.h" #include "scene/gui/button_group.h" #include "scene/gui/check_button.h" #include "scene/gui/margin_container.h" #include "scene/io/resource_format_image.h" +#include "thirdparty/misc/md5.h" + static const char *flag_names[]={ ("Streaming Format"), ("Fix Border Alpha"), diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp index 4a164e5ba1a..976e6208ee6 100644 --- a/platform/uwp/export/export.cpp +++ b/platform/uwp/export/export.cpp @@ -72,17 +72,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "editor/editor_import_export.h" #include "editor/editor_node.h" #include "global_config.h" -#include "io/base64.h" #include "io/marshalls.h" -#include "io/sha256.h" -#include "io/unzip.h" -#include "io/zip.h" #include "io/zip_io.h" #include "object.h" #include "os/file_access.h" #include "platform/uwp/logo.h" #include "version.h" +#include "thirdparty/minizip/unzip.h" +#include "thirdparty/minizip/zip.h" +#include "thirdparty/misc/base64.h" +#include "thirdparty/misc/sha256.h" + #include // Capabilities diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index b54861a3147..39eef892746 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -28,10 +28,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "collision_polygon_2d.h" + #include "collision_object_2d.h" #include "scene/resources/concave_polygon_shape_2d.h" #include "scene/resources/convex_polygon_shape_2d.h" -#include "triangulator.h" + +#include "thirdparty/misc/triangulator.h" + void CollisionPolygon2D::_add_to_collision_object(Object *p_obj) { if (unparenting || !can_update_body) diff --git a/scene/2d/navigation_polygon.cpp b/scene/2d/navigation_polygon.cpp index aec6d7108bd..807f72e81f1 100644 --- a/scene/2d/navigation_polygon.cpp +++ b/scene/2d/navigation_polygon.cpp @@ -28,9 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "navigation_polygon.h" + #include "core_string_names.h" #include "navigation2d.h" -#include "triangulator.h" + +#include "thirdparty/misc/triangulator.h" void NavigationPolygon::set_vertices(const PoolVector &p_vertices) { diff --git a/thirdparty/README.md b/thirdparty/README.md index f6edff490f6..67732743dfd 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -142,6 +142,58 @@ changes to ensure they build for Javascript/HTML5. Those changes are marked with `// -- GODOT --` comments. +## minizip + +- Upstream: http://www.zlib.net +- Version: 1.2.4 (zlib contrib) +- License: zlib + +Files extracted from the upstream source: + +- contrib/minizip/{crypt.h,ioapi.{c,h},zip.{c,h},unzip.{c,h}} + +Important: Some files have Godot-made changes for use in core/io. +TODO: Properly sync with version 1.2.4 and document changes. + + +## misc + +Collection of single-file libraries used in Godot. + +- `aes256.{cpp,h}` + * Upstream: http://www.literatecode.com/aes256 + * Version: latest, as of April 2017 + * License: ISC +- `base64.{c,h}` + * Upstream: http://episec.com/people/edelkind/c.html + * Version: latest, as of April 2017 + * License: Public Domain +- `fastlz.{c,h}` + * Upstream: https://code.google.com/archive/p/fastlz + * Version: svn (r12) + * License: MIT +- `hq2x.{cpp,h}` + * Upstream: https://github.com/brunexgeek/hqx + * Version: TBD, file structure differs + * License: Apache 2.0 +- `md5.{cpp,h}` + * Upstream: http://www.efgh.com/software/md5.htm + * Version: TBD, might not be latest from above URL + * License: RSA Message-Digest License +- `pcg.{cpp,h}` + * Upstream: http://www.pcg-random.org + * Version: minimal C implemention, http://www.pcg-random.org/download.html + * License: Apache 2.0 +- `sha256.{c,h}` + * Upstream: https://github.com/ilvn/SHA256 + * Version: git (35ff823, 2015) + * License: ISC +- `triangulator.{cpp,h}` + * Upstream: https://github.com/ivanfratric/polypartition (`src/polypartition.cpp`) + * Version: TBD, class was renamed + * License: MIT + + ## openssl - Upstream: https://www.openssl.org diff --git a/core/io/LICENSE-InfoZip.txt b/thirdparty/minizip/LICENSE-InfoZip.txt similarity index 100% rename from core/io/LICENSE-InfoZip.txt rename to thirdparty/minizip/LICENSE-InfoZip.txt diff --git a/core/io/LICENSE-MiniZip.txt b/thirdparty/minizip/LICENSE-MiniZip.txt similarity index 100% rename from core/io/LICENSE-MiniZip.txt rename to thirdparty/minizip/LICENSE-MiniZip.txt diff --git a/core/io/crypt.h b/thirdparty/minizip/crypt.h similarity index 100% rename from core/io/crypt.h rename to thirdparty/minizip/crypt.h diff --git a/core/io/ioapi.c b/thirdparty/minizip/ioapi.c similarity index 100% rename from core/io/ioapi.c rename to thirdparty/minizip/ioapi.c diff --git a/core/io/ioapi.h b/thirdparty/minizip/ioapi.h similarity index 100% rename from core/io/ioapi.h rename to thirdparty/minizip/ioapi.h diff --git a/core/io/unzip.c b/thirdparty/minizip/unzip.c similarity index 100% rename from core/io/unzip.c rename to thirdparty/minizip/unzip.c diff --git a/core/io/unzip.h b/thirdparty/minizip/unzip.h similarity index 100% rename from core/io/unzip.h rename to thirdparty/minizip/unzip.h diff --git a/core/io/zip.c b/thirdparty/minizip/zip.c similarity index 100% rename from core/io/zip.c rename to thirdparty/minizip/zip.c diff --git a/core/io/zip.h b/thirdparty/minizip/zip.h similarity index 100% rename from core/io/zip.h rename to thirdparty/minizip/zip.h diff --git a/core/io/aes256.cpp b/thirdparty/misc/aes256.cpp similarity index 100% rename from core/io/aes256.cpp rename to thirdparty/misc/aes256.cpp diff --git a/core/io/aes256.h b/thirdparty/misc/aes256.h similarity index 100% rename from core/io/aes256.h rename to thirdparty/misc/aes256.h diff --git a/core/io/base64.c b/thirdparty/misc/base64.c similarity index 100% rename from core/io/base64.c rename to thirdparty/misc/base64.c diff --git a/core/io/base64.h b/thirdparty/misc/base64.h similarity index 100% rename from core/io/base64.h rename to thirdparty/misc/base64.h diff --git a/core/io/fastlz.c b/thirdparty/misc/fastlz.c similarity index 100% rename from core/io/fastlz.c rename to thirdparty/misc/fastlz.c diff --git a/core/io/fastlz.h b/thirdparty/misc/fastlz.h similarity index 100% rename from core/io/fastlz.h rename to thirdparty/misc/fastlz.h diff --git a/core/hq2x.cpp b/thirdparty/misc/hq2x.cpp similarity index 100% rename from core/hq2x.cpp rename to thirdparty/misc/hq2x.cpp diff --git a/core/hq2x.h b/thirdparty/misc/hq2x.h similarity index 100% rename from core/hq2x.h rename to thirdparty/misc/hq2x.h diff --git a/core/io/md5.cpp b/thirdparty/misc/md5.cpp similarity index 99% rename from core/io/md5.cpp rename to thirdparty/misc/md5.cpp index 5a88328dd4f..1653ab0be51 100644 --- a/core/io/md5.cpp +++ b/thirdparty/misc/md5.cpp @@ -1,5 +1,3 @@ -#include "md5.h" - /* ********************************************************************** ** md5.c ** @@ -34,7 +32,7 @@ */ /* -- include the following line if the md5.h header file is separate -- */ -/* #include "md5.h" */ +#include "md5.h" /* forward declaration */ static void Transform (uint32_t *buf, uint32_t *in); diff --git a/core/io/md5.h b/thirdparty/misc/md5.h similarity index 100% rename from core/io/md5.h rename to thirdparty/misc/md5.h diff --git a/core/math/pcg.cpp b/thirdparty/misc/pcg.cpp similarity index 100% rename from core/math/pcg.cpp rename to thirdparty/misc/pcg.cpp diff --git a/core/math/pcg.h b/thirdparty/misc/pcg.h similarity index 100% rename from core/math/pcg.h rename to thirdparty/misc/pcg.h diff --git a/core/io/sha256.c b/thirdparty/misc/sha256.c similarity index 100% rename from core/io/sha256.c rename to thirdparty/misc/sha256.c diff --git a/core/io/sha256.h b/thirdparty/misc/sha256.h similarity index 100% rename from core/io/sha256.h rename to thirdparty/misc/sha256.h diff --git a/core/math/triangulator.cpp b/thirdparty/misc/triangulator.cpp similarity index 100% rename from core/math/triangulator.cpp rename to thirdparty/misc/triangulator.cpp diff --git a/core/math/triangulator.h b/thirdparty/misc/triangulator.h similarity index 100% rename from core/math/triangulator.h rename to thirdparty/misc/triangulator.h From c5f830d6b90574ef1e34fd2c35a0ebfa1ad92fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2017 19:00:11 +0200 Subject: [PATCH 3/4] Split thirdparty smaz.c out of compressed_translation.cpp Code comes from https://github.com/antirez/smaz/blob/150e125cbae2e8fd20dd332432776ce13395d4d4/smaz.c With a small modification to match Godot expectations: ``` diff --git a/thirdparty/core/smaz.c b/thirdparty/core/smaz.c index 9b1ebc2..555dfea 100644 --- a/thirdparty/core/smaz.c +++ b/thirdparty/core/smaz.c @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #include /* Our compression codebook, used for compression */ -static char *Smaz_cb[241] = { +static const char *Smaz_cb[241] = { "\002s,\266", "\003had\232\002leW", "\003on \216", "", "\001yS", "\002ma\255\002li\227", "\003or \260", "", "\002ll\230\003s t\277", "\004fromg\002mel", "", "\003its\332", "\001z\333", "\003ingF", "\001>\336", @@ -89,7 +89,7 @@ static char *Smaz_rcb[254] = { "e, ", " it", "whi", " ma", "ge", "x", "e c", "men", ".com" }; -int smaz_compress(char *in, int inlen, char *out, int outlen) { +int smaz_compress(const char *in, int inlen, char *out, int outlen) { unsigned int h1,h2,h3=0; int verblen = 0, _outlen = outlen; char verb[256], *_out = out; @@ -167,7 +167,7 @@ out: return out-_out; } -int smaz_decompress(char *in, int inlen, char *out, int outlen) { +int smaz_decompress(const char *in, int inlen, char *out, int outlen) { unsigned char *c = (unsigned char*) in; char *_out = out; int _outlen = outlen; @@ -192,7 +192,7 @@ int smaz_decompress(char *in, int inlen, char *out, int outlen) { inlen -= 2+len; } else { /* Codebook entry */ - char *s = Smaz_rcb[*c]; + const char *s = Smaz_rcb[*c]; int len = strlen(s); if (outlen < len) return _outlen+1; diff --git a/thirdparty/core/smaz.h b/thirdparty/core/smaz.h index a547d89..a9d8a33 100644 --- a/thirdparty/core/smaz.h +++ b/thirdparty/core/smaz.h @@ -14,7 +14,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND #ifndef _SMAZ_H #define _SMAZ_H -int smaz_compress(char *in, int inlen, char *out, int outlen); -int smaz_decompress(char *in, int inlen, char *out, int outlen); +int smaz_compress(const char *in, int inlen, char *out, int outlen); +int smaz_decompress(const char *in, int inlen, char *out, int outlen); #endif ``` --- core/SCsub | 1 + core/compressed_translation.cpp | 211 +------------------------------- thirdparty/README.md | 5 + thirdparty/misc/smaz.c | 207 +++++++++++++++++++++++++++++++ thirdparty/misc/smaz.h | 20 +++ 5 files changed, 235 insertions(+), 209 deletions(-) create mode 100644 thirdparty/misc/smaz.c create mode 100644 thirdparty/misc/smaz.h diff --git a/core/SCsub b/core/SCsub index 52403f3ad97..5e32acb310f 100644 --- a/core/SCsub +++ b/core/SCsub @@ -60,6 +60,7 @@ thirdparty_sources = [ "base64.c", "fastlz.c", "sha256.c", + "smaz.c", # C++ sources "aes256.cpp", diff --git a/core/compressed_translation.cpp b/core/compressed_translation.cpp index d41534703c0..9bdd9604240 100644 --- a/core/compressed_translation.cpp +++ b/core/compressed_translation.cpp @@ -30,218 +30,11 @@ #include "compressed_translation.h" #include "pair.h" -#include -/////////// SMAZ ///////////// - -/* -Copyright (c) 2006-2009, Salvatore Sanfilippo -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Smaz nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* Our compression codebook, used for compression */ -static const char *Smaz_cb[241] = { - "\002s,\266", "\003had\232\002leW", "\003on \216", "", "\001yS", - "\002ma\255\002li\227", "\003or \260", "", "\002ll\230\003s t\277", - "\004fromg\002mel", "", "\003its\332", "\001z\333", "\003ingF", "\001>\336", - "\001 \000\003 (\002nc\344", "\002nd=\003 on\312", - "\002ne\213\003hat\276\003re q", "", "\002ngT\003herz\004have\306\003s o\225", - "", "\003ionk\003s a\254\002ly\352", "\003hisL\003 inN\003 be\252", "", - "\003 fo\325\003 of \003 ha\311", "", "\002of\005", - "\003 co\241\002no\267\003 ma\370", "", "", "\003 cl\356\003enta\003 an7", - "\002ns\300\001\"e", "\003n t\217\002ntP\003s, \205", - "\002pe\320\003 we\351\002om\223", "\002on\037", "", "\002y G", "\003 wa\271", - "\003 re\321\002or*", "", "\002=\"\251\002ot\337", "\003forD\002ou[", - "\003 toR", "\003 th\r", "\003 it\366", - "\003but\261\002ra\202\003 wi\363\002<\346", "\002to\024", "\003arew", "\001d\030", - "\002tr\303", "", "\001\n1\003 a \222", "\003f tv\002veo", "\002un\340", "", - "\003e o\242", "\002a \243\002wa\326\001e\002", "\002ur\226\003e a\274", - "\002us\244\003\n\r\n\247", "\002ut\304\003e c\373", "\002we\221", "", "", - "\002wh\302", "\001f,", "", "", "", "\003d t\206", "", "", "\003th \343", - "\001g;", "", "", "\001\r9\003e s\265", "\003e t\234", "", "\003to Y", - "\003e\r\n\236", "\002d \036\001h\022", "", "\001,Q", "\002 a\031", "\002 b^", - "\002\r\n\025\002 cI", "\002 d\245", "\002 e\253", "\002 fh\001i\b\002e \v", - "", "\002 hU\001-\314", "\002 i8", "", "", "\002 l\315", "\002 m{", - "\002f :\002 n\354", "\002 o\035", "\002 p}\001.n\003\r\n\r\250", "", - "\002 r\275", "\002 s>", "\002 t\016", "", "\002g \235\005which+\003whi\367", - "\002 w5", "\001/\305", "\003as \214", "\003at \207", "", "\003who\331", "", - "\001l\026\002h \212", "", "\002, $", "", "\004withV", "", "", "", "\001m-", "", - "", "\002ac\357", "\002ad\350", "\003TheH", "", "", "\004this\233\001n\t", - "", "\002. y", "", "\002alX\003e, \365", "\003tio\215\002be\\", - "\002an\032\003ver\347", "", "\004that0\003tha\313\001o\006", "\003was2", - "\002arO", "\002as.", "\002at'\003the\001\004they\200\005there\322\005theird", - "\002ce\210", "\004were]", "", "\002ch\231\002l \264\001p<", "", "", - "\003one\256", "", "\003he \023\002dej", "\003ter\270", "\002cou", "", - "\002by\177\002di\201\002eax", "", "\002ec\327", "\002edB", "\002ee\353", "", - "", "\001r\f\002n )", "", "", "", "\002el\262", "", "\003in i\002en3", "", - "\002o `\001s\n", "", "\002er\033", "\003is t\002es6", "", "\002ge\371", - "\004.com\375", "\002fo\334\003our\330", "\003ch \301\001t\003", "\002hab", "", - "\003men\374", "", "\002he\020", "", "", "\001u&", "\002hif", "", - "\003not\204\002ic\203", "\003ed @\002id\355", "", "", "\002ho\273", - "\002r K\001vm", "", "", "", "\003t t\257\002il\360", "\002im\342", - "\003en \317\002in\017", "\002io\220", "\002s \027\001wA", "", "\003er |", - "\003es ~\002is%", "\002it/", "", "\002iv\272", "", - "\002t #\ahttp://C\001x\372", "\002la\211", "\001<\341", "\003, a\224" -}; - -/* Reverse compression codebook, used for decompression */ -static const char *Smaz_rcb[254] = { - " ", "the", "e", "t", "a", "of", "o", "and", "i", "n", "s", "e ", "r", " th", - " t", "in", "he", "th", "h", "he ", "to", "\r\n", "l", "s ", "d", " a", "an", - "er", "c", " o", "d ", "on", " of", "re", "of ", "t ", ", ", "is", "u", "at", - " ", "n ", "or", "which", "f", "m", "as", "it", "that", "\n", "was", "en", - " ", " w", "es", " an", " i", "\r", "f ", "g", "p", "nd", " s", "nd ", "ed ", - "w", "ed", "http://", "for", "te", "ing", "y ", "The", " c", "ti", "r ", "his", - "st", " in", "ar", "nt", ",", " to", "y", "ng", " h", "with", "le", "al", "to ", - "b", "ou", "be", "were", " b", "se", "o ", "ent", "ha", "ng ", "their", "\"", - "hi", "from", " f", "in ", "de", "ion", "me", "v", ".", "ve", "all", "re ", - "ri", "ro", "is ", "co", "f t", "are", "ea", ". ", "her", " m", "er ", " p", - "es ", "by", "they", "di", "ra", "ic", "not", "s, ", "d t", "at ", "ce", "la", - "h ", "ne", "as ", "tio", "on ", "n t", "io", "we", " a ", "om", ", a", "s o", - "ur", "li", "ll", "ch", "had", "this", "e t", "g ", "e\r\n", " wh", "ere", - " co", "e o", "a ", "us", " d", "ss", "\n\r\n", "\r\n\r", "=\"", " be", " e", - "s a", "ma", "one", "t t", "or ", "but", "el", "so", "l ", "e s", "s,", "no", - "ter", " wa", "iv", "ho", "e a", " r", "hat", "s t", "ns", "ch ", "wh", "tr", - "ut", "/", "have", "ly ", "ta", " ha", " on", "tha", "-", " l", "ati", "en ", - "pe", " re", "there", "ass", "si", " fo", "wa", "ec", "our", "who", "its", "z", - "fo", "rs", ">", "ot", "un", "<", "im", "th ", "nc", "ate", "><", "ver", "ad", - " we", "ly", "ee", " n", "id", " cl", "ac", "il", " 1) h2 += in[1]; - if (inlen > 2) h3 = h2 ^ in[2]; - if (j > inlen) j = inlen; - - /* Try to lookup substrings into the hash table, starting from the -* longer to the shorter substrings */ - for (; j > 0; j--) { - switch (j) { - case 1: slot = Smaz_cb[h1 % 241]; break; - case 2: slot = Smaz_cb[h2 % 241]; break; - default: slot = Smaz_cb[h3 % 241]; break; - } - while (slot[0]) { - if (slot[0] == j && memcmp(slot + 1, in, j) == 0) { - /* Match found in the hash table, -* prepare a verbatim bytes flush if needed */ - if (verblen) { - needed = (verblen == 1) ? 2 : 2 + verblen; - flush = out; - out += needed; - outlen -= needed; - } - /* Emit the byte */ - if (outlen <= 0) return _outlen + 1; - out[0] = slot[slot[0] + 1]; - out++; - outlen--; - inlen -= j; - in += j; - goto out; - } else { - slot += slot[0] + 2; - } - } - } - /* Match not found - add the byte to the verbatim buffer */ - verb[verblen] = in[0]; - verblen++; - inlen--; - in++; - out: - /* Prepare a flush if we reached the flush length limit, and there -* is not already a pending flush operation. */ - if (!flush && (verblen == 256 || (verblen > 0 && inlen == 0))) { - needed = (verblen == 1) ? 2 : 2 + verblen; - flush = out; - out += needed; - outlen -= needed; - if (outlen < 0) return _outlen + 1; - } - /* Perform a verbatim flush if needed */ - if (flush) { - if (verblen == 1) { - flush[0] = (signed char)254; - flush[1] = verb[0]; - } else { - flush[0] = (signed char)255; - flush[1] = (signed char)(verblen - 1); - memcpy(flush + 2, verb, verblen); - } - flush = NULL; - verblen = 0; - } - } - return out - _out; +extern "C" { +#include "thirdparty/misc/smaz.h" } -static int smaz_decompress(const char *in, int inlen, char *out, int outlen) { - unsigned char *c = (unsigned char *)in; - char *_out = out; - int _outlen = outlen; - - while (inlen) { - if (*c == 254) { - /* Verbatim byte */ - if (outlen < 1) return _outlen + 1; - *out = *(c + 1); - out++; - outlen--; - c += 2; - inlen -= 2; - } else if (*c == 255) { - /* Verbatim string */ - int len = (*(c + 1)) + 1; - if (outlen < len) return _outlen + 1; - memcpy(out, c + 2, len); - out += len; - outlen -= len; - c += 2 + len; - inlen -= 2 + len; - } else { - /* Codebook entry */ - const char *s = Smaz_rcb[*c]; - int len = strlen(s); - - if (outlen < len) return _outlen + 1; - memcpy(out, s, len); - out += len; - outlen -= len; - c++; - inlen--; - } - } - return out - _out; -} - -/////////// END OF SMAZ ///////////// - struct _PHashTranslationCmp { int orig_len; diff --git a/thirdparty/README.md b/thirdparty/README.md index 67732743dfd..ea731282efe 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -188,6 +188,11 @@ Collection of single-file libraries used in Godot. * Upstream: https://github.com/ilvn/SHA256 * Version: git (35ff823, 2015) * License: ISC +- `smaz.{c,h}` + * Upstream: https://github.com/antirez/smaz + * Version: git (150e125, 2009) + * License: BSD 3-clause + * Modifications: use `const char*` instead of `char*` for input string - `triangulator.{cpp,h}` * Upstream: https://github.com/ivanfratric/polypartition (`src/polypartition.cpp`) * Version: TBD, class was renamed diff --git a/thirdparty/misc/smaz.c b/thirdparty/misc/smaz.c new file mode 100644 index 00000000000..555dfea844c --- /dev/null +++ b/thirdparty/misc/smaz.c @@ -0,0 +1,207 @@ +/* +Copyright (c) 2006-2009, Salvatore Sanfilippo +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of Smaz nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include + +/* Our compression codebook, used for compression */ +static const char *Smaz_cb[241] = { +"\002s,\266", "\003had\232\002leW", "\003on \216", "", "\001yS", +"\002ma\255\002li\227", "\003or \260", "", "\002ll\230\003s t\277", +"\004fromg\002mel", "", "\003its\332", "\001z\333", "\003ingF", "\001>\336", +"\001 \000\003 (\002nc\344", "\002nd=\003 on\312", +"\002ne\213\003hat\276\003re q", "", "\002ngT\003herz\004have\306\003s o\225", +"", "\003ionk\003s a\254\002ly\352", "\003hisL\003 inN\003 be\252", "", +"\003 fo\325\003 of \003 ha\311", "", "\002of\005", +"\003 co\241\002no\267\003 ma\370", "", "", "\003 cl\356\003enta\003 an7", +"\002ns\300\001\"e", "\003n t\217\002ntP\003s, \205", +"\002pe\320\003 we\351\002om\223", "\002on\037", "", "\002y G", "\003 wa\271", +"\003 re\321\002or*", "", "\002=\"\251\002ot\337", "\003forD\002ou[", +"\003 toR", "\003 th\r", "\003 it\366", +"\003but\261\002ra\202\003 wi\363\002<\346", "\002to\024", "\003arew", "\001d\030", +"\002tr\303", "", "\001\n1\003 a \222", "\003f tv\002veo", "\002un\340", "", +"\003e o\242", "\002a \243\002wa\326\001e\002", "\002ur\226\003e a\274", +"\002us\244\003\n\r\n\247", "\002ut\304\003e c\373", "\002we\221", "", "", +"\002wh\302", "\001f,", "", "", "", "\003d t\206", "", "", "\003th \343", +"\001g;", "", "", "\001\r9\003e s\265", "\003e t\234", "", "\003to Y", +"\003e\r\n\236", "\002d \036\001h\022", "", "\001,Q", "\002 a\031", "\002 b^", +"\002\r\n\025\002 cI", "\002 d\245", "\002 e\253", "\002 fh\001i\b\002e \v", +"", "\002 hU\001-\314", "\002 i8", "", "", "\002 l\315", "\002 m{", +"\002f :\002 n\354", "\002 o\035", "\002 p}\001.n\003\r\n\r\250", "", +"\002 r\275", "\002 s>", "\002 t\016", "", "\002g \235\005which+\003whi\367", +"\002 w5", "\001/\305", "\003as \214", "\003at \207", "", "\003who\331", "", +"\001l\026\002h \212", "", "\002, $", "", "\004withV", "", "", "", "\001m-", "", +"", "\002ac\357", "\002ad\350", "\003TheH", "", "", "\004this\233\001n\t", +"", "\002. y", "", "\002alX\003e, \365", "\003tio\215\002be\\", +"\002an\032\003ver\347", "", "\004that0\003tha\313\001o\006", "\003was2", +"\002arO", "\002as.", "\002at'\003the\001\004they\200\005there\322\005theird", +"\002ce\210", "\004were]", "", "\002ch\231\002l \264\001p<", "", "", +"\003one\256", "", "\003he \023\002dej", "\003ter\270", "\002cou", "", +"\002by\177\002di\201\002eax", "", "\002ec\327", "\002edB", "\002ee\353", "", +"", "\001r\f\002n )", "", "", "", "\002el\262", "", "\003in i\002en3", "", +"\002o `\001s\n", "", "\002er\033", "\003is t\002es6", "", "\002ge\371", +"\004.com\375", "\002fo\334\003our\330", "\003ch \301\001t\003", "\002hab", "", +"\003men\374", "", "\002he\020", "", "", "\001u&", "\002hif", "", +"\003not\204\002ic\203", "\003ed @\002id\355", "", "", "\002ho\273", +"\002r K\001vm", "", "", "", "\003t t\257\002il\360", "\002im\342", +"\003en \317\002in\017", "\002io\220", "\002s \027\001wA", "", "\003er |", +"\003es ~\002is%", "\002it/", "", "\002iv\272", "", +"\002t #\ahttp://C\001x\372", "\002la\211", "\001<\341", "\003, a\224" +}; + +/* Reverse compression codebook, used for decompression */ +static char *Smaz_rcb[254] = { +" ", "the", "e", "t", "a", "of", "o", "and", "i", "n", "s", "e ", "r", " th", +" t", "in", "he", "th", "h", "he ", "to", "\r\n", "l", "s ", "d", " a", "an", +"er", "c", " o", "d ", "on", " of", "re", "of ", "t ", ", ", "is", "u", "at", +" ", "n ", "or", "which", "f", "m", "as", "it", "that", "\n", "was", "en", +" ", " w", "es", " an", " i", "\r", "f ", "g", "p", "nd", " s", "nd ", "ed ", +"w", "ed", "http://", "for", "te", "ing", "y ", "The", " c", "ti", "r ", "his", +"st", " in", "ar", "nt", ",", " to", "y", "ng", " h", "with", "le", "al", "to ", +"b", "ou", "be", "were", " b", "se", "o ", "ent", "ha", "ng ", "their", "\"", +"hi", "from", " f", "in ", "de", "ion", "me", "v", ".", "ve", "all", "re ", +"ri", "ro", "is ", "co", "f t", "are", "ea", ". ", "her", " m", "er ", " p", +"es ", "by", "they", "di", "ra", "ic", "not", "s, ", "d t", "at ", "ce", "la", +"h ", "ne", "as ", "tio", "on ", "n t", "io", "we", " a ", "om", ", a", "s o", +"ur", "li", "ll", "ch", "had", "this", "e t", "g ", "e\r\n", " wh", "ere", +" co", "e o", "a ", "us", " d", "ss", "\n\r\n", "\r\n\r", "=\"", " be", " e", +"s a", "ma", "one", "t t", "or ", "but", "el", "so", "l ", "e s", "s,", "no", +"ter", " wa", "iv", "ho", "e a", " r", "hat", "s t", "ns", "ch ", "wh", "tr", +"ut", "/", "have", "ly ", "ta", " ha", " on", "tha", "-", " l", "ati", "en ", +"pe", " re", "there", "ass", "si", " fo", "wa", "ec", "our", "who", "its", "z", +"fo", "rs", ">", "ot", "un", "<", "im", "th ", "nc", "ate", "><", "ver", "ad", +" we", "ly", "ee", " n", "id", " cl", "ac", "il", " 1) h2 += in[1]; + if (inlen > 2) h3 = h2^in[2]; + if (j > inlen) j = inlen; + + /* Try to lookup substrings into the hash table, starting from the + * longer to the shorter substrings */ + for (; j > 0; j--) { + switch(j) { + case 1: slot = Smaz_cb[h1%241]; break; + case 2: slot = Smaz_cb[h2%241]; break; + default: slot = Smaz_cb[h3%241]; break; + } + while(slot[0]) { + if (slot[0] == j && memcmp(slot+1,in,j) == 0) { + /* Match found in the hash table, + * prepare a verbatim bytes flush if needed */ + if (verblen) { + needed = (verblen == 1) ? 2 : 2+verblen; + flush = out; + out += needed; + outlen -= needed; + } + /* Emit the byte */ + if (outlen <= 0) return _outlen+1; + out[0] = slot[slot[0]+1]; + out++; + outlen--; + inlen -= j; + in += j; + goto out; + } else { + slot += slot[0]+2; + } + } + } + /* Match not found - add the byte to the verbatim buffer */ + verb[verblen] = in[0]; + verblen++; + inlen--; + in++; +out: + /* Prepare a flush if we reached the flush length limit, and there + * is not already a pending flush operation. */ + if (!flush && (verblen == 256 || (verblen > 0 && inlen == 0))) { + needed = (verblen == 1) ? 2 : 2+verblen; + flush = out; + out += needed; + outlen -= needed; + if (outlen < 0) return _outlen+1; + } + /* Perform a verbatim flush if needed */ + if (flush) { + if (verblen == 1) { + flush[0] = (signed char)254; + flush[1] = verb[0]; + } else { + flush[0] = (signed char)255; + flush[1] = (signed char)(verblen-1); + memcpy(flush+2,verb,verblen); + } + flush = NULL; + verblen = 0; + } + } + return out-_out; +} + +int smaz_decompress(const char *in, int inlen, char *out, int outlen) { + unsigned char *c = (unsigned char*) in; + char *_out = out; + int _outlen = outlen; + + while(inlen) { + if (*c == 254) { + /* Verbatim byte */ + if (outlen < 1) return _outlen+1; + *out = *(c+1); + out++; + outlen--; + c += 2; + inlen -= 2; + } else if (*c == 255) { + /* Verbatim string */ + int len = (*(c+1))+1; + if (outlen < len) return _outlen+1; + memcpy(out,c+2,len); + out += len; + outlen -= len; + c += 2+len; + inlen -= 2+len; + } else { + /* Codebook entry */ + const char *s = Smaz_rcb[*c]; + int len = strlen(s); + + if (outlen < len) return _outlen+1; + memcpy(out,s,len); + out += len; + outlen -= len; + c++; + inlen--; + } + } + return out-_out; +} diff --git a/thirdparty/misc/smaz.h b/thirdparty/misc/smaz.h new file mode 100644 index 00000000000..a9d8a337a76 --- /dev/null +++ b/thirdparty/misc/smaz.h @@ -0,0 +1,20 @@ +/* +Copyright (c) 2006-2009, Salvatore Sanfilippo +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of Smaz nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#ifndef _SMAZ_H +#define _SMAZ_H + +int smaz_compress(const char *in, int inlen, char *out, int outlen); +int smaz_decompress(const char *in, int inlen, char *out, int outlen); + +#endif From d4029aa51a0f0bce5dc73885af74b592e3aa33b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 28 Apr 2017 19:28:21 +0200 Subject: [PATCH 4/4] Move other lone thirdparty files to thirdparty/misc Also move Box2D ConvexDecomposition contrib code to thirdparty/b2d_convexdecomp. --- core/SCsub | 2 +- drivers/convex_decomp/SCsub | 9 +++++ drivers/convex_decomp/b2d_decompose.cpp | 3 +- modules/openssl/SCsub | 11 +++++- modules/openssl/stream_peer_openssl.h | 6 ++- .../stb_vorbis/audio_stream_ogg_vorbis.cpp | 3 +- modules/stb_vorbis/audio_stream_ogg_vorbis.h | 2 +- modules/theora/video_stream_theora.cpp | 3 +- modules/webm/video_stream_webm.cpp | 3 +- scene/SCsub | 19 +++++++++- scene/resources/SCsub | 1 - scene/resources/dynamic_font_stb.cpp | 1 - scene/resources/dynamic_font_stb.h | 3 +- scene/resources/surface_tool.h | 3 +- thirdparty/README.md | 37 ++++++++++++++++++- .../b2d_convexdecomp}/b2Glue.h | 0 .../b2d_convexdecomp}/b2Polygon.cpp | 0 .../b2d_convexdecomp}/b2Polygon.h | 0 .../b2d_convexdecomp}/b2Triangle.cpp | 0 .../b2d_convexdecomp}/b2Triangle.h | 0 .../misc}/curl_hostcheck.c | 0 .../misc}/curl_hostcheck.h | 0 .../misc}/mikktspace.c | 0 .../misc}/mikktspace.h | 0 .../misc}/stb_truetype.h | 0 thirdparty/{stb_vorbis => misc}/stb_vorbis.c | 0 {modules/theora => thirdparty/misc}/yuv2rgb.h | 0 27 files changed, 90 insertions(+), 16 deletions(-) rename {drivers/convex_decomp => thirdparty/b2d_convexdecomp}/b2Glue.h (100%) rename {drivers/convex_decomp => thirdparty/b2d_convexdecomp}/b2Polygon.cpp (100%) rename {drivers/convex_decomp => thirdparty/b2d_convexdecomp}/b2Polygon.h (100%) rename {drivers/convex_decomp => thirdparty/b2d_convexdecomp}/b2Triangle.cpp (100%) rename {drivers/convex_decomp => thirdparty/b2d_convexdecomp}/b2Triangle.h (100%) rename {modules/openssl => thirdparty/misc}/curl_hostcheck.c (100%) rename {modules/openssl => thirdparty/misc}/curl_hostcheck.h (100%) rename {scene/resources => thirdparty/misc}/mikktspace.c (100%) rename {scene/resources => thirdparty/misc}/mikktspace.h (100%) rename {scene/resources => thirdparty/misc}/stb_truetype.h (100%) rename thirdparty/{stb_vorbis => misc}/stb_vorbis.c (100%) rename {modules/theora => thirdparty/misc}/yuv2rgb.h (100%) diff --git a/core/SCsub b/core/SCsub index 5e32acb310f..fd3f57dd7cb 100644 --- a/core/SCsub +++ b/core/SCsub @@ -84,7 +84,7 @@ thirdparty_minizip_sources = [thirdparty_minizip_dir + file for file in thirdpar env.add_source_files(env.core_sources, thirdparty_minizip_sources) -# Godot's own source +# Godot's own sources env.add_source_files(env.core_sources, "*.cpp") diff --git a/drivers/convex_decomp/SCsub b/drivers/convex_decomp/SCsub index ee39fd26317..f017e551208 100644 --- a/drivers/convex_decomp/SCsub +++ b/drivers/convex_decomp/SCsub @@ -4,4 +4,13 @@ Import('env') env.add_source_files(env.drivers_sources, "*.cpp") +# Thirdparty dependencies +thirdparty_dir = "#thirdparty/b2d_convexdecomp/" +thirdparty_sources = [ + "b2Polygon.cpp", + "b2Triangle.cpp", +] +thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] +env.add_source_files(env.drivers_sources, thirdparty_sources) + Export('env') diff --git a/drivers/convex_decomp/b2d_decompose.cpp b/drivers/convex_decomp/b2d_decompose.cpp index f918b66c315..d9011b8eab8 100644 --- a/drivers/convex_decomp/b2d_decompose.cpp +++ b/drivers/convex_decomp/b2d_decompose.cpp @@ -28,7 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "b2d_decompose.h" -#include "b2Polygon.h" + +#include "thirdparty/b2d_convexdecomp/b2Polygon.h" namespace b2ConvexDecomp { diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub index 0e811ce8c9d..add7d4dcfc7 100644 --- a/modules/openssl/SCsub +++ b/modules/openssl/SCsub @@ -677,7 +677,16 @@ if (env['builtin_openssl'] != 'no'): # Module sources env_openssl.add_source_files(env.modules_sources, "*.cpp") -env_openssl.add_source_files(env.modules_sources, "*.c") + + +# Other thirdparty dependencies +thirdparty_misc_dir = "#thirdparty/misc/" +thirdparty_misc_sources = [ + "curl_hostcheck.c", +] +thirdparty_misc_sources = [thirdparty_misc_dir + file for file in thirdparty_misc_sources] +env_openssl.add_source_files(env.modules_sources, thirdparty_misc_sources) + # platform/uwp need to know openssl is available, pass to main env if "platform" in env and env["platform"] == "uwp": diff --git a/modules/openssl/stream_peer_openssl.h b/modules/openssl/stream_peer_openssl.h index 12262da94a7..5c830ebf371 100644 --- a/modules/openssl/stream_peer_openssl.h +++ b/modules/openssl/stream_peer_openssl.h @@ -30,17 +30,19 @@ #ifndef STREAM_PEER_OPEN_SSL_H #define STREAM_PEER_OPEN_SSL_H -#include "curl_hostcheck.h" #include "global_config.h" #include "io/stream_peer_ssl.h" #include "os/file_access.h" -#include // If you don't know what this is for stop reading now. + +#include "thirdparty/misc/curl_hostcheck.h" #include // BIO objects for I/O #include // Error reporting #include // SSL and SSL_CTX for SSL connections #include +#include + class StreamPeerOpenSSL : public StreamPeerSSL { private: static int _bio_create(BIO *b); diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp index b0870c9dc27..c645a55703d 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp @@ -30,7 +30,8 @@ #include "audio_stream_ogg_vorbis.h" #include "os/file_access.h" -#include "thirdparty/stb_vorbis/stb_vorbis.c" + +#include "thirdparty/misc/stb_vorbis.c" void AudioStreamPlaybackOGGVorbis::_mix_internal(AudioFrame *p_buffer, int p_frames) { diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.h b/modules/stb_vorbis/audio_stream_ogg_vorbis.h index bb895c4dfa7..287aa4ca47e 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.h +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.h @@ -34,7 +34,7 @@ #include "servers/audio/audio_stream.h" #define STB_VORBIS_HEADER_ONLY -#include "thirdparty/stb_vorbis/stb_vorbis.c" +#include "thirdparty/misc/stb_vorbis.c" #undef STB_VORBIS_HEADER_ONLY class AudioStreamOGGVorbis; diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp index 28463e2cbae..61112f20b4b 100644 --- a/modules/theora/video_stream_theora.cpp +++ b/modules/theora/video_stream_theora.cpp @@ -31,7 +31,8 @@ #include "global_config.h" #include "os/os.h" -#include "yuv2rgb.h" + +#include "thirdparty/misc/yuv2rgb.h" int VideoStreamPlaybackTheora::buffer_data() { diff --git a/modules/webm/video_stream_webm.cpp b/modules/webm/video_stream_webm.cpp index 9d8062d2832..eaf42153023 100644 --- a/modules/webm/video_stream_webm.cpp +++ b/modules/webm/video_stream_webm.cpp @@ -32,12 +32,13 @@ #include "OpusVorbisDecoder.hpp" #include "VPXDecoder.hpp" -#include "../theora/yuv2rgb.h" #include "mkvparser/mkvparser.h" #include "global_config.h" #include "os/file_access.h" +#include "thirdparty/misc/yuv2rgb.h" + #include class MkvReader : public mkvparser::IMkvReader { diff --git a/scene/SCsub b/scene/SCsub index bd2da1eab99..df52e9c6cb4 100644 --- a/scene/SCsub +++ b/scene/SCsub @@ -3,10 +3,23 @@ Import('env') env.scene_sources = [] + + +# Thirdparty code +thirdparty_dir = "#thirdparty/misc/" +thirdparty_sources = [ + # C sources + "mikktspace.c", +] +thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] +env.add_source_files(env.scene_sources, thirdparty_sources) + + +# Godot's own sources env.add_source_files(env.scene_sources, "*.cpp") -Export('env') +# Chain load SCsubs SConscript('main/SCsub') SConscript('gui/SCsub') SConscript('3d/SCsub') @@ -17,6 +30,8 @@ SConscript('resources/SCsub') SConscript('io/SCsub') +# Build it all as a library lib = env.Library("scene", env.scene_sources) - env.Prepend(LIBS=[lib]) + +Export('env') diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 60b16cd0d4d..2ad90247a78 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -3,7 +3,6 @@ Import('env') env.add_source_files(env.scene_sources, "*.cpp") -env.add_source_files(env.scene_sources, "*.c") Export('env') diff --git a/scene/resources/dynamic_font_stb.cpp b/scene/resources/dynamic_font_stb.cpp index 0a784c64963..397349bbf95 100644 --- a/scene/resources/dynamic_font_stb.cpp +++ b/scene/resources/dynamic_font_stb.cpp @@ -33,7 +33,6 @@ #define STB_TRUETYPE_IMPLEMENTATION #include "os/file_access.h" -#include "stb_truetype.h" void DynamicFontData::lock() { diff --git a/scene/resources/dynamic_font_stb.h b/scene/resources/dynamic_font_stb.h index 3862607ab50..a2c081a9256 100644 --- a/scene/resources/dynamic_font_stb.h +++ b/scene/resources/dynamic_font_stb.h @@ -34,7 +34,8 @@ #include "font.h" #include "io/resource_loader.h" -#include "stb_truetype.h" + +#include "thirdparty/misc/stb_truetype.h" class DynamicFontAtSize; class DynamicFont; diff --git a/scene/resources/surface_tool.h b/scene/resources/surface_tool.h index 6e52db218d5..b143086e11e 100644 --- a/scene/resources/surface_tool.h +++ b/scene/resources/surface_tool.h @@ -30,9 +30,10 @@ #ifndef SURFACE_TOOL_H #define SURFACE_TOOL_H -#include "mikktspace.h" #include "scene/resources/mesh.h" +#include "thirdparty/misc/mikktspace.h" + class SurfaceTool : public Reference { GDCLASS(SurfaceTool, Reference); diff --git a/thirdparty/README.md b/thirdparty/README.md index ea731282efe..1c4bad48361 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -1,6 +1,13 @@ # Third party libraries +## b2d_convexdecomp + +- Upstream: https://github.com/erincatto/Box2D (Contributions/Utilities/ConvexDecomposition) +- Version: TBD +- License: zlib + + ## certs - Upstream: ? @@ -158,7 +165,9 @@ TODO: Properly sync with version 1.2.4 and document changes. ## misc -Collection of single-file libraries used in Godot. +Collection of single-file libraries used in Godot components. + +### core - `aes256.{cpp,h}` * Upstream: http://www.literatecode.com/aes256 @@ -198,6 +207,32 @@ Collection of single-file libraries used in Godot. * Version: TBD, class was renamed * License: MIT +### modules + +- `curl_hostcheck.{c,h}` + * Upstream: https://curl.haxx.se/ + * Version: ? (2013) + * License: MIT +- `yuv2rgb.h` + * Upstream: http://wss.co.uk/pinknoise/yuv2rgb/ (to check) + * Version: ? + * License: BSD + +### scene + +- `mikktspace.{c,h}` + * Upstream: https://wiki.blender.org/index.php/Dev:Shading/Tangent_Space_Normal_Maps + * Version: 1.0 + * License: zlib +- `stb_truetype.h` + * Upstream: https://github.com/nothings/stb + * Version: 1.11 + * License: Public Domain (Unlicense) or MIT +- `stb_vorbis.c` + * Upstream: https://github.com/nothings/stb + * Version: 1.09 + * License: Public Domain (Unlicense) or MIT + ## openssl diff --git a/drivers/convex_decomp/b2Glue.h b/thirdparty/b2d_convexdecomp/b2Glue.h similarity index 100% rename from drivers/convex_decomp/b2Glue.h rename to thirdparty/b2d_convexdecomp/b2Glue.h diff --git a/drivers/convex_decomp/b2Polygon.cpp b/thirdparty/b2d_convexdecomp/b2Polygon.cpp similarity index 100% rename from drivers/convex_decomp/b2Polygon.cpp rename to thirdparty/b2d_convexdecomp/b2Polygon.cpp diff --git a/drivers/convex_decomp/b2Polygon.h b/thirdparty/b2d_convexdecomp/b2Polygon.h similarity index 100% rename from drivers/convex_decomp/b2Polygon.h rename to thirdparty/b2d_convexdecomp/b2Polygon.h diff --git a/drivers/convex_decomp/b2Triangle.cpp b/thirdparty/b2d_convexdecomp/b2Triangle.cpp similarity index 100% rename from drivers/convex_decomp/b2Triangle.cpp rename to thirdparty/b2d_convexdecomp/b2Triangle.cpp diff --git a/drivers/convex_decomp/b2Triangle.h b/thirdparty/b2d_convexdecomp/b2Triangle.h similarity index 100% rename from drivers/convex_decomp/b2Triangle.h rename to thirdparty/b2d_convexdecomp/b2Triangle.h diff --git a/modules/openssl/curl_hostcheck.c b/thirdparty/misc/curl_hostcheck.c similarity index 100% rename from modules/openssl/curl_hostcheck.c rename to thirdparty/misc/curl_hostcheck.c diff --git a/modules/openssl/curl_hostcheck.h b/thirdparty/misc/curl_hostcheck.h similarity index 100% rename from modules/openssl/curl_hostcheck.h rename to thirdparty/misc/curl_hostcheck.h diff --git a/scene/resources/mikktspace.c b/thirdparty/misc/mikktspace.c similarity index 100% rename from scene/resources/mikktspace.c rename to thirdparty/misc/mikktspace.c diff --git a/scene/resources/mikktspace.h b/thirdparty/misc/mikktspace.h similarity index 100% rename from scene/resources/mikktspace.h rename to thirdparty/misc/mikktspace.h diff --git a/scene/resources/stb_truetype.h b/thirdparty/misc/stb_truetype.h similarity index 100% rename from scene/resources/stb_truetype.h rename to thirdparty/misc/stb_truetype.h diff --git a/thirdparty/stb_vorbis/stb_vorbis.c b/thirdparty/misc/stb_vorbis.c similarity index 100% rename from thirdparty/stb_vorbis/stb_vorbis.c rename to thirdparty/misc/stb_vorbis.c diff --git a/modules/theora/yuv2rgb.h b/thirdparty/misc/yuv2rgb.h similarity index 100% rename from modules/theora/yuv2rgb.h rename to thirdparty/misc/yuv2rgb.h