forked from godotengine/godot
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add ability to bind typed arrays to script API
Note: Only replaced 2 instances to test, Node.get_children and TileMap.get_used_cells Note: Will do a mass replace on later PRs of whathever I can find, but probably need a tool to grep through doc. Warning: Mono will break, needs to be fixed (and so do TypeScript and NativeScript, need to ask respective maintainers)
- Loading branch information
Showing
24 changed files
with
452 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| #ifndef CONTAINER_TYPE_VALIDATE_H | ||
| #define CONTAINER_TYPE_VALIDATE_H | ||
|
|
||
| #include "core/script_language.h" | ||
| #include "core/variant.h" | ||
|
|
||
| struct ContainerTypeValidate { | ||
|
|
||
| Variant::Type type = Variant::NIL; | ||
| StringName class_name; | ||
| Ref<Script> script; | ||
| const char *where = "conatiner"; | ||
|
|
||
| _FORCE_INLINE_ bool can_reference(const ContainerTypeValidate &p_type) const { | ||
| if (type == p_type.type) { | ||
| if (type != Variant::OBJECT) { | ||
| return true; //nothing else to check | ||
| } | ||
| } else { | ||
| return false; | ||
| } | ||
|
|
||
| //both are object | ||
|
|
||
| if ((class_name != StringName()) != (p_type.class_name != StringName())) { | ||
| return false; //both need to have class or none | ||
| } | ||
|
|
||
| if (class_name != p_type.class_name) { | ||
| if (!ClassDB::is_parent_class(p_type.class_name, class_name)) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| if (script.is_null() != p_type.script.is_null()) { | ||
| return false; | ||
| } | ||
|
|
||
| if (script != p_type.script) { | ||
| if (!p_type.script->inherits_script(script)) { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| _FORCE_INLINE_ bool validate(const Variant &p_variant, const char *p_operation = "use") { | ||
|
|
||
| if (type == Variant::NIL) { | ||
| return true; | ||
| } | ||
|
|
||
| ERR_FAIL_COND_V_MSG(type != p_variant.get_type(), false, "Attempted to " + String(p_operation) + " a variable of type '" + Variant::get_type_name(p_variant.get_type()) + "' into a " + where + " of type '" + Variant::get_type_name(type) + "'."); | ||
| if (type != p_variant.get_type()) { | ||
| return false; | ||
| } | ||
|
|
||
| if (type != Variant::OBJECT) { | ||
| return true; | ||
| } | ||
| #ifdef DEBUG_ENABLED | ||
| ObjectID object_id = p_variant; | ||
| if (object_id == ObjectID()) { | ||
| return true; //fine its null; | ||
| } | ||
| Object *object = ObjectDB::get_instance(object_id); | ||
| ERR_FAIL_COND_V_MSG(object == nullptr, false, "Attempted to " + String(p_operation) + " an invalid (previously freed?) object instance into a '" + String(where) + "."); | ||
| #else | ||
| Object *object = p_variant; | ||
| if (object == nullptr) { | ||
| return true; //fine | ||
| } | ||
| #endif | ||
| if (class_name == StringName()) { | ||
| return true; //all good, no class type requested | ||
| } | ||
|
|
||
| StringName obj_class = object->get_class_name(); | ||
| if (obj_class != class_name) { | ||
| ERR_FAIL_COND_V_MSG(!ClassDB::is_parent_class(object->get_class_name(), class_name), false, "Attempted to " + String(p_operation) + " an object of type '" + object->get_class() + "' into a " + where + ", which does not inherit from '" + String(class_name) + "'."); | ||
| } | ||
|
|
||
| if (script.is_null()) { | ||
| return true; //all good | ||
| } | ||
|
|
||
| Ref<Script> other_script = object->get_script(); | ||
|
|
||
| //check base script.. | ||
| ERR_FAIL_COND_V_MSG(other_script.is_null(), false, "Attempted to " + String(p_operation) + " an object into a " + String(where) + ", that does not inherit from '" + String(script->get_class_name()) + "'."); | ||
| ERR_FAIL_COND_V_MSG(!other_script->inherits_script(script), false, "Attempted to " + String(p_operation) + " an object into a " + String(where) + ", that does not inherit from '" + String(script->get_class_name()) + "'."); | ||
|
|
||
| return true; | ||
| } | ||
| }; | ||
|
|
||
| #endif // CONTAINER_TYPE_VALIDATE_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include "typed_array.h" |
Oops, something went wrong.