Added Vector2i.

gdnative/vector2i.cpp

@@ -0,0 +1,215 @@
+/**************************************************************************/
+/*  vector2.cpp                                                           */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             PANDEMONIUM ENGINE                               */
+/*                        https://pandemoniumengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* 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.                 */
+/**************************************************************************/
+
+#include "gdn/vector2i.h"
+
+#include "core/math/vector2i.h"
+#include "core/variant/variant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+static_assert(sizeof(pandemonium_vector2i) == sizeof(Vector2i), "Vector2i size mismatch");
+
+void GDAPI pandemonium_vector2i_set_x(pandemonium_vector2i *p_self, const pandemonium_real p_x) {
+	Vector2i *self = (Vector2i *)p_self;
+	self->x = p_x;
+}
+void GDAPI pandemonium_vector2i_set_y(pandemonium_vector2i *p_self, const pandemonium_real p_y) {
+	Vector2i *self = (Vector2i *)p_self;
+	self->y = p_y;
+}
+
+pandemonium_real GDAPI pandemonium_vector2i_get_x(const pandemonium_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->x;
+}
+pandemonium_real GDAPI pandemonium_vector2i_get_y(const pandemonium_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->y;
+}
+
+void GDAPI pandemonium_vector2i_set_axis(pandemonium_vector2i *p_self, const pandemonium_vector2i_axis p_axis, const pandemonium_real p_value) {
+	Vector2i *self = (Vector2i *)p_self;
+	self->operator[](p_axis) = p_value;
+}
+pandemonium_real GDAPI pandemonium_vector2i_get_axis(const pandemonium_vector2i *p_self, const pandemonium_vector2i_axis p_axis) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->operator[](p_axis);
+}
+
+void GDAPI pandemonium_vector2i_set_all(pandemonium_vector2i *p_self, const pandemonium_real p_value) {
+	Vector2i *self = (Vector2i *)p_self;
+	self->set_all(p_value);
+}
+
+pandemonium_int GDAPI pandemonium_vector2i_min_axis(const pandemonium_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->min_axis();
+}
+pandemonium_int GDAPI pandemonium_vector2i_max_axis(const pandemonium_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->max_axis();
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_min(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	pandemonium_vector2i dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	*((Vector2i *)&dest) = self->min(*b);
+	return dest;
+}
+pandemonium_vector2i GDAPI pandemonium_vector2i_max(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	pandemonium_vector2i dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	*((Vector2i *)&dest) = self->max(*b);
+	return dest;
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_linear_interpolate(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b, const pandemonium_real p_t) {
+	pandemonium_vector2i dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	*((Vector2i *)&dest) = self->linear_interpolate(*b, p_t);
+	return dest;
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_add(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	pandemonium_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;
+}
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_subtract(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	pandemonium_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;
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_multiply_vector(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	pandemonium_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;
+}
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_multiply_scalar(const pandemonium_vector2i *p_self, const pandemonium_real p_b) {
+	pandemonium_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*dest = *self * p_b;
+	return raw_dest;
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_divide_vector(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	pandemonium_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;
+}
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_divide_scalar(const pandemonium_vector2i *p_self, const pandemonium_real p_b) {
+	pandemonium_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*dest = *self / p_b;
+	return raw_dest;
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_neg(const pandemonium_vector2i *p_self) {
+	pandemonium_vector2i raw_dest;
+	Vector2i *dest = (Vector2i *)&raw_dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*dest = -(*self);
+	return raw_dest;
+}
+
+pandemonium_bool GDAPI pandemonium_vector2i_operator_equal(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	return *self == *b;
+}
+pandemonium_bool GDAPI pandemonium_vector2i_operator_less(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	const Vector2i *b = (const Vector2i *)p_b;
+	return *self < *b;
+}
+
+pandemonium_real GDAPI pandemonium_vector2i_length(const pandemonium_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->length();
+}
+pandemonium_real GDAPI pandemonium_vector2i_length_squared(const pandemonium_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->length_squared();
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_abs(const pandemonium_vector2i *p_self) {
+	pandemonium_vector2i dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*((Vector2i *)&dest) = self->abs();
+	return dest;
+}
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_sign(const pandemonium_vector2i *p_self) {
+	pandemonium_vector2i dest;
+	const Vector2i *self = (const Vector2i *)p_self;
+	*((Vector2i *)&dest) = self->sign();
+	return dest;
+}
+pandemonium_real GDAPI pandemonium_vector2i_aspect(const pandemonium_vector2i *p_self) {
+	const Vector2i *self = (const Vector2i *)p_self;
+	return self->aspect();
+}
+
+pandemonium_string GDAPI pandemonium_vector2i_as_string(const pandemonium_vector2i *p_self) {
+	pandemonium_string ret;
+	const Vector2i *self = (const Vector2i *)p_self;
+	memnew_placement(&ret, String(*self));
+	return ret;
+}
+
+void GDAPI pandemonium_vector2i_new(pandemonium_vector2i *r_dest, const pandemonium_real p_x, const pandemonium_real p_y) {
+	Vector2i *dest = (Vector2i *)r_dest;
+	*dest = Vector2i(p_x, p_y);
+}
+
+#ifdef __cplusplus
+}
+#endif

gdnative_api.json

@@ -4140,7 +4140,7 @@
                 ]
             },
             {
-                "name": "pandemonium_transform2d_determinant",
+                "name": "pandemonium_transform2d_basis_determinant",
                 "return_type": "pandemonium_real",
                 "arguments": [
                     ["const pandemonium_transform2d *", "p_self"]

include/gdn/gdnative.h

@@ -152,6 +152,10 @@ typedef void pandemonium_object;
 
 #include <gdn/vector2.h>
 
+////// Vector2i
+
+#include <gdn/vector2i.h>
+
 ////// Rect2
 
 #include <gdn/rect2.h>

include/gdn/vector2i.h

@@ -0,0 +1,116 @@
+/**************************************************************************/
+/*  vector2.h                                                             */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             PANDEMONIUM ENGINE                               */
+/*                        https://pandemoniumengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* 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 GDNATIVE_VECTOR2I_H
+#define GDNATIVE_VECTOR2I_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+#define PANDEMONIUM_VECTOR2I_SIZE 8
+
+#ifndef PANDEMONIUM_CORE_API_PANDEMONIUM_VECTOR2I_TYPE_DEFINED
+#define PANDEMONIUM_CORE_API_PANDEMONIUM_VECTOR2I_TYPE_DEFINED
+typedef struct {
+	uint8_t _dont_touch_that[PANDEMONIUM_VECTOR2I_SIZE];
+} pandemonium_vector2i;
+#endif
+
+// reduce extern "C" nesting for VS2013
+#ifdef __cplusplus
+}
+#endif
+
+#include <gdn/gdnative.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+	PANDEMONIUM_VECTOR2I_AXIS_X,
+	PANDEMONIUM_VECTOR2I_AXIS_Y,
+} pandemonium_vector2i_axis;
+
+void GDAPI pandemonium_vector2i_set_x(pandemonium_vector2i *p_self, const pandemonium_real p_x);
+void GDAPI pandemonium_vector2i_set_y(pandemonium_vector2i *p_self, const pandemonium_real p_y);
+
+pandemonium_real GDAPI pandemonium_vector2i_get_x(const pandemonium_vector2i *p_self);
+pandemonium_real GDAPI pandemonium_vector2i_get_y(const pandemonium_vector2i *p_self);
+
+void GDAPI pandemonium_vector2i_set_axis(pandemonium_vector2i *p_self, const pandemonium_vector2i_axis p_axis, const pandemonium_real p_value);
+pandemonium_real GDAPI pandemonium_vector2i_get_axis(const pandemonium_vector2i *p_self, const pandemonium_vector2i_axis p_axis);
+
+void GDAPI pandemonium_vector2i_set_all(pandemonium_vector2i *p_self, const pandemonium_real p_value);
+
+pandemonium_int GDAPI pandemonium_vector2i_min_axis(const pandemonium_vector2i *p_self);
+pandemonium_int GDAPI pandemonium_vector2i_max_axis(const pandemonium_vector2i *p_self);
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_min(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+pandemonium_vector2i GDAPI pandemonium_vector2i_max(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_linear_interpolate(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b, const pandemonium_real p_t);
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_add(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_subtract(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_multiply_vector(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_multiply_scalar(const pandemonium_vector2i *p_self, const pandemonium_real p_b);
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_divide_vector(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_divide_scalar(const pandemonium_vector2i *p_self, const pandemonium_real p_b);
+
+pandemonium_vector2i GDAPI pandemonium_vector2i_operator_neg(const pandemonium_vector2i *p_self);
+
+pandemonium_bool GDAPI pandemonium_vector2i_operator_equal(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+pandemonium_bool GDAPI pandemonium_vector2i_operator_less(const pandemonium_vector2i *p_self, const pandemonium_vector2i *p_b);
+
+pandemonium_real GDAPI pandemonium_vector2i_length(const pandemonium_vector2i *p_self);
+pandemonium_real GDAPI pandemonium_vector2i_length_squared(const pandemonium_vector2i *p_self);
+
+pandemonium_real GDAPI pandemonium_vector2i_aspect(const pandemonium_vector2i *p_self);
+pandemonium_vector2i GDAPI pandemonium_vector2i_sign(const pandemonium_vector2i *p_self);
+pandemonium_vector2i GDAPI pandemonium_vector2i_abs(const pandemonium_vector2i *p_self);
+//Vector2i clamp(const Vector2i &p_min, const Vector2i &p_max) const;
+
+//Vector2 to_vector2() const { return Vector2(x, y); }
+
+pandemonium_string GDAPI pandemonium_vector2i_as_string(const pandemonium_vector2i *p_self);
+
+void GDAPI pandemonium_vector2i_new(pandemonium_vector2i *r_dest, const pandemonium_real p_x, const pandemonium_real p_y);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // GDNATIVE_VECTOR2_H