From 2559c70e274f9239cd29c434ab262c46f6dc8552 Mon Sep 17 00:00:00 2001 From: Mika Pi Date: Sat, 22 Feb 2020 18:13:37 -0800 Subject: Fix compilation warnings about unused vars --- src/core/String.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/String.cpp b/src/core/String.cpp index 7340b6d..c97d131 100644 --- a/src/core/String.cpp +++ b/src/core/String.cpp @@ -134,7 +134,7 @@ void String::operator+=(const String &s) { _godot_string = godot::api->godot_string_operator_plus(&_godot_string, &s._godot_string); } -void String::operator+=(const wchar_t c) { +void String::operator+=(const wchar_t /*c*/) { // @Todo } @@ -475,19 +475,19 @@ float String::similarity(String text) const { return godot::api->godot_string_similarity(&_godot_string, &text._godot_string); } -PoolStringArray String::split(String divisor, bool allow_empty) const { +PoolStringArray String::split(String divisor, bool /*allow_empty*/) const { godot_array arr = godot::api->godot_string_split(&_godot_string, &divisor._godot_string); return *(Array *)&arr; } -PoolIntArray String::split_ints(String divisor, bool allow_empty) const { +PoolIntArray String::split_ints(String divisor, bool /*allow_empty*/) const { godot_array arr = godot::api->godot_string_split_floats(&_godot_string, &divisor._godot_string); return *(Array *)&arr; } -PoolRealArray String::split_floats(String divisor, bool allow_empty) const { +PoolRealArray String::split_floats(String divisor, bool /*allow_empty*/) const { godot_array arr = godot::api->godot_string_split_floats(&_godot_string, &divisor._godot_string); return *(Array *)&arr; -- cgit v1.2.3 From 8e1cc29c66cc4dd28721a0367ef2f55464e9f026 Mon Sep 17 00:00:00 2001 From: Marc Gilleron Date: Tue, 8 Dec 2020 23:00:34 +0000 Subject: Added missing constants to Vector2, Vector3, Basis and Quat --- src/core/Basis.cpp | 5 +++++ src/core/Quat.cpp | 2 ++ src/core/Transform.cpp | 5 +++++ src/core/Transform2D.cpp | 4 ++++ src/core/Vector2.cpp | 9 +++++++++ src/core/Vector3.cpp | 11 +++++++++++ 6 files changed, 36 insertions(+) (limited to 'src') diff --git a/src/core/Basis.cpp b/src/core/Basis.cpp index 368afa1..903566c 100644 --- a/src/core/Basis.cpp +++ b/src/core/Basis.cpp @@ -7,6 +7,11 @@ namespace godot { +const Basis Basis::IDENTITY = Basis(); +const Basis Basis::FLIP_X = Basis(-1, 0, 0, 0, 1, 0, 0, 0, 1); +const Basis Basis::FLIP_Y = Basis(1, 0, 0, 0, -1, 0, 0, 0, 1); +const Basis Basis::FLIP_Z = Basis(1, 0, 0, 0, 1, 0, 0, 0, -1); + Basis::Basis(const Vector3 &row0, const Vector3 &row1, const Vector3 &row2) { elements[0] = row0; elements[1] = row1; diff --git a/src/core/Quat.cpp b/src/core/Quat.cpp index 00fa43d..dc179e2 100644 --- a/src/core/Quat.cpp +++ b/src/core/Quat.cpp @@ -7,6 +7,8 @@ namespace godot { +const Quat Quat::IDENTITY = Quat(); + // set_euler_xyz expects a vector containing the Euler angles in the format // (ax,ay,az), where ax is the angle of rotation around x axis, // and similar for other axes. diff --git a/src/core/Transform.cpp b/src/core/Transform.cpp index d32de8d..1eca983 100644 --- a/src/core/Transform.cpp +++ b/src/core/Transform.cpp @@ -9,6 +9,11 @@ namespace godot { +const Transform Transform::IDENTITY = Transform(); +const Transform Transform::FLIP_X = Transform(-1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0); +const Transform Transform::FLIP_Y = Transform(1, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0); +const Transform Transform::FLIP_Z = Transform(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0); + Transform Transform::inverse_xform(const Transform &t) const { Vector3 v = t.origin - origin; diff --git a/src/core/Transform2D.cpp b/src/core/Transform2D.cpp index acd6af1..6395c3d 100644 --- a/src/core/Transform2D.cpp +++ b/src/core/Transform2D.cpp @@ -7,6 +7,10 @@ namespace godot { +const Transform2D Transform2D::IDENTITY; +const Transform2D Transform2D::FLIP_X = Transform2D(-1, 0, 0, 1, 0, 0); +const Transform2D Transform2D::FLIP_Y = Transform2D(1, 0, 0, -1, 0, 0); + Transform2D::Transform2D(real_t xx, real_t xy, real_t yx, real_t yy, real_t ox, real_t oy) { elements[0][0] = xx; diff --git a/src/core/Vector2.cpp b/src/core/Vector2.cpp index 44dc001..eeeeb85 100644 --- a/src/core/Vector2.cpp +++ b/src/core/Vector2.cpp @@ -6,6 +6,15 @@ namespace godot { +const Vector2 Vector2::ZERO; +const Vector2 Vector2::ONE; +const Vector2 Vector2::INF; + +const Vector2 Vector2::LEFT = Vector2(-1, 0); +const Vector2 Vector2::RIGHT = Vector2(1, 0); +const Vector2 Vector2::UP = Vector2(0, -1); +const Vector2 Vector2::DOWN = Vector2(0, 1); + bool Vector2::operator==(const Vector2 &p_vec2) const { return x == p_vec2.x && y == p_vec2.y; } diff --git a/src/core/Vector3.cpp b/src/core/Vector3.cpp index 879de0b..f4db462 100644 --- a/src/core/Vector3.cpp +++ b/src/core/Vector3.cpp @@ -8,6 +8,17 @@ namespace godot { +const Vector3 Vector3::ZERO = Vector3(); +const Vector3 Vector3::ONE = Vector3(); +const Vector3 Vector3::INF = Vector3(INFINITY, INFINITY, INFINITY); + +const Vector3 Vector3::LEFT = Vector3(-1, 0, 0); +const Vector3 Vector3::RIGHT = Vector3(1, 0, 0); +const Vector3 Vector3::UP = Vector3(0, 1, 0); +const Vector3 Vector3::DOWN = Vector3(0, -1, 0); +const Vector3 Vector3::FORWARD = Vector3(0, 0, -1); +const Vector3 Vector3::BACK = Vector3(0, 0, 1); + bool Vector3::operator<(const Vector3 &p_v) const { if (x == p_v.x) { if (y == p_v.y) -- cgit v1.2.3 From 38c9b624db45fd9f00515c28ed6c72edb913b980 Mon Sep 17 00:00:00 2001 From: Colugo Date: Sun, 20 Dec 2020 16:44:49 +0000 Subject: Fix constness of Array::find, Array::find_last and Array::rfind --- src/core/Array.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/Array.cpp b/src/core/Array.cpp index 676eba5..b63e935 100644 --- a/src/core/Array.cpp +++ b/src/core/Array.cpp @@ -92,11 +92,11 @@ Variant Array::back() const { return *(Variant *)&v; } -int Array::find(const Variant &what, const int from) { +int Array::find(const Variant &what, const int from) const { return godot::api->godot_array_find(&_godot_array, (godot_variant *)&what, from); } -int Array::find_last(const Variant &what) { +int Array::find_last(const Variant &what) const { return godot::api->godot_array_find_last(&_godot_array, (godot_variant *)&what); } @@ -146,7 +146,7 @@ void Array::resize(const int size) { godot::api->godot_array_resize(&_godot_array, size); } -int Array::rfind(const Variant &what, const int from) { +int Array::rfind(const Variant &what, const int from) const { return godot::api->godot_array_rfind(&_godot_array, (godot_variant *)&what, from); } -- cgit v1.2.3