Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
d4029aa5
Commit
d4029aa5
authored
Apr 28, 2017
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move other lone thirdparty files to thirdparty/misc
Also move Box2D ConvexDecomposition contrib code to thirdparty/b2d_convexdecomp.
parent
c5f830d6
Show whitespace changes
Inline
Side-by-side
Showing
27 changed files
with
90 additions
and
16 deletions
+90
-16
SCsub
core/SCsub
+1
-1
SCsub
drivers/convex_decomp/SCsub
+9
-0
b2d_decompose.cpp
drivers/convex_decomp/b2d_decompose.cpp
+2
-1
SCsub
modules/openssl/SCsub
+10
-1
stream_peer_openssl.h
modules/openssl/stream_peer_openssl.h
+4
-2
audio_stream_ogg_vorbis.cpp
modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
+2
-1
audio_stream_ogg_vorbis.h
modules/stb_vorbis/audio_stream_ogg_vorbis.h
+1
-1
video_stream_theora.cpp
modules/theora/video_stream_theora.cpp
+2
-1
video_stream_webm.cpp
modules/webm/video_stream_webm.cpp
+2
-1
SCsub
scene/SCsub
+17
-2
SCsub
scene/resources/SCsub
+0
-1
dynamic_font_stb.cpp
scene/resources/dynamic_font_stb.cpp
+0
-1
dynamic_font_stb.h
scene/resources/dynamic_font_stb.h
+2
-1
surface_tool.h
scene/resources/surface_tool.h
+2
-1
README.md
thirdparty/README.md
+36
-1
b2Glue.h
thirdparty/b2d_convexdecomp/b2Glue.h
+0
-0
b2Polygon.cpp
thirdparty/b2d_convexdecomp/b2Polygon.cpp
+0
-0
b2Polygon.h
thirdparty/b2d_convexdecomp/b2Polygon.h
+0
-0
b2Triangle.cpp
thirdparty/b2d_convexdecomp/b2Triangle.cpp
+0
-0
b2Triangle.h
thirdparty/b2d_convexdecomp/b2Triangle.h
+0
-0
curl_hostcheck.c
thirdparty/misc/curl_hostcheck.c
+0
-0
curl_hostcheck.h
thirdparty/misc/curl_hostcheck.h
+0
-0
mikktspace.c
thirdparty/misc/mikktspace.c
+0
-0
mikktspace.h
thirdparty/misc/mikktspace.h
+0
-0
stb_truetype.h
thirdparty/misc/stb_truetype.h
+0
-0
stb_vorbis.c
thirdparty/misc/stb_vorbis.c
+0
-0
yuv2rgb.h
thirdparty/misc/yuv2rgb.h
+0
-0
No files found.
core/SCsub
View file @
d4029aa5
...
...
@@ -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 source
s
env
.
add_source_files
(
env
.
core_sources
,
"*.cpp"
)
...
...
drivers/convex_decomp/SCsub
View file @
d4029aa5
...
...
@@ -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'
)
drivers/convex_decomp/b2d_decompose.cpp
View file @
d4029aa5
...
...
@@ -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
{
...
...
modules/openssl/SCsub
View file @
d4029aa5
...
...
@@ -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"
:
...
...
modules/openssl/stream_peer_openssl.h
View file @
d4029aa5
...
...
@@ -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
);
...
...
modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
View file @
d4029aa5
...
...
@@ -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
)
{
...
...
modules/stb_vorbis/audio_stream_ogg_vorbis.h
View file @
d4029aa5
...
...
@@ -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
;
...
...
modules/theora/video_stream_theora.cpp
View file @
d4029aa5
...
...
@@ -31,7 +31,8 @@
#include "global_config.h"
#include "os/os.h"
#include "yuv2rgb.h"
#include "thirdparty/misc/yuv2rgb.h"
int
VideoStreamPlaybackTheora
::
buffer_data
()
{
...
...
modules/webm/video_stream_webm.cpp
View file @
d4029aa5
...
...
@@ -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
{
...
...
scene/SCsub
View file @
d4029aa5
...
...
@@ -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'
)
scene/resources/SCsub
View file @
d4029aa5
...
...
@@ -3,7 +3,6 @@
Import
(
'env'
)
env
.
add_source_files
(
env
.
scene_sources
,
"*.cpp"
)
env
.
add_source_files
(
env
.
scene_sources
,
"*.c"
)
Export
(
'env'
)
...
...
scene/resources/dynamic_font_stb.cpp
View file @
d4029aa5
...
...
@@ -33,7 +33,6 @@
#define STB_TRUETYPE_IMPLEMENTATION
#include "os/file_access.h"
#include "stb_truetype.h"
void
DynamicFontData
::
lock
()
{
...
...
scene/resources/dynamic_font_stb.h
View file @
d4029aa5
...
...
@@ -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
;
...
...
scene/resources/surface_tool.h
View file @
d4029aa5
...
...
@@ -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
);
...
...
thirdparty/README.md
View file @
d4029aa5
# 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
...
...
drivers/convex_
decomp/b2Glue.h
→
thirdparty/b2d_convex
decomp/b2Glue.h
View file @
d4029aa5
File moved
drivers/convex_
decomp/b2Polygon.cpp
→
thirdparty/b2d_convex
decomp/b2Polygon.cpp
View file @
d4029aa5
File moved
drivers/convex_
decomp/b2Polygon.h
→
thirdparty/b2d_convex
decomp/b2Polygon.h
View file @
d4029aa5
File moved
drivers/convex_
decomp/b2Triangle.cpp
→
thirdparty/b2d_convex
decomp/b2Triangle.cpp
View file @
d4029aa5
File moved
drivers/convex_
decomp/b2Triangle.h
→
thirdparty/b2d_convex
decomp/b2Triangle.h
View file @
d4029aa5
File moved
modules/openssl
/curl_hostcheck.c
→
thirdparty/misc
/curl_hostcheck.c
View file @
d4029aa5
File moved
modules/openssl
/curl_hostcheck.h
→
thirdparty/misc
/curl_hostcheck.h
View file @
d4029aa5
File moved
scene/resources
/mikktspace.c
→
thirdparty/misc
/mikktspace.c
View file @
d4029aa5
File moved
scene/resources
/mikktspace.h
→
thirdparty/misc
/mikktspace.h
View file @
d4029aa5
File moved
scene/resources
/stb_truetype.h
→
thirdparty/misc
/stb_truetype.h
View file @
d4029aa5
File moved
thirdparty/
stb_vorbis
/stb_vorbis.c
→
thirdparty/
misc
/stb_vorbis.c
View file @
d4029aa5
File moved
modules/theora
/yuv2rgb.h
→
thirdparty/misc
/yuv2rgb.h
View file @
d4029aa5
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment