From 596bf6bdaaceb8b495c8d58ca481aae9852dc430 Mon Sep 17 00:00:00 2001 From: Arnav Vijaywargiya Date: Tue, 11 Jan 2022 09:47:42 +0530 Subject: [PATCH] Fixed incorrect property types (cherry picked from commit 0c46f73b5e5e89ba8fbe1f2294f203b5e9df2d0a) --- doc/classes/RayCast.xml | 2 +- modules/websocket/websocket_server.cpp | 2 +- scene/2d/polygon_2d.cpp | 2 +- scene/3d/ray_cast.cpp | 4 ++-- scene/3d/ray_cast.h | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/classes/RayCast.xml b/doc/classes/RayCast.xml index d45961f2abd..9b5aacfbd2b 100644 --- a/doc/classes/RayCast.xml +++ b/doc/classes/RayCast.xml @@ -123,7 +123,7 @@ The custom color to use to draw the shape in the editor and at run-time if [b]Visible Collision Shapes[/b] is enabled in the [b]Debug[/b] menu. This color will be highlighted at run-time if the [RayCast] is colliding with something. If set to [code]Color(0.0, 0.0, 0.0)[/code] (by default), the color set in [member ProjectSettings.debug/shapes/collision/shape_color] is used. - + If set to [code]1[/code], a line is used as the debug shape. Otherwise, a truncated pyramid is drawn to represent the [RayCast]. Requires [b]Visible Collision Shapes[/b] to be enabled in the [b]Debug[/b] menu for the debug shape to be visible at run-time. diff --git a/modules/websocket/websocket_server.cpp b/modules/websocket/websocket_server.cpp index 69c53db6d84..27e19ac676e 100644 --- a/modules/websocket/websocket_server.cpp +++ b/modules/websocket/websocket_server.cpp @@ -67,7 +67,7 @@ void WebSocketServer::_bind_methods() { ClassDB::bind_method(D_METHOD("get_handshake_timeout"), &WebSocketServer::get_handshake_timeout); ClassDB::bind_method(D_METHOD("set_handshake_timeout", "timeout"), &WebSocketServer::set_handshake_timeout); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "handshake_timeout"), "set_handshake_timeout", "get_handshake_timeout"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "handshake_timeout"), "set_handshake_timeout", "get_handshake_timeout"); ADD_SIGNAL(MethodInfo("client_close_request", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::INT, "code"), PropertyInfo(Variant::STRING, "reason"))); ADD_SIGNAL(MethodInfo("client_disconnected", PropertyInfo(Variant::INT, "id"), PropertyInfo(Variant::BOOL, "was_clean_close"))); diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index e86f35ab986..77721a8899b 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -636,7 +636,7 @@ void Polygon2D::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::POOL_VECTOR2_ARRAY, "uv"), "set_uv", "get_uv"); ADD_PROPERTY(PropertyInfo(Variant::POOL_COLOR_ARRAY, "vertex_colors"), "set_vertex_colors", "get_vertex_colors"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "polygons"), "set_polygons", "get_polygons"); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "bones", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "_set_bones", "_get_bones"); + ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "bones", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "_set_bones", "_get_bones"); ADD_PROPERTY(PropertyInfo(Variant::INT, "internal_vertex_count", PROPERTY_HINT_RANGE, "0,1000"), "set_internal_vertex_count", "get_internal_vertex_count"); } diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index f6fdc51d264..8db3b94af98 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -332,7 +332,7 @@ void RayCast::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "debug_shape_thickness", PROPERTY_HINT_RANGE, "1,5"), "set_debug_shape_thickness", "get_debug_shape_thickness"); } -float RayCast::get_debug_shape_thickness() const { +int RayCast::get_debug_shape_thickness() const { return debug_shape_thickness; } @@ -361,7 +361,7 @@ void RayCast::_update_debug_shape_vertices() { } } -void RayCast::set_debug_shape_thickness(const float p_debug_shape_thickness) { +void RayCast::set_debug_shape_thickness(const int p_debug_shape_thickness) { debug_shape_thickness = p_debug_shape_thickness; update_gizmo(); diff --git a/scene/3d/ray_cast.h b/scene/3d/ray_cast.h index 150595ed4bd..f7639bdce6f 100644 --- a/scene/3d/ray_cast.h +++ b/scene/3d/ray_cast.h @@ -100,8 +100,8 @@ public: Ref get_debug_material(); - float get_debug_shape_thickness() const; - void set_debug_shape_thickness(const float p_debug_thickness); + int get_debug_shape_thickness() const; + void set_debug_shape_thickness(const int p_debug_thickness); void force_raycast_update(); bool is_colliding() const;