godotengine/godot-cpp
1
0
Fork 0
mirror of https://github.com/godotengine/godot-cpp.git synced 2026-01-03 18:09:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: godotengine:godot-3.4.3-stable
Branches Tags
godotengine:master godotengine:4.4 godotengine:4.5 godotengine:4.3 godotengine:4.2 godotengine:4.1 godotengine:3.x godotengine:4.0 godotengine:3.4 godotengine:3.5 godotengine:3.3 godotengine:3.1 godotengine:3.2 godotengine:nativescript-1.1 godotengine:nativescript-1.0 godotengine:3.0
godotengine:godot-4.5-stable godotengine:godot-4.4.1-stable godotengine:godot-4.4-stable godotengine:godot-4.3-stable godotengine:godot-4.2.2-stable godotengine:godot-4.1.4-stable godotengine:godot-4.2.1-stable godotengine:godot-4.2-stable godotengine:godot-4.1.3-stable godotengine:godot-4.0.4-stable godotengine:godot-4.1.2-stable godotengine:godot-3.5.3-stable godotengine:godot-4.1.1-stable godotengine:godot-4.1-stable godotengine:godot-4.0.3-stable godotengine:godot-4.0.2-stable godotengine:godot-4.0.1-stable godotengine:godot-3.5.2-stable godotengine:godot-4.0-stable godotengine:godot-3.5.1-stable godotengine:godot-3.5-stable godotengine:godot-3.4.5-stable godotengine:godot-3.4.4-stable godotengine:godot-3.4.3-stable godotengine:godot-3.4.2-stable godotengine:godot-3.4.1-stable godotengine:godot-3.4-stable godotengine:godot-3.3.4-stable godotengine:godot-3.3.3-stable godotengine:godot-3.3.1-stable godotengine:godot-3.3.2-stable godotengine:godot-3.3-stable godotengine:godot-3.2.3-stable godotengine:godot-3.2-stable godotengine:godot-3.1.2-stable godotengine:godot-3.1.1-stable godotengine:godot-3.1-stable
...
compare: godotengine:3.5
Branches Tags
godotengine:master godotengine:4.4 godotengine:4.5 godotengine:4.3 godotengine:4.2 godotengine:4.1 godotengine:3.x godotengine:4.0 godotengine:3.4 godotengine:3.5 godotengine:3.3 godotengine:3.1 godotengine:3.2 godotengine:nativescript-1.1 godotengine:nativescript-1.0 godotengine:3.0
godotengine:godot-4.5-stable godotengine:godot-4.4.1-stable godotengine:godot-4.4-stable godotengine:godot-4.3-stable godotengine:godot-4.2.2-stable godotengine:godot-4.1.4-stable godotengine:godot-4.2.1-stable godotengine:godot-4.2-stable godotengine:godot-4.1.3-stable godotengine:godot-4.0.4-stable godotengine:godot-4.1.2-stable godotengine:godot-3.5.3-stable godotengine:godot-4.1.1-stable godotengine:godot-4.1-stable godotengine:godot-4.0.3-stable godotengine:godot-4.0.2-stable godotengine:godot-4.0.1-stable godotengine:godot-3.5.2-stable godotengine:godot-4.0-stable godotengine:godot-3.5.1-stable godotengine:godot-3.5-stable godotengine:godot-3.4.5-stable godotengine:godot-3.4.4-stable godotengine:godot-3.4.3-stable godotengine:godot-3.4.2-stable godotengine:godot-3.4.1-stable godotengine:godot-3.4-stable godotengine:godot-3.3.4-stable godotengine:godot-3.3.3-stable godotengine:godot-3.3.1-stable godotengine:godot-3.3.2-stable godotengine:godot-3.3-stable godotengine:godot-3.2.3-stable godotengine:godot-3.2-stable godotengine:godot-3.1.2-stable godotengine:godot-3.1.1-stable godotengine:godot-3.1-stable

36 Commits
godot-3.4. ... 3.5

Author SHA1 Message Date
Rémi Verschelde
5b340cb483 CI: Fix MinGW install error by pinning to earlier version 
Works around https://github.com/egor-tensin/setup-mingw/issues/14.

(cherry picked from commit 0369f6fea0)
 2023-10-04 15:21:23 +02:00
Rémi Verschelde
4212e9e38b CI: Update all images and actions 
(cherry picked from commit 5f401ad88a)
 2023-09-26 23:01:33 +02:00
Aaron Franke
745d7a2d1a Bump Ubuntu version on CI from 18.04 to 20.04 
(cherry picked from commit 102e3c8d16)
 2023-09-26 23:01:16 +02:00
Rémi Verschelde
ef26a3b42d headers: Sync with upstream 3.5 commit 6c814135b (3.5.3-stable) 2023-09-25 15:51:54 +02:00
Rémi Verschelde
76d6ad5d8d headers: Sync with upstream 3.5 commit 338114d47 (3.5.2-stable) 2023-03-07 09:38:59 +01:00
Rémi Verschelde
316b91c5f5 headers: Sync with upstream 3.5 commit 63d04316d (3.5.1-stable) 2022-09-28 00:01:34 +02:00
Rémi Verschelde
97c181a246 Merge pull request #832 from aaronfranke/3.x-ci 2022-09-08 09:47:54 +02:00
Aaron Franke
62714899ff Upgrade 3.x CI to Godot 3.5-stable 2022-09-07 22:30:09 -05:00
Fabio Alessandrelli
02333f8dae [CI] Fix Android builds after GH container update. 
(cherry picked from commit 0943dfc34a)
 2022-08-07 15:46:39 +02:00
Rémi Verschelde
867374da40 headers: Sync with upstream 3.x commit a1c0be731 2022-08-03 10:13:24 +02:00
Rémi Verschelde
7a193d3857 headers: Sync with upstream 3.x commit 38b95cc2f 2022-07-22 11:07:49 +02:00
Rémi Verschelde
dac7dc2a35 CI: Use setup-python@v4 
(cherry picked from commit c7a30aec03)
 2022-07-22 11:06:30 +02:00
dependabot[bot]
a930046796 Bump actions/upload-artifact from 2 to 3 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 4963e6f3fc)
 2022-07-22 11:06:30 +02:00
Hugo Locurcio
db93fbb5f7 Print a warning with unknown SCons variables to ease troubleshooting 
(cherry picked from commit 1e2eafe777)
 2022-07-22 11:06:30 +02:00
Rémi Verschelde
15e173d159 headers: Sync with upstream 3.x commit 3f6dd3352 2022-07-18 14:46:34 +02:00
Joshua Cooper
43fae056d0 CMake: fix CMAKE_BUILD_TYPE and BITS check 
(cherry picked from commit 165ad14b0f)
 2022-07-18 14:00:28 +02:00
Rémi Verschelde
bf0d95369d CMake: Don't use -fPIC on Windows (#732) 
(cherry picked from commits 3c73d1a7a2
and 9b4519280a)
 2022-07-18 13:00:17 +02:00
Rémi Verschelde
e7ebeccd25 SCons: Default num_jobs to max CPUs minus 1 if not specified 
This doesn't change the behavior when `--jobs`/`-j` is specified as a
command-line argument or in `SCONSFLAGS`.

The SCons hack used to know if `num_jobs` was set by the user is derived
from the MongoDB setup.

We use `os.cpu_count()` for portability (available since Python 3.4).

With 4 CPUs or less, we use the max. With more than 4 we use max - 1 to
preserve some bandwidth for the user's other programs.

Makefile: Dehardcode -j4, SCons defaults to max - 1

(cherry picked from commits cdcd473371 and
c2b35fb226)
 2022-07-18 13:00:17 +02:00
Rémi Verschelde
3e1f8f3d89 Merge pull request #667 from theomonnom/patch-1 2022-07-18 11:49:14 +02:00
Rémi Verschelde
2b9843d573 headers: Sync with upstream 3.x commit 28d387f72 2022-06-28 21:51:33 +02:00
Rémi Verschelde
9e5341a5c1 Merge pull request #776 from Faless/fix/3.x_rect2 2022-06-27 12:01:14 +02:00
Fabio Alessandrelli
7bff71a9f5 Fix Rect2::distance_to not returning 0. 
Was relying on comparison with 1e20 which cannot be represented as
float, causing some epsilon to always be returned and compilers
complaining when using -Werror.
 2022-06-27 10:40:24 +02:00
Rémi Verschelde
ac572d5f84 Merge pull request #691 from Faless/build/3.x_tools 2022-06-13 14:17:34 +02:00
Fabio Alessandrelli
c7b81a15f6 [SCons] Fix android build with modern NDKs. 2022-06-08 23:02:21 +02:00
Rémi Verschelde
95258f61f4 headers: Sync with upstream 3.x commit f33899d 2022-05-18 12:56:09 +02:00
Rémi Verschelde
f9f6767722 headers: Sync with upstream 3.x commit 21827a7 2022-05-05 00:19:10 +02:00
Fabio Alessandrelli
9451c184b1 [CI] Matrix build for all platforms. 
Test is only run on macOS and Linux.
 2022-04-14 05:22:50 +02:00
Fabio Alessandrelli
ca7cd22326 Library SCons boilerplate to build projects. 2022-04-14 05:22:50 +02:00
Rémi Verschelde
7d00a6e05b headers: Sync with upstream 3.x commit 21c3048 2022-04-04 13:47:02 +02:00
Rémi Verschelde
3427c97f24 CI: Install MinGW via egor-tensin/setup-mingw 
Scoop install is being problematic since their 0.1.0 release.

(cherry picked from commit 3846201fbb)
 2022-04-04 12:31:26 +02:00
Rémi Verschelde
7a3ad31dc4 Update copyright year 2022-04-04 12:28:54 +02:00
Rémi Verschelde
2eedcb0131 Merge pull request #710 from aaronfranke/3.x-black 
[3.x] Run black format on SConstruct files and bindings generator
 2022-02-26 23:44:16 +01:00
Aaron Franke
f230e51e98 [3.x] Run black format on SConstruct files and bindings generator 2022-02-26 15:03:55 -06:00
Hugo Locurcio
63df6debdf Merge pull request #676 from Ivorforce/patch-3 2022-01-26 18:47:15 +01:00
Ivorius
09249530bd In CMakeLists, use the new FindPython3 instead of FindPython 2021-12-29 15:04:57 +01:00
Théo Monnom
c1f632a146 Generate bin files in the current CMake source dir 
Use CMAKE_CURRENT_SOURCE_DIR to generate the binary in the current CMake directory instead of building it at the top level of the source tree
 2021-12-05 17:49:50 +01:00
58 changed files with 767 additions and 822 deletions
Expand all files Collapse all files

202
.github/workflows/ci.yml vendored
View File

@@ -2,155 +2,117 @@ name: Continuous integration
on: [push, pull_request] on: [push, pull_request]
jobs: jobs:
linux: build:
name: Build (Linux, GCC) name: ${{ matrix.name }}
runs-on: ubuntu-18.04 runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- name: 🐧 Linux (GCC)
os: ubuntu-20.04
platform: linux
artifact-name: godot-cpp-linux-glibc2.31-x86_64-release
artifact-path: bin/libgodot-cpp.linux.release.64.a
godot_zip: Godot_v3.5-stable_linux_server.64.zip
executable: Godot_v3.5-stable_linux_server.64
- name: 🏁 Windows (x86_64, MSVC)
os: windows-2022
platform: windows
artifact-name: godot-cpp-windows-msvc2019-x86_64-release
artifact-path: bin/libgodot-cpp.windows.release.64.lib
- name: 🏁 Windows (x86_64, MinGW)
os: windows-2022
platform: windows
artifact-name: godot-cpp-linux-mingw-x86_64-release
artifact-path: bin/libgodot-cpp.windows.release.64.a
flags: use_mingw=yes
- name: 🍎 macOS (universal)
os: macos-13
platform: osx
artifact-name: godot-cpp-macos-universal-release
artifact-path: bin/libgodot-cpp.osx.release.64.a
flags: macos_arch=universal
godot_zip: Godot_v3.5-stable_osx.universal.zip
executable: Godot.app/Contents/MacOS/Godot
- name: 🤖 Android (arm64)
os: ubuntu-20.04
platform: android
artifact-name: godot-cpp-android-arm64-release
artifact-path: bin/libgodot-cpp.android.release.arm64v8.a
flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME android_arch=arm64v8
- name: 🍏 iOS (arm64)
os: macos-13
platform: ios
artifact-name: godot-cpp-ios-arm64-release
artifact-path: bin/libgodot-cpp.ios.release.arm64.a
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: Set up Python (for SCons) - name: Set up Python (for SCons)
uses: actions/setup-python@v2 uses: actions/setup-python@v4
with: with:
python-version: '3.x' python-version: '3.x'
- name: Install dependencies - name: Linux dependencies
if: ${{ matrix.platform == 'linux' }}
run: | run: |
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qqq build-essential pkg-config sudo apt-get install -qqq build-essential pkg-config
- name: Install scons
run: |
python -m pip install scons python -m pip install scons
curl -LO https://downloads.tuxfamily.org/godotengine/3.4/Godot_v3.4-stable_linux_server.64.zip
unzip Godot_v3.4-stable_linux_server.64.zip
- name: Build godot-cpp - name: Windows dependency (MinGW)
run: | if: ${{ matrix.platform == 'windows' }}
scons target=release generate_bindings=yes -j $(nproc) uses: egor-tensin/setup-mingw@v2
- name: Upload artifact
uses: actions/upload-artifact@v2
with: with:
name: godot-cpp-linux-glibc2.27-x86_64-release version: 12.2.0
path: bin/libgodot-cpp.linux.release.64.a
if-no-files-found: error
- name: Build test GDNative library - name: Build godot-cpp (debug)
run: | run: |
scons target=release platform=linux bits=64 -j $(nproc) -C test scons platform=${{ matrix.platform }} target=debug generate_bindings=yes ${{ matrix.flags }}
- name: Build test without rebuilding godot-cpp (debug)
run: |
cd test
scons platform=${{ matrix.platform }} target=debug ${{ matrix.flags }} build_library=no
- name: Build test and godot-cpp (release)
run: |
cd test
scons platform=${{ matrix.platform }} target=release ${{ matrix.flags }}
- name: Run test GDNative library - name: Run test GDNative library
if: ${{ matrix.platform == 'linux' || matrix.platform == 'osx' }}
run: | run: |
./Godot_v3.4-stable_linux_server.64 --path test -s script.gd curl -LO https://downloads.tuxfamily.org/godotengine/3.5/${{ matrix.godot_zip }}
unzip ${{ matrix.godot_zip }}
windows-msvc: ./${{ matrix.executable }} --path test -s script.gd
name: Build (Windows, MSVC)
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install scons
- name: Build godot-cpp
run: |
scons target=release generate_bindings=yes -j $env:NUMBER_OF_PROCESSORS
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: godot-cpp-windows-msvc2019-x86_64-release name: ${{ matrix.artifact-name }}
path: bin/libgodot-cpp.windows.release.64.lib path: ${{ matrix.artifact-path }}
if-no-files-found: error if-no-files-found: error
windows-mingw:
name: Build (Windows, MinGW)
runs-on: windows-2019
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install scons
- name: Build godot-cpp
# Install GCC from Scoop as the default supplied GCC doesn't work ("Error 1").
run: |
Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
scoop install gcc
g++ --version
gcc --version
scons target=release generate_bindings=yes use_mingw=yes -j $env:NUMBER_OF_PROCESSORS
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: godot-cpp-linux-mingw-x86_64-release
path: bin/libgodot-cpp.windows.release.64.a
if-no-files-found: error
macos:
name: Build (macOS, Clang)
runs-on: macos-11
steps:
- name: Checkout
uses: actions/checkout@v2
with:
submodules: recursive
- name: Set up Python (for SCons)
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install scons
curl -LO https://downloads.tuxfamily.org/godotengine/3.4/Godot_v3.4-stable_osx.universal.zip
unzip Godot_v3.4-stable_osx.universal.zip
- name: Build godot-cpp
run: |
scons target=release generate_bindings=yes -j $(sysctl -n hw.logicalcpu)
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: godot-cpp-macos-universal-release
path: bin/libgodot-cpp.osx.release.64.a
if-no-files-found: error
- name: Build test GDNative library
run: |
scons target=release platform=osx bits=64 macos_arch=universal -j $(sysctl -n hw.logicalcpu) -C test
- name: Run test GDNative library
run: |
./Godot.app/Contents/MacOS/Godot --path test -s script.gd
static-checks: static-checks:
name: Static Checks (clang-format) name: 📊 Static Checks (clang-format)
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v4
- name: Make apt sources.list use the default Ubuntu repositories - name: Make apt sources.list use the default Ubuntu repositories
run: | run: |

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
# Misc # Misc
gen/*
logs/* logs/*
*.log *.log

54
CMakeLists.txt
View File

@@ -1,36 +1,36 @@
# cmake arguments # cmake arguments
# CMAKE_BUILD_TYPE: Compilation target (Debug or Release defaults to Debug) # CMAKE_BUILD_TYPE: Compilation target (Debug or Release defaults to Debug)
# #
# godot-cpp cmake arguments # godot-cpp cmake arguments
# GODOT_HEADERS_DIR: This is where the gdnative include folder is (godot_source/modules/gdnative/include) # GODOT_HEADERS_DIR: This is where the gdnative include folder is (godot_source/modules/gdnative/include)
# GODOT_CUSTOM_API_FILE: This is if you have another path for the godot_api.json # GODOT_CUSTOM_API_FILE: This is if you have another path for the godot_api.json
# #
# Android cmake arguments # Android cmake arguments
# CMAKE_TOOLCHAIN_FILE: The path to the android cmake toolchain ($ANDROID_NDK/build/cmake/android.toolchain.cmake) # CMAKE_TOOLCHAIN_FILE: The path to the android cmake toolchain ($ANDROID_NDK/build/cmake/android.toolchain.cmake)
# ANDROID_NDK: The path to the android ndk root folder # ANDROID_NDK: The path to the android ndk root folder
# ANDROID_TOOLCHAIN_NAME: The android toolchain (arm-linux-androideabi-4.9 or aarch64-linux-android-4.9 or x86-4.9 or x86_64-4.9) # ANDROID_TOOLCHAIN_NAME: The android toolchain (arm-linux-androideabi-4.9 or aarch64-linux-android-4.9 or x86-4.9 or x86_64-4.9)
# ANDROID_PLATFORM: The android platform version (android-23) # ANDROID_PLATFORM: The android platform version (android-23)
# More info here: https://godot.readthedocs.io/en/latest/development/compiling/compiling_for_android.html # More info here: https://godot.readthedocs.io/en/latest/development/compiling/compiling_for_android.html
# #
# Examples # Examples
# #
# Builds a debug version: # Builds a debug version:
# cmake . # cmake .
# cmake --build . # cmake --build .
# #
# Builds a release version with clang # Builds a release version with clang
# CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" . # CC=/usr/bin/clang CXX=/usr/bin/clang++ cmake -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles" .
# cmake --build . # cmake --build .
# #
# Builds an android armeabi-v7a debug version: # Builds an android armeabi-v7a debug version:
# cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_NDK=$ANDROID_NDK \ # cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_NDK=$ANDROID_NDK \
# -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DANDROID_PLATFORM=android-23 -DCMAKE_BUILD_TYPE=Debug . # -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DANDROID_PLATFORM=android-23 -DCMAKE_BUILD_TYPE=Debug .
# cmake --build . # cmake --build .
# #
# Protip # Protip
# Generate the buildfiles in a sub directory to not clutter the root directory with build files: # Generate the buildfiles in a sub directory to not clutter the root directory with build files:
# mkdir build && cd build && cmake -G "Unix Makefiles" .. && cmake --build . # mkdir build && cd build && cmake -G "Unix Makefiles" .. && cmake --build .
# #
# Todo # Todo
# Test build for Windows, Mac and mingw. # Test build for Windows, Mac and mingw.
@@ -40,7 +40,7 @@ cmake_minimum_required(VERSION 3.6)
option(GENERATE_TEMPLATE_GET_NODE "Generate a template version of the Node class's get_node." ON) option(GENERATE_TEMPLATE_GET_NODE "Generate a template version of the Node class's get_node." ON)
# Change the output directory to the bin directory # Change the output directory to the bin directory
set(BUILD_PATH ${CMAKE_SOURCE_DIR}/bin) set(BUILD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${BUILD_PATH}") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${BUILD_PATH}")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PATH}") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${BUILD_PATH}")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${BUILD_PATH}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${BUILD_PATH}")
@@ -52,7 +52,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BUILD_PATH}")
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BUILD_PATH}") SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BUILD_PATH}")
# Default build type is Debug in the SConstruct # Default build type is Debug in the SConstruct
if(CMAKE_BUILD_TYPE STREQUAL "") if("${CMAKE_BUILD_TYPE}" STREQUAL "")
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
endif() endif()
@@ -67,6 +67,13 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
if(NOT DEFINED BITS)
set(BITS 32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(BITS 64)
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
endif()
# Input from user for godot headers and the api file # Input from user for godot headers and the api file
set(GODOT_HEADERS_DIR "godot-headers" CACHE STRING "") set(GODOT_HEADERS_DIR "godot-headers" CACHE STRING "")
set(GODOT_CUSTOM_API_FILE "godot-headers/api.json" CACHE STRING "") set(GODOT_CUSTOM_API_FILE "godot-headers/api.json" CACHE STRING "")
@@ -97,17 +104,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
#endif() #endif()
else() else() # GCC/Clang
#elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# using Clang
#elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# using GCC and maybe MinGW?
set(GODOT_LINKER_FLAGS "-static-libgcc -static-libstdc++ -Wl,-R,'$$ORIGIN'") set(GODOT_LINKER_FLAGS "-static-libgcc -static-libstdc++ -Wl,-R,'$$ORIGIN'")
# Hmm.. maybe to strikt? if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
set(GODOT_COMPILE_FLAGS "-fPIC -g -Wwrite-strings") set(GODOT_COMPILE_FLAGS "-fPIC")
endif()
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -g -Wwrite-strings")
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wchar-subscripts -Wcomment -Wdisabled-optimization") set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wchar-subscripts -Wcomment -Wdisabled-optimization")
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wformat -Wformat=2 -Wformat-security -Wformat-y2k") set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wformat -Wformat=2 -Wformat-security -Wformat-y2k")
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wimport -Winit-self -Winline -Winvalid-pch -Werror") set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} -Wimport -Winit-self -Winline -Winvalid-pch -Werror")
@@ -133,7 +136,7 @@ else()
endif() endif()
# Generate source from the bindings file # Generate source from the bindings file
find_package(PythonInterp REQUIRED) find_package(Python3 3.4 REQUIRED) # pathlib should be present
if(GENERATE_TEMPLATE_GET_NODE) if(GENERATE_TEMPLATE_GET_NODE)
set(GENERATE_BINDING_PARAMETERS "True") set(GENERATE_BINDING_PARAMETERS "True")
else() else()
@@ -141,14 +144,14 @@ else()
endif() endif()
message(STATUS "Generating Bindings") message(STATUS "Generating Bindings")
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_CUSTOM_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", headers=True)" execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_CUSTOM_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", headers=True)"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE HEADERS_FILE_LIST_RESULT RESULT_VARIABLE HEADERS_FILE_LIST_RESULT
OUTPUT_VARIABLE HEADERS_FILE_LIST OUTPUT_VARIABLE HEADERS_FILE_LIST
) )
set(HEADERS_FILE_LIST ${HEADERS_FILE_LIST}) set(HEADERS_FILE_LIST ${HEADERS_FILE_LIST})
execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_CUSTOM_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", sources=True)" execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.print_file_list(\"${GODOT_CUSTOM_API_FILE}\", \"${CMAKE_CURRENT_BINARY_DIR}\", sources=True)"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE SOURCES_FILE_LIST_RESULT RESULT_VARIABLE SOURCES_FILE_LIST_RESULT
OUTPUT_VARIABLE SOURCES_FILE_LIST OUTPUT_VARIABLE SOURCES_FILE_LIST
@@ -156,7 +159,7 @@ execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; b
set(SOURCES_FILE_LIST ${SOURCES_FILE_LIST}) set(SOURCES_FILE_LIST ${SOURCES_FILE_LIST})
add_custom_command(OUTPUT ${HEADERS_FILE_LIST} ${SOURCES_FILE_LIST} add_custom_command(OUTPUT ${HEADERS_FILE_LIST} ${SOURCES_FILE_LIST}
COMMAND "${PYTHON_EXECUTABLE}" "-c" "import binding_generator; binding_generator.generate_bindings(\"${GODOT_CUSTOM_API_FILE}\", \"${GENERATE_BINDING_PARAMETERS}\", \"${CMAKE_CURRENT_BINARY_DIR}\")" COMMAND "${Python3_EXECUTABLE}" "-c" "import binding_generator; binding_generator.generate_bindings(\"${GODOT_CUSTOM_API_FILE}\", \"${GENERATE_BINDING_PARAMETERS}\", \"${CMAKE_CURRENT_BINARY_DIR}\")"
VERBATIM VERBATIM
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
MAIN_DEPENDENCY ${GODOT_CUSTOM_API_FILE} MAIN_DEPENDENCY ${GODOT_CUSTOM_API_FILE}
@@ -194,11 +197,6 @@ set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS ${GODOT_LI
# Create the correct name (godot.os.build_type.system_bits) # Create the correct name (godot.os.build_type.system_bits)
set(BITS 32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(BITS 64)
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
string(TOLOWER "${CMAKE_SYSTEM_NAME}" SYSTEM_NAME) string(TOLOWER "${CMAKE_SYSTEM_NAME}" SYSTEM_NAME)
string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE) string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)

2
LICENSE.md
View File

@@ -1,6 +1,6 @@
# MIT License # MIT License
Copyright (c) 2017-2021 Godot Engine contributors. Copyright (c) 2017-2022 Godot Engine contributors.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

2
Makefile
View File

@@ -3,7 +3,7 @@ HEADERS = godot-headers
TARGET = debug TARGET = debug
USE_CLANG = no USE_CLANG = no
BASE = scons use_llvm=$(USE_CLANG) generate_bindings=$(GENERATE_BINDINGS) target=$(TARGET) headers=$(HEADERS) -j4 BASE = scons use_llvm=$(USE_CLANG) generate_bindings=$(GENERATE_BINDINGS) target=$(TARGET) headers=$(HEADERS)
LINUX = $(BASE) platform=linux LINUX = $(BASE) platform=linux
WINDOWS = $(BASE) platform=windows WINDOWS = $(BASE) platform=windows
OSX = $(BASE) platform=osx OSX = $(BASE) platform=osx

653
SConstruct
View File

@@ -5,24 +5,35 @@ import sys
import subprocess import subprocess
if sys.version_info < (3,): if sys.version_info < (3,):
def decode_utf8(x): def decode_utf8(x):
return x return x
else: else:
import codecs import codecs
def decode_utf8(x): def decode_utf8(x):
return codecs.utf_8_decode(x)[0] return codecs.utf_8_decode(x)[0]
# Workaround for MinGW. See: # Workaround for MinGW. See:
# http://www.scons.org/wiki/LongCmdLinesOnWin32 # http://www.scons.org/wiki/LongCmdLinesOnWin32
if os.name == "nt": if os.name == "nt":
import subprocess import subprocess
def mySubProcess(cmdline,env): def mySubProcess(cmdline, env):
#print "SPAWNED : " + cmdline # print "SPAWNED : " + cmdline
startupinfo = subprocess.STARTUPINFO() startupinfo = subprocess.STARTUPINFO()
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE, proc = subprocess.Popen(
stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False, env = env) cmdline,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
startupinfo=startupinfo,
shell=False,
env=env,
)
data, err = proc.communicate() data, err = proc.communicate()
rv = proc.wait() rv = proc.wait()
if rv: if rv:
@@ -33,200 +44,195 @@ if os.name == "nt":
def mySpawn(sh, escape, cmd, args, env): def mySpawn(sh, escape, cmd, args, env):
newargs = ' '.join(args[1:]) newargs = " ".join(args[1:])
cmdline = cmd + " " + newargs cmdline = cmd + " " + newargs
rv=0 rv = 0
if len(cmdline) > 32000 and cmd.endswith("ar") : if len(cmdline) > 32000 and cmd.endswith("ar"):
cmdline = cmd + " " + args[1] + " " + args[2] + " " cmdline = cmd + " " + args[1] + " " + args[2] + " "
for i in range(3,len(args)) : for i in range(3, len(args)):
rv = mySubProcess( cmdline + args[i], env ) rv = mySubProcess(cmdline + args[i], env)
if rv : if rv:
break break
else: else:
rv = mySubProcess( cmdline, env ) rv = mySubProcess(cmdline, env)
return rv return rv
def add_sources(sources, dir, extension): def add_sources(sources, dir, extension):
for f in os.listdir(dir): for f in os.listdir(dir):
if f.endswith('.' + extension): if f.endswith("." + extension):
sources.append(dir + '/' + f) sources.append(dir + "/" + f)
# Try to detect the host platform automatically. # Try to detect the host platform automatically.
# This is used if no `platform` argument is passed # This is used if no `platform` argument is passed
if sys.platform.startswith('linux'): if sys.platform.startswith("linux"):
host_platform = 'linux' host_platform = "linux"
elif sys.platform.startswith('freebsd'): elif sys.platform.startswith("freebsd"):
host_platform = 'freebsd' host_platform = "freebsd"
elif sys.platform == 'darwin': elif sys.platform == "darwin":
host_platform = 'osx' host_platform = "osx"
elif sys.platform == 'win32' or sys.platform == 'msys': elif sys.platform == "win32" or sys.platform == "msys":
host_platform = 'windows' host_platform = "windows"
else: else:
raise ValueError( raise ValueError("Could not detect platform automatically, please specify with platform=<platform>")
'Could not detect platform automatically, please specify with '
'platform=<platform>'
)
env = Environment(ENV = os.environ) env = Environment(ENV=os.environ)
is64 = sys.maxsize > 2**32 # Default num_jobs to local cpu count if not user specified.
# SCons has a peculiarity where user-specified options won't be overridden
# by SetOption, so we can rely on this to know if we should use our default.
initial_num_jobs = env.GetOption("num_jobs")
altered_num_jobs = initial_num_jobs + 1
env.SetOption("num_jobs", altered_num_jobs)
# os.cpu_count() requires Python 3.4+.
if hasattr(os, "cpu_count") and env.GetOption("num_jobs") == altered_num_jobs:
cpu_count = os.cpu_count()
if cpu_count is None:
print("Couldn't auto-detect CPU count to configure build parallelism. Specify it with the -j argument.")
else:
safer_cpu_count = cpu_count if cpu_count <= 4 else cpu_count - 1
print(
"Auto-detected %d CPU cores available for build parallelism. Using %d cores by default. You can override it with the -j argument."
% (cpu_count, safer_cpu_count)
)
env.SetOption("num_jobs", safer_cpu_count)
is64 = sys.maxsize > 2 ** 32
if ( if (
env['TARGET_ARCH'] == 'amd64' or env["TARGET_ARCH"] == "amd64"
env['TARGET_ARCH'] == 'emt64' or or env["TARGET_ARCH"] == "emt64"
env['TARGET_ARCH'] == 'x86_64' or or env["TARGET_ARCH"] == "x86_64"
env['TARGET_ARCH'] == 'arm64-v8a' or env["TARGET_ARCH"] == "arm64-v8a"
): ):
is64 = True is64 = True
opts = Variables([], ARGUMENTS) opts = Variables([], ARGUMENTS)
opts.Add(EnumVariable( opts.Add(
'platform', EnumVariable(
'Target platform', "platform",
host_platform, "Target platform",
allowed_values=('linux', 'freebsd', 'osx', 'windows', 'android', 'ios', 'javascript'), host_platform,
ignorecase=2 allowed_values=("linux", "freebsd", "osx", "windows", "android", "ios", "javascript"),
)) ignorecase=2,
opts.Add(EnumVariable( )
'bits', )
'Target platform bits', opts.Add(EnumVariable("bits", "Target platform bits", "64" if is64 else "32", ("32", "64")))
'64' if is64 else '32', opts.Add(BoolVariable("use_llvm", "Use the LLVM compiler - only effective when targeting Linux or FreeBSD", False))
('32', '64') opts.Add(BoolVariable("use_mingw", "Use the MinGW compiler instead of MSVC - only effective on Windows", False))
))
opts.Add(BoolVariable(
'use_llvm',
'Use the LLVM compiler - only effective when targeting Linux or FreeBSD',
False
))
opts.Add(BoolVariable(
'use_mingw',
'Use the MinGW compiler instead of MSVC - only effective on Windows',
False
))
# Must be the same setting as used for cpp_bindings # Must be the same setting as used for cpp_bindings
opts.Add(EnumVariable( opts.Add(EnumVariable("target", "Compilation target", "debug", allowed_values=("debug", "release"), ignorecase=2))
'target',
'Compilation target',
'debug',
allowed_values=('debug', 'release'),
ignorecase=2
))
opts.Add(PathVariable(
'headers_dir',
'Path to the directory containing Godot headers',
'godot-headers',
PathVariable.PathIsDir
))
opts.Add(PathVariable(
'custom_api_file',
'Path to a custom JSON API file',
None,
PathVariable.PathIsFile
))
opts.Add(EnumVariable(
'generate_bindings',
'Generate GDNative API bindings',
'auto',
allowed_values = ['yes', 'no', 'auto', 'true'],
ignorecase = 2
))
opts.Add(EnumVariable(
'android_arch',
'Target Android architecture',
'armv7',
['armv7','arm64v8','x86','x86_64']
))
opts.Add( opts.Add(
'macos_deployment_target', PathVariable(
'macOS deployment target', "headers_dir",
'default' "Path to the directory containing Godot headers",
"godot-headers",
PathVariable.PathIsDir,
)
)
opts.Add(PathVariable("custom_api_file", "Path to a custom JSON API file", None, PathVariable.PathIsFile))
opts.Add(
EnumVariable(
"generate_bindings",
"Generate GDNative API bindings",
"auto",
allowed_values=["yes", "no", "auto", "true"],
ignorecase=2,
)
) )
opts.Add( opts.Add(
'macos_sdk_path', EnumVariable(
'macOS SDK path', "android_arch",
'' "Target Android architecture",
"armv7",
["armv7", "arm64v8", "x86", "x86_64"],
)
) )
opts.Add(EnumVariable( opts.Add("macos_deployment_target", "macOS deployment target", "default")
'macos_arch', opts.Add("macos_sdk_path", "macOS SDK path", "")
'Target macOS architecture', opts.Add(EnumVariable("macos_arch", "Target macOS architecture", "universal", ["universal", "x86_64", "arm64"]))
'universal', opts.Add(EnumVariable("ios_arch", "Target iOS architecture", "arm64", ["armv7", "arm64", "x86_64"]))
['universal', 'x86_64', 'arm64'] opts.Add(BoolVariable("ios_simulator", "Target iOS Simulator", False))
))
opts.Add(EnumVariable(
'ios_arch',
'Target iOS architecture',
'arm64',
['armv7', 'arm64', 'x86_64']
))
opts.Add(BoolVariable(
'ios_simulator',
'Target iOS Simulator',
False
))
opts.Add( opts.Add(
'IPHONEPATH', "IPHONEPATH",
'Path to iPhone toolchain', "Path to iPhone toolchain",
'/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain', "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain",
) )
opts.Add( opts.Add(
'android_api_level', "android_api_level",
'Target Android API level', "Target Android API level",
'18' if ARGUMENTS.get("android_arch", 'armv7') in ['armv7', 'x86'] else '21' "18" if ARGUMENTS.get("android_arch", "armv7") in ["armv7", "x86"] else "21",
) )
opts.Add( opts.Add(
'ANDROID_NDK_ROOT', "ANDROID_NDK_ROOT",
'Path to your Android NDK installation. By default, uses ANDROID_NDK_ROOT from your defined environment variables.', "Path to your Android NDK installation. By default, uses ANDROID_NDK_ROOT from your defined environment variables.",
os.environ.get("ANDROID_NDK_ROOT", None) os.environ.get("ANDROID_NDK_ROOT", None),
) )
opts.Add(BoolVariable( opts.Add(
'generate_template_get_node', BoolVariable(
"Generate a template version of the Node class's get_node.", "generate_template_get_node",
True "Generate a template version of the Node class's get_node.",
)) True,
)
)
opts.Add(BoolVariable("build_library", "Build the godot-cpp library.", True))
opts.Update(env) opts.Update(env)
Help(opts.GenerateHelpText(env)) Help(opts.GenerateHelpText(env))
# Detect and print a warning listing unknown SCons variables to ease troubleshooting.
unknown = opts.UnknownVariables()
if unknown:
print("WARNING: Unknown SCons variables were passed and will be ignored:")
for item in unknown.items():
print(" " + item[0] + "=" + item[1])
# This makes sure to keep the session environment variables on Windows. # This makes sure to keep the session environment variables on Windows.
# This way, you can run SCons in a Visual Studio 2017 prompt and it will find # This way, you can run SCons in a Visual Studio 2017 prompt and it will find
# all the required tools # all the required tools
if host_platform == 'windows' and env['platform'] != 'android': if host_platform == "windows" and env["platform"] != "android":
if env['bits'] == '64': if env["bits"] == "64":
env = Environment(TARGET_ARCH='amd64') env = Environment(TARGET_ARCH="amd64")
elif env['bits'] == '32': elif env["bits"] == "32":
env = Environment(TARGET_ARCH='x86') env = Environment(TARGET_ARCH="x86")
opts.Update(env) opts.Update(env)
if env['platform'] == 'linux' or env['platform'] == 'freebsd': # Require C++14
if env['use_llvm']: if host_platform == "windows" and env["platform"] == "windows" and not env["use_mingw"]:
env['CXX'] = 'clang++' # MSVC
env.Append(CCFLAGS=["/std:c++14"])
else:
env.Append(CCFLAGS=["-std=c++14"])
env.Append(CCFLAGS=['-fPIC', '-std=c++14', '-Wwrite-strings']) if env["platform"] == "linux" or env["platform"] == "freebsd":
if env["use_llvm"]:
env["CXX"] = "clang++"
env.Append(CCFLAGS=["-fPIC", "-Wwrite-strings"])
env.Append(LINKFLAGS=["-Wl,-R,'$$ORIGIN'"]) env.Append(LINKFLAGS=["-Wl,-R,'$$ORIGIN'"])
if env['target'] == 'debug': if env["target"] == "debug":
env.Append(CCFLAGS=['-Og', '-g']) env.Append(CCFLAGS=["-Og", "-g"])
elif env['target'] == 'release': elif env["target"] == "release":
env.Append(CCFLAGS=['-O3']) env.Append(CCFLAGS=["-O3"])
if env['bits'] == '64': if env["bits"] == "64":
env.Append(CCFLAGS=['-m64']) env.Append(CCFLAGS=["-m64"])
env.Append(LINKFLAGS=['-m64']) env.Append(LINKFLAGS=["-m64"])
elif env['bits'] == '32': elif env["bits"] == "32":
env.Append(CCFLAGS=['-m32']) env.Append(CCFLAGS=["-m32"])
env.Append(LINKFLAGS=['-m32']) env.Append(LINKFLAGS=["-m32"])
elif env['platform'] == 'osx': elif env["platform"] == "osx":
# Use Clang on macOS by default # Use Clang on macOS by default
env['CXX'] = 'clang++' env["CXX"] = "clang++"
if env['bits'] == '32': if env["bits"] == "32":
raise ValueError( raise ValueError("Only 64-bit builds are supported for the macOS target.")
'Only 64-bit builds are supported for the macOS target.'
)
if env["macos_arch"] == "universal": if env["macos_arch"] == "universal":
env.Append(LINKFLAGS=["-arch", "x86_64", "-arch", "arm64"]) env.Append(LINKFLAGS=["-arch", "x86_64", "-arch", "arm64"])
@@ -235,175 +241,203 @@ elif env['platform'] == 'osx':
env.Append(LINKFLAGS=["-arch", env["macos_arch"]]) env.Append(LINKFLAGS=["-arch", env["macos_arch"]])
env.Append(CCFLAGS=["-arch", env["macos_arch"]]) env.Append(CCFLAGS=["-arch", env["macos_arch"]])
env.Append(CCFLAGS=['-std=c++14']) if env["macos_deployment_target"] != "default":
env.Append(CCFLAGS=["-mmacosx-version-min=" + env["macos_deployment_target"]])
env.Append(LINKFLAGS=["-mmacosx-version-min=" + env["macos_deployment_target"]])
if env['macos_deployment_target'] != 'default': if env["macos_sdk_path"]:
env.Append(CCFLAGS=['-mmacosx-version-min=' + env['macos_deployment_target']]) env.Append(CCFLAGS=["-isysroot", env["macos_sdk_path"]])
env.Append(LINKFLAGS=['-mmacosx-version-min=' + env['macos_deployment_target']]) env.Append(LINKFLAGS=["-isysroot", env["macos_sdk_path"]])
if env['macos_sdk_path']: env.Append(LINKFLAGS=["-Wl,-undefined,dynamic_lookup"])
env.Append(CCFLAGS=['-isysroot', env['macos_sdk_path']])
env.Append(LINKFLAGS=['-isysroot', env['macos_sdk_path']])
env.Append(LINKFLAGS=[ if env["target"] == "debug":
'-framework', env.Append(CCFLAGS=["-Og", "-g"])
'Cocoa', elif env["target"] == "release":
'-Wl,-undefined,dynamic_lookup', env.Append(CCFLAGS=["-O3"])
])
if env['target'] == 'debug': elif env["platform"] == "ios":
env.Append(CCFLAGS=['-Og', '-g']) if env["ios_simulator"]:
elif env['target'] == 'release': sdk_name = "iphonesimulator"
env.Append(CCFLAGS=['-O3']) env.Append(CCFLAGS=["-mios-simulator-version-min=10.0"])
elif env['platform'] == 'ios':
if env['ios_simulator']:
sdk_name = 'iphonesimulator'
env.Append(CCFLAGS=['-mios-simulator-version-min=10.0'])
env['LIBSUFFIX'] = ".simulator" + env['LIBSUFFIX']
else: else:
sdk_name = 'iphoneos' sdk_name = "iphoneos"
env.Append(CCFLAGS=['-miphoneos-version-min=10.0']) env.Append(CCFLAGS=["-miphoneos-version-min=10.0"])
try: try:
sdk_path = decode_utf8(subprocess.check_output(['xcrun', '--sdk', sdk_name, '--show-sdk-path']).strip()) sdk_path = decode_utf8(subprocess.check_output(["xcrun", "--sdk", sdk_name, "--show-sdk-path"]).strip())
except (subprocess.CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
raise ValueError("Failed to find SDK path while running xcrun --sdk {} --show-sdk-path.".format(sdk_name)) raise ValueError("Failed to find SDK path while running xcrun --sdk {} --show-sdk-path.".format(sdk_name))
compiler_path = env['IPHONEPATH'] + '/usr/bin/' compiler_path = env["IPHONEPATH"] + "/usr/bin/"
env['ENV']['PATH'] = env['IPHONEPATH'] + "/Developer/usr/bin/:" + env['ENV']['PATH'] env["ENV"]["PATH"] = env["IPHONEPATH"] + "/Developer/usr/bin/:" + env["ENV"]["PATH"]
env['CC'] = compiler_path + 'clang' env["CC"] = compiler_path + "clang"
env['CXX'] = compiler_path + 'clang++' env["CXX"] = compiler_path + "clang++"
env['AR'] = compiler_path + 'ar' env["AR"] = compiler_path + "ar"
env['RANLIB'] = compiler_path + 'ranlib' env["RANLIB"] = compiler_path + "ranlib"
env["SHLIBSUFFIX"] = ".dylib"
env.Append(CCFLAGS=['-std=c++14', '-arch', env['ios_arch'], '-isysroot', sdk_path]) env.Append(CCFLAGS=["-arch", env["ios_arch"], "-isysroot", sdk_path])
env.Append(LINKFLAGS=[ env.Append(
'-arch', LINKFLAGS=[
env['ios_arch'], "-arch",
'-framework', env["ios_arch"],
'Cocoa', "-Wl,-undefined,dynamic_lookup",
'-Wl,-undefined,dynamic_lookup', "-isysroot",
'-isysroot', sdk_path, sdk_path,
'-F' + sdk_path "-F" + sdk_path,
]) ]
)
if env['target'] == 'debug': if env["target"] == "debug":
env.Append(CCFLAGS=['-Og', '-g']) env.Append(CCFLAGS=["-Og", "-g"])
elif env['target'] == 'release': elif env["target"] == "release":
env.Append(CCFLAGS=['-O3']) env.Append(CCFLAGS=["-O3"])
elif env['platform'] == 'windows': elif env["platform"] == "windows":
if host_platform == 'windows' and not env['use_mingw']: if host_platform == "windows" and not env["use_mingw"]:
# MSVC # MSVC
env.Append(LINKFLAGS=['/WX']) env.Append(LINKFLAGS=["/WX"])
if env['target'] == 'debug': if env["target"] == "debug":
env.Append(CCFLAGS=['/Z7', '/Od', '/EHsc', '/D_DEBUG', '/MDd']) env.Append(CCFLAGS=["/Z7", "/Od", "/EHsc", "/D_DEBUG", "/MDd"])
elif env['target'] == 'release': elif env["target"] == "release":
env.Append(CCFLAGS=['/O2', '/EHsc', '/DNDEBUG', '/MD']) env.Append(CCFLAGS=["/O2", "/EHsc", "/DNDEBUG", "/MD"])
elif host_platform == 'linux' or host_platform == 'freebsd' or host_platform == 'osx': elif host_platform == "linux" or host_platform == "freebsd" or host_platform == "osx":
# Cross-compilation using MinGW # Cross-compilation using MinGW
if env['bits'] == '64': if env["bits"] == "64":
env['CXX'] = 'x86_64-w64-mingw32-g++' env["CXX"] = "x86_64-w64-mingw32-g++"
env['AR'] = "x86_64-w64-mingw32-ar" env["AR"] = "x86_64-w64-mingw32-ar"
env['RANLIB'] = "x86_64-w64-mingw32-ranlib" env["RANLIB"] = "x86_64-w64-mingw32-ranlib"
env['LINK'] = "x86_64-w64-mingw32-g++" env["LINK"] = "x86_64-w64-mingw32-g++"
elif env['bits'] == '32': elif env["bits"] == "32":
env['CXX'] = 'i686-w64-mingw32-g++' env["CXX"] = "i686-w64-mingw32-g++"
env['AR'] = "i686-w64-mingw32-ar" env["AR"] = "i686-w64-mingw32-ar"
env['RANLIB'] = "i686-w64-mingw32-ranlib" env["RANLIB"] = "i686-w64-mingw32-ranlib"
env['LINK'] = "i686-w64-mingw32-g++" env["LINK"] = "i686-w64-mingw32-g++"
elif host_platform == 'windows' and env['use_mingw']: elif host_platform == "windows" and env["use_mingw"]:
# Don't Clone the environment. Because otherwise, SCons will pick up msvc stuff. # Don't Clone the environment. Because otherwise, SCons will pick up msvc stuff.
env = Environment(ENV = os.environ, tools=["mingw"]) env = Environment(ENV=os.environ, tools=["mingw"])
opts.Update(env) opts.Update(env)
#env = env.Clone(tools=['mingw'])
# Still need to use C++14.
env.Append(CCFLAGS=["-std=c++14"])
# Don't want lib prefixes
env["IMPLIBPREFIX"] = ""
env["SHLIBPREFIX"] = ""
env["SPAWN"] = mySpawn env["SPAWN"] = mySpawn
env.Replace(ARFLAGS=["q"])
# Native or cross-compilation using MinGW # Native or cross-compilation using MinGW
if host_platform == 'linux' or host_platform == 'freebsd' or host_platform == 'osx' or env['use_mingw']: if host_platform == "linux" or host_platform == "freebsd" or host_platform == "osx" or env["use_mingw"]:
# These options are for a release build even using target=debug # These options are for a release build even using target=debug
env.Append(CCFLAGS=['-O3', '-std=c++14', '-Wwrite-strings']) env.Append(CCFLAGS=["-O3", "-Wwrite-strings"])
env.Append(LINKFLAGS=[ env.Append(
'--static', LINKFLAGS=[
'-Wl,--no-undefined', "--static",
'-static-libgcc', "-Wl,--no-undefined",
'-static-libstdc++', "-static-libgcc",
]) "-static-libstdc++",
]
)
elif env['platform'] == 'android': elif env["platform"] == "android":
if host_platform == 'windows': if host_platform == "windows":
# Don't Clone the environment. Because otherwise, SCons will pick up msvc stuff. # Don't Clone the environment. Because otherwise, SCons will pick up msvc stuff.
env = Environment(ENV = os.environ, tools=["mingw"]) env = Environment(ENV=os.environ, tools=["mingw"])
opts.Update(env) opts.Update(env)
#env = env.Clone(tools=['mingw'])
# Long line hack. Use custom spawn, quick AR append (to avoid files with the same names to override each other).
env["SPAWN"] = mySpawn env["SPAWN"] = mySpawn
env.Replace(ARFLAGS=["q"])
# Verify NDK root # Verify NDK root
if not 'ANDROID_NDK_ROOT' in env: if not "ANDROID_NDK_ROOT" in env:
raise ValueError("To build for Android, ANDROID_NDK_ROOT must be defined. Please set ANDROID_NDK_ROOT to the root folder of your Android NDK installation.") raise ValueError(
"To build for Android, ANDROID_NDK_ROOT must be defined. Please set ANDROID_NDK_ROOT to the root folder of your Android NDK installation."
)
# Validate API level # Validate API level
api_level = int(env['android_api_level']) api_level = int(env["android_api_level"])
if env['android_arch'] in ['x86_64', 'arm64v8'] and api_level < 21: if env["android_arch"] in ["x86_64", "arm64v8"] and api_level < 21:
print("WARN: 64-bit Android architectures require an API level of at least 21; setting android_api_level=21") print("WARN: 64-bit Android architectures require an API level of at least 21; setting android_api_level=21")
env['android_api_level'] = '21' env["android_api_level"] = "21"
api_level = 21 api_level = 21
# Setup toolchain # Setup toolchain
toolchain = env['ANDROID_NDK_ROOT'] + "/toolchains/llvm/prebuilt/" toolchain = env["ANDROID_NDK_ROOT"] + "/toolchains/llvm/prebuilt/"
if host_platform == "windows": if host_platform == "windows":
toolchain += "windows" toolchain += "windows"
import platform as pltfm import platform as pltfm
if pltfm.machine().endswith("64"): if pltfm.machine().endswith("64"):
toolchain += "-x86_64" toolchain += "-x86_64"
elif host_platform == "linux": elif host_platform == "linux":
toolchain += "linux-x86_64" toolchain += "linux-x86_64"
elif host_platform == "osx": elif host_platform == "osx":
toolchain += "darwin-x86_64" toolchain += "darwin-x86_64"
env.PrependENVPath('PATH', toolchain + "/bin") # This does nothing half of the time, but we'll put it here anyways env.PrependENVPath("PATH", toolchain + "/bin") # This does nothing half of the time, but we'll put it here anyways
# Get architecture info # Get architecture info
arch_info_table = { arch_info_table = {
"armv7" : { "armv7": {
"march":"armv7-a", "target":"armv7a-linux-androideabi", "tool_path":"arm-linux-androideabi", "compiler_path":"armv7a-linux-androideabi", "march": "armv7-a",
"ccflags" : ['-mfpu=neon'] "target": "armv7a-linux-androideabi",
}, "tool_path": "arm-linux-androideabi",
"arm64v8" : { "compiler_path": "armv7a-linux-androideabi",
"march":"armv8-a", "target":"aarch64-linux-android", "tool_path":"aarch64-linux-android", "compiler_path":"aarch64-linux-android", "ccflags": ["-mfpu=neon"],
"ccflags" : [] },
}, "arm64v8": {
"x86" : { "march": "armv8-a",
"march":"i686", "target":"i686-linux-android", "tool_path":"i686-linux-android", "compiler_path":"i686-linux-android", "target": "aarch64-linux-android",
"ccflags" : ['-mstackrealign'] "tool_path": "aarch64-linux-android",
}, "compiler_path": "aarch64-linux-android",
"x86_64" : {"march":"x86-64", "target":"x86_64-linux-android", "tool_path":"x86_64-linux-android", "compiler_path":"x86_64-linux-android", "ccflags": [],
"ccflags" : [] },
} "x86": {
"march": "i686",
"target": "i686-linux-android",
"tool_path": "i686-linux-android",
"compiler_path": "i686-linux-android",
"ccflags": ["-mstackrealign"],
},
"x86_64": {
"march": "x86-64",
"target": "x86_64-linux-android",
"tool_path": "x86_64-linux-android",
"compiler_path": "x86_64-linux-android",
"ccflags": [],
},
} }
arch_info = arch_info_table[env['android_arch']] arch_info = arch_info_table[env["android_arch"]]
# Setup tools # Setup tools
env['CC'] = toolchain + "/bin/clang" env["CC"] = toolchain + "/bin/clang"
env['CXX'] = toolchain + "/bin/clang++" env["CXX"] = toolchain + "/bin/clang++"
env['AR'] = toolchain + "/bin/" + arch_info['tool_path'] + "-ar" env["AR"] = toolchain + "/bin/llvm-ar"
env["AS"] = toolchain + "/bin/" + arch_info['tool_path'] + "-as" env["AS"] = toolchain + "/bin/llvm-as"
env["LD"] = toolchain + "/bin/" + arch_info['tool_path'] + "-ld" env["LD"] = toolchain + "/bin/llvm-ld"
env["STRIP"] = toolchain + "/bin/" + arch_info['tool_path'] + "-strip" env["STRIP"] = toolchain + "/bin/llvm-strip"
env["RANLIB"] = toolchain + "/bin/" + arch_info['tool_path'] + "-ranlib" env["RANLIB"] = toolchain + "/bin/llvm-ranlib"
env["SHLIBSUFFIX"] = ".so"
env.Append(CCFLAGS=['--target=' + arch_info['target'] + env['android_api_level'], '-march=' + arch_info['march'], '-fPIC']) env.Append(
env.Append(CCFLAGS=arch_info['ccflags']) CCFLAGS=[
"--target=" + arch_info["target"] + env["android_api_level"],
"-march=" + arch_info["march"],
"-fPIC",
]
)
env.Append(CCFLAGS=arch_info["ccflags"])
env.Append(LINKFLAGS=["--target=" + arch_info["target"] + env["android_api_level"], "-march=" + arch_info["march"]])
if env['target'] == 'debug': if env["target"] == "debug":
env.Append(CCFLAGS=['-Og', '-g']) env.Append(CCFLAGS=["-Og", "-g"])
elif env['target'] == 'release': elif env["target"] == "release":
env.Append(CCFLAGS=['-O3']) env.Append(CCFLAGS=["-O3"])
elif env["platform"] == "javascript": elif env["platform"] == "javascript":
env["ENV"] = os.environ env["ENV"] = os.environ
@@ -430,64 +464,73 @@ elif env["platform"] == "javascript":
env["LIBSUFFIX"] = ".a" env["LIBSUFFIX"] = ".a"
env["LIBPREFIXES"] = ["$LIBPREFIX"] env["LIBPREFIXES"] = ["$LIBPREFIX"]
env["LIBSUFFIXES"] = ["$LIBSUFFIX"] env["LIBSUFFIXES"] = ["$LIBSUFFIX"]
env.Replace(SHLINKFLAGS='$LINKFLAGS') env.Replace(SHLINKFLAGS="$LINKFLAGS")
env.Replace(SHLINKFLAGS='$LINKFLAGS') env.Replace(SHLINKFLAGS="$LINKFLAGS")
if env['target'] == 'debug': if env["target"] == "debug":
env.Append(CCFLAGS=['-O0', '-g']) env.Append(CCFLAGS=["-O0", "-g"])
elif env['target'] == 'release': elif env["target"] == "release":
env.Append(CCFLAGS=['-O3']) env.Append(CCFLAGS=["-O3"])
env.Append(CPPPATH=[ env.Append(
'.', CPPPATH=[
env['headers_dir'], ".",
'include', env["headers_dir"],
'include/gen', "include",
'include/core', "include/gen",
]) "include/core",
]
)
# Generate bindings? # Generate bindings?
json_api_file = '' json_api_file = ""
if 'custom_api_file' in env: if "custom_api_file" in env:
json_api_file = env['custom_api_file'] json_api_file = env["custom_api_file"]
else: else:
json_api_file = os.path.join(os.getcwd(), env['headers_dir'], 'api.json') json_api_file = os.path.join(os.getcwd(), env["headers_dir"], "api.json")
if env['generate_bindings'] == 'auto': if env["generate_bindings"] == "auto":
# Check if generated files exist # Check if generated files exist
should_generate_bindings = not os.path.isfile(os.path.join(os.getcwd(), 'src', 'gen', 'Object.cpp')) should_generate_bindings = not os.path.isfile(os.path.join(os.getcwd(), "src", "gen", "Object.cpp"))
else: else:
should_generate_bindings = env['generate_bindings'] in ['yes', 'true'] should_generate_bindings = env["generate_bindings"] in ["yes", "true"]
if should_generate_bindings: if should_generate_bindings:
# Actually create the bindings here # Actually create the bindings here
import binding_generator import binding_generator
binding_generator.generate_bindings(json_api_file, env['generate_template_get_node']) binding_generator.generate_bindings(json_api_file, env["generate_template_get_node"])
# Sources to compile # Sources to compile
sources = [] sources = []
add_sources(sources, 'src/core', 'cpp') add_sources(sources, "src/core", "cpp")
add_sources(sources, 'src/gen', 'cpp') add_sources(sources, "src/gen", "cpp")
arch_suffix = env['bits'] arch_suffix = env["bits"]
if env['platform'] == 'android': if env["platform"] == "android":
arch_suffix = env['android_arch'] arch_suffix = env["android_arch"]
elif env['platform'] == 'ios': elif env["platform"] == "ios":
arch_suffix = env['ios_arch'] arch_suffix = env["ios_arch"]
elif env['platform'] == 'osx': if env["ios_simulator"]:
if env['macos_arch'] != 'universal': arch_suffix += ".simulator"
arch_suffix = env['macos_arch'] elif env["platform"] == "osx":
elif env['platform'] == 'javascript': if env["macos_arch"] != "universal":
arch_suffix = 'wasm' arch_suffix = env["macos_arch"]
elif env["platform"] == "javascript":
arch_suffix = "wasm"
# Expose it to projects that import this env.
env["arch_suffix"] = arch_suffix
library = env.StaticLibrary( library = None
target='bin/' + 'libgodot-cpp.{}.{}.{}{}'.format( env["OBJSUFFIX"] = ".{}.{}.{}{}".format(env["platform"], env["target"], arch_suffix, env["OBJSUFFIX"])
env['platform'], library_name = "libgodot-cpp.{}.{}.{}{}".format(env["platform"], env["target"], arch_suffix, env["LIBSUFFIX"])
env['target'],
arch_suffix, if env["build_library"]:
env['LIBSUFFIX'] library = env.StaticLibrary(target=env.File("bin/%s" % library_name), source=sources)
), source=sources Default(library)
)
Default(library) env.Append(CPPPATH=[env.Dir(f) for f in [env["headers_dir"], "include", "include/gen", "include/core"]])
env.Append(LIBPATH=[env.Dir("bin")])
env.Append(LIBS=library_name)
Return("env")

316
binding_generator.py
View File

@@ -17,11 +17,11 @@ classes = []
def print_file_list(api_filepath, output_dir, headers=False, sources=False): def print_file_list(api_filepath, output_dir, headers=False, sources=False):
global classes global classes
end = ';' end = ";"
with open(api_filepath) as api_file: with open(api_filepath) as api_file:
classes = json.load(api_file) classes = json.load(api_file)
include_gen_folder = Path(output_dir) / 'include' / 'gen' include_gen_folder = Path(output_dir) / "include" / "gen"
source_gen_folder = Path(output_dir) / 'src' / 'gen' source_gen_folder = Path(output_dir) / "src" / "gen"
for _class in classes: for _class in classes:
header_filename = include_gen_folder / (strip_name(_class["name"]) + ".hpp") header_filename = include_gen_folder / (strip_name(_class["name"]) + ".hpp")
source_filename = source_gen_folder / (strip_name(_class["name"]) + ".cpp") source_filename = source_gen_folder / (strip_name(_class["name"]) + ".cpp")
@@ -29,9 +29,9 @@ def print_file_list(api_filepath, output_dir, headers=False, sources=False):
print(str(header_filename.as_posix()), end=end) print(str(header_filename.as_posix()), end=end)
if sources: if sources:
print(str(source_filename.as_posix()), end=end) print(str(source_filename.as_posix()), end=end)
icall_header_filename = include_gen_folder / '__icalls.hpp' icall_header_filename = include_gen_folder / "__icalls.hpp"
register_types_filename = source_gen_folder / '__register_types.cpp' register_types_filename = source_gen_folder / "__register_types.cpp"
init_method_bindings_filename = source_gen_folder / '__init_method_bindings.cpp' init_method_bindings_filename = source_gen_folder / "__init_method_bindings.cpp"
if headers: if headers:
print(str(icall_header_filename.as_posix()), end=end) print(str(icall_header_filename.as_posix()), end=end)
if sources: if sources:
@@ -45,8 +45,8 @@ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
classes = json.load(api_file) classes = json.load(api_file)
icalls = set() icalls = set()
include_gen_folder = Path(output_dir) / 'include' / 'gen' include_gen_folder = Path(output_dir) / "include" / "gen"
source_gen_folder = Path(output_dir) / 'src' / 'gen' source_gen_folder = Path(output_dir) / "src" / "gen"
try: try:
include_gen_folder.mkdir(parents=True) include_gen_folder.mkdir(parents=True)
@@ -82,27 +82,28 @@ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
with source_filename.open("w+") as source_file: with source_filename.open("w+") as source_file:
source_file.write(impl) source_file.write(impl)
icall_header_filename = include_gen_folder / '__icalls.hpp' icall_header_filename = include_gen_folder / "__icalls.hpp"
with icall_header_filename.open("w+") as icall_header_file: with icall_header_filename.open("w+") as icall_header_file:
icall_header_file.write(generate_icall_header(icalls)) icall_header_file.write(generate_icall_header(icalls))
register_types_filename = source_gen_folder / '__register_types.cpp' register_types_filename = source_gen_folder / "__register_types.cpp"
with register_types_filename.open("w+") as register_types_file: with register_types_filename.open("w+") as register_types_file:
register_types_file.write(generate_type_registry(classes)) register_types_file.write(generate_type_registry(classes))
init_method_bindings_filename = source_gen_folder / '__init_method_bindings.cpp' init_method_bindings_filename = source_gen_folder / "__init_method_bindings.cpp"
with init_method_bindings_filename.open("w+") as init_method_bindings_file: with init_method_bindings_filename.open("w+") as init_method_bindings_file:
init_method_bindings_file.write(generate_init_method_bindings(classes)) init_method_bindings_file.write(generate_init_method_bindings(classes))
def is_reference_type(t): def is_reference_type(t):
for c in classes: for c in classes:
if c['name'] != t: if c["name"] != t:
continue continue
if c['is_reference']: if c["is_reference"]:
return True return True
return False return False
def make_gdnative_type(t, ref_allowed): def make_gdnative_type(t, ref_allowed):
if is_enum(t): if is_enum(t):
return remove_enum_prefix(t) + " " return remove_enum_prefix(t) + " "
@@ -131,7 +132,6 @@ def generate_class_header(used_classes, c, use_template_get_node):
source.append("#include <cstdint>") source.append("#include <cstdint>")
source.append("") source.append("")
source.append("#include <core/CoreTypes.hpp>") source.append("#include <core/CoreTypes.hpp>")
class_name = strip_name(c["name"]) class_name = strip_name(c["name"])
@@ -145,7 +145,6 @@ def generate_class_header(used_classes, c, use_template_get_node):
source.append("#include <core/TagDB.hpp>") source.append("#include <core/TagDB.hpp>")
ref_allowed = False ref_allowed = False
included = [] included = []
for used_class in used_classes: for used_class in used_classes:
@@ -153,36 +152,38 @@ def generate_class_header(used_classes, c, use_template_get_node):
used_class_name = remove_enum_prefix(extract_nested_type(used_class)) used_class_name = remove_enum_prefix(extract_nested_type(used_class))
if used_class_name not in included: if used_class_name not in included:
included.append(used_class_name) included.append(used_class_name)
source.append("#include \"" + used_class_name + ".hpp\"") source.append('#include "' + used_class_name + '.hpp"')
elif is_enum(used_class) and is_nested_type(used_class) and not is_nested_type(used_class, class_name): elif is_enum(used_class) and is_nested_type(used_class) and not is_nested_type(used_class, class_name):
used_class_name = remove_enum_prefix(used_class) used_class_name = remove_enum_prefix(used_class)
if used_class_name not in included: if used_class_name not in included:
included.append(used_class_name) included.append(used_class_name)
source.append("#include \"" + used_class_name + ".hpp\"") source.append('#include "' + used_class_name + '.hpp"')
source.append("") source.append("")
if c["base_class"] != "": if c["base_class"] != "":
source.append("#include \"" + strip_name(c["base_class"]) + ".hpp\"") source.append('#include "' + strip_name(c["base_class"]) + '.hpp"')
source.append("namespace godot {") source.append("namespace godot {")
source.append("") source.append("")
for used_type in used_classes: for used_type in used_classes:
if is_enum(used_type) or is_nested_type(used_type, class_name): if is_enum(used_type) or is_nested_type(used_type, class_name):
continue continue
else: else:
source.append("class " + strip_name(used_type) + ";") source.append("class " + strip_name(used_type) + ";")
source.append("") source.append("")
vararg_templates = "" vararg_templates = ""
# generate the class definition here # generate the class definition here
source.append("class " + class_name + (" : public _Wrapped" if c["base_class"] == "" else (" : public " + strip_name(c["base_class"])) ) + " {") source.append(
"class "
+ class_name
+ (" : public _Wrapped" if c["base_class"] == "" else (" : public " + strip_name(c["base_class"])))
+ " {"
)
if c["base_class"] == "": if c["base_class"] == "":
source.append("public: enum { ___CLASS_IS_SCRIPT = 0, };") source.append("public: enum { ___CLASS_IS_SCRIPT = 0, };")
@@ -213,7 +214,6 @@ def generate_class_header(used_classes, c, use_template_get_node):
source.append("") source.append("")
if c["singleton"]: if c["singleton"]:
source.append("\tstatic inline " + class_name + " *get_singleton()") source.append("\tstatic inline " + class_name + " *get_singleton()")
source.append("\t{") source.append("\t{")
@@ -229,10 +229,18 @@ def generate_class_header(used_classes, c, use_template_get_node):
# class name: # class name:
# Two versions needed needed because when the user implements a custom class, # Two versions needed needed because when the user implements a custom class,
# we want to override `___get_class_name` while `___get_godot_class_name` can keep returning the base name # we want to override `___get_class_name` while `___get_godot_class_name` can keep returning the base name
source.append("\tstatic inline const char *___get_class_name() { return (const char *) \"" + strip_name(c["name"]) + "\"; }") source.append(
source.append("\tstatic inline const char *___get_godot_class_name() { return (const char *) \"" + strip_name(c["name"]) + "\"; }") '\tstatic inline const char *___get_class_name() { return (const char *) "' + strip_name(c["name"]) + '"; }'
)
source.append(
'\tstatic inline const char *___get_godot_class_name() { return (const char *) "'
+ strip_name(c["name"])
+ '"; }'
)
source.append("\tstatic inline Object *___get_from_variant(Variant a) { godot_object *o = (godot_object*) a; return (o) ? (Object *) godot::nativescript_1_1_api->godot_nativescript_get_instance_binding_data(godot::_RegisterState::language_index, o) : nullptr; }") source.append(
"\tstatic inline Object *___get_from_variant(Variant a) { godot_object *o = (godot_object*) a; return (o) ? (Object *) godot::nativescript_1_1_api->godot_nativescript_get_instance_binding_data(godot::_RegisterState::language_index, o) : nullptr; }"
)
enum_values = [] enum_values = []
@@ -250,7 +258,6 @@ def generate_class_header(used_classes, c, use_template_get_node):
if name not in enum_values: if name not in enum_values:
source.append("\tconst static int " + name + " = " + str(c["constants"][name]) + ";") source.append("\tconst static int " + name + " = " + str(c["constants"][name]) + ";")
if c["instanciable"]: if c["instanciable"]:
source.append("") source.append("")
source.append("") source.append("")
@@ -258,7 +265,6 @@ def generate_class_header(used_classes, c, use_template_get_node):
source.append("\n\t// methods") source.append("\n\t// methods")
if class_name == "Object": if class_name == "Object":
source.append("#ifndef GODOT_CPP_NO_OBJECT_CAST") source.append("#ifndef GODOT_CPP_NO_OBJECT_CAST")
source.append("\ttemplate<class T>") source.append("\ttemplate<class T>")
@@ -273,8 +279,7 @@ def generate_class_header(used_classes, c, use_template_get_node):
# method_signature += "virtual " if method["is_virtual"] else "" # method_signature += "virtual " if method["is_virtual"] else ""
method_signature += make_gdnative_type(method["return_type"], ref_allowed) method_signature += make_gdnative_type(method["return_type"], ref_allowed)
method_name = escape_cpp(method["name"]) method_name = escape_cpp(method["name"])
method_signature += method_name + "(" method_signature += method_name + "("
has_default_argument = False has_default_argument = False
method_arguments = "" method_arguments = ""
@@ -285,7 +290,6 @@ def generate_class_header(used_classes, c, use_template_get_node):
method_signature += argument_name method_signature += argument_name
method_arguments += argument_name method_arguments += argument_name
# default arguments # default arguments
def escape_default_arg(_type, default_value): def escape_default_arg(_type, default_value):
if _type == "Color": if _type == "Color":
@@ -294,7 +298,15 @@ def generate_class_header(used_classes, c, use_template_get_node):
return default_value.lower() return default_value.lower()
if _type == "Array": if _type == "Array":
return "Array()" return "Array()"
if _type in ["PoolVector2Array", "PoolStringArray", "PoolVector3Array", "PoolColorArray", "PoolIntArray", "PoolRealArray", "PoolByteArray"]: if _type in [
"PoolVector2Array",
"PoolStringArray",
"PoolVector3Array",
"PoolColorArray",
"PoolIntArray",
"PoolRealArray",
"PoolByteArray",
]:
return _type + "()" return _type + "()"
if _type == "Vector2": if _type == "Vector2":
return "Vector2" + default_value return "Vector2" + default_value
@@ -309,7 +321,7 @@ def generate_class_header(used_classes, c, use_template_get_node):
if _type == "Variant": if _type == "Variant":
return "Variant()" if default_value == "Null" else default_value return "Variant()" if default_value == "Null" else default_value
if _type == "String" or _type == "NodePath": if _type == "String" or _type == "NodePath":
return "\"" + default_value + "\"" return '"' + default_value + '"'
if _type == "RID": if _type == "RID":
return "RID()" return "RID()"
@@ -318,15 +330,10 @@ def generate_class_header(used_classes, c, use_template_get_node):
return default_value return default_value
if argument["has_default_value"] or has_default_argument: if argument["has_default_value"] or has_default_argument:
method_signature += " = " + escape_default_arg(argument["type"], argument["default_value"]) method_signature += " = " + escape_default_arg(argument["type"], argument["default_value"])
has_default_argument = True has_default_argument = True
if i != len(method["arguments"]) - 1: if i != len(method["arguments"]) - 1:
method_signature += ", " method_signature += ", "
method_arguments += "," method_arguments += ","
@@ -335,12 +342,20 @@ def generate_class_header(used_classes, c, use_template_get_node):
if len(method["arguments"]) > 0: if len(method["arguments"]) > 0:
method_signature += ", " method_signature += ", "
method_arguments += ", " method_arguments += ", "
vararg_templates += "\ttemplate <class... Args> " + method_signature + "Args... args){\n\t\treturn " + method_name + "(" + method_arguments + "Array::make(args...));\n\t}\n""" vararg_templates += (
"\ttemplate <class... Args> "
+ method_signature
+ "Args... args){\n\t\treturn "
+ method_name
+ "("
+ method_arguments
+ "Array::make(args...));\n\t}\n"
""
)
method_signature += "const Array& __var_args = Array()" method_signature += "const Array& __var_args = Array()"
method_signature += ")" + (" const" if method["is_const"] else "") method_signature += ")" + (" const" if method["is_const"] else "")
source.append("\t" + method_signature + ";") source.append("\t" + method_signature + ";")
source.append(vararg_templates) source.append(vararg_templates)
@@ -370,20 +385,16 @@ def generate_class_header(used_classes, c, use_template_get_node):
source.append("#endif") source.append("#endif")
return "\n".join(source) return "\n".join(source)
def generate_class_implementation(icalls, used_classes, c, use_template_get_node): def generate_class_implementation(icalls, used_classes, c, use_template_get_node):
class_name = strip_name(c["name"]) class_name = strip_name(c["name"])
ref_allowed = class_name != "Object" and class_name != "Reference" ref_allowed = class_name != "Object" and class_name != "Reference"
source = [] source = []
source.append("#include \"" + class_name + ".hpp\"") source.append('#include "' + class_name + '.hpp"')
source.append("") source.append("")
source.append("") source.append("")
@@ -394,8 +405,7 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
source.append("#include <core/Godot.hpp>") source.append("#include <core/Godot.hpp>")
source.append("") source.append("")
source.append('#include "__icalls.hpp"')
source.append("#include \"__icalls.hpp\"")
source.append("") source.append("")
source.append("") source.append("")
@@ -403,17 +413,15 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
if is_enum(used_class): if is_enum(used_class):
continue continue
else: else:
source.append("#include \"" + strip_name(used_class) + ".hpp\"") source.append('#include "' + strip_name(used_class) + '.hpp"')
source.append("") source.append("")
source.append("") source.append("")
source.append("namespace godot {") source.append("namespace godot {")
core_object_name = "this" core_object_name = "this"
source.append("") source.append("")
source.append("") source.append("")
@@ -424,7 +432,7 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
# FIXME Test if inlining has a huge impact on binary size # FIXME Test if inlining has a huge impact on binary size
source.append(class_name + "::" + class_name + "() {") source.append(class_name + "::" + class_name + "() {")
source.append("\t_owner = godot::api->godot_global_get_singleton((char *) \"" + strip_name(c["name"]) + "\");") source.append('\t_owner = godot::api->godot_global_get_singleton((char *) "' + strip_name(c["name"]) + '");')
source.append("}") source.append("}")
source.append("") source.append("")
@@ -440,10 +448,18 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
source.append("void " + class_name + "::___init_method_bindings() {") source.append("void " + class_name + "::___init_method_bindings() {")
for method in c["methods"]: for method in c["methods"]:
source.append("\t___mb.mb_" + method["name"] + " = godot::api->godot_method_bind_get_method(\"" + c["name"] + "\", \"" + ("get_node" if use_template_get_node and method["name"] == "get_node_internal" else method["name"]) + "\");") source.append(
"\t___mb.mb_"
+ method["name"]
+ ' = godot::api->godot_method_bind_get_method("'
+ c["name"]
+ '", "'
+ ("get_node" if use_template_get_node and method["name"] == "get_node_internal" else method["name"])
+ '");'
)
source.append("\tgodot_string_name class_name;") source.append("\tgodot_string_name class_name;")
source.append("\tgodot::api->godot_string_name_new_data(&class_name, \"" + c["name"] + "\");") source.append('\tgodot::api->godot_string_name_new_data(&class_name, "' + c["name"] + '");')
source.append("\t_detail_class_tag = godot::core_1_2_api->godot_get_class_tag(&class_name);") source.append("\t_detail_class_tag = godot::core_1_2_api->godot_get_class_tag(&class_name);")
source.append("\tgodot::api->godot_string_name_destroy(&class_name);") source.append("\tgodot::api->godot_string_name_destroy(&class_name);")
@@ -453,7 +469,13 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
if c["instanciable"]: if c["instanciable"]:
source.append(class_name + " *" + strip_name(c["name"]) + "::_new()") source.append(class_name + " *" + strip_name(c["name"]) + "::_new()")
source.append("{") source.append("{")
source.append("\treturn (" + class_name + " *) godot::nativescript_1_1_api->godot_nativescript_get_instance_binding_data(godot::_RegisterState::language_index, godot::api->godot_get_class_constructor((char *)\"" + c["name"] + "\")());") source.append(
"\treturn ("
+ class_name
+ ' *) godot::nativescript_1_1_api->godot_nativescript_get_instance_binding_data(godot::_RegisterState::language_index, godot::api->godot_get_class_constructor((char *)"'
+ c["name"]
+ '")());'
)
source.append("}") source.append("}")
for method in c["methods"]: for method in c["methods"]:
@@ -478,7 +500,6 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
source.append(method_signature + " {") source.append(method_signature + " {")
if method["name"] == "free": if method["name"] == "free":
# dirty hack because Object::free is marked virtual but doesn't actually exist... # dirty hack because Object::free is marked virtual but doesn't actually exist...
source.append("\tgodot::api->godot_object_destroy(_owner);") source.append("\tgodot::api->godot_object_destroy(_owner);")
@@ -496,7 +517,9 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
elif return_type_is_ref: elif return_type_is_ref:
return_statement += "return Ref<" + strip_name(method["return_type"]) + ">::__internal_constructor(" return_statement += "return Ref<" + strip_name(method["return_type"]) + ">::__internal_constructor("
else: else:
return_statement += "return " + ("(" + strip_name(method["return_type"]) + " *) " if is_class_type(method["return_type"]) else "") return_statement += "return " + (
"(" + strip_name(method["return_type"]) + " *) " if is_class_type(method["return_type"]) else ""
)
else: else:
return_statement += "return " return_statement += "return "
@@ -507,8 +530,6 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
return "Object" return "Object"
return name return name
if method["has_varargs"]: if method["has_varargs"]:
if len(method["arguments"]) != 0: if len(method["arguments"]) != 0:
@@ -519,7 +540,6 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
source.append("") source.append("")
for i, argument in enumerate(method["arguments"]): for i, argument in enumerate(method["arguments"]):
source.append("\t__given_args[" + str(i) + "] = " + escape_cpp(argument["name"]) + ";") source.append("\t__given_args[" + str(i) + "] = " + escape_cpp(argument["name"]) + ";")
@@ -531,7 +551,9 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
else: else:
size = "(" + str(len(method["arguments"])) + ")" size = "(" + str(len(method["arguments"])) + ")"
source.append("\tgodot_variant **__args = (godot_variant **) alloca(sizeof(godot_variant *) * " + size + ");") source.append(
"\tgodot_variant **__args = (godot_variant **) alloca(sizeof(godot_variant *) * " + size + ");"
)
source.append("") source.append("")
@@ -542,24 +564,35 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
if method["has_varargs"]: if method["has_varargs"]:
source.append("\tfor (int i = 0; i < __var_args.size(); i++) {") source.append("\tfor (int i = 0; i < __var_args.size(); i++) {")
source.append("\t\t__args[i + " + str(len(method["arguments"])) + "] = (godot_variant *) &((Array &) __var_args)[i];") source.append(
"\t\t__args[i + "
+ str(len(method["arguments"]))
+ "] = (godot_variant *) &((Array &) __var_args)[i];"
)
source.append("\t}") source.append("\t}")
source.append("") source.append("")
source.append("\tVariant __result;") source.append("\tVariant __result;")
source.append("\t*(godot_variant *) &__result = godot::api->godot_method_bind_call(___mb.mb_" + method["name"] + ", ((const Object *) " + core_object_name + ")->_owner, (const godot_variant **) __args, " + size + ", nullptr);") source.append(
"\t*(godot_variant *) &__result = godot::api->godot_method_bind_call(___mb.mb_"
+ method["name"]
+ ", ((const Object *) "
+ core_object_name
+ ")->_owner, (const godot_variant **) __args, "
+ size
+ ", nullptr);"
)
source.append("") source.append("")
if is_class_type(method["return_type"]): if is_class_type(method["return_type"]):
source.append("\tObject *obj = Object::___get_from_variant(__result);") source.append("\tObject *obj = Object::___get_from_variant(__result);")
source.append("\tif (obj->has_method(\"reference\"))") source.append('\tif (obj->has_method("reference"))')
source.append("\t\tobj->callv(\"reference\", Array());") source.append('\t\tobj->callv("reference", Array());')
source.append("") source.append("")
for i, argument in enumerate(method["arguments"]): for i, argument in enumerate(method["arguments"]):
source.append("\tgodot::api->godot_variant_destroy((godot_variant *) &__given_args[" + str(i) + "]);") source.append("\tgodot::api->godot_variant_destroy((godot_variant *) &__given_args[" + str(i) + "]);")
@@ -571,12 +604,17 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
if return_type_is_ref: if return_type_is_ref:
cast += "Ref<" + strip_name(method["return_type"]) + ">::__internal_constructor(__result);" cast += "Ref<" + strip_name(method["return_type"]) + ">::__internal_constructor(__result);"
else: else:
cast += "(" + strip_name(method["return_type"]) + " *) " + strip_name(method["return_type"] + "::___get_from_variant(") + "__result);" cast += (
"("
+ strip_name(method["return_type"])
+ " *) "
+ strip_name(method["return_type"] + "::___get_from_variant(")
+ "__result);"
)
else: else:
cast += "__result;" cast += "__result;"
source.append("\treturn " + cast) source.append("\treturn " + cast)
else: else:
args = [] args = []
@@ -607,17 +645,11 @@ def generate_class_implementation(icalls, used_classes, c, use_template_get_node
source.append("}") source.append("}")
source.append("") source.append("")
source.append("}") source.append("}")
return "\n".join(source) return "\n".join(source)
def generate_icall_header(icalls): def generate_icall_header(icalls):
source = [] source = []
@@ -632,7 +664,7 @@ def generate_icall_header(icalls):
source.append("#include <core/GodotGlobal.hpp>") source.append("#include <core/GodotGlobal.hpp>")
source.append("#include <core/CoreTypes.hpp>") source.append("#include <core/CoreTypes.hpp>")
source.append("#include \"Object.hpp\"") source.append('#include "Object.hpp"')
source.append("") source.append("")
source.append("") source.append("")
@@ -645,7 +677,9 @@ def generate_icall_header(icalls):
method_signature = "static inline " method_signature = "static inline "
method_signature += get_icall_return_type(ret_type) + get_icall_name(icall) + "(godot_method_bind *mb, const Object *inst" method_signature += (
get_icall_return_type(ret_type) + get_icall_name(icall) + "(godot_method_bind *mb, const Object *inst"
)
for i, arg in enumerate(args): for i, arg in enumerate(args):
method_signature += ", const " method_signature += ", const "
@@ -668,11 +702,12 @@ def generate_icall_header(icalls):
source.append(method_signature + " {") source.append(method_signature + " {")
if ret_type != "void": if ret_type != "void":
source.append("\t" + ("godot_object *" if is_class_type(ret_type) else get_icall_return_type(ret_type)) + "ret;") source.append(
"\t" + ("godot_object *" if is_class_type(ret_type) else get_icall_return_type(ret_type)) + "ret;"
)
if is_class_type(ret_type): if is_class_type(ret_type):
source.append("\tret = nullptr;") source.append("\tret = nullptr;")
source.append("\tconst void *args[" + ("1" if len(args) == 0 else "") + "] = {") source.append("\tconst void *args[" + ("1" if len(args) == 0 else "") + "] = {")
for i, arg in enumerate(args): for i, arg in enumerate(args):
@@ -689,12 +724,18 @@ def generate_icall_header(icalls):
source.append("\t};") source.append("\t};")
source.append("") source.append("")
source.append("\tgodot::api->godot_method_bind_ptrcall(mb, inst->_owner, args, " + ("nullptr" if ret_type == "void" else "&ret") + ");") source.append(
"\tgodot::api->godot_method_bind_ptrcall(mb, inst->_owner, args, "
+ ("nullptr" if ret_type == "void" else "&ret")
+ ");"
)
if ret_type != "void": if ret_type != "void":
if is_class_type(ret_type): if is_class_type(ret_type):
source.append("\tif (ret) {") source.append("\tif (ret) {")
source.append("\t\treturn (Object *) godot::nativescript_1_1_api->godot_nativescript_get_instance_binding_data(godot::_RegisterState::language_index, ret);") source.append(
"\t\treturn (Object *) godot::nativescript_1_1_api->godot_nativescript_get_instance_binding_data(godot::_RegisterState::language_index, ret);"
)
source.append("\t}") source.append("\t}")
source.append("") source.append("")
source.append("\treturn (Object *) ret;") source.append("\treturn (Object *) ret;")
@@ -715,7 +756,7 @@ def generate_icall_header(icalls):
def generate_type_registry(classes): def generate_type_registry(classes):
source = [] source = []
source.append("#include \"TagDB.hpp\"") source.append('#include "TagDB.hpp"')
source.append("#include <typeinfo>") source.append("#include <typeinfo>")
source.append("\n") source.append("\n")
@@ -741,14 +782,21 @@ def generate_type_registry(classes):
if base_class_name == "": if base_class_name == "":
base_class_type_hash = "0" base_class_type_hash = "0"
source.append("\tgodot::_TagDB::register_global_type(\"" + c["name"] + "\", " + class_type_hash + ", " + base_class_type_hash + ");") source.append(
'\tgodot::_TagDB::register_global_type("'
+ c["name"]
+ '", '
+ class_type_hash
+ ", "
+ base_class_type_hash
+ ");"
)
source.append("}") source.append("}")
source.append("") source.append("")
source.append("}") source.append("}")
return "\n".join(source) return "\n".join(source)
@@ -799,9 +847,6 @@ def get_icall_name(sig):
return name return name
def get_used_classes(c): def get_used_classes(c):
classes = [] classes = []
for method in c["methods"]: for method in c["methods"]:
@@ -814,86 +859,91 @@ def get_used_classes(c):
return classes return classes
def strip_name(name): def strip_name(name):
if len(name) == 0: if len(name) == 0:
return name return name
if name[0] == '_': if name[0] == "_":
return name[1:] return name[1:]
return name return name
def extract_nested_type(nested_type): def extract_nested_type(nested_type):
return strip_name(nested_type[:nested_type.find("::")]) return strip_name(nested_type[: nested_type.find("::")])
def remove_nested_type_prefix(name): def remove_nested_type_prefix(name):
return name if name.find("::") == -1 else strip_name(name[name.find("::") + 2:]) return name if name.find("::") == -1 else strip_name(name[name.find("::") + 2 :])
def remove_enum_prefix(name): def remove_enum_prefix(name):
return strip_name(name[name.find("enum.") + 5:]) return strip_name(name[name.find("enum.") + 5 :])
def is_nested_type(name, type = ""):
def is_nested_type(name, type=""):
return name.find(type + "::") != -1 return name.find(type + "::") != -1
def is_enum(name): def is_enum(name):
return name.find("enum.") == 0 return name.find("enum.") == 0
def is_class_type(name): def is_class_type(name):
return not is_core_type(name) and not is_primitive(name) return not is_core_type(name) and not is_primitive(name)
def is_core_type(name): def is_core_type(name):
core_types = ["Array", core_types = [
"Basis", "Array",
"Color", "Basis",
"Dictionary", "Color",
"Error", "Dictionary",
"NodePath", "Error",
"Plane", "NodePath",
"PoolByteArray", "Plane",
"PoolIntArray", "PoolByteArray",
"PoolRealArray", "PoolIntArray",
"PoolStringArray", "PoolRealArray",
"PoolVector2Array", "PoolStringArray",
"PoolVector3Array", "PoolVector2Array",
"PoolColorArray", "PoolVector3Array",
"PoolIntArray", "PoolColorArray",
"PoolRealArray", "PoolIntArray",
"Quat", "PoolRealArray",
"Rect2", "Quat",
"AABB", "Rect2",
"RID", "AABB",
"String", "RID",
"Transform", "String",
"Transform2D", "Transform",
"Variant", "Transform2D",
"Vector2", "Variant",
"Vector3"] "Vector2",
"Vector3",
]
return name in core_types return name in core_types
def is_primitive(name): def is_primitive(name):
core_types = ["int", "bool", "real", "float", "void"] core_types = ["int", "bool", "real", "float", "void"]
return name in core_types return name in core_types
def escape_cpp(name): def escape_cpp(name):
escapes = { escapes = {
"class": "_class", "class": "_class",
"enum": "_enum", "enum": "_enum",
"char": "_char", "char": "_char",
"short": "_short", "short": "_short",
"bool": "_bool", "bool": "_bool",
"int": "_int", "int": "_int",
"default": "_default", "default": "_default",
"case": "_case", "case": "_case",
"switch": "_switch", "switch": "_switch",
"export": "_export", "export": "_export",
"template": "_template", "template": "_template",
"new": "new_", "new": "new_",
"operator": "_operator", "operator": "_operator",
"typename": "_typename" "typename": "_typename",
} }
if name in escapes: if name in escapes:
return escapes[name] return escapes[name]

2
godot-headers

Submodule godot-headers updated: d1596b939d...86afe2307b

4
include/core/AABB.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Array.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Basis.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/CameraMatrix.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Color.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/CoreTypes.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Defs.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Dictionary.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Godot.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/GodotGlobal.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/GodotProfiling.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Math.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/NodePath.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Plane.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/PoolArrays.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Quat.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/RID.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Rect2.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Ref.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/String.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/TagDB.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Transform.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Transform2D.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Variant.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Vector2.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Vector3.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
include/core/Wrapped.hpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/AABB.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Array.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Basis.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/CameraMatrix.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Color.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Dictionary.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/GodotGlobal.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/NodePath.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Plane.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/PoolArrays.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Quat.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/RID.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

28
src/core/Rect2.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */
@@ -46,25 +46,35 @@ namespace godot {
#endif #endif
real_t Rect2::distance_to(const Vector2 &p_point) const { real_t Rect2::distance_to(const Vector2 &p_point) const {
real_t dist = 1e20; real_t dist = 0.0;
bool inside = true;
if (p_point.x < position.x) { if (p_point.x < position.x) {
dist = MIN(dist, position.x - p_point.x); real_t d = position.x - p_point.x;
dist = d;
inside = false;
} }
if (p_point.y < position.y) { if (p_point.y < position.y) {
dist = MIN(dist, position.y - p_point.y); real_t d = position.y - p_point.y;
dist = inside ? d : MIN(dist, d);
inside = false;
} }
if (p_point.x >= (position.x + size.x)) { if (p_point.x >= (position.x + size.x)) {
dist = MIN(p_point.x - (position.x + size.x), dist); real_t d = p_point.x - (position.x + size.x);
dist = inside ? d : MIN(dist, d);
inside = false;
} }
if (p_point.y >= (position.y + size.y)) { if (p_point.y >= (position.y + size.y)) {
dist = MIN(p_point.y - (position.y + size.y), dist); real_t d = p_point.y - (position.y + size.y);
dist = inside ? d : MIN(dist, d);
inside = false;
} }
if (dist == 1e20) if (inside) {
return 0; return 0;
else } else {
return dist; return dist;
}
} }
Rect2 Rect2::clip(const Rect2 &p_rect) const { /// return a clipped rect Rect2 Rect2::clip(const Rect2 &p_rect) const { /// return a clipped rect

4
src/core/String.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/TagDB.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Transform.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Transform2D.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Variant.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Vector2.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

4
src/core/Vector3.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */

133
test/SConstruct
View File

@@ -1,135 +1,16 @@
#!/usr/bin/env python #!/usr/bin/env python
import os
import sys
# Try to detect the host platform automatically. env = SConscript("../SConstruct")
# This is used if no `platform` argument is passed
if sys.platform.startswith('linux'):
host_platform = 'linux'
elif sys.platform == 'darwin':
host_platform = 'osx'
elif sys.platform == 'win32' or sys.platform == 'msys':
host_platform = 'windows'
else:
raise ValueError(
'Could not detect platform automatically, please specify with '
'platform=<platform>'
)
env = Environment(ENV = os.environ)
opts = Variables([], ARGUMENTS)
# Define our options
opts.Add(EnumVariable('target', "Compilation target", 'debug', ['d', 'debug', 'r', 'release']))
opts.Add(EnumVariable('platform', "Compilation platform", host_platform, ['', 'windows', 'x11', 'linux', 'osx']))
opts.Add(EnumVariable('p', "Compilation target, alias for 'platform'", host_platform, ['', 'windows', 'x11', 'linux', 'osx']))
opts.Add(EnumVariable('bits', 'Target platform bits', '64', ('32', '64')))
opts.Add(BoolVariable('use_llvm', "Use the LLVM / Clang compiler", 'no'))
opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'bin/', PathVariable.PathAccept))
opts.Add(PathVariable('target_name', 'The library name.', 'libgdexample', PathVariable.PathAccept))
# Local dependency paths, adapt them to your setup
godot_headers_path = "../godot-headers/"
cpp_bindings_path = "../"
cpp_library = "libgodot-cpp"
# only support 64 at this time..
bits = 64
# Updates the environment with the option variables.
opts.Update(env)
# Generates help for the -h scons option.
Help(opts.GenerateHelpText(env))
# This makes sure to keep the session environment variables on Windows.
# This way, you can run SCons in a Visual Studio 2017 prompt and it will find
# all the required tools
if host_platform == 'windows' and env['platform'] != 'android':
if env['bits'] == '64':
env = Environment(TARGET_ARCH='amd64')
elif env['bits'] == '32':
env = Environment(TARGET_ARCH='x86')
opts.Update(env)
# Process some arguments
if env['use_llvm']:
env['CC'] = 'clang'
env['CXX'] = 'clang++'
if env['p'] != '':
env['platform'] = env['p']
if env['platform'] == '':
print("No valid target platform selected.")
quit();
# For the reference:
# - CCFLAGS are compilation flags shared between C and C++
# - CFLAGS are for C-specific compilation flags
# - CXXFLAGS are for C++-specific compilation flags
# - CPPFLAGS are for pre-processor flags
# - CPPDEFINES are for pre-processor defines
# - LINKFLAGS are for linking flags
# Check our platform specifics
if env['platform'] == "osx":
env['target_path'] += 'osx/'
cpp_library += '.osx'
env.Append(CCFLAGS=['-arch', 'x86_64'])
env.Append(CXXFLAGS=['-std=c++17'])
env.Append(LINKFLAGS=['-arch', 'x86_64'])
if env['target'] in ('debug', 'd'):
env.Append(CCFLAGS=['-g', '-O2'])
else:
env.Append(CCFLAGS=['-g', '-O3'])
elif env['platform'] in ('x11', 'linux'):
env['target_path'] += 'x11/'
cpp_library += '.linux'
env.Append(CCFLAGS=['-fPIC'])
env.Append(CXXFLAGS=['-std=c++17'])
if env['target'] in ('debug', 'd'):
env.Append(CCFLAGS=['-g3', '-Og'])
else:
env.Append(CCFLAGS=['-g', '-O3'])
elif env['platform'] == "windows":
env['target_path'] += 'win64/'
cpp_library += '.windows'
# This makes sure to keep the session environment variables on windows,
# that way you can run scons in a vs 2017 prompt and it will find all the required tools
env.Append(ENV=os.environ)
env.Append(CPPDEFINES=['WIN32', '_WIN32', '_WINDOWS', '_CRT_SECURE_NO_WARNINGS'])
env.Append(CCFLAGS=['-W3', '-GR'])
env.Append(CXXFLAGS=['-std:c++17'])
if env['target'] in ('debug', 'd'):
env.Append(CPPDEFINES=['_DEBUG'])
env.Append(CCFLAGS=['-EHsc', '-MDd', '-ZI'])
env.Append(LINKFLAGS=['-DEBUG'])
else:
env.Append(CPPDEFINES=['NDEBUG'])
env.Append(CCFLAGS=['-O2', '-EHsc', '-MD'])
if env['target'] in ('debug', 'd'):
cpp_library += '.debug'
else:
cpp_library += '.release'
cpp_library += '.' + str(bits)
# make sure our binding library is properly includes
env.Append(CPPPATH=['.', godot_headers_path, cpp_bindings_path + 'include/', cpp_bindings_path + 'include/core/', cpp_bindings_path + 'include/gen/'])
env.Append(LIBPATH=[cpp_bindings_path + 'bin/'])
env.Append(LIBS=[cpp_library])
# tweak this if you want to use different folders, or more folders, to store your source code in. # tweak this if you want to use different folders, or more folders, to store your source code in.
env.Append(CPPPATH=['src/']) env.Append(CPPPATH=['src/'])
sources = Glob('src/*.cpp') sources = Glob('src/*.cpp')
library = env.SharedLibrary(target=env['target_path'] + env['target_name'] , source=sources) library = env.SharedLibrary(
"bin/libgdexample.{}.{}.{}{}".format(
env["platform"], env["target"], env["arch_suffix"], env["SHLIBSUFFIX"]
),
source=sources,
)
Default(library) Default(library)

8
test/gdexample.gdnlib
View File

@@ -7,10 +7,10 @@ reloadable=false
[entry] [entry]
X11.64="res://bin/x11/libgdexample.so" X11.64="res://bin/libgdexample.linux.release.64.so"
Server.64="res://bin/x11/libgdexample.so" Server.64="res://bin/libgdexample.linux.release.64.so"
Windows.64="res://bin/win64/libgdexample.dll" Windows.64="res://bin/libgdexample.windows.release.64.dll"
OSX.64="res://bin/osx/libgdexample.dylib" OSX.64="res://bin/libgdexample.osx.release.64.dylib"
[dependencies] [dependencies]

4
test/src/init.cpp
View File

@@ -5,8 +5,8 @@
/* GODOT ENGINE */ /* GODOT ENGINE */
/* https://godotengine.org */ /* https://godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md). */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */