diff options
| -rw-r--r-- | core/SCsub | 46 | ||||
| -rw-r--r-- | core/bind/core_bind.cpp | 4 | ||||
| -rw-r--r-- | core/compressed_translation.cpp | 211 | ||||
| -rw-r--r-- | core/image.cpp | 3 | ||||
| -rw-r--r-- | core/io/SCsub | 2 | ||||
| -rw-r--r-- | core/io/compression.cpp | 8 | ||||
| -rw-r--r-- | core/io/file_access_encrypted.cpp | 11 | ||||
| -rw-r--r-- | core/io/file_access_zip.h | 4 | ||||
| -rw-r--r-- | core/io/sha-README.md | 5 | ||||
| -rw-r--r-- | core/io/zip_io.h | 5 | ||||
| -rw-r--r-- | core/math/math_funcs.h | 3 | ||||
| -rw-r--r-- | core/os/file_access.cpp | 6 | ||||
| -rw-r--r-- | core/ustring.cpp | 5 | ||||
| -rw-r--r-- | drivers/convex_decomp/SCsub | 9 | ||||
| -rw-r--r-- | drivers/convex_decomp/b2d_decompose.cpp | 3 | ||||
| -rw-r--r-- | editor/editor_export.cpp | 4 | ||||
| -rw-r--r-- | editor/export_template_manager.cpp | 33 | ||||
| -rw-r--r-- | editor/export_template_manager.h | 29 | ||||
| -rw-r--r-- | editor/io_plugins/editor_texture_import_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/curve_editor_plugin.cpp | 30 | ||||
| -rw-r--r-- | editor/plugins/curve_editor_plugin.h | 29 | ||||
| -rw-r--r-- | editor/plugins/gradient_texture_editor_plugin.cpp | 33 | ||||
| -rw-r--r-- | editor/plugins/gradient_texture_editor_plugin.h | 29 | ||||
| -rw-r--r-- | modules/openssl/SCsub | 11 | ||||
| -rw-r--r-- | modules/openssl/stream_peer_openssl.h | 6 | ||||
| -rw-r--r-- | modules/stb_vorbis/audio_stream_ogg_vorbis.cpp | 3 | ||||
| -rw-r--r-- | modules/stb_vorbis/audio_stream_ogg_vorbis.h | 2 | ||||
| -rw-r--r-- | modules/theora/video_stream_theora.cpp | 3 | ||||
| -rw-r--r-- | modules/webm/video_stream_webm.cpp | 3 | ||||
| -rw-r--r-- | platform/uwp/export/export.cpp | 9 | ||||
| -rw-r--r-- | scene/2d/collision_polygon_2d.cpp | 5 | ||||
| -rw-r--r-- | scene/2d/navigation_polygon.cpp | 4 | ||||
| -rw-r--r-- | scene/SCsub | 19 | ||||
| -rw-r--r-- | scene/resources/SCsub | 1 | ||||
| -rw-r--r-- | scene/resources/dynamic_font_stb.cpp | 1 | ||||
| -rw-r--r-- | scene/resources/dynamic_font_stb.h | 3 | ||||
| -rw-r--r-- | scene/resources/surface_tool.h | 3 | ||||
| -rw-r--r-- | thirdparty/README.md | 92 | ||||
| -rw-r--r-- | thirdparty/b2d_convexdecomp/b2Glue.h (renamed from drivers/convex_decomp/b2Glue.h) | 0 | ||||
| -rw-r--r-- | thirdparty/b2d_convexdecomp/b2Polygon.cpp (renamed from drivers/convex_decomp/b2Polygon.cpp) | 0 | ||||
| -rw-r--r-- | thirdparty/b2d_convexdecomp/b2Polygon.h (renamed from drivers/convex_decomp/b2Polygon.h) | 0 | ||||
| -rw-r--r-- | thirdparty/b2d_convexdecomp/b2Triangle.cpp (renamed from drivers/convex_decomp/b2Triangle.cpp) | 0 | ||||
| -rw-r--r-- | thirdparty/b2d_convexdecomp/b2Triangle.h (renamed from drivers/convex_decomp/b2Triangle.h) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/LICENSE-InfoZip.txt (renamed from core/io/LICENSE-InfoZip.txt) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/LICENSE-MiniZip.txt (renamed from core/io/LICENSE-MiniZip.txt) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/crypt.h (renamed from core/io/crypt.h) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/ioapi.c (renamed from core/io/ioapi.c) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/ioapi.h (renamed from core/io/ioapi.h) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/unzip.c (renamed from core/io/unzip.c) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/unzip.h (renamed from core/io/unzip.h) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/zip.c (renamed from core/io/zip.c) | 0 | ||||
| -rw-r--r-- | thirdparty/minizip/zip.h (renamed from core/io/zip.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/aes256.cpp (renamed from core/io/aes256.cpp) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/aes256.h (renamed from core/io/aes256.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/base64.c (renamed from core/io/base64.c) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/base64.h (renamed from core/io/base64.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/curl_hostcheck.c (renamed from modules/openssl/curl_hostcheck.c) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/curl_hostcheck.h (renamed from modules/openssl/curl_hostcheck.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/fastlz.c (renamed from core/io/fastlz.c) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/fastlz.h (renamed from core/io/fastlz.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/hq2x.cpp (renamed from core/hq2x.cpp) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/hq2x.h (renamed from core/hq2x.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/md5.cpp (renamed from core/io/md5.cpp) | 4 | ||||
| -rw-r--r-- | thirdparty/misc/md5.h (renamed from core/io/md5.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/mikktspace.c (renamed from scene/resources/mikktspace.c) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/mikktspace.h (renamed from scene/resources/mikktspace.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/pcg.cpp (renamed from core/math/pcg.cpp) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/pcg.h (renamed from core/math/pcg.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/sha256.c (renamed from core/io/sha256.c) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/sha256.h (renamed from core/io/sha256.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/smaz.c | 207 | ||||
| -rw-r--r-- | thirdparty/misc/smaz.h | 20 | ||||
| -rw-r--r-- | thirdparty/misc/stb_truetype.h (renamed from scene/resources/stb_truetype.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/stb_vorbis.c (renamed from thirdparty/stb_vorbis/stb_vorbis.c) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/triangulator.cpp (renamed from core/math/triangulator.cpp) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/triangulator.h (renamed from core/math/triangulator.h) | 0 | ||||
| -rw-r--r-- | thirdparty/misc/yuv2rgb.h (renamed from modules/theora/yuv2rgb.h) | 0 |
77 files changed, 647 insertions, 265 deletions
diff --git a/core/SCsub b/core/SCsub index 77c8288846..fd3f57dd7c 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,57 @@ 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", + "smaz.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 sources 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 bd41e48a30..7a03ceb64c 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/compressed_translation.cpp b/core/compressed_translation.cpp index d41534703c..9bdd960424 100644 --- a/core/compressed_translation.cpp +++ b/core/compressed_translation.cpp @@ -30,218 +30,11 @@ #include "compressed_translation.h" #include "pair.h" -#include <string.h> - -/////////// 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</\361", "\003 wh\237", "\002 4", - "\003nd ?", "\002re!", "", "\003ng c", "", - "\003ly \307\003ass\323\001a\004\002rir", "", "", "", "\002se_", "\003of \"", - "\003div\364\002ros\003ere\240", "", "\002ta\310\001bZ\002si\324", "", - "\003and\a\002rs\335", "\002rt\362", "\002teE", "\003ati\316", "\002so\263", - "\002th\021", "\002tiJ\001c\034\003allp", "\003ate\345", "\002ss\246", - "\002stM", "", "\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", "</", "rt", " wi", "div", - "e, ", " it", "whi", " ma", "ge", "x", "e c", "men", ".com" -}; -static 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; - - while (inlen) { - int j = 7, needed; - char *flush = NULL; - const char *slot; - - h1 = h2 = in[0] << 3; - if (inlen > 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; -} - -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; +extern "C" { +#include "thirdparty/misc/smaz.h" } -/////////// END OF SMAZ ///////////// - struct _PHashTranslationCmp { int orig_len; diff --git a/core/image.cpp b/core/image.cpp index 8a09dc1a8c..b81d92fa33 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 <stdio.h> const char *Image::format_names[Image::FORMAT_MAX] = { diff --git a/core/io/SCsub b/core/io/SCsub index 6789aa8bc6..4efc902717 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 c26bd7cdcd..662411a62e 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 <zlib.h> + 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 2625e5fe34..f2b33a01bb 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 "core/variant.h" #include "os/copymem.h" #include "print_string.h" -#define COMP_MAGIC 0x43454447 -#include "core/variant.h" +#include "thirdparty/misc/aes256.h" +#include "thirdparty/misc/md5.h" + #include <stdio.h> +#define COMP_MAGIC 0x43454447 + Error FileAccessEncrypted::open_and_parse(FileAccess *p_base, const Vector<uint8_t> &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 8c3cd3ae67..c9cc2dac79 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 <stdlib.h> class ZipArchive : public PackSource { diff --git a/core/io/sha-README.md b/core/io/sha-README.md deleted file mode 100644 index 27a73cffe7..0000000000 --- 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 d5af042499..88e680c0e0 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 5bfbc1005f..06ec77daae 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 <float.h> #include <math.h> diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index f344525d1e..375121c0cc 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 b01f680dd6..dcb6545bd1 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 <wchar.h> #ifndef NO_USE_STDLIB diff --git a/drivers/convex_decomp/SCsub b/drivers/convex_decomp/SCsub index ee39fd2631..f017e55120 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 f918b66c31..d9011b8eab 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/editor/editor_export.cpp b/editor/editor_export.cpp index 7dc5db4c7d..b719e4a487 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/export_template_manager.cpp b/editor/export_template_manager.cpp index 83ada90144..e6f15d1712 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 c3834ec643..480c73e123 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/io_plugins/editor_texture_import_plugin.cpp b/editor/io_plugins/editor_texture_import_plugin.cpp index ba380f0334..d9b4a95045 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/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 52edc75bc0..f3ad5c0fd1 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 e98cec2727..ebe05539aa 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 9551fe19fa..41dd64d931 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 5af828f17c..cb2f6b4061 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 diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub index 0e811ce8c9..add7d4dcfc 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 12262da94a..5c830ebf37 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 <stdio.h> // If you don't know what this is for stop reading now. + +#include "thirdparty/misc/curl_hostcheck.h" #include <openssl/bio.h> // BIO objects for I/O #include <openssl/err.h> // Error reporting #include <openssl/ssl.h> // SSL and SSL_CTX for SSL connections #include <openssl/x509v3.h> +#include <stdio.h> + 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 b0870c9dc2..c645a55703 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 bb895c4dfa..287aa4ca47 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 28463e2cba..61112f20b4 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 9d8062d283..eaf4215302 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 <string.h> class MkvReader : public mkvparser::IMkvReader { diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp index 4a164e5ba1..976e6208ee 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 <zlib.h> // Capabilities diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index b54861a314..39eef89274 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 aec6d7108b..807f72e81f 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<Vector2> &p_vertices) { diff --git a/scene/SCsub b/scene/SCsub index bd2da1eab9..df52e9c6cb 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 60b16cd0d4..2ad90247a7 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 0a784c6496..397349bbf9 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 3862607ab5..a2c081a925 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 6e52db218d..b143086e11 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 f6edff490f..1c4bad4836 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: ? @@ -142,6 +149,91 @@ 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 components. + +### core + +- `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 +- `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 + * 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 - Upstream: https://www.openssl.org diff --git a/drivers/convex_decomp/b2Glue.h b/thirdparty/b2d_convexdecomp/b2Glue.h index 425486356e..425486356e 100644 --- a/drivers/convex_decomp/b2Glue.h +++ b/thirdparty/b2d_convexdecomp/b2Glue.h diff --git a/drivers/convex_decomp/b2Polygon.cpp b/thirdparty/b2d_convexdecomp/b2Polygon.cpp index b6ead62c63..b6ead62c63 100644 --- a/drivers/convex_decomp/b2Polygon.cpp +++ b/thirdparty/b2d_convexdecomp/b2Polygon.cpp diff --git a/drivers/convex_decomp/b2Polygon.h b/thirdparty/b2d_convexdecomp/b2Polygon.h index c466e28f7e..c466e28f7e 100644 --- a/drivers/convex_decomp/b2Polygon.h +++ b/thirdparty/b2d_convexdecomp/b2Polygon.h diff --git a/drivers/convex_decomp/b2Triangle.cpp b/thirdparty/b2d_convexdecomp/b2Triangle.cpp index a0a30b9407..a0a30b9407 100644 --- a/drivers/convex_decomp/b2Triangle.cpp +++ b/thirdparty/b2d_convexdecomp/b2Triangle.cpp diff --git a/drivers/convex_decomp/b2Triangle.h b/thirdparty/b2d_convexdecomp/b2Triangle.h index 99ab5cba69..99ab5cba69 100644 --- a/drivers/convex_decomp/b2Triangle.h +++ b/thirdparty/b2d_convexdecomp/b2Triangle.h diff --git a/core/io/LICENSE-InfoZip.txt b/thirdparty/minizip/LICENSE-InfoZip.txt index bcfe47e978..bcfe47e978 100644 --- a/core/io/LICENSE-InfoZip.txt +++ b/thirdparty/minizip/LICENSE-InfoZip.txt diff --git a/core/io/LICENSE-MiniZip.txt b/thirdparty/minizip/LICENSE-MiniZip.txt index 0e8950f86f..0e8950f86f 100644 --- a/core/io/LICENSE-MiniZip.txt +++ b/thirdparty/minizip/LICENSE-MiniZip.txt diff --git a/core/io/crypt.h b/thirdparty/minizip/crypt.h index a01d08d932..a01d08d932 100644 --- a/core/io/crypt.h +++ b/thirdparty/minizip/crypt.h diff --git a/core/io/ioapi.c b/thirdparty/minizip/ioapi.c index d6063a5fe6..d6063a5fe6 100644 --- a/core/io/ioapi.c +++ b/thirdparty/minizip/ioapi.c diff --git a/core/io/ioapi.h b/thirdparty/minizip/ioapi.h index cb6cb7e766..cb6cb7e766 100644 --- a/core/io/ioapi.h +++ b/thirdparty/minizip/ioapi.h diff --git a/core/io/unzip.c b/thirdparty/minizip/unzip.c index 7aa0a86d13..7aa0a86d13 100644 --- a/core/io/unzip.c +++ b/thirdparty/minizip/unzip.c diff --git a/core/io/unzip.h b/thirdparty/minizip/unzip.h index f67c3b2fa8..f67c3b2fa8 100644 --- a/core/io/unzip.h +++ b/thirdparty/minizip/unzip.h diff --git a/core/io/zip.c b/thirdparty/minizip/zip.c index 27a3d3cdc1..27a3d3cdc1 100644 --- a/core/io/zip.c +++ b/thirdparty/minizip/zip.c diff --git a/core/io/zip.h b/thirdparty/minizip/zip.h index 37478b34c0..37478b34c0 100644 --- a/core/io/zip.h +++ b/thirdparty/minizip/zip.h diff --git a/core/io/aes256.cpp b/thirdparty/misc/aes256.cpp index dc271928b4..dc271928b4 100644 --- a/core/io/aes256.cpp +++ b/thirdparty/misc/aes256.cpp diff --git a/core/io/aes256.h b/thirdparty/misc/aes256.h index 8fcc25a4de..8fcc25a4de 100644 --- a/core/io/aes256.h +++ b/thirdparty/misc/aes256.h diff --git a/core/io/base64.c b/thirdparty/misc/base64.c index 0929ae5db5..0929ae5db5 100644 --- a/core/io/base64.c +++ b/thirdparty/misc/base64.c diff --git a/core/io/base64.h b/thirdparty/misc/base64.h index 456ef1811b..456ef1811b 100644 --- a/core/io/base64.h +++ b/thirdparty/misc/base64.h diff --git a/modules/openssl/curl_hostcheck.c b/thirdparty/misc/curl_hostcheck.c index feef232619..feef232619 100644 --- a/modules/openssl/curl_hostcheck.c +++ b/thirdparty/misc/curl_hostcheck.c diff --git a/modules/openssl/curl_hostcheck.h b/thirdparty/misc/curl_hostcheck.h index 1b7fbe81e3..1b7fbe81e3 100644 --- a/modules/openssl/curl_hostcheck.h +++ b/thirdparty/misc/curl_hostcheck.h diff --git a/core/io/fastlz.c b/thirdparty/misc/fastlz.c index 508f6ea2ae..508f6ea2ae 100644 --- a/core/io/fastlz.c +++ b/thirdparty/misc/fastlz.c diff --git a/core/io/fastlz.h b/thirdparty/misc/fastlz.h index e5ca8dfc02..e5ca8dfc02 100644 --- a/core/io/fastlz.h +++ b/thirdparty/misc/fastlz.h diff --git a/core/hq2x.cpp b/thirdparty/misc/hq2x.cpp index 7ebb505d64..7ebb505d64 100644 --- a/core/hq2x.cpp +++ b/thirdparty/misc/hq2x.cpp diff --git a/core/hq2x.h b/thirdparty/misc/hq2x.h index 8f119d2a01..8f119d2a01 100644 --- a/core/hq2x.h +++ b/thirdparty/misc/hq2x.h diff --git a/core/io/md5.cpp b/thirdparty/misc/md5.cpp index 5a88328dd4..1653ab0be5 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 index e99d58b443..e99d58b443 100644 --- a/core/io/md5.h +++ b/thirdparty/misc/md5.h diff --git a/scene/resources/mikktspace.c b/thirdparty/misc/mikktspace.c index 62aa2da251..62aa2da251 100644 --- a/scene/resources/mikktspace.c +++ b/thirdparty/misc/mikktspace.c diff --git a/scene/resources/mikktspace.h b/thirdparty/misc/mikktspace.h index 52c44a713c..52c44a713c 100644 --- a/scene/resources/mikktspace.h +++ b/thirdparty/misc/mikktspace.h diff --git a/core/math/pcg.cpp b/thirdparty/misc/pcg.cpp index eac3b36d36..eac3b36d36 100644 --- a/core/math/pcg.cpp +++ b/thirdparty/misc/pcg.cpp diff --git a/core/math/pcg.h b/thirdparty/misc/pcg.h index 81f4c9770e..81f4c9770e 100644 --- a/core/math/pcg.h +++ b/thirdparty/misc/pcg.h diff --git a/core/io/sha256.c b/thirdparty/misc/sha256.c index 68a4339af9..68a4339af9 100644 --- a/core/io/sha256.c +++ b/thirdparty/misc/sha256.c diff --git a/core/io/sha256.h b/thirdparty/misc/sha256.h index e19e56b4cc..e19e56b4cc 100644 --- a/core/io/sha256.h +++ b/thirdparty/misc/sha256.h diff --git a/thirdparty/misc/smaz.c b/thirdparty/misc/smaz.c new file mode 100644 index 0000000000..555dfea844 --- /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 <string.h> + +/* 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</\361", "\003 wh\237", "\002 4", +"\003nd ?", "\002re!", "", "\003ng c", "", +"\003ly \307\003ass\323\001a\004\002rir", "", "", "", "\002se_", "\003of \"", +"\003div\364\002ros\003ere\240", "", "\002ta\310\001bZ\002si\324", "", +"\003and\a\002rs\335", "\002rt\362", "\002teE", "\003ati\316", "\002so\263", +"\002th\021", "\002tiJ\001c\034\003allp", "\003ate\345", "\002ss\246", +"\002stM", "", "\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", "</", "rt", " wi", "div", +"e, ", " it", "whi", " ma", "ge", "x", "e c", "men", ".com" +}; + +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; + + while(inlen) { + int j = 7, needed; + char *flush = NULL; + char *slot; + + h1 = h2 = in[0]<<3; + if (inlen > 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 0000000000..a9d8a337a7 --- /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 diff --git a/scene/resources/stb_truetype.h b/thirdparty/misc/stb_truetype.h index 016972785a..016972785a 100644 --- a/scene/resources/stb_truetype.h +++ b/thirdparty/misc/stb_truetype.h diff --git a/thirdparty/stb_vorbis/stb_vorbis.c b/thirdparty/misc/stb_vorbis.c index c4f24d5898..c4f24d5898 100644 --- a/thirdparty/stb_vorbis/stb_vorbis.c +++ b/thirdparty/misc/stb_vorbis.c diff --git a/core/math/triangulator.cpp b/thirdparty/misc/triangulator.cpp index 75b2b064c4..75b2b064c4 100644 --- a/core/math/triangulator.cpp +++ b/thirdparty/misc/triangulator.cpp diff --git a/core/math/triangulator.h b/thirdparty/misc/triangulator.h index b6dd7e8236..b6dd7e8236 100644 --- a/core/math/triangulator.h +++ b/thirdparty/misc/triangulator.h diff --git a/modules/theora/yuv2rgb.h b/thirdparty/misc/yuv2rgb.h index a9bef76da8..a9bef76da8 100644 --- a/modules/theora/yuv2rgb.h +++ b/thirdparty/misc/yuv2rgb.h |