Skip to content

godot
godot
Unverified Commit 38250ef5 by Rémi Verschelde Committed by GitHub
Options

Merge pull request #38826 from bruvzg/gdnative_core_types

Add new (and rename changed) core types to GDNative API.
parents 5ee340ab 74eecd1d
Showing with 1200 additions and 34 deletions
modules/gdnative/gdnative/array.cpp
......@@ -102,9 +102,9 @@ void GDAPI godot_array_new_packed_string_array(godot_array *r_dest, const godot_
}
}
void GDAPI godot_array_new_packed_real_array(godot_array *r_dest, const godot_packed_real_array *p_pra) {
void GDAPI godot_array_new_packed_float32_array(godot_array *r_dest, const godot_packed_float32_array *p_pra) {
Array *dest = (Array *)r_dest;
Vector<godot_real> *pca = (Vector<godot_real> *)p_pra;
Vector<float> *pca = (Vector<float> *)p_pra;
memnew_placement(dest, Array);
dest->resize(pca->size());
......@@ -114,9 +114,33 @@ void GDAPI godot_array_new_packed_real_array(godot_array *r_dest, const godot_pa
}
}
void GDAPI godot_array_new_packed_int_array(godot_array *r_dest, const godot_packed_int_array *p_pia) {
void GDAPI godot_array_new_packed_float64_array(godot_array *r_dest, const godot_packed_float64_array *p_pra) {
Array *dest = (Array *)r_dest;
Vector<godot_int> *pca = (Vector<godot_int> *)p_pia;
Vector<double> *pca = (Vector<double> *)p_pra;
memnew_placement(dest, Array);
dest->resize(pca->size());
for (int i = 0; i < dest->size(); i++) {
Variant v = pca->operator[](i);
dest->operator[](i) = v;
}
}
void GDAPI godot_array_new_packed_int32_array(godot_array *r_dest, const godot_packed_int32_array *p_pia) {
Array *dest = (Array *)r_dest;
Vector<int32_t> *pca = (Vector<int32_t> *)p_pia;
memnew_placement(dest, Array);
dest->resize(pca->size());
for (int i = 0; i < dest->size(); i++) {
Variant v = pca->operator[](i);
dest->operator[](i) = v;
}
}
void GDAPI godot_array_new_packed_int64_array(godot_array *r_dest, const godot_packed_int64_array *p_pia) {
Array *dest = (Array *)r_dest;
Vector<int64_t> *pca = (Vector<int64_t> *)p_pia;
memnew_placement(dest, Array);
dest->resize(pca->size());
......
modules/gdnative/gdnative/gdnative.cpp
......@@ -165,7 +165,7 @@ void _gdnative_report_loading_error(const godot_object *p_library, const char *p
_err_print_error("gdnative_init", library->get_current_library_path().utf8().ptr(), 0, message.utf8().ptr());
}
godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id) {
godot_object GDAPI *godot_instance_from_id(uint64_t p_instance_id) {
return (godot_object *)ObjectDB::get_instance(ObjectID(p_instance_id));
}
......@@ -184,6 +184,11 @@ godot_object *godot_object_cast_to(const godot_object *p_object, void *p_class_t
return o->is_class_ptr(p_class_tag) ? (godot_object *)o : nullptr;
}
uint64_t GDAPI godot_object_get_instance_id(const godot_object *p_object) {
const Object *o = (const Object *)p_object;
return (uint64_t)o->get_instance_id();
}
#ifdef __cplusplus
}
#endif
modules/gdnative/gdnative/rect2.cpp
......@@ -38,6 +38,9 @@ extern "C" {
#endif
static_assert(sizeof(godot_rect2) == sizeof(Rect2), "Rect2 size mismatch");
static_assert(sizeof(godot_rect2i) == sizeof(Rect2i), "Rect2i size mismatch");
// Rect2
void GDAPI godot_rect2_new_with_position_and_size(godot_rect2 *r_dest, const godot_vector2 *p_pos, const godot_vector2 *p_size) {
const Vector2 *position = (const Vector2 *)p_pos;
......@@ -58,6 +61,13 @@ godot_string GDAPI godot_rect2_as_string(const godot_rect2 *p_self) {
return ret;
}
godot_rect2i GDAPI godot_rect2_as_rect2i(const godot_rect2 *p_self) {
godot_rect2i dest;
const Rect2 *self = (const Rect2 *)p_self;
*((Rect2i *)&dest) = Rect2i(*self);
return dest;
}
godot_real GDAPI godot_rect2_get_area(const godot_rect2 *p_self) {
const Rect2 *self = (const Rect2 *)p_self;
return self->get_area();
......@@ -173,6 +183,149 @@ void GDAPI godot_rect2_set_size(godot_rect2 *p_self, const godot_vector2 *p_size
self->set_size(*size);
}
// Rect2i
void GDAPI godot_rect2i_new_with_position_and_size(godot_rect2i *r_dest, const godot_vector2i *p_pos, const godot_vector2i *p_size) {
const Vector2i *position = (const Vector2i *)p_pos;
const Vector2i *size = (const Vector2i *)p_size;
Rect2i *dest = (Rect2i *)r_dest;
*dest = Rect2i(*position, *size);
}
void GDAPI godot_rect2i_new(godot_rect2i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_width, const godot_int p_height) {
Rect2i *dest = (Rect2i *)r_dest;
*dest = Rect2i(p_x, p_y, p_width, p_height);
}
godot_string GDAPI godot_rect2i_as_string(const godot_rect2i *p_self) {
godot_string ret;
const Rect2i *self = (const Rect2i *)p_self;
memnew_placement(&ret, String(*self));
return ret;
}
godot_rect2 GDAPI godot_rect2i_as_rect2(const godot_rect2i *p_self) {
godot_rect2 dest;
const Rect2i *self = (const Rect2i *)p_self;
*((Rect2 *)&dest) = Rect2(*self);
return dest;
}
godot_int GDAPI godot_rect2i_get_area(const godot_rect2i *p_self) {
const Rect2i *self = (const Rect2i *)p_self;
return self->get_area();
}
godot_bool GDAPI godot_rect2i_intersects(const godot_rect2i *p_self, const godot_rect2i *p_b) {
const Rect2i *self = (const Rect2i *)p_self;
const Rect2i *b = (const Rect2i *)p_b;
return self->intersects(*b);
}
godot_bool GDAPI godot_rect2i_encloses(const godot_rect2i *p_self, const godot_rect2i *p_b) {
const Rect2i *self = (const Rect2i *)p_self;
const Rect2i *b = (const Rect2i *)p_b;
return self->encloses(*b);
}
godot_bool GDAPI godot_rect2i_has_no_area(const godot_rect2i *p_self) {
const Rect2i *self = (const Rect2i *)p_self;
return self->has_no_area();
}
godot_rect2i GDAPI godot_rect2i_clip(const godot_rect2i *p_self, const godot_rect2i *p_b) {
godot_rect2i dest;
const Rect2i *self = (const Rect2i *)p_self;
const Rect2i *b = (const Rect2i *)p_b;
*((Rect2i *)&dest) = self->clip(*b);
return dest;
}
godot_rect2i GDAPI godot_rect2i_merge(const godot_rect2i *p_self, const godot_rect2i *p_b) {
godot_rect2i dest;
const Rect2i *self = (const Rect2i *)p_self;
const Rect2i *b = (const Rect2i *)p_b;
*((Rect2i *)&dest) = self->merge(*b);
return dest;
}
godot_bool GDAPI godot_rect2i_has_point(const godot_rect2i *p_self, const godot_vector2i *p_point) {
const Rect2i *self = (const Rect2i *)p_self;
const Vector2i *point = (const Vector2i *)p_point;
return self->has_point(*point);
}
godot_rect2i GDAPI godot_rect2i_grow(const godot_rect2i *p_self, const godot_int p_by) {
godot_rect2i dest;
const Rect2i *self = (const Rect2i *)p_self;
*((Rect2i *)&dest) = self->grow(p_by);
return dest;
}
godot_rect2i GDAPI godot_rect2i_grow_individual(const godot_rect2i *p_self, const godot_int p_left, const godot_int p_top, const godot_int p_right, const godot_int p_bottom) {
godot_rect2i dest;
const Rect2i *self = (const Rect2i *)p_self;
*((Rect2i *)&dest) = self->grow_individual(p_left, p_top, p_right, p_bottom);
return dest;
}
godot_rect2i GDAPI godot_rect2i_grow_margin(const godot_rect2i *p_self, const godot_int p_margin, const godot_int p_by) {
godot_rect2i dest;
const Rect2i *self = (const Rect2i *)p_self;
*((Rect2i *)&dest) = self->grow_margin((Margin)p_margin, p_by);
return dest;
}
godot_rect2i GDAPI godot_rect2i_abs(const godot_rect2i *p_self) {
godot_rect2i dest;
const Rect2i *self = (const Rect2i *)p_self;
*((Rect2i *)&dest) = self->abs();
return dest;
}
godot_rect2i GDAPI godot_rect2i_expand(const godot_rect2i *p_self, const godot_vector2i *p_to) {
godot_rect2i dest;
const Rect2i *self = (const Rect2i *)p_self;
const Vector2i *to = (const Vector2i *)p_to;
*((Rect2i *)&dest) = self->expand(*to);
return dest;
}
godot_bool GDAPI godot_rect2i_operator_equal(const godot_rect2i *p_self, const godot_rect2i *p_b) {
const Rect2i *self = (const Rect2i *)p_self;
const Rect2i *b = (const Rect2i *)p_b;
return *self == *b;
}
godot_vector2i GDAPI godot_rect2i_get_position(const godot_rect2i *p_self) {
godot_vector2i dest;
Vector2i *d = (Vector2i *)&dest;
const Rect2i *self = (const Rect2i *)p_self;
*d = self->get_position();
return dest;
}
godot_vector2i GDAPI godot_rect2i_get_size(const godot_rect2i *p_self) {
godot_vector2i dest;
Vector2i *d = (Vector2i *)&dest;
const Rect2i *self = (const Rect2i *)p_self;
*d = self->get_size();
return dest;
}
void GDAPI godot_rect2i_set_position(godot_rect2i *p_self, const godot_vector2i *p_pos) {
Rect2i *self = (Rect2i *)p_self;
const Vector2i *position = (const Vector2i *)p_pos;
self->set_position(*position);
}
void GDAPI godot_rect2i_set_size(godot_rect2i *p_self, const godot_vector2i *p_size) {
Rect2i *self = (Rect2i *)p_self;
const Vector2i *size = (const Vector2i *)p_size;
self->set_size(*size);
}
#ifdef __cplusplus
}
#endif
modules/gdnative/gdnative/variant.cpp
......@@ -99,24 +99,48 @@ void GDAPI godot_variant_new_string(godot_variant *r_dest, const godot_string *p
memnew_placement_custom(dest, Variant, Variant(*s));
}
void GDAPI godot_variant_new_string_name(godot_variant *r_dest, const godot_string_name *p_s) {
Variant *dest = (Variant *)r_dest;
StringName *s = (StringName *)p_s;
memnew_placement_custom(dest, Variant, Variant(*s));
}
void GDAPI godot_variant_new_vector2(godot_variant *r_dest, const godot_vector2 *p_v2) {
Variant *dest = (Variant *)r_dest;
Vector2 *v2 = (Vector2 *)p_v2;
memnew_placement_custom(dest, Variant, Variant(*v2));
}
void GDAPI godot_variant_new_vector2i(godot_variant *r_dest, const godot_vector2i *p_v2) {
Variant *dest = (Variant *)r_dest;
Vector2i *v2 = (Vector2i *)p_v2;
memnew_placement_custom(dest, Variant, Variant(*v2));
}
void GDAPI godot_variant_new_rect2(godot_variant *r_dest, const godot_rect2 *p_rect2) {
Variant *dest = (Variant *)r_dest;
Rect2 *rect2 = (Rect2 *)p_rect2;
memnew_placement_custom(dest, Variant, Variant(*rect2));
}
void GDAPI godot_variant_new_rect2i(godot_variant *r_dest, const godot_rect2i *p_rect2) {
Variant *dest = (Variant *)r_dest;
Rect2i *rect2 = (Rect2i *)p_rect2;
memnew_placement_custom(dest, Variant, Variant(*rect2));
}
void GDAPI godot_variant_new_vector3(godot_variant *r_dest, const godot_vector3 *p_v3) {
Variant *dest = (Variant *)r_dest;
Vector3 *v3 = (Vector3 *)p_v3;
memnew_placement_custom(dest, Variant, Variant(*v3));
}
void GDAPI godot_variant_new_vector3i(godot_variant *r_dest, const godot_vector3i *p_v3) {
Variant *dest = (Variant *)r_dest;
Vector3i *v3 = (Vector3i *)p_v3;
memnew_placement_custom(dest, Variant, Variant(*v3));
}
void GDAPI godot_variant_new_transform2d(godot_variant *r_dest, const godot_transform2d *p_t2d) {
Variant *dest = (Variant *)r_dest;
Transform2D *t2d = (Transform2D *)p_t2d;
......@@ -171,6 +195,18 @@ void GDAPI godot_variant_new_rid(godot_variant *r_dest, const godot_rid *p_rid)
memnew_placement_custom(dest, Variant, Variant(*rid));
}
void GDAPI godot_variant_new_callable(godot_variant *r_dest, const godot_callable *p_cb) {
Variant *dest = (Variant *)r_dest;
Callable *cb = (Callable *)p_cb;
memnew_placement_custom(dest, Variant, Variant(*cb));
}
void GDAPI godot_variant_new_signal(godot_variant *r_dest, const godot_signal *p_signal) {
Variant *dest = (Variant *)r_dest;
Signal *signal = (Signal *)p_signal;
memnew_placement_custom(dest, Variant, Variant(*signal));
}
void GDAPI godot_variant_new_object(godot_variant *r_dest, const godot_object *p_obj) {
Variant *dest = (Variant *)r_dest;
Object *obj = (Object *)p_obj;
......@@ -209,18 +245,30 @@ void GDAPI godot_variant_new_packed_byte_array(godot_variant *r_dest, const godo
memnew_placement_custom(dest, Variant, Variant(*pba));
}
void GDAPI godot_variant_new_packed_int_array(godot_variant *r_dest, const godot_packed_int_array *p_pia) {
void GDAPI godot_variant_new_packed_int32_array(godot_variant *r_dest, const godot_packed_int32_array *p_pia) {
Variant *dest = (Variant *)r_dest;
PackedInt32Array *pia = (PackedInt32Array *)p_pia;
memnew_placement_custom(dest, Variant, Variant(*pia));
}
void GDAPI godot_variant_new_packed_real_array(godot_variant *r_dest, const godot_packed_real_array *p_pra) {
void GDAPI godot_variant_new_packed_int64_array(godot_variant *r_dest, const godot_packed_int64_array *p_pia) {
Variant *dest = (Variant *)r_dest;
PackedInt64Array *pia = (PackedInt64Array *)p_pia;
memnew_placement_custom(dest, Variant, Variant(*pia));
}
void GDAPI godot_variant_new_packed_float32_array(godot_variant *r_dest, const godot_packed_float32_array *p_pra) {
Variant *dest = (Variant *)r_dest;
PackedFloat32Array *pra = (PackedFloat32Array *)p_pra;
memnew_placement_custom(dest, Variant, Variant(*pra));
}
void GDAPI godot_variant_new_packed_float64_array(godot_variant *r_dest, const godot_packed_float64_array *p_pra) {
Variant *dest = (Variant *)r_dest;
PackedFloat64Array *pra = (PackedFloat64Array *)p_pra;
memnew_placement_custom(dest, Variant, Variant(*pra));
}
void GDAPI godot_variant_new_packed_string_array(godot_variant *r_dest, const godot_packed_string_array *p_psa) {
Variant *dest = (Variant *)r_dest;
PackedStringArray *psa = (PackedStringArray *)p_psa;
......@@ -273,6 +321,14 @@ godot_string GDAPI godot_variant_as_string(const godot_variant *p_self) {
return raw_dest;
}
godot_string_name GDAPI godot_variant_as_string_name(const godot_variant *p_self) {
godot_string_name raw_dest;
const Variant *self = (const Variant *)p_self;
StringName *dest = (StringName *)&raw_dest;
memnew_placement(dest, StringName(self->operator StringName())); // operator = is overloaded by StringName
return raw_dest;
}
godot_vector2 GDAPI godot_variant_as_vector2(const godot_variant *p_self) {
godot_vector2 raw_dest;
const Variant *self = (const Variant *)p_self;
......@@ -281,6 +337,14 @@ godot_vector2 GDAPI godot_variant_as_vector2(const godot_variant *p_self) {
return raw_dest;
}
godot_vector2i GDAPI godot_variant_as_vector2i(const godot_variant *p_self) {
godot_vector2i raw_dest;
const Variant *self = (const Variant *)p_self;
Vector2i *dest = (Vector2i *)&raw_dest;
*dest = *self;
return raw_dest;
}
godot_rect2 GDAPI godot_variant_as_rect2(const godot_variant *p_self) {
godot_rect2 raw_dest;
const Variant *self = (const Variant *)p_self;
......@@ -289,6 +353,14 @@ godot_rect2 GDAPI godot_variant_as_rect2(const godot_variant *p_self) {
return raw_dest;
}
godot_rect2i GDAPI godot_variant_as_rect2i(const godot_variant *p_self) {
godot_rect2i raw_dest;
const Variant *self = (const Variant *)p_self;
Rect2i *dest = (Rect2i *)&raw_dest;
*dest = *self;
return raw_dest;
}
godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self) {
godot_vector3 raw_dest;
const Variant *self = (const Variant *)p_self;
......@@ -297,6 +369,14 @@ godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self) {
return raw_dest;
}
godot_vector3i GDAPI godot_variant_as_vector3i(const godot_variant *p_self) {
godot_vector3i raw_dest;
const Variant *self = (const Variant *)p_self;
Vector3i *dest = (Vector3i *)&raw_dest;
*dest = *self;
return raw_dest;
}
godot_transform2d GDAPI godot_variant_as_transform2d(const godot_variant *p_self) {
godot_transform2d raw_dest;
const Variant *self = (const Variant *)p_self;
......@@ -369,6 +449,22 @@ godot_rid GDAPI godot_variant_as_rid(const godot_variant *p_self) {
return raw_dest;
}
godot_callable GDAPI godot_variant_as_callable(const godot_variant *p_self) {
godot_callable raw_dest;
const Variant *self = (const Variant *)p_self;
Callable *dest = (Callable *)&raw_dest;
*dest = *self;
return raw_dest;
}
godot_signal GDAPI godot_variant_as_signal(const godot_variant *p_self) {
godot_signal raw_dest;
const Variant *self = (const Variant *)p_self;
Signal *dest = (Signal *)&raw_dest;
*dest = *self;
return raw_dest;
}
godot_object GDAPI *godot_variant_as_object(const godot_variant *p_self) {
const Variant *self = (const Variant *)p_self;
Object *dest;
......@@ -401,8 +497,8 @@ godot_packed_byte_array GDAPI godot_variant_as_packed_byte_array(const godot_var
return raw_dest;
}
godot_packed_int_array GDAPI godot_variant_as_packed_int_array(const godot_variant *p_self) {
godot_packed_int_array raw_dest;
godot_packed_int32_array GDAPI godot_variant_as_packed_int32_array(const godot_variant *p_self) {
godot_packed_int32_array raw_dest;
const Variant *self = (const Variant *)p_self;
PackedInt32Array *dest = (PackedInt32Array *)&raw_dest;
memnew_placement(dest, PackedInt32Array(self->operator PackedInt32Array())); // operator = is overloaded by PackedInt32Array
......@@ -410,8 +506,17 @@ godot_packed_int_array GDAPI godot_variant_as_packed_int_array(const godot_varia
return raw_dest;
}
godot_packed_real_array GDAPI godot_variant_as_packed_real_array(const godot_variant *p_self) {
godot_packed_real_array raw_dest;
godot_packed_int64_array GDAPI godot_variant_as_packed_int64_array(const godot_variant *p_self) {
godot_packed_int64_array raw_dest;
const Variant *self = (const Variant *)p_self;
PackedInt64Array *dest = (PackedInt64Array *)&raw_dest;
memnew_placement(dest, PackedInt64Array(self->operator PackedInt64Array())); // operator = is overloaded by PackedInt64Array
*dest = *self;
return raw_dest;
}
godot_packed_float32_array GDAPI godot_variant_as_packed_float32_array(const godot_variant *p_self) {
godot_packed_float32_array raw_dest;
const Variant *self = (const Variant *)p_self;
PackedFloat32Array *dest = (PackedFloat32Array *)&raw_dest;
memnew_placement(dest, PackedFloat32Array(self->operator PackedFloat32Array())); // operator = is overloaded by PackedFloat32Array
......@@ -419,6 +524,15 @@ godot_packed_real_array GDAPI godot_variant_as_packed_real_array(const godot_var
return raw_dest;
}
godot_packed_float64_array GDAPI godot_variant_as_packed_float64_array(const godot_variant *p_self) {
godot_packed_float64_array raw_dest;
const Variant *self = (const Variant *)p_self;
PackedFloat64Array *dest = (PackedFloat64Array *)&raw_dest;
memnew_placement(dest, PackedFloat64Array(self->operator PackedFloat64Array())); // operator = is overloaded by PackedFloat64Array
*dest = *self;
return raw_dest;
}
godot_packed_string_array GDAPI godot_variant_as_packed_string_array(const godot_variant *p_self) {
godot_packed_string_array raw_dest;
const Variant *self = (const Variant *)p_self;
......@@ -489,6 +603,11 @@ godot_bool GDAPI godot_variant_operator_less(const godot_variant *p_self, const
return self->operator<(*other);
}
uint32_t GDAPI godot_variant_hash(const godot_variant *p_self) {
const Variant *self = (const Variant *)p_self;
return self->hash();
}
godot_bool GDAPI godot_variant_hash_compare(const godot_variant *p_self, const godot_variant *p_other) {
const Variant *self = (const Variant *)p_self;
const Variant *other = (const Variant *)p_other;
......
modules/gdnative/gdnative/vector2.cpp
......@@ -38,6 +38,9 @@ extern "C" {
#endif
static_assert(sizeof(godot_vector2) == sizeof(Vector2), "Vector2 size mismatch");
static_assert(sizeof(godot_vector2i) == sizeof(Vector2i), "Vector2i size mismatch");
// Vector2
void GDAPI godot_vector2_new(godot_vector2 *r_dest, const godot_real p_x, const godot_real p_y) {
Vector2 *dest = (Vector2 *)r_dest;
......@@ -51,6 +54,13 @@ godot_string GDAPI godot_vector2_as_string(const godot_vector2 *p_self) {
return ret;
}
godot_vector2i GDAPI godot_vector2_as_vector2i(const godot_vector2 *p_self) {
godot_vector2i dest;
const Vector2 *self = (const Vector2 *)p_self;
*((Vector2i *)&dest) = Vector2i(*self);
return dest;
}
godot_vector2 GDAPI godot_vector2_normalized(const godot_vector2 *p_self) {
godot_vector2 dest;
const Vector2 *self = (const Vector2 *)p_self;
......@@ -158,6 +168,13 @@ godot_vector2 GDAPI godot_vector2_floor(const godot_vector2 *p_self) {
return dest;
}
godot_vector2 GDAPI godot_vector2_sign(const godot_vector2 *p_self) {
godot_vector2 dest;
const Vector2 *self = (const Vector2 *)p_self;
*((Vector2 *)&dest) = self->sign();
return dest;
}
godot_vector2 GDAPI godot_vector2_snapped(const godot_vector2 *p_self, const godot_vector2 *p_by) {
godot_vector2 dest;
const Vector2 *self = (const Vector2 *)p_self;
......@@ -308,6 +325,138 @@ godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_self) {
return self->y;
}
// Vector2i
void GDAPI godot_vector2i_new(godot_vector2i *r_dest, const godot_int p_x, const godot_int p_y) {
Vector2i *dest = (Vector2i *)r_dest;
*dest = Vector2i(p_x, p_y);
}
godot_string GDAPI godot_vector2i_as_string(const godot_vector2i *p_self) {
godot_string ret;
const Vector2i *self = (const Vector2i *)p_self;
memnew_placement(&ret, String(*self));
return ret;
}
godot_vector2 GDAPI godot_vector2i_as_vector2(const godot_vector2i *p_self) {
godot_vector2 dest;
const Vector2i *self = (const Vector2i *)p_self;
*((Vector2 *)&dest) = Vector2(*self);
return dest;
}
godot_real GDAPI godot_vector2i_aspect(const godot_vector2i *p_self) {
const Vector2i *self = (const Vector2i *)p_self;
return self->aspect();
}
godot_vector2i GDAPI godot_vector2i_abs(const godot_vector2i *p_self) {
godot_vector2i dest;
const Vector2i *self = (const Vector2i *)p_self;
*((Vector2i *)&dest) = self->abs();
return dest;
}
godot_vector2i GDAPI godot_vector2i_sign(const godot_vector2i *p_self) {
godot_vector2i dest;
const Vector2i *self = (const Vector2i *)p_self;
*((Vector2i *)&dest) = self->sign();
return dest;
}
godot_vector2i GDAPI godot_vector2i_operator_add(const godot_vector2i *p_self, const godot_vector2i *p_b) {
godot_vector2i raw_dest;
Vector2i *dest = (Vector2i *)&raw_dest;
const Vector2i *self = (const Vector2i *)p_self;
const Vector2i *b = (const Vector2i *)p_b;
*dest = *self + *b;
return raw_dest;
}
godot_vector2i GDAPI godot_vector2i_operator_subtract(const godot_vector2i *p_self, const godot_vector2i *p_b) {
godot_vector2i raw_dest;
Vector2i *dest = (Vector2i *)&raw_dest;
const Vector2i *self = (const Vector2i *)p_self;
const Vector2i *b = (const Vector2i *)p_b;
*dest = *self - *b;
return raw_dest;
}
godot_vector2i GDAPI godot_vector2i_operator_multiply_vector(const godot_vector2i *p_self, const godot_vector2i *p_b) {
godot_vector2i raw_dest;
Vector2i *dest = (Vector2i *)&raw_dest;
const Vector2i *self = (const Vector2i *)p_self;
const Vector2i *b = (const Vector2i *)p_b;
*dest = *self * *b;
return raw_dest;
}
godot_vector2i GDAPI godot_vector2i_operator_multiply_scalar(const godot_vector2i *p_self, const godot_int p_b) {
godot_vector2i raw_dest;
Vector2i *dest = (Vector2i *)&raw_dest;
const Vector2i *self = (const Vector2i *)p_self;
*dest = *self * p_b;
return raw_dest;
}
godot_vector2i GDAPI godot_vector2i_operator_divide_vector(const godot_vector2i *p_self, const godot_vector2i *p_b) {
godot_vector2i raw_dest;
Vector2i *dest = (Vector2i *)&raw_dest;
const Vector2i *self = (const Vector2i *)p_self;
const Vector2i *b = (const Vector2i *)p_b;
*dest = *self / *b;
return raw_dest;
}
godot_vector2i GDAPI godot_vector2i_operator_divide_scalar(const godot_vector2i *p_self, const godot_int p_b) {
godot_vector2i raw_dest;
Vector2i *dest = (Vector2i *)&raw_dest;
const Vector2i *self = (const Vector2i *)p_self;
*dest = *self / p_b;
return raw_dest;
}
godot_bool GDAPI godot_vector2i_operator_equal(const godot_vector2i *p_self, const godot_vector2i *p_b) {
const Vector2i *self = (const Vector2i *)p_self;
const Vector2i *b = (const Vector2i *)p_b;
return *self == *b;
}
godot_bool GDAPI godot_vector2i_operator_less(const godot_vector2i *p_self, const godot_vector2i *p_b) {
const Vector2i *self = (const Vector2i *)p_self;
const Vector2i *b = (const Vector2i *)p_b;
return *self < *b;
}
godot_vector2i GDAPI godot_vector2i_operator_neg(const godot_vector2i *p_self) {
godot_vector2i raw_dest;
Vector2i *dest = (Vector2i *)&raw_dest;
const Vector2i *self = (const Vector2i *)p_self;
*dest = -(*self);
return raw_dest;
}
void GDAPI godot_vector2i_set_x(godot_vector2i *p_self, const godot_int p_x) {
Vector2i *self = (Vector2i *)p_self;
self->x = p_x;
}
void GDAPI godot_vector2i_set_y(godot_vector2i *p_self, const godot_int p_y) {
Vector2i *self = (Vector2i *)p_self;
self->y = p_y;
}
godot_int GDAPI godot_vector2i_get_x(const godot_vector2i *p_self) {
const Vector2i *self = (const Vector2i *)p_self;
return self->x;
}
godot_int GDAPI godot_vector2i_get_y(const godot_vector2i *p_self) {
const Vector2i *self = (const Vector2i *)p_self;
return self->y;
}
#ifdef __cplusplus
}
#endif
modules/gdnative/gdnative/vector3.cpp
......@@ -38,6 +38,9 @@ extern "C" {
#endif
static_assert(sizeof(godot_vector3) == sizeof(Vector3), "Vector3 size mismatch");
static_assert(sizeof(godot_vector3i) == sizeof(Vector3i), "Vector3i size mismatch");
// Vector3
void GDAPI godot_vector3_new(godot_vector3 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z) {
Vector3 *dest = (Vector3 *)r_dest;
......@@ -51,6 +54,13 @@ godot_string GDAPI godot_vector3_as_string(const godot_vector3 *p_self) {
return ret;
}
godot_vector3i GDAPI godot_vector3_as_vector3i(const godot_vector3 *p_self) {
godot_vector3i dest;
const Vector3 *self = (const Vector3 *)p_self;
*((Vector3i *)&dest) = Vector3i(*self);
return dest;
}
godot_int GDAPI godot_vector3_min_axis(const godot_vector3 *p_self) {
const Vector3 *self = (const Vector3 *)p_self;
return self->min_axis();
......@@ -169,6 +179,13 @@ godot_vector3 GDAPI godot_vector3_abs(const godot_vector3 *p_self) {
return dest;
}
godot_vector3 GDAPI godot_vector3_sign(const godot_vector3 *p_self) {
godot_vector3 dest;
const Vector3 *self = (const Vector3 *)p_self;
*((Vector3 *)&dest) = self->sign();
return dest;
}
godot_vector3 GDAPI godot_vector3_floor(const godot_vector3 *p_self) {
godot_vector3 dest;
const Vector3 *self = (const Vector3 *)p_self;
......@@ -315,6 +332,133 @@ godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_self, const godot
return self->get_axis(p_axis);
}
// Vector3i
void GDAPI godot_vector3i_new(godot_vector3i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_z) {
Vector3i *dest = (Vector3i *)r_dest;
*dest = Vector3i(p_x, p_y, p_z);
}
godot_string GDAPI godot_vector3i_as_string(const godot_vector3i *p_self) {
godot_string ret;
const Vector3i *self = (const Vector3i *)p_self;
memnew_placement(&ret, String(*self));
return ret;
}
godot_vector3 GDAPI godot_vector3i_as_vector3(const godot_vector3i *p_self) {
godot_vector3 dest;
const Vector3i *self = (const Vector3i *)p_self;
*((Vector3 *)&dest) = Vector3(*self);
return dest;
}
godot_int GDAPI godot_vector3i_min_axis(const godot_vector3i *p_self) {
const Vector3i *self = (const Vector3i *)p_self;
return self->min_axis();
}
godot_int GDAPI godot_vector3i_max_axis(const godot_vector3i *p_self) {
const Vector3i *self = (const Vector3i *)p_self;
return self->max_axis();
}
godot_vector3i GDAPI godot_vector3i_abs(const godot_vector3i *p_self) {
godot_vector3i dest;
const Vector3i *self = (const Vector3i *)p_self;
*((Vector3i *)&dest) = self->abs();
return dest;
}
godot_vector3i GDAPI godot_vector3i_sign(const godot_vector3i *p_self) {
godot_vector3i dest;
const Vector3i *self = (const Vector3i *)p_self;
*((Vector3i *)&dest) = self->sign();
return dest;
}
godot_vector3i GDAPI godot_vector3i_operator_add(const godot_vector3i *p_self, const godot_vector3i *p_b) {
godot_vector3i raw_dest;
Vector3i *dest = (Vector3i *)&raw_dest;
Vector3i *self = (Vector3i *)p_self;
const Vector3i *b = (const Vector3i *)p_b;
*dest = *self + *b;
return raw_dest;
}
godot_vector3i GDAPI godot_vector3i_operator_subtract(const godot_vector3i *p_self, const godot_vector3i *p_b) {
godot_vector3i raw_dest;
Vector3i *dest = (Vector3i *)&raw_dest;
Vector3i *self = (Vector3i *)p_self;
const Vector3i *b = (const Vector3i *)p_b;
*dest = *self - *b;
return raw_dest;
}
godot_vector3i GDAPI godot_vector3i_operator_multiply_vector(const godot_vector3i *p_self, const godot_vector3i *p_b) {
godot_vector3i raw_dest;
Vector3i *dest = (Vector3i *)&raw_dest;
Vector3i *self = (Vector3i *)p_self;
const Vector3i *b = (const Vector3i *)p_b;
*dest = *self * *b;
return raw_dest;
}
godot_vector3i GDAPI godot_vector3i_operator_multiply_scalar(const godot_vector3i *p_self, const godot_int p_b) {
godot_vector3i raw_dest;
Vector3i *dest = (Vector3i *)&raw_dest;
Vector3i *self = (Vector3i *)p_self;
*dest = *self * p_b;
return raw_dest;
}
godot_vector3i GDAPI godot_vector3i_operator_divide_vector(const godot_vector3i *p_self, const godot_vector3i *p_b) {
godot_vector3i raw_dest;
Vector3i *dest = (Vector3i *)&raw_dest;
Vector3i *self = (Vector3i *)p_self;
const Vector3i *b = (const Vector3i *)p_b;
*dest = *self / *b;
return raw_dest;
}
godot_vector3i GDAPI godot_vector3i_operator_divide_scalar(const godot_vector3i *p_self, const godot_int p_b) {
godot_vector3i raw_dest;
Vector3i *dest = (Vector3i *)&raw_dest;
Vector3i *self = (Vector3i *)p_self;
*dest = *self / p_b;
return raw_dest;
}
godot_bool GDAPI godot_vector3i_operator_equal(const godot_vector3i *p_self, const godot_vector3i *p_b) {
Vector3i *self = (Vector3i *)p_self;
const Vector3i *b = (const Vector3i *)p_b;
return *self == *b;
}
godot_bool GDAPI godot_vector3i_operator_less(const godot_vector3i *p_self, const godot_vector3i *p_b) {
Vector3i *self = (Vector3i *)p_self;
const Vector3i *b = (const Vector3i *)p_b;
return *self < *b;
}
godot_vector3i GDAPI godot_vector3i_operator_neg(const godot_vector3i *p_self) {
godot_vector3i raw_dest;
Vector3i *dest = (Vector3i *)&raw_dest;
const Vector3i *self = (const Vector3i *)p_self;
*dest = -(*self);
return raw_dest;
}
void GDAPI godot_vector3i_set_axis(godot_vector3i *p_self, const godot_vector3_axis p_axis, const godot_int p_val) {
Vector3i *self = (Vector3i *)p_self;
self->set_axis(p_axis, p_val);
}
godot_int GDAPI godot_vector3i_get_axis(const godot_vector3i *p_self, const godot_vector3_axis p_axis) {
const Vector3i *self = (const Vector3i *)p_self;
return self->get_axis(p_axis);
}
#ifdef __cplusplus
}
#endif
modules/gdnative/include/gdnative/array.h
......@@ -51,7 +51,7 @@ typedef struct {
}
#endif
#include <gdnative/pool_arrays.h>
#include <gdnative/packed_arrays.h>
#include <gdnative/variant.h>
#include <gdnative/gdnative.h>
......@@ -66,8 +66,10 @@ void GDAPI godot_array_new_packed_color_array(godot_array *r_dest, const godot_p
void GDAPI godot_array_new_packed_vector3_array(godot_array *r_dest, const godot_packed_vector3_array *p_pv3a);
void GDAPI godot_array_new_packed_vector2_array(godot_array *r_dest, const godot_packed_vector2_array *p_pv2a);
void GDAPI godot_array_new_packed_string_array(godot_array *r_dest, const godot_packed_string_array *p_psa);
void GDAPI godot_array_new_packed_real_array(godot_array *r_dest, const godot_packed_real_array *p_pra);
void GDAPI godot_array_new_packed_int_array(godot_array *r_dest, const godot_packed_int_array *p_pia);
void GDAPI godot_array_new_packed_float32_array(godot_array *r_dest, const godot_packed_float32_array *p_pra);
void GDAPI godot_array_new_packed_float64_array(godot_array *r_dest, const godot_packed_float64_array *p_pra);
void GDAPI godot_array_new_packed_int32_array(godot_array *r_dest, const godot_packed_int32_array *p_pia);
void GDAPI godot_array_new_packed_int64_array(godot_array *r_dest, const godot_packed_int64_array *p_pia);
void GDAPI godot_array_new_packed_byte_array(godot_array *r_dest, const godot_packed_byte_array *p_pba);
void GDAPI godot_array_set(godot_array *p_self, const godot_int p_idx, const godot_variant *p_value);
......
modules/gdnative/include/gdnative/callable.h 0 → 100644
/*************************************************************************/
/* callable.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef GODOT_CALLABLE_H
#define GODOT_CALLABLE_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdint.h>
#define GODOT_CALLABLE_SIZE (16)
#ifndef GODOT_CORE_API_GODOT_CALLABLE_TYPE_DEFINED
#define GODOT_CORE_API_GODOT_CALLABLE_TYPE_DEFINED
typedef struct {
uint8_t _dont_touch_that[GODOT_CALLABLE_SIZE];
} godot_callable;
#endif
#define GODOT_SIGNAL_SIZE (16)
#ifndef GODOT_CORE_API_GODOT_SIGNAL_TYPE_DEFINED
#define GODOT_CORE_API_GODOT_SIGNAL_TYPE_DEFINED
typedef struct {
uint8_t _dont_touch_that[GODOT_SIGNAL_SIZE];
} godot_signal;
#endif
#ifdef __cplusplus
}
#endif
#include <gdnative/gdnative.h>
#include <gdnative/string_name.h>
#ifdef __cplusplus
extern "C" {
#endif
// Callable
void GDAPI godot_callable_new_with_object(godot_callable *r_dest, const godot_object *p_object, const godot_string_name *p_method);
void GDAPI godot_callable_new_with_object_id(godot_callable *r_dest, uint64_t p_objectid, const godot_string_name *p_method);
void GDAPI godot_callable_new_copy(godot_callable *r_dest, const godot_callable *p_src);
void GDAPI godot_callable_destroy(godot_callable *p_self);
godot_int GDAPI godot_callable_call(const godot_callable *p_self, const godot_variant **p_arguments, godot_int p_argcount, godot_variant *r_return_value);
void GDAPI godot_callable_call_deferred(const godot_callable *p_self, const godot_variant **p_arguments, godot_int p_argcount);
godot_bool GDAPI godot_callable_is_null(const godot_callable *p_self);
godot_bool GDAPI godot_callable_is_custom(const godot_callable *p_self);
godot_bool GDAPI godot_callable_is_standard(const godot_callable *p_self);
godot_object GDAPI *godot_callable_get_object(const godot_callable *p_self);
uint64_t GDAPI godot_callable_get_object_id(const godot_callable *p_self);
godot_string_name GDAPI godot_callable_get_method(const godot_callable *p_self);
uint32_t GDAPI godot_callable_hash(const godot_callable *p_self);
godot_string GDAPI godot_callable_as_string(const godot_callable *p_self);
godot_bool GDAPI godot_callable_operator_equal(const godot_callable *p_self, const godot_callable *p_other);
godot_bool GDAPI godot_callable_operator_less(const godot_callable *p_self, const godot_callable *p_other);
// Signal
void GDAPI godot_signal_new_with_object(godot_signal *r_dest, const godot_object *p_object, const godot_string_name *p_name);
void GDAPI godot_signal_new_with_object_id(godot_signal *r_dest, uint64_t p_objectid, const godot_string_name *p_name);
void GDAPI godot_signal_new_copy(godot_signal *r_dest, const godot_signal *p_src);
void GDAPI godot_signal_destroy(godot_signal *p_self);
godot_int GDAPI godot_signal_emit(const godot_signal *p_self, const godot_variant **p_arguments, godot_int p_argcount);
godot_int GDAPI godot_signal_connect(godot_signal *p_self, const godot_callable *p_callable, const godot_array *p_binds, uint32_t p_flags);
void GDAPI godot_signal_disconnect(godot_signal *p_self, const godot_callable *p_callable);
godot_bool GDAPI godot_signal_is_null(const godot_signal *p_self);
godot_bool GDAPI godot_signal_is_connected(const godot_signal *p_self, const godot_callable *p_callable);
godot_array GDAPI godot_signal_get_connections(const godot_signal *p_self);
godot_object GDAPI *godot_signal_get_object(const godot_signal *p_self);
uint64_t GDAPI godot_signal_get_object_id(const godot_signal *p_self);
godot_string_name GDAPI godot_signal_get_name(const godot_signal *p_self);
godot_string GDAPI godot_signal_as_string(const godot_signal *p_self);
godot_bool GDAPI godot_signal_operator_equal(const godot_signal *p_self, const godot_signal *p_other);
godot_bool GDAPI godot_signal_operator_less(const godot_signal *p_self, const godot_signal *p_other);
#ifdef __cplusplus
}
#endif
#endif
modules/gdnative/include/gdnative/gdnative.h
......@@ -144,15 +144,15 @@ typedef void godot_object;
#include <gdnative/string_name.h>
////// Vector2
////// Vector2 & Vector2i
#include <gdnative/vector2.h>
////// Rect2
////// Rect2 & Rect2i
#include <gdnative/rect2.h>
////// Vector3
////// Vector3 & Vector3i
#include <gdnative/vector3.h>
......@@ -192,6 +192,10 @@ typedef void godot_object;
#include <gdnative/rid.h>
/////// Callable & Signal
#include <gdnative/callable.h>
/////// Dictionary
#include <gdnative/dictionary.h>
......@@ -200,8 +204,8 @@ typedef void godot_object;
#include <gdnative/array.h>
// single API file for Pool*Array
#include <gdnative/pool_arrays.h>
// single API file for Packed*Array
#include <gdnative/packed_arrays.h>
void GDAPI godot_object_destroy(godot_object *p_o);
......@@ -289,7 +293,9 @@ void GDAPI *godot_get_class_tag(const godot_string_name *p_class);
godot_object GDAPI *godot_object_cast_to(const godot_object *p_object, void *p_class_tag);
// equivalent of GDScript's instance_from_id
godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id);
godot_object GDAPI *godot_instance_from_id(uint64_t p_instance_id);
uint64_t GDAPI godot_object_get_instance_id(const godot_object *p_object);
#ifdef __cplusplus
}
......
modules/gdnative/include/gdnative/rect2.h
......@@ -44,6 +44,13 @@ typedef struct godot_rect2 {
} godot_rect2;
#endif
#ifndef GODOT_CORE_API_GODOT_RECT2I_TYPE_DEFINED
#define GODOT_CORE_API_GODOT_RECT2I_TYPE_DEFINED
typedef struct godot_rect2i {
uint8_t _dont_touch_that[16];
} godot_rect2i;
#endif
// reduce extern "C" nesting for VS2013
#ifdef __cplusplus
}
......@@ -56,11 +63,15 @@ typedef struct godot_rect2 {
extern "C" {
#endif
// Rect2
void GDAPI godot_rect2_new_with_position_and_size(godot_rect2 *r_dest, const godot_vector2 *p_pos, const godot_vector2 *p_size);
void GDAPI godot_rect2_new(godot_rect2 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_width, const godot_real p_height);
godot_string GDAPI godot_rect2_as_string(const godot_rect2 *p_self);
godot_rect2i GDAPI godot_rect2_as_rect2i(const godot_rect2 *p_self);
godot_real GDAPI godot_rect2_get_area(const godot_rect2 *p_self);
godot_bool GDAPI godot_rect2_intersects(const godot_rect2 *p_self, const godot_rect2 *p_b);
......@@ -95,6 +106,49 @@ void GDAPI godot_rect2_set_position(godot_rect2 *p_self, const godot_vector2 *p_
void GDAPI godot_rect2_set_size(godot_rect2 *p_self, const godot_vector2 *p_size);
// Rect2I
void GDAPI godot_rect2i_new_with_position_and_size(godot_rect2i *r_dest, const godot_vector2i *p_pos, const godot_vector2i *p_size);
void GDAPI godot_rect2i_new(godot_rect2i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_width, const godot_int p_height);
godot_string GDAPI godot_rect2i_as_string(const godot_rect2i *p_self);
godot_rect2 GDAPI godot_rect2i_as_rect2(const godot_rect2i *p_self);
godot_int GDAPI godot_rect2i_get_area(const godot_rect2i *p_self);
godot_bool GDAPI godot_rect2i_intersects(const godot_rect2i *p_self, const godot_rect2i *p_b);
godot_bool GDAPI godot_rect2i_encloses(const godot_rect2i *p_self, const godot_rect2i *p_b);
godot_bool GDAPI godot_rect2i_has_no_area(const godot_rect2i *p_self);
godot_rect2i GDAPI godot_rect2i_clip(const godot_rect2i *p_self, const godot_rect2i *p_b);
godot_rect2i GDAPI godot_rect2i_merge(const godot_rect2i *p_self, const godot_rect2i *p_b);
godot_bool GDAPI godot_rect2i_has_point(const godot_rect2i *p_self, const godot_vector2i *p_point);
godot_rect2i GDAPI godot_rect2i_grow(const godot_rect2i *p_self, const godot_int p_by);
godot_rect2i GDAPI godot_rect2i_grow_individual(const godot_rect2i *p_self, const godot_int p_left, const godot_int p_top, const godot_int p_right, const godot_int p_bottom);
godot_rect2i GDAPI godot_rect2i_grow_margin(const godot_rect2i *p_self, const godot_int p_margin, const godot_int p_by);
godot_rect2i GDAPI godot_rect2i_abs(const godot_rect2i *p_self);
godot_rect2i GDAPI godot_rect2i_expand(const godot_rect2i *p_self, const godot_vector2i *p_to);
godot_bool GDAPI godot_rect2i_operator_equal(const godot_rect2i *p_self, const godot_rect2i *p_b);
godot_vector2i GDAPI godot_rect2i_get_position(const godot_rect2i *p_self);
godot_vector2i GDAPI godot_rect2i_get_size(const godot_rect2i *p_self);
void GDAPI godot_rect2i_set_position(godot_rect2i *p_self, const godot_vector2i *p_pos);
void GDAPI godot_rect2i_set_size(godot_rect2i *p_self, const godot_vector2i *p_size);
#ifdef __cplusplus
}
#endif
......
modules/gdnative/include/gdnative/variant.h
......@@ -71,16 +71,21 @@ typedef enum godot_variant_type {
// misc types
GODOT_VARIANT_TYPE_COLOR,
GODOT_VARIANT_TYPE_STRING_NAME,
GODOT_VARIANT_TYPE_NODE_PATH,
GODOT_VARIANT_TYPE_RID,
GODOT_VARIANT_TYPE_OBJECT,
GODOT_VARIANT_TYPE_CALLABLE,
GODOT_VARIANT_TYPE_SIGNAL,
GODOT_VARIANT_TYPE_DICTIONARY,
GODOT_VARIANT_TYPE_ARRAY,
// arrays
GODOT_VARIANT_TYPE_PACKED_BYTE_ARRAY,
GODOT_VARIANT_TYPE_PACKED_INT_ARRAY,
GODOT_VARIANT_TYPE_PACKED_REAL_ARRAY,
GODOT_VARIANT_TYPE_PACKED_INT32_ARRAY,
GODOT_VARIANT_TYPE_PACKED_INT64_ARRAY,
GODOT_VARIANT_TYPE_PACKED_FLOAT32_ARRAY,
GODOT_VARIANT_TYPE_PACKED_FLOAT64_ARRAY,
GODOT_VARIANT_TYPE_PACKED_STRING_ARRAY,
GODOT_VARIANT_TYPE_PACKED_VECTOR2_ARRAY,
GODOT_VARIANT_TYPE_PACKED_VECTOR3_ARRAY,
......@@ -149,15 +154,17 @@ typedef enum godot_variant_operator {
#include <gdnative/aabb.h>
#include <gdnative/array.h>
#include <gdnative/basis.h>
#include <gdnative/callable.h>
#include <gdnative/color.h>
#include <gdnative/dictionary.h>
#include <gdnative/node_path.h>
#include <gdnative/packed_arrays.h>
#include <gdnative/plane.h>
#include <gdnative/pool_arrays.h>
#include <gdnative/quat.h>
#include <gdnative/rect2.h>
#include <gdnative/rid.h>
#include <gdnative/string.h>
#include <gdnative/string_name.h>
#include <gdnative/transform.h>
#include <gdnative/transform2d.h>
#include <gdnative/variant.h>
......@@ -181,9 +188,13 @@ void GDAPI godot_variant_new_uint(godot_variant *r_dest, const uint64_t p_i);
void GDAPI godot_variant_new_int(godot_variant *r_dest, const int64_t p_i);
void GDAPI godot_variant_new_real(godot_variant *r_dest, const double p_r);
void GDAPI godot_variant_new_string(godot_variant *r_dest, const godot_string *p_s);
void GDAPI godot_variant_new_string_name(godot_variant *r_dest, const godot_string_name *p_s);
void GDAPI godot_variant_new_vector2(godot_variant *r_dest, const godot_vector2 *p_v2);
void GDAPI godot_variant_new_vector2i(godot_variant *r_dest, const godot_vector2i *p_v2);
void GDAPI godot_variant_new_rect2(godot_variant *r_dest, const godot_rect2 *p_rect2);
void GDAPI godot_variant_new_rect2i(godot_variant *r_dest, const godot_rect2i *p_rect2);
void GDAPI godot_variant_new_vector3(godot_variant *r_dest, const godot_vector3 *p_v3);
void GDAPI godot_variant_new_vector3i(godot_variant *r_dest, const godot_vector3i *p_v3);
void GDAPI godot_variant_new_transform2d(godot_variant *r_dest, const godot_transform2d *p_t2d);
void GDAPI godot_variant_new_plane(godot_variant *r_dest, const godot_plane *p_plane);
void GDAPI godot_variant_new_quat(godot_variant *r_dest, const godot_quat *p_quat);
......@@ -193,12 +204,16 @@ void GDAPI godot_variant_new_transform(godot_variant *r_dest, const godot_transf
void GDAPI godot_variant_new_color(godot_variant *r_dest, const godot_color *p_color);
void GDAPI godot_variant_new_node_path(godot_variant *r_dest, const godot_node_path *p_np);
void GDAPI godot_variant_new_rid(godot_variant *r_dest, const godot_rid *p_rid);
void GDAPI godot_variant_new_callable(godot_variant *r_dest, const godot_callable *p_callable);
void GDAPI godot_variant_new_signal(godot_variant *r_dest, const godot_signal *p_signal);
void GDAPI godot_variant_new_object(godot_variant *r_dest, const godot_object *p_obj);
void GDAPI godot_variant_new_dictionary(godot_variant *r_dest, const godot_dictionary *p_dict);
void GDAPI godot_variant_new_array(godot_variant *r_dest, const godot_array *p_arr);
void GDAPI godot_variant_new_packed_byte_array(godot_variant *r_dest, const godot_packed_byte_array *p_pba);
void GDAPI godot_variant_new_packed_int_array(godot_variant *r_dest, const godot_packed_int_array *p_pia);
void GDAPI godot_variant_new_packed_real_array(godot_variant *r_dest, const godot_packed_real_array *p_pra);
void GDAPI godot_variant_new_packed_int32_array(godot_variant *r_dest, const godot_packed_int32_array *p_pia);
void GDAPI godot_variant_new_packed_int64_array(godot_variant *r_dest, const godot_packed_int64_array *p_pia);
void GDAPI godot_variant_new_packed_float32_array(godot_variant *r_dest, const godot_packed_float32_array *p_pra);
void GDAPI godot_variant_new_packed_float64_array(godot_variant *r_dest, const godot_packed_float64_array *p_pra);
void GDAPI godot_variant_new_packed_string_array(godot_variant *r_dest, const godot_packed_string_array *p_psa);
void GDAPI godot_variant_new_packed_vector2_array(godot_variant *r_dest, const godot_packed_vector2_array *p_pv2a);
void GDAPI godot_variant_new_packed_vector3_array(godot_variant *r_dest, const godot_packed_vector3_array *p_pv3a);
......@@ -209,9 +224,13 @@ uint64_t GDAPI godot_variant_as_uint(const godot_variant *p_self);
int64_t GDAPI godot_variant_as_int(const godot_variant *p_self);
double GDAPI godot_variant_as_real(const godot_variant *p_self);
godot_string GDAPI godot_variant_as_string(const godot_variant *p_self);
godot_string_name GDAPI godot_variant_as_string_name(const godot_variant *p_self);
godot_vector2 GDAPI godot_variant_as_vector2(const godot_variant *p_self);
godot_vector2i GDAPI godot_variant_as_vector2i(const godot_variant *p_self);
godot_rect2 GDAPI godot_variant_as_rect2(const godot_variant *p_self);
godot_rect2i GDAPI godot_variant_as_rect2i(const godot_variant *p_self);
godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self);
godot_vector3i GDAPI godot_variant_as_vector3i(const godot_variant *p_self);
godot_transform2d GDAPI godot_variant_as_transform2d(const godot_variant *p_self);
godot_plane GDAPI godot_variant_as_plane(const godot_variant *p_self);
godot_quat GDAPI godot_variant_as_quat(const godot_variant *p_self);
......@@ -221,12 +240,16 @@ godot_transform GDAPI godot_variant_as_transform(const godot_variant *p_self);
godot_color GDAPI godot_variant_as_color(const godot_variant *p_self);
godot_node_path GDAPI godot_variant_as_node_path(const godot_variant *p_self);
godot_rid GDAPI godot_variant_as_rid(const godot_variant *p_self);
godot_callable GDAPI godot_variant_as_callable(const godot_variant *p_self);
godot_signal GDAPI godot_variant_as_signal(const godot_variant *p_self);
godot_object GDAPI *godot_variant_as_object(const godot_variant *p_self);
godot_dictionary GDAPI godot_variant_as_dictionary(const godot_variant *p_self);
godot_array GDAPI godot_variant_as_array(const godot_variant *p_self);
godot_packed_byte_array GDAPI godot_variant_as_packed_byte_array(const godot_variant *p_self);
godot_packed_int_array GDAPI godot_variant_as_packed_int_array(const godot_variant *p_self);
godot_packed_real_array GDAPI godot_variant_as_packed_real_array(const godot_variant *p_self);
godot_packed_int32_array GDAPI godot_variant_as_packed_int32_array(const godot_variant *p_self);
godot_packed_int64_array GDAPI godot_variant_as_packed_int64_array(const godot_variant *p_self);
godot_packed_float32_array GDAPI godot_variant_as_packed_float32_array(const godot_variant *p_self);
godot_packed_float64_array GDAPI godot_variant_as_packed_float64_array(const godot_variant *p_self);
godot_packed_string_array GDAPI godot_variant_as_packed_string_array(const godot_variant *p_self);
godot_packed_vector2_array GDAPI godot_variant_as_packed_vector2_array(const godot_variant *p_self);
godot_packed_vector3_array GDAPI godot_variant_as_packed_vector3_array(const godot_variant *p_self);
......@@ -239,6 +262,7 @@ godot_bool GDAPI godot_variant_has_method(const godot_variant *p_self, const god
godot_bool GDAPI godot_variant_operator_equal(const godot_variant *p_self, const godot_variant *p_other);
godot_bool GDAPI godot_variant_operator_less(const godot_variant *p_self, const godot_variant *p_other);
uint32_t GDAPI godot_variant_hash(const godot_variant *p_self);
godot_bool GDAPI godot_variant_hash_compare(const godot_variant *p_self, const godot_variant *p_other);
godot_bool GDAPI godot_variant_booleanize(const godot_variant *p_self);
......
modules/gdnative/include/gdnative/vector2.h
......@@ -46,6 +46,15 @@ typedef struct {
} godot_vector2;
#endif
#define GODOT_VECTOR2I_SIZE 8
#ifndef GODOT_CORE_API_GODOT_VECTOR2I_TYPE_DEFINED
#define GODOT_CORE_API_GODOT_VECTOR2I_TYPE_DEFINED
typedef struct {
uint8_t _dont_touch_that[GODOT_VECTOR2I_SIZE];
} godot_vector2i;
#endif
// reduce extern "C" nesting for VS2013
#ifdef __cplusplus
}
......@@ -57,10 +66,14 @@ typedef struct {
extern "C" {
#endif
// Vector2
void GDAPI godot_vector2_new(godot_vector2 *r_dest, const godot_real p_x, const godot_real p_y);
godot_string GDAPI godot_vector2_as_string(const godot_vector2 *p_self);
godot_vector2i GDAPI godot_vector2_as_vector2i(const godot_vector2 *p_self);
godot_vector2 GDAPI godot_vector2_normalized(const godot_vector2 *p_self);
godot_real GDAPI godot_vector2_length(const godot_vector2 *p_self);
......@@ -93,6 +106,8 @@ godot_vector2 GDAPI godot_vector2_tangent(const godot_vector2 *p_self);
godot_vector2 GDAPI godot_vector2_floor(const godot_vector2 *p_self);
godot_vector2 GDAPI godot_vector2_sign(const godot_vector2 *p_self);
godot_vector2 GDAPI godot_vector2_snapped(const godot_vector2 *p_self, const godot_vector2 *p_by);
godot_real GDAPI godot_vector2_aspect(const godot_vector2 *p_self);
......@@ -135,6 +150,46 @@ godot_real GDAPI godot_vector2_get_x(const godot_vector2 *p_self);
godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_self);
// Vector2i
void GDAPI godot_vector2i_new(godot_vector2i *r_dest, const godot_int p_x, const godot_int p_y);
godot_string GDAPI godot_vector2i_as_string(const godot_vector2i *p_self);
godot_vector2 GDAPI godot_vector2i_as_vector2(const godot_vector2i *p_self);
godot_real GDAPI godot_vector2i_aspect(const godot_vector2i *p_self);
godot_vector2i GDAPI godot_vector2i_abs(const godot_vector2i *p_self);
godot_vector2i GDAPI godot_vector2i_sign(const godot_vector2i *p_self);
godot_vector2i GDAPI godot_vector2i_operator_add(const godot_vector2i *p_self, const godot_vector2i *p_b);
godot_vector2i GDAPI godot_vector2i_operator_subtract(const godot_vector2i *p_self, const godot_vector2i *p_b);
godot_vector2i GDAPI godot_vector2i_operator_multiply_vector(const godot_vector2i *p_self, const godot_vector2i *p_b);
godot_vector2i GDAPI godot_vector2i_operator_multiply_scalar(const godot_vector2i *p_self, const godot_int p_b);
godot_vector2i GDAPI godot_vector2i_operator_divide_vector(const godot_vector2i *p_self, const godot_vector2i *p_b);
godot_vector2i GDAPI godot_vector2i_operator_divide_scalar(const godot_vector2i *p_self, const godot_int p_b);
godot_bool GDAPI godot_vector2i_operator_equal(const godot_vector2i *p_self, const godot_vector2i *p_b);
godot_bool GDAPI godot_vector2i_operator_less(const godot_vector2i *p_self, const godot_vector2i *p_b);
godot_vector2i GDAPI godot_vector2i_operator_neg(const godot_vector2i *p_self);
void GDAPI godot_vector2i_set_x(godot_vector2i *p_self, const godot_int p_x);
void GDAPI godot_vector2i_set_y(godot_vector2i *p_self, const godot_int p_y);
godot_int GDAPI godot_vector2i_get_x(const godot_vector2i *p_self);
godot_int GDAPI godot_vector2i_get_y(const godot_vector2i *p_self);
#ifdef __cplusplus
}
#endif
......
modules/gdnative/include/gdnative/vector3.h
......@@ -46,6 +46,15 @@ typedef struct {
} godot_vector3;
#endif
#define GODOT_VECTOR3I_SIZE 12
#ifndef GODOT_CORE_API_GODOT_VECTOR3I_TYPE_DEFINED
#define GODOT_CORE_API_GODOT_VECTOR3I_TYPE_DEFINED
typedef struct {
uint8_t _dont_touch_that[GODOT_VECTOR3I_SIZE];
} godot_vector3i;
#endif
// reduce extern "C" nesting for VS2013
#ifdef __cplusplus
}
......@@ -64,10 +73,14 @@ typedef enum {
GODOT_VECTOR3_AXIS_Z,
} godot_vector3_axis;
// Vector3
void GDAPI godot_vector3_new(godot_vector3 *r_dest, const godot_real p_x, const godot_real p_y, const godot_real p_z);
godot_string GDAPI godot_vector3_as_string(const godot_vector3 *p_self);
godot_vector3i GDAPI godot_vector3_as_vector3i(const godot_vector3 *p_self);
godot_int GDAPI godot_vector3_min_axis(const godot_vector3 *p_self);
godot_int GDAPI godot_vector3_max_axis(const godot_vector3 *p_self);
......@@ -102,6 +115,8 @@ godot_basis GDAPI godot_vector3_to_diagonal_matrix(const godot_vector3 *p_self);
godot_vector3 GDAPI godot_vector3_abs(const godot_vector3 *p_self);
godot_vector3 GDAPI godot_vector3_sign(const godot_vector3 *p_self);
godot_vector3 GDAPI godot_vector3_floor(const godot_vector3 *p_self);
godot_vector3 GDAPI godot_vector3_ceil(const godot_vector3 *p_self);
......@@ -142,6 +157,44 @@ void GDAPI godot_vector3_set_axis(godot_vector3 *p_self, const godot_vector3_axi
godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_self, const godot_vector3_axis p_axis);
// Vector3i
void GDAPI godot_vector3i_new(godot_vector3i *r_dest, const godot_int p_x, const godot_int p_y, const godot_int p_z);
godot_string GDAPI godot_vector3i_as_string(const godot_vector3i *p_self);
godot_vector3 GDAPI godot_vector3i_as_vector3(const godot_vector3i *p_self);
godot_int GDAPI godot_vector3i_min_axis(const godot_vector3i *p_self);
godot_int GDAPI godot_vector3i_max_axis(const godot_vector3i *p_self);
godot_vector3i GDAPI godot_vector3i_abs(const godot_vector3i *p_self);
godot_vector3i GDAPI godot_vector3i_sign(const godot_vector3i *p_self);
godot_vector3i GDAPI godot_vector3i_operator_add(const godot_vector3i *p_self, const godot_vector3i *p_b);
godot_vector3i GDAPI godot_vector3i_operator_subtract(const godot_vector3i *p_self, const godot_vector3i *p_b);
godot_vector3i GDAPI godot_vector3i_operator_multiply_vector(const godot_vector3i *p_self, const godot_vector3i *p_b);
godot_vector3i GDAPI godot_vector3i_operator_multiply_scalar(const godot_vector3i *p_self, const godot_int p_b);
godot_vector3i GDAPI godot_vector3i_operator_divide_vector(const godot_vector3i *p_self, const godot_vector3i *p_b);
godot_vector3i GDAPI godot_vector3i_operator_divide_scalar(const godot_vector3i *p_self, const godot_int p_b);
godot_bool GDAPI godot_vector3i_operator_equal(const godot_vector3i *p_self, const godot_vector3i *p_b);
godot_bool GDAPI godot_vector3i_operator_less(const godot_vector3i *p_self, const godot_vector3i *p_b);
godot_vector3i GDAPI godot_vector3i_operator_neg(const godot_vector3i *p_self);
void GDAPI godot_vector3i_set_axis(godot_vector3i *p_self, const godot_vector3_axis p_axis, const godot_int p_val);
godot_int GDAPI godot_vector3i_get_axis(const godot_vector3i *p_self, const godot_vector3_axis p_axis);
#ifdef __cplusplus
}
#endif
......
modules/gdnative/include/nativescript/godot_nativescript.h
......@@ -172,17 +172,17 @@ typedef struct {
godot_string hint_string;
godot_property_usage_flags usage;
godot_variant default_value;
} godot_signal_argument;
} godot_nativescript_signal_argument;
typedef struct {
godot_string name;
int num_args;
godot_signal_argument *args;
godot_nativescript_signal_argument *args;
int num_default_args;
godot_variant *default_args;
} godot_signal;
} godot_nativescript_signal;
void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_signal *p_signal);
void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_nativescript_signal *p_signal);
void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance);
......
modules/gdnative/nativescript/godot_nativescript.cpp
......@@ -159,7 +159,7 @@ void GDAPI godot_nativescript_register_property(void *p_gdnative_handle, const c
E->get().properties.insert(p_path, property);
}
void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_signal *p_signal) {
void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const char *p_name, const godot_nativescript_signal *p_signal) {
String *s = (String *)p_gdnative_handle;
Map<StringName, NativeScriptDesc>::Element *E = NSL->library_classes[*s].find(p_name);
......@@ -171,7 +171,7 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha
for (int i = 0; i < p_signal->num_args; i++) {
PropertyInfo info;
godot_signal_argument arg = p_signal->args[i];
godot_nativescript_signal_argument arg = p_signal->args[i];
info.hint = (PropertyHint)arg.hint;
info.hint_string = *(String *)&arg.hint_string;
......@@ -184,7 +184,7 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha
for (int i = 0; i < p_signal->num_default_args; i++) {
Variant *v;
godot_signal_argument attrib = p_signal->args[i];
godot_nativescript_signal_argument attrib = p_signal->args[i];
v = (Variant *)&attrib.default_value;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment