Skip to content

Commit c02e644

Browse files
committed
Rename GDNative to GDExtension
Non-exhaustive list of case-sensitive renames: GDExtension -> GDNative GDNATIVE -> GDEXTENSION gdextension -> gdnative ExtensionExtension -> Extension (for where there was GDNativeExtension) EXTENSION_EXTENSION -> EXTENSION (for where there was GDNATIVE_EXTENSION) gdnlib -> gdextension gdn_interface -> gde_interface gdni -> gde_interface
1 parent f74c472 commit c02e644

38 files changed

+1357
-1355
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ jobs:
145145
cmake -DCMAKE_BUILD_TYPE=Release .
146146
make -j $(nproc) VERBOSE=1
147147
148-
- name: Build test GDNative library
148+
- name: Build test GDExtension library
149149
run: |
150150
cd test && cmake -DCMAKE_BUILD_TYPE=Release -DGODOT_HEADERS_PATH="../godot-headers" -DCPP_BINDINGS_PATH=".." .
151151
make -j $(nproc) VERBOSE=1
@@ -169,7 +169,7 @@ jobs:
169169
cmake -DCMAKE_BUILD_TYPE=Release -GNinja .
170170
cmake --build . -j $(nproc) --verbose
171171
172-
- name: Build test GDNative library
172+
- name: Build test GDExtension library
173173
run: |
174174
cd test && cmake -DCMAKE_BUILD_TYPE=Release -DGODOT_HEADERS_PATH="../godot-headers" -DCPP_BINDINGS_PATH=".." -GNinja .
175175
cmake --build . -j $(nproc) --verbose
@@ -188,7 +188,7 @@ jobs:
188188
cmake -DCMAKE_BUILD_TYPE=Release -G"Visual Studio 16 2019" .
189189
cmake --build . --verbose
190190
191-
- name: Build test GDNative library
191+
- name: Build test GDExtension library
192192
run: |
193193
cd test && cmake -DCMAKE_BUILD_TYPE=Release -DGODOT_HEADERS_PATH="../godot-headers" -DCPP_BINDINGS_PATH=".." -G"Visual Studio 16 2019" .
194194
cmake --build . --verbose

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# CMAKE_BUILD_TYPE: Compilation target (Debug or Release defaults to Debug)
33
#
44
# godot-cpp cmake arguments
5-
# GODOT_HEADERS_DIR: This is where the gdnative include folder is (godot_source/modules/gdnative/include)
6-
# GODOT_CUSTOM_API_FILE: This is if you have another path for the godot_api.json
5+
# GODOT_HEADERS_DIR: Custom include path for the GDExtension. It should include interface header at this subpath: godot/gdextension_interface.h
6+
# GODOT_CUSTOM_API_FILE: Custom path for extension_api.json
77
# FLOAT_TYPE Floating-point precision (32, 64)
88
#
99
# Android cmake arguments

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ extern "C" {
7676

7777
// Initialization.
7878

79-
GDNativeBool GDN_EXPORT example_library_init(const GDNativeInterface *p_interface, GDNativeExtensionClassLibraryPtr p_library, GDNativeInitialization *r_initialization) {
79+
GDExtensionBool GDE_EXPORT example_library_init(const GDExtensionInterface *p_interface, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
8080
godot::GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
8181

8282
init_obj.register_initializer(initialize_example_module);

SConstruct

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ else:
183183

184184
bindings = env.GenerateBindings(
185185
env.Dir("."),
186-
[json_api_file, os.path.join(env["headers_dir"], "godot", "gdnative_interface.h"), "binding_generator.py"],
186+
[json_api_file, os.path.join(env["headers_dir"], "godot", "gdextension_interface.h"), "binding_generator.py"],
187187
)
188188

189189
scons_cache_path = os.environ.get("SCONS_CACHE")

binding_generator.py

+50-48
Large diffs are not rendered by default.

godot-headers/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# godot-headers
22

33
This repository contains C headers for
4-
[**Godot Engine**](https://github.com/godotengine/godot)'s *GDNative Extensions* API.
4+
[**Godot Engine**](https://github.com/godotengine/godot)'s *GDExtensions* API.
55

66
## Updating Headers
77

@@ -13,4 +13,4 @@ procedure used to sync this repository with upstream releases:
1313
version/commit which you are using.
1414
- Use the compiled executable to generate the `extension_api.json` file with:
1515
`godot --dump-extension-api extension_api.json`
16-
- Copy the file `core/extension/gdnative_interface.h` to `godot`
16+
- Copy the file `core/extension/gdextension_interface.h` to `godot`

godot-headers/extension_api.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -126642,7 +126642,7 @@
126642126642
]
126643126643
},
126644126644
{
126645-
"name": "NativeExtension",
126645+
"name": "GDExtension",
126646126646
"is_refcounted": true,
126647126647
"is_instantiable": true,
126648126648
"inherits": "Resource",
@@ -126720,7 +126720,7 @@
126720126720
"is_virtual": false,
126721126721
"hash": 3541246554,
126722126722
"return_value": {
126723-
"type": "enum::NativeExtension.InitializationLevel"
126723+
"type": "enum::GDExtension.InitializationLevel"
126724126724
}
126725126725
},
126726126726
{
@@ -126733,14 +126733,14 @@
126733126733
"arguments": [
126734126734
{
126735126735
"name": "level",
126736-
"type": "enum::NativeExtension.InitializationLevel"
126736+
"type": "enum::GDExtension.InitializationLevel"
126737126737
}
126738126738
]
126739126739
}
126740126740
]
126741126741
},
126742126742
{
126743-
"name": "NativeExtensionManager",
126743+
"name": "GDExtensionManager",
126744126744
"is_refcounted": false,
126745126745
"is_instantiable": false,
126746126746
"inherits": "Object",
@@ -126782,7 +126782,7 @@
126782126782
"is_virtual": false,
126783126783
"hash": 3900395898,
126784126784
"return_value": {
126785-
"type": "enum::NativeExtensionManager.LoadStatus"
126785+
"type": "enum::GDExtensionManager.LoadStatus"
126786126786
},
126787126787
"arguments": [
126788126788
{
@@ -126799,7 +126799,7 @@
126799126799
"is_virtual": false,
126800126800
"hash": 3900395898,
126801126801
"return_value": {
126802-
"type": "enum::NativeExtensionManager.LoadStatus"
126802+
"type": "enum::GDExtensionManager.LoadStatus"
126803126803
},
126804126804
"arguments": [
126805126805
{
@@ -126816,7 +126816,7 @@
126816126816
"is_virtual": false,
126817126817
"hash": 3900395898,
126818126818
"return_value": {
126819-
"type": "enum::NativeExtensionManager.LoadStatus"
126819+
"type": "enum::GDExtensionManager.LoadStatus"
126820126820
},
126821126821
"arguments": [
126822126822
{
@@ -126861,7 +126861,7 @@
126861126861
"is_virtual": false,
126862126862
"hash": 3065478200,
126863126863
"return_value": {
126864-
"type": "NativeExtension"
126864+
"type": "GDExtension"
126865126865
},
126866126866
"arguments": [
126867126867
{
@@ -265457,8 +265457,8 @@
265457265457
"type": "Time"
265458265458
},
265459265459
{
265460-
"name": "NativeExtensionManager",
265461-
"type": "NativeExtensionManager"
265460+
"name": "GDExtensionManager",
265461+
"type": "GDExtensionManager"
265462265462
},
265463265463
{
265464265464
"name": "ResourceUID",

0 commit comments

Comments
 (0)