thirdparty: Cleanup after godotengine#38386, document provenance and …

…copyright

Also renamed `delaunay.h` to `delaunay_2d.h` to match the class name.

COPYRIGHT.txt

@@ -303,6 +303,11 @@ Comment: NanoSVG
 Copyright: 2013-2014, Mikko Mononen
 License: Zlib
 
+Files: ./thirdparty/oidn/
+Comment: Intel Open Image Denoise
+Copyright: 2009-2020, Intel Corporation
+License: Apache-2.0
+
 Files: ./thirdparty/opus/
 Comment: Opus
 Copyright: 2001-2011, Xiph.Org, Skype Limited, Octasic,

core/SCsub

@@ -49,6 +49,7 @@ thirdparty_misc_dir = "#thirdparty/misc/"
 thirdparty_misc_sources = [
     # C sources
     "fastlz.c",
+    "r128.c",
     "smaz.c",
     # C++ sources
     "hq2x.cpp",

core/math/delaunay.h → core/math/delaunay_2d.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  delaunay.h                                                           */
+/*  delaunay_2d.h                                                        */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef DELAUNAY_H
-#define DELAUNAY_H
+#ifndef DELAUNAY_2D_H
+#define DELAUNAY_2D_H
 
 #include "core/math/rect2.h"
 
@@ -170,4 +170,4 @@ class Delaunay2D {
 	}
 };
 
-#endif // DELAUNAY_H
+#endif // DELAUNAY_2D_H

core/math/delaunay_3d.h

@@ -10,7 +10,8 @@
 #include "core/print_string.h"
 #include "core/variant.h"
 #include "core/vector.h"
-#include "thirdparty/r128/r128.h"
+
+#include "thirdparty/misc/r128.h"
 
 class Delaunay3D {
 	struct Simplex;

core/math/geometry.cpp

@@ -31,10 +31,11 @@
 #include "geometry.h"
 
 #include "core/print_string.h"
+
 #include "thirdparty/misc/clipper.hpp"
 #include "thirdparty/misc/triangulator.h"
 #define STB_RECT_PACK_IMPLEMENTATION
-#include "thirdparty/stb_rect_pack/stb_rect_pack.h"
+#include "thirdparty/misc/stb_rect_pack.h"
 
 #define SCALE_FACTOR 100000.0 // Based on CMP_EPSILON.
 

core/math/geometry.h

@@ -31,13 +31,12 @@
 #ifndef GEOMETRY_H
 #define GEOMETRY_H
 
-#include "core/math/delaunay.h"
+#include "core/math/delaunay_2d.h"
 #include "core/math/face3.h"
 #include "core/math/rect2.h"
 #include "core/math/triangulate.h"
 #include "core/math/vector3.h"
 #include "core/object.h"
-
 #include "core/print_string.h"
 #include "core/vector.h"
 

editor/plugins/animation_blend_space_2d_editor.cpp

@@ -32,7 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
-#include "core/math/delaunay.h"
+#include "core/math/delaunay_2d.h"
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 #include "editor/editor_scale.h"

editor/plugins/animation_state_machine_editor.cpp

@@ -32,7 +32,7 @@
 
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
-#include "core/math/delaunay.h"
+#include "core/math/delaunay_2d.h"
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 #include "editor/editor_scale.h"

editor/plugins/animation_tree_editor_plugin.cpp

@@ -36,7 +36,7 @@
 #include "animation_state_machine_editor.h"
 #include "core/input/input.h"
 #include "core/io/resource_loader.h"
-#include "core/math/delaunay.h"
+#include "core/math/delaunay_2d.h"
 #include "core/os/keyboard.h"
 #include "core/project_settings.h"
 #include "editor/editor_scale.h"

modules/denoise/SCsub

@@ -17,7 +17,7 @@ thirdparty_sources = [
     "core/network.cpp",
     "core/autoencoder.cpp",
     "core/transfer_function.cpp",
-    "weights/rtlightmap_hdr.cpp",
+    "weights/rtlightmap_hdr.gen.cpp",
     "mkl-dnn/src/common/batch_normalization.cpp",
     "mkl-dnn/src/common/concat.cpp",
     "mkl-dnn/src/common/convolution.cpp",
@@ -110,7 +110,7 @@ env_thirdparty.disable_warnings()
 env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources)
 
 weights_in_path = thirdparty_dir + "weights/rtlightmap_hdr.tza"
-weights_out_path = thirdparty_dir + "weights/rtlightmap_hdr.cpp"
+weights_out_path = thirdparty_dir + "weights/rtlightmap_hdr.gen.cpp"
 
 env_thirdparty.Depends(weights_out_path, weights_in_path)
 env_thirdparty.CommandNoCache(weights_out_path, weights_in_path, resource_to_cpp.tza_to_cpp)

scene/animation/animation_blend_space_2d.cpp

@@ -29,7 +29,8 @@
 /*************************************************************************/
 
 #include "animation_blend_space_2d.h"
-#include "core/math/delaunay.h"
+
+#include "core/math/delaunay_2d.h"
 
 void AnimationNodeBlendSpace2D::get_parameter_list(List<PropertyInfo> *r_list) const {
 	r_list->push_back(PropertyInfo(Variant::VECTOR2, blend_position));

thirdparty/README.md

@@ -384,11 +384,19 @@ Collection of single-file libraries used in Godot components.
   * Upstream: http://www.pcg-random.org
   * Version: minimal C implementation, http://www.pcg-random.org/download.html
   * License: Apache 2.0
+- `r128.h`
+  * Upstream: /~https://github.com/fahickman/r128
+  * Version: 1.4.3 (2019)
+  * License: Public Domain
 - `smaz.{c,h}`
   * Upstream: /~https://github.com/antirez/smaz
   * Version: git (150e125cbae2e8fd20dd332432776ce13395d4d4, 2009)
   * License: BSD-3-Clause
   * Modifications: use `const char*` instead of `char*` for input string
+- `stb_rect_pack.h`
+  * Upstream: /~https://github.com/nothings/stb
+  * Version: 1.00 (2019)
+  * License: Public Domain (Unlicense) or MIT
 - `triangulator.{cpp,h}`
   * Upstream: /~https://github.com/ivanfratric/polypartition (`src/polypartition.cpp`)
   * Version: TBD, class was renamed
@@ -437,6 +445,17 @@ Files extracted from the upstream source:
 - LICENSE.txt
 
 
+## oidn
+
+- Upstream: /~https://github.com/OpenImageDenoise/oidn
+- Version: TBD
+- License: Apache 2.0
+
+Files extracted from upstream source:
+
+- TBD
+
+
 ## opus
 
 - Upstream: https://opus-codec.org

thirdparty/misc/r128.c

@@ -0,0 +1,2 @@
+#define R128_IMPLEMENTATION
+#include "r128.h"

thirdparty/r128/r128.h → thirdparty/misc/r128.h

@@ -77,7 +77,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #  define R128_S32 int32_t
 #  define R128_U32 uint32_t
 #  define R128_S64 int64_t
-#  define R128_U64 long long unsigned int
+#  define R128_U64 uint64_t
 #  define R128_LIT_S64(x) x##ll
 #  define R128_LIT_U64(x) x##ull
 #endif
@@ -703,12 +703,12 @@ static R128_U32 r128__udiv64(R128_U32 nlo, R128_U32 nhi, R128_U32 d, R128_U32 *r
 }
 #elif !defined(_M_X64) || defined(R128_STDC_ONLY)
 #define r128__umul64(a, b) ((a) * (R128_U64)(b))
-/*static R128_U32 r128__udiv64(R128_U32 nlo, R128_U32 nhi, R128_U32 d, R128_U32 *rem)
+static R128_U32 r128__udiv64(R128_U32 nlo, R128_U32 nhi, R128_U32 d, R128_U32 *rem)
 {
    R128_U64 n64 = ((R128_U64)nhi << 32) | nlo;
    *rem = (R128_U32)(n64 % d);
    return (R128_U32)(n64 / d);
-}*/
+}
 #endif   //!R128_64BIT
 
 static void r128__neg(R128 *dst, const R128 *src)
@@ -1188,7 +1188,7 @@ static int r128__format(char *dst, size_t dstSize, const R128 *v, const R128ToSt
       // print a maximum of 20 digits
       fullPrecision = 0;
       precision = 20;
-   } else if (precision > (int)sizeof(buf) - 21) {
+   } else if (precision > sizeof(buf) - 21) {
       trail = precision - (sizeof(buf) - 21);
       precision -= trail;
    }
@@ -2121,4 +2121,3 @@ void r128Ceil(R128 *dst, const R128 *v)
 }
 
 #endif   //R128_IMPLEMENTATION
-

thirdparty/stb_rect_pack/stb_rect_pack.h → thirdparty/misc/stb_rect_pack.h

@@ -626,4 +626,3 @@ 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.
 ------------------------------------------------------------------------------
 */
-