godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-25 15:37:42 +00:00
Code Releases Wiki Activity

Merge pull request #68073 from timothyqiu/marker-3d-extents

Browse Source 
Make Marker3D gizmo resizable
This commit is contained in:
Rémi Verschelde
2022-10-31 12:17:13 +01:00
parent 1518bb716e 3ded27c62d
commit 4b92533efa
5 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/classes/Marker3D.xml
View File

@@ -8,4 +8,9 @@
</description> </description>
<tutorials> <tutorials>
</tutorials> </tutorials>
<members>
<member name="gizmo_extents" type="float" setter="set_gizmo_extents" getter="get_gizmo_extents" default="0.25">
Size of the gizmo cross that appears in the editor.
</member>
</members>
</class> </class>

21
editor/plugins/node_3d_editor_gizmos.cpp
View File

@@ -2277,10 +2277,10 @@ void Label3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
Marker3DGizmoPlugin::Marker3DGizmoPlugin() { Marker3DGizmoPlugin::Marker3DGizmoPlugin() {
pos3d_mesh = Ref<ArrayMesh>(memnew(ArrayMesh)); pos3d_mesh = Ref<ArrayMesh>(memnew(ArrayMesh));
cursor_points = Vector<Vector3>();
Vector<Vector3> cursor_points;
Vector<Color> cursor_colors; Vector<Color> cursor_colors;
const float cs = 0.25; const float cs = 1.0;
// Add more points to create a "hard stop" in the color gradient. // Add more points to create a "hard stop" in the color gradient.
cursor_points.push_back(Vector3(+cs, 0, 0)); cursor_points.push_back(Vector3(+cs, 0, 0));
cursor_points.push_back(Vector3()); cursor_points.push_back(Vector3());
@@ -2348,9 +2348,22 @@ int Marker3DGizmoPlugin::get_priority() const {
} }
void Marker3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) { void Marker3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
const Marker3D *marker = Object::cast_to<Marker3D>(p_gizmo->get_node_3d());
const real_t extents = marker->get_gizmo_extents();
const Transform3D xform(Basis::from_scale(Vector3(extents, extents, extents)));
p_gizmo->clear(); p_gizmo->clear();
p_gizmo->add_mesh(pos3d_mesh); p_gizmo->add_mesh(pos3d_mesh, Ref<Material>(), xform);
p_gizmo->add_collision_segments(cursor_points);
const Vector<Vector3> points = {
Vector3(-extents, 0, 0),
Vector3(+extents, 0, 0),
Vector3(0, -extents, 0),
Vector3(0, +extents, 0),
Vector3(0, 0, -extents),
Vector3(0, 0, +extents),
};
p_gizmo->add_collision_segments(points);
} }
//// ////

1
editor/plugins/node_3d_editor_gizmos.h
View File

@@ -338,7 +338,6 @@ class Marker3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(Marker3DGizmoPlugin, EditorNode3DGizmoPlugin); GDCLASS(Marker3DGizmoPlugin, EditorNode3DGizmoPlugin);
Ref<ArrayMesh> pos3d_mesh; Ref<ArrayMesh> pos3d_mesh;
Vector<Vector3> cursor_points;
public: public:
bool has_gizmo(Node3D *p_spatial) override; bool has_gizmo(Node3D *p_spatial) override;

19
scene/3d/marker_3d.cpp
View File

@@ -30,5 +30,24 @@
#include "marker_3d.h" #include "marker_3d.h"
void Marker3D::set_gizmo_extents(real_t p_extents) {
if (Math::is_equal_approx(gizmo_extents, p_extents)) {
return;
}
gizmo_extents = p_extents;
update_gizmos();
}
real_t Marker3D::get_gizmo_extents() const {
return gizmo_extents;
}
void Marker3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_gizmo_extents", "extents"), &Marker3D::set_gizmo_extents);
ClassDB::bind_method(D_METHOD("get_gizmo_extents"), &Marker3D::get_gizmo_extents);
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "gizmo_extents", PROPERTY_HINT_RANGE, "0,10,0.01,or_greater,suffix:m"), "set_gizmo_extents", "get_gizmo_extents");
}
Marker3D::Marker3D() { Marker3D::Marker3D() {
} }

8
scene/3d/marker_3d.h
View File

@@ -36,7 +36,15 @@
class Marker3D : public Node3D { class Marker3D : public Node3D {
GDCLASS(Marker3D, Node3D); GDCLASS(Marker3D, Node3D);
real_t gizmo_extents = 0.25;
protected:
static void _bind_methods();
public: public:
void set_gizmo_extents(real_t p_extents);
real_t get_gizmo_extents() const;
Marker3D(); Marker3D();
}; };