Skip to content

godot
godot
Commit 3841a647 by jfons
Options

Rename all gizmo classes, using the 4.0 node names.

parent 11f31a73
Showing with 102 additions and 102 deletions
editor/node_3d_editor_gizmos.h
......@@ -36,9 +36,9 @@
class Camera3D;
class LightNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class Light3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(LightNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(Light3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -51,12 +51,12 @@ public:
void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
void redraw(EditorNode3DGizmo *p_gizmo);
LightNode3DGizmoPlugin();
Light3DGizmoPlugin();
};
class AudioStreamPlayer3DNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class AudioStreamPlayer3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(AudioStreamPlayer3DNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(AudioStreamPlayer3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -69,12 +69,12 @@ public:
void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
void redraw(EditorNode3DGizmo *p_gizmo);
AudioStreamPlayer3DNode3DGizmoPlugin();
AudioStreamPlayer3DGizmoPlugin();
};
class CameraNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class Camera3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(CameraNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(Camera3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -87,12 +87,12 @@ public:
void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
void redraw(EditorNode3DGizmo *p_gizmo);
CameraNode3DGizmoPlugin();
Camera3DGizmoPlugin();
};
class MeshInstanceNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class MeshInstance3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(MeshInstanceNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(MeshInstance3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -101,12 +101,12 @@ public:
bool can_be_hidden() const;
void redraw(EditorNode3DGizmo *p_gizmo);
MeshInstanceNode3DGizmoPlugin();
MeshInstance3DGizmoPlugin();
};
class Sprite3DNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class Sprite3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(Sprite3DNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(Sprite3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -115,12 +115,12 @@ public:
bool can_be_hidden() const;
void redraw(EditorNode3DGizmo *p_gizmo);
Sprite3DNode3DGizmoPlugin();
Sprite3DGizmoPlugin();
};
class Position3DNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class Position3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(Position3DNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(Position3DGizmoPlugin, EditorNode3DGizmoPlugin);
Ref<ArrayMesh> pos3d_mesh;
Vector<Vector3> cursor_points;
......@@ -131,12 +131,12 @@ public:
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
Position3DNode3DGizmoPlugin();
Position3DGizmoPlugin();
};
class SkeletonNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class Skeleton3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(SkeletonNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(Skeleton3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -144,12 +144,12 @@ public:
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
SkeletonNode3DGizmoPlugin();
Skeleton3DGizmoPlugin();
};
class PhysicalBoneNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class PhysicalBone3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(PhysicalBoneNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(PhysicalBone3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -157,12 +157,12 @@ public:
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
PhysicalBoneNode3DGizmoPlugin();
PhysicalBone3DGizmoPlugin();
};
class RayCastNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class RayCast3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(RayCastNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(RayCast3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -170,12 +170,12 @@ public:
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
RayCastNode3DGizmoPlugin();
RayCast3DGizmoPlugin();
};
class SpringArmNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class SpringArm3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(SpringArmNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(SpringArm3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -183,12 +183,12 @@ public:
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
SpringArmNode3DGizmoPlugin();
SpringArm3DGizmoPlugin();
};
class VehicleWheelNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class VehicleWheel3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(VehicleWheelNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(VehicleWheel3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -196,12 +196,12 @@ public:
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
VehicleWheelNode3DGizmoPlugin();
VehicleWheel3DGizmoPlugin();
};
class SoftBodyNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class SoftBody3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(SoftBodyNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(SoftBody3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -215,12 +215,12 @@ public:
void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel);
bool is_handle_highlighted(const EditorNode3DGizmo *p_gizmo, int idx) const;
SoftBodyNode3DGizmoPlugin();
SoftBody3DGizmoPlugin();
};
class VisibilityNotifierGizmoPlugin : public EditorNode3DGizmoPlugin {
class VisibilityNotifier3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(VisibilityNotifierGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(VisibilityNotifier3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -233,7 +233,7 @@ public:
void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
VisibilityNotifierGizmoPlugin();
VisibilityNotifier3DGizmoPlugin();
};
class CPUParticles3DGizmoPlugin : public EditorNode3DGizmoPlugin {
......@@ -322,9 +322,9 @@ public:
BakedIndirectLightGizmoPlugin();
};
#endif
class CollisionShapeNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class CollisionShape3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(CollisionShapeNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(CollisionShape3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -337,23 +337,23 @@ public:
void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel = false);
CollisionShapeNode3DGizmoPlugin();
CollisionShape3DGizmoPlugin();
};
class CollisionPolygonNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(CollisionPolygonNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
class CollisionPolygon3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(CollisionPolygon3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
String get_name() const;
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
CollisionPolygonNode3DGizmoPlugin();
CollisionPolygon3DGizmoPlugin();
};
class NavigationMeshNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class NavigationRegion3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(NavigationMeshNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(NavigationRegion3DGizmoPlugin, EditorNode3DGizmoPlugin);
struct _EdgeKey {
......@@ -369,7 +369,7 @@ public:
int get_priority() const;
void redraw(EditorNode3DGizmo *p_gizmo);
NavigationMeshNode3DGizmoPlugin();
NavigationRegion3DGizmoPlugin();
};
class JointGizmosDrawer {
......@@ -387,9 +387,9 @@ public:
static void draw_cone(const Transform &p_offset, const Basis &p_base, real_t p_swing, real_t p_twist, Vector<Vector3> &r_points);
};
class JointNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class Joint3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(JointNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(Joint3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -428,7 +428,7 @@ public:
Vector<Vector3> *r_body_a_points,
Vector<Vector3> *r_body_b_points);
JointNode3DGizmoPlugin();
Joint3DGizmoPlugin();
};
#endif // SPATIAL_EDITOR_GIZMOS_H
editor/plugins/node_3d_editor_plugin.cpp
......@@ -5907,28 +5907,28 @@ void Node3DEditor::_node_removed(Node *p_node) {
}
void Node3DEditor::_register_all_gizmos() {
add_gizmo_plugin(Ref<CameraNode3DGizmoPlugin>(memnew(CameraNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<LightNode3DGizmoPlugin>(memnew(LightNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<AudioStreamPlayer3DNode3DGizmoPlugin>(memnew(AudioStreamPlayer3DNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<MeshInstanceNode3DGizmoPlugin>(memnew(MeshInstanceNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<SoftBodyNode3DGizmoPlugin>(memnew(SoftBodyNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<Sprite3DNode3DGizmoPlugin>(memnew(Sprite3DNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<SkeletonNode3DGizmoPlugin>(memnew(SkeletonNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<Position3DNode3DGizmoPlugin>(memnew(Position3DNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<RayCastNode3DGizmoPlugin>(memnew(RayCastNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<SpringArmNode3DGizmoPlugin>(memnew(SpringArmNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<VehicleWheelNode3DGizmoPlugin>(memnew(VehicleWheelNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<VisibilityNotifierGizmoPlugin>(memnew(VisibilityNotifierGizmoPlugin)));
add_gizmo_plugin(Ref<Camera3DGizmoPlugin>(memnew(Camera3DGizmoPlugin)));
add_gizmo_plugin(Ref<Light3DGizmoPlugin>(memnew(Light3DGizmoPlugin)));
add_gizmo_plugin(Ref<AudioStreamPlayer3DGizmoPlugin>(memnew(AudioStreamPlayer3DGizmoPlugin)));
add_gizmo_plugin(Ref<MeshInstance3DGizmoPlugin>(memnew(MeshInstance3DGizmoPlugin)));
add_gizmo_plugin(Ref<SoftBody3DGizmoPlugin>(memnew(SoftBody3DGizmoPlugin)));
add_gizmo_plugin(Ref<Sprite3DGizmoPlugin>(memnew(Sprite3DGizmoPlugin)));
add_gizmo_plugin(Ref<Skeleton3DGizmoPlugin>(memnew(Skeleton3DGizmoPlugin)));
add_gizmo_plugin(Ref<Position3DGizmoPlugin>(memnew(Position3DGizmoPlugin)));
add_gizmo_plugin(Ref<RayCast3DGizmoPlugin>(memnew(RayCast3DGizmoPlugin)));
add_gizmo_plugin(Ref<SpringArm3DGizmoPlugin>(memnew(SpringArm3DGizmoPlugin)));
add_gizmo_plugin(Ref<VehicleWheel3DGizmoPlugin>(memnew(VehicleWheel3DGizmoPlugin)));
add_gizmo_plugin(Ref<VisibilityNotifier3DGizmoPlugin>(memnew(VisibilityNotifier3DGizmoPlugin)));
add_gizmo_plugin(Ref<GPUParticles3DGizmoPlugin>(memnew(GPUParticles3DGizmoPlugin)));
add_gizmo_plugin(Ref<CPUParticles3DGizmoPlugin>(memnew(CPUParticles3DGizmoPlugin)));
add_gizmo_plugin(Ref<ReflectionProbeGizmoPlugin>(memnew(ReflectionProbeGizmoPlugin)));
add_gizmo_plugin(Ref<GIProbeGizmoPlugin>(memnew(GIProbeGizmoPlugin)));
// add_gizmo_plugin(Ref<BakedIndirectLightGizmoPlugin>(memnew(BakedIndirectLightGizmoPlugin)));
add_gizmo_plugin(Ref<CollisionShapeNode3DGizmoPlugin>(memnew(CollisionShapeNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<CollisionPolygonNode3DGizmoPlugin>(memnew(CollisionPolygonNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<NavigationMeshNode3DGizmoPlugin>(memnew(NavigationMeshNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<JointNode3DGizmoPlugin>(memnew(JointNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<PhysicalBoneNode3DGizmoPlugin>(memnew(PhysicalBoneNode3DGizmoPlugin)));
add_gizmo_plugin(Ref<CollisionShape3DGizmoPlugin>(memnew(CollisionShape3DGizmoPlugin)));
add_gizmo_plugin(Ref<CollisionPolygon3DGizmoPlugin>(memnew(CollisionPolygon3DGizmoPlugin)));
add_gizmo_plugin(Ref<NavigationRegion3DGizmoPlugin>(memnew(NavigationRegion3DGizmoPlugin)));
add_gizmo_plugin(Ref<Joint3DGizmoPlugin>(memnew(Joint3DGizmoPlugin)));
add_gizmo_plugin(Ref<PhysicalBone3DGizmoPlugin>(memnew(PhysicalBone3DGizmoPlugin)));
}
void Node3DEditor::_bind_methods() {
......
editor/plugins/path_3d_editor_plugin.cpp
......@@ -34,7 +34,7 @@
#include "node_3d_editor_plugin.h"
#include "scene/resources/curve.h"
String PathNode3DGizmo::get_handle_name(int p_idx) const {
String Path3DGizmo::get_handle_name(int p_idx) const {
Ref<Curve3D> c = path->get_curve();
if (c.is_null())
......@@ -57,7 +57,7 @@ String PathNode3DGizmo::get_handle_name(int p_idx) const {
return n;
}
Variant PathNode3DGizmo::get_handle_value(int p_idx) {
Variant Path3DGizmo::get_handle_value(int p_idx) {
Ref<Curve3D> c = path->get_curve();
if (c.is_null())
......@@ -84,7 +84,7 @@ Variant PathNode3DGizmo::get_handle_value(int p_idx) {
return ofs;
}
void PathNode3DGizmo::set_handle(int p_idx, Camera3D *p_camera, const Point2 &p_point) {
void Path3DGizmo::set_handle(int p_idx, Camera3D *p_camera, const Point2 &p_point) {
Ref<Curve3D> c = path->get_curve();
if (c.is_null())
......@@ -154,7 +154,7 @@ void PathNode3DGizmo::set_handle(int p_idx, Camera3D *p_camera, const Point2 &p_
}
}
void PathNode3DGizmo::commit_handle(int p_idx, const Variant &p_restore, bool p_cancel) {
void Path3DGizmo::commit_handle(int p_idx, const Variant &p_restore, bool p_cancel) {
Ref<Curve3D> c = path->get_curve();
if (c.is_null())
......@@ -217,7 +217,7 @@ void PathNode3DGizmo::commit_handle(int p_idx, const Variant &p_restore, bool p_
}
}
void PathNode3DGizmo::redraw() {
void Path3DGizmo::redraw() {
clear();
......@@ -286,7 +286,7 @@ void PathNode3DGizmo::redraw() {
}
}
PathNode3DGizmo::PathNode3DGizmo(Path3D *p_path) {
Path3DGizmo::Path3DGizmo(Path3D *p_path) {
path = p_path;
set_spatial_node(p_path);
......@@ -563,7 +563,7 @@ Path3DEditorPlugin::Path3DEditorPlugin(EditorNode *p_node) {
mirror_handle_angle = true;
mirror_handle_length = true;
Ref<PathNode3DGizmoPlugin> gizmo_plugin;
Ref<Path3DGizmoPlugin> gizmo_plugin;
gizmo_plugin.instance();
Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
......@@ -627,24 +627,24 @@ Path3DEditorPlugin::Path3DEditorPlugin(EditorNode *p_node) {
Path3DEditorPlugin::~Path3DEditorPlugin() {
}
Ref<EditorNode3DGizmo> PathNode3DGizmoPlugin::create_gizmo(Node3D *p_spatial) {
Ref<PathNode3DGizmo> ref;
Ref<EditorNode3DGizmo> Path3DGizmoPlugin::create_gizmo(Node3D *p_spatial) {
Ref<Path3DGizmo> ref;
Path3D *path = Object::cast_to<Path3D>(p_spatial);
if (path) ref = Ref<PathNode3DGizmo>(memnew(PathNode3DGizmo(path)));
if (path) ref = Ref<Path3DGizmo>(memnew(Path3DGizmo(path)));
return ref;
}
String PathNode3DGizmoPlugin::get_name() const {
String Path3DGizmoPlugin::get_name() const {
return "Path3D";
}
int PathNode3DGizmoPlugin::get_priority() const {
int Path3DGizmoPlugin::get_priority() const {
return -1;
}
PathNode3DGizmoPlugin::PathNode3DGizmoPlugin() {
Path3DGizmoPlugin::Path3DGizmoPlugin() {
Color path_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/path", Color(0.5, 0.5, 1.0, 0.8));
create_material("path_material", path_color);
......
editor/plugins/path_3d_editor_plugin.h
......@@ -34,9 +34,9 @@
#include "editor/node_3d_editor_gizmos.h"
#include "scene/3d/path_3d.h"
class PathNode3DGizmo : public EditorNode3DGizmo {
class Path3DGizmo : public EditorNode3DGizmo {
GDCLASS(PathNode3DGizmo, EditorNode3DGizmo);
GDCLASS(Path3DGizmo, EditorNode3DGizmo);
Path3D *path;
mutable Vector3 original;
......@@ -50,12 +50,12 @@ public:
virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
virtual void redraw();
PathNode3DGizmo(Path3D *p_path = nullptr);
Path3DGizmo(Path3D *p_path = nullptr);
};
class PathNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class Path3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(PathNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(Path3DGizmoPlugin, EditorNode3DGizmoPlugin);
protected:
Ref<EditorNode3DGizmo> create_gizmo(Node3D *p_spatial);
......@@ -63,7 +63,7 @@ protected:
public:
String get_name() const;
int get_priority() const;
PathNode3DGizmoPlugin();
Path3DGizmoPlugin();
};
class Path3DEditorPlugin : public EditorPlugin {
......
modules/csg/csg_gizmos.cpp
......@@ -32,7 +32,7 @@
///////////
CSGShapeNode3DGizmoPlugin::CSGShapeNode3DGizmoPlugin() {
CSGShape3DGizmoPlugin::CSGShape3DGizmoPlugin() {
Color gizmo_color = EDITOR_DEF("editors/3d_gizmos/gizmo_colors/csg", Color(0.0, 0.4, 1, 0.15));
create_material("shape_union_material", gizmo_color);
......@@ -49,7 +49,7 @@ CSGShapeNode3DGizmoPlugin::CSGShapeNode3DGizmoPlugin() {
create_handle_material("handles");
}
String CSGShapeNode3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
String CSGShape3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_gizmo, int p_idx) const {
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
......@@ -76,7 +76,7 @@ String CSGShapeNode3DGizmoPlugin::get_handle_name(const EditorNode3DGizmo *p_giz
return "";
}
Variant CSGShapeNode3DGizmoPlugin::get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const {
Variant CSGShape3DGizmoPlugin::get_handle_value(EditorNode3DGizmo *p_gizmo, int p_idx) const {
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
......@@ -110,7 +110,7 @@ Variant CSGShapeNode3DGizmoPlugin::get_handle_value(EditorNode3DGizmo *p_gizmo,
return Variant();
}
void CSGShapeNode3DGizmoPlugin::set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
void CSGShape3DGizmoPlugin::set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point) {
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
......@@ -207,7 +207,7 @@ void CSGShapeNode3DGizmoPlugin::set_handle(EditorNode3DGizmo *p_gizmo, int p_idx
s->set_outer_radius(d);
}
}
void CSGShapeNode3DGizmoPlugin::commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
void CSGShape3DGizmoPlugin::commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel) {
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
......@@ -299,23 +299,23 @@ void CSGShapeNode3DGizmoPlugin::commit_handle(EditorNode3DGizmo *p_gizmo, int p_
ur->commit_action();
}
}
bool CSGShapeNode3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
bool CSGShape3DGizmoPlugin::has_gizmo(Node3D *p_spatial) {
return Object::cast_to<CSGSphere3D>(p_spatial) || Object::cast_to<CSGBox3D>(p_spatial) || Object::cast_to<CSGCylinder3D>(p_spatial) || Object::cast_to<CSGTorus3D>(p_spatial) || Object::cast_to<CSGMesh3D>(p_spatial) || Object::cast_to<CSGPolygon3D>(p_spatial);
}
String CSGShapeNode3DGizmoPlugin::get_name() const {
return "CSGShapes";
String CSGShape3DGizmoPlugin::get_name() const {
return "CSGShape3D";
}
int CSGShapeNode3DGizmoPlugin::get_priority() const {
int CSGShape3DGizmoPlugin::get_priority() const {
return -1;
}
bool CSGShapeNode3DGizmoPlugin::is_selectable_when_hidden() const {
bool CSGShape3DGizmoPlugin::is_selectable_when_hidden() const {
return true;
}
void CSGShapeNode3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
void CSGShape3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
CSGShape3D *cs = Object::cast_to<CSGShape3D>(p_gizmo->get_spatial_node());
......@@ -419,6 +419,6 @@ void CSGShapeNode3DGizmoPlugin::redraw(EditorNode3DGizmo *p_gizmo) {
}
EditorPluginCSG::EditorPluginCSG(EditorNode *p_editor) {
Ref<CSGShapeNode3DGizmoPlugin> gizmo_plugin = Ref<CSGShapeNode3DGizmoPlugin>(memnew(CSGShapeNode3DGizmoPlugin));
Ref<CSGShape3DGizmoPlugin> gizmo_plugin = Ref<CSGShape3DGizmoPlugin>(memnew(CSGShape3DGizmoPlugin));
Node3DEditor::get_singleton()->add_gizmo_plugin(gizmo_plugin);
}
modules/csg/csg_gizmos.h
......@@ -35,9 +35,9 @@
#include "editor/editor_plugin.h"
#include "editor/node_3d_editor_gizmos.h"
class CSGShapeNode3DGizmoPlugin : public EditorNode3DGizmoPlugin {
class CSGShape3DGizmoPlugin : public EditorNode3DGizmoPlugin {
GDCLASS(CSGShapeNode3DGizmoPlugin, EditorNode3DGizmoPlugin);
GDCLASS(CSGShape3DGizmoPlugin, EditorNode3DGizmoPlugin);
public:
bool has_gizmo(Node3D *p_spatial);
......@@ -51,7 +51,7 @@ public:
void set_handle(EditorNode3DGizmo *p_gizmo, int p_idx, Camera3D *p_camera, const Point2 &p_point);
void commit_handle(EditorNode3DGizmo *p_gizmo, int p_idx, const Variant &p_restore, bool p_cancel);
CSGShapeNode3DGizmoPlugin();
CSGShape3DGizmoPlugin();
};
class EditorPluginCSG : public EditorPlugin {
......
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