Bring that Whole New World to the Old Continent too

Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde 2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions

View file

@ -29,35 +29,33 @@
#ifndef SPATIAL_EDITOR_GIZMOS_H
#define SPATIAL_EDITOR_GIZMOS_H
#include "editor/plugins/spatial_editor_plugin.h"
#include "scene/3d/body_shape.h"
#include "scene/3d/camera.h"
#include "scene/3d/light.h"
#include "scene/3d/listener.h"
#include "scene/3d/camera.h"
#include "scene/3d/mesh_instance.h"
#include "scene/3d/navigation_mesh.h"
#include "scene/3d/portal.h"
#include "scene/3d/position_3d.h"
#include "scene/3d/ray_cast.h"
#include "scene/3d/room_instance.h"
#include "scene/3d/spatial_sample_player.h"
#include "scene/3d/spatial_stream_player.h"
#include "scene/3d/test_cube.h"
#include "scene/3d/mesh_instance.h"
#include "scene/3d/body_shape.h"
#include "scene/3d/room_instance.h"
#include "scene/3d/visibility_notifier.h"
#include "scene/3d/portal.h"
#include "scene/3d/ray_cast.h"
#include "scene/3d/navigation_mesh.h"
#include "scene/3d/vehicle_body.h"
#include "scene/3d/collision_polygon.h"
#include "scene/3d/physics_joint.h"
#include "scene/3d/vehicle_body.h"
class Camera;
class EditorSpatialGizmo : public SpatialEditorGizmo {
class EditorSpatialGizmo : public SpatialEditorGizmo {
OBJ_TYPE(EditorSpatialGizmo,SpatialGizmo);
OBJ_TYPE(EditorSpatialGizmo, SpatialGizmo);
struct Instance{
struct Instance {
RID instance;
Ref<Mesh> mesh;
@ -68,14 +66,13 @@ class EditorSpatialGizmo : public SpatialEditorGizmo {
bool extra_margin;
Instance() {
billboard=false;
unscaled=false;
can_intersect=false;
extra_margin=false;
billboard = false;
unscaled = false;
can_intersect = false;
extra_margin = false;
}
void create_instance(Spatial *p_base);
};
Vector<Vector3> collision_segments;
@ -96,22 +93,23 @@ class EditorSpatialGizmo : public SpatialEditorGizmo {
Spatial *spatial_node;
void _set_spatial_node(Node *p_node) { set_spatial_node(p_node->cast_to<Spatial>()); }
protected:
void add_lines(const Vector<Vector3> &p_lines,const Ref<Material>& p_material,bool p_billboard=false);
void add_mesh(const Ref<Mesh>& p_mesh,bool p_billboard=false,const RID& p_skeleton=RID());
void add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard = false);
void add_mesh(const Ref<Mesh> &p_mesh, bool p_billboard = false, const RID &p_skeleton = RID());
void add_collision_segments(const Vector<Vector3> &p_lines);
void add_collision_triangles(const Ref<TriangleMesh>& p_tmesh);
void add_unscaled_billboard(const Ref<Material>& p_material,float p_scale=1);
void add_handles(const Vector<Vector3> &p_handles,bool p_billboard=false,bool p_secondary=false);
void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh);
void add_unscaled_billboard(const Ref<Material> &p_material, float p_scale = 1);
void add_handles(const Vector<Vector3> &p_handles, bool p_billboard = false, bool p_secondary = false);
void set_spatial_node(Spatial *p_node);
static void _bind_methods();
public:
public:
virtual Vector3 get_handle_pos(int p_idx) const;
virtual bool intersect_frustum(const Camera *p_camera,const Vector<Plane> &p_frustum);
virtual bool intersect_ray(const Camera *p_camera,const Point2& p_point, Vector3& r_pos, Vector3& r_normal,int *r_gizmo_handle=NULL,bool p_sec_first=false);
virtual bool intersect_frustum(const Camera *p_camera, const Vector<Plane> &p_frustum);
virtual bool intersect_ray(const Camera *p_camera, const Point2 &p_point, Vector3 &r_pos, Vector3 &r_normal, int *r_gizmo_handle = NULL, bool p_sec_first = false);
void clear();
void create();
@ -123,349 +121,276 @@ public:
~EditorSpatialGizmo();
};
class LightSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(LightSpatialGizmo, EditorSpatialGizmo);
class LightSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(LightSpatialGizmo,EditorSpatialGizmo);
Light* light;
Light *light;
public:
virtual String get_handle_name(int p_idx) const;
virtual Variant get_handle_value(int p_idx) const;
virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
virtual void set_handle(int p_idx, Camera *p_camera, const Point2 &p_point);
virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
void redraw();
LightSpatialGizmo(Light* p_light=NULL);
LightSpatialGizmo(Light *p_light = NULL);
};
class ListenerSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(ListenerSpatialGizmo, EditorSpatialGizmo);
Listener* listener;
Listener *listener;
public:
void redraw();
ListenerSpatialGizmo(Listener* p_listener = NULL);
ListenerSpatialGizmo(Listener *p_listener = NULL);
};
class CameraSpatialGizmo : public EditorSpatialGizmo {
class CameraSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(CameraSpatialGizmo,EditorSpatialGizmo);
OBJ_TYPE(CameraSpatialGizmo, EditorSpatialGizmo);
Camera* camera;
Camera *camera;
public:
virtual String get_handle_name(int p_idx) const;
virtual Variant get_handle_value(int p_idx) const;
virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
virtual void set_handle(int p_idx, Camera *p_camera, const Point2 &p_point);
virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
void redraw();
CameraSpatialGizmo(Camera* p_camera=NULL);
CameraSpatialGizmo(Camera *p_camera = NULL);
};
class MeshInstanceSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(MeshInstanceSpatialGizmo, EditorSpatialGizmo);
class MeshInstanceSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(MeshInstanceSpatialGizmo,EditorSpatialGizmo);
MeshInstance* mesh;
public:
void redraw();
MeshInstanceSpatialGizmo(MeshInstance* p_mesh=NULL);
};
class Position3DSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(Position3DSpatialGizmo,EditorSpatialGizmo);
Position3D* p3d;
public:
void redraw();
Position3DSpatialGizmo(Position3D* p_p3d=NULL);
};
class SkeletonSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(SkeletonSpatialGizmo,EditorSpatialGizmo);
Skeleton* skel;
public:
void redraw();
SkeletonSpatialGizmo(Skeleton* p_skel=NULL);
};
class SpatialPlayerSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(SpatialPlayerSpatialGizmo,EditorSpatialGizmo);
SpatialPlayer* splayer;
public:
void redraw();
SpatialPlayerSpatialGizmo(SpatialPlayer* p_splayer=NULL);
};
class TestCubeSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(TestCubeSpatialGizmo,EditorSpatialGizmo);
TestCube* tc;
MeshInstance *mesh;
public:
void redraw();
TestCubeSpatialGizmo(TestCube* p_tc=NULL);
MeshInstanceSpatialGizmo(MeshInstance *p_mesh = NULL);
};
class Position3DSpatialGizmo : public EditorSpatialGizmo {
class RoomSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(Position3DSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(RoomSpatialGizmo,EditorSpatialGizmo);
Position3D *p3d;
public:
void redraw();
Position3DSpatialGizmo(Position3D *p_p3d = NULL);
};
class SkeletonSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(SkeletonSpatialGizmo, EditorSpatialGizmo);
Skeleton *skel;
public:
void redraw();
SkeletonSpatialGizmo(Skeleton *p_skel = NULL);
};
class SpatialPlayerSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(SpatialPlayerSpatialGizmo, EditorSpatialGizmo);
SpatialPlayer *splayer;
public:
void redraw();
SpatialPlayerSpatialGizmo(SpatialPlayer *p_splayer = NULL);
};
class TestCubeSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(TestCubeSpatialGizmo, EditorSpatialGizmo);
TestCube *tc;
public:
void redraw();
TestCubeSpatialGizmo(TestCube *p_tc = NULL);
};
class RoomSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(RoomSpatialGizmo, EditorSpatialGizmo);
struct _EdgeKey {
Vector3 from;
Vector3 to;
bool operator<(const _EdgeKey& p_with) const { return from==p_with.from ? to < p_with.to : from < p_with.from; }
bool operator<(const _EdgeKey &p_with) const { return from == p_with.from ? to < p_with.to : from < p_with.from; }
};
Room* room;
Room *room;
public:
void redraw();
RoomSpatialGizmo(Room* p_room=NULL);
RoomSpatialGizmo(Room *p_room = NULL);
};
class PortalSpatialGizmo : public EditorSpatialGizmo {
class PortalSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(PortalSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(PortalSpatialGizmo,EditorSpatialGizmo);
Portal* portal;
Portal *portal;
public:
void redraw();
PortalSpatialGizmo(Portal* p_portal=NULL);
PortalSpatialGizmo(Portal *p_portal = NULL);
};
class VisibilityNotifierGizmo : public EditorSpatialGizmo {
class VisibilityNotifierGizmo : public EditorSpatialGizmo {
OBJ_TYPE(VisibilityNotifierGizmo, EditorSpatialGizmo);
OBJ_TYPE(VisibilityNotifierGizmo ,EditorSpatialGizmo);
VisibilityNotifier* notifier;
public:
virtual String get_handle_name(int p_idx) const;
virtual Variant get_handle_value(int p_idx) const;
virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
void redraw();
VisibilityNotifierGizmo(VisibilityNotifier* p_notifier=NULL);
};
class CollisionShapeSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(CollisionShapeSpatialGizmo,EditorSpatialGizmo);
CollisionShape* cs;
VisibilityNotifier *notifier;
public:
virtual String get_handle_name(int p_idx) const;
virtual Variant get_handle_value(int p_idx) const;
virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
void redraw();
CollisionShapeSpatialGizmo(CollisionShape* p_cs=NULL);
virtual void set_handle(int p_idx, Camera *p_camera, const Point2 &p_point);
virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
void redraw();
VisibilityNotifierGizmo(VisibilityNotifier *p_notifier = NULL);
};
class CollisionShapeSpatialGizmo : public EditorSpatialGizmo {
class CollisionPolygonSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(CollisionShapeSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(CollisionPolygonSpatialGizmo,EditorSpatialGizmo);
CollisionPolygon* polygon;
CollisionShape *cs;
public:
virtual String get_handle_name(int p_idx) const;
virtual Variant get_handle_value(int p_idx) const;
virtual void set_handle(int p_idx, Camera *p_camera, const Point2 &p_point);
virtual void commit_handle(int p_idx, const Variant &p_restore, bool p_cancel = false);
void redraw();
CollisionPolygonSpatialGizmo(CollisionPolygon* p_polygon=NULL);
CollisionShapeSpatialGizmo(CollisionShape *p_cs = NULL);
};
class CollisionPolygonSpatialGizmo : public EditorSpatialGizmo {
class RayCastSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(CollisionPolygonSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(RayCastSpatialGizmo,EditorSpatialGizmo);
RayCast* raycast;
CollisionPolygon *polygon;
public:
void redraw();
RayCastSpatialGizmo(RayCast* p_raycast=NULL);
CollisionPolygonSpatialGizmo(CollisionPolygon *p_polygon = NULL);
};
class RayCastSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(RayCastSpatialGizmo, EditorSpatialGizmo);
class VehicleWheelSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(VehicleWheelSpatialGizmo,EditorSpatialGizmo);
VehicleWheel* car_wheel;
RayCast *raycast;
public:
void redraw();
VehicleWheelSpatialGizmo(VehicleWheel* p_car_wheel=NULL);
RayCastSpatialGizmo(RayCast *p_raycast = NULL);
};
class VehicleWheelSpatialGizmo : public EditorSpatialGizmo {
class NavigationMeshSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(VehicleWheelSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(NavigationMeshSpatialGizmo,EditorSpatialGizmo);
VehicleWheel *car_wheel;
public:
void redraw();
VehicleWheelSpatialGizmo(VehicleWheel *p_car_wheel = NULL);
};
class NavigationMeshSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(NavigationMeshSpatialGizmo, EditorSpatialGizmo);
struct _EdgeKey {
Vector3 from;
Vector3 to;
bool operator<(const _EdgeKey& p_with) const { return from==p_with.from ? to < p_with.to : from < p_with.from; }
bool operator<(const _EdgeKey &p_with) const { return from == p_with.from ? to < p_with.to : from < p_with.from; }
};
NavigationMeshInstance* navmesh;
NavigationMeshInstance *navmesh;
public:
void redraw();
NavigationMeshSpatialGizmo(NavigationMeshInstance* p_navmesh=NULL);
NavigationMeshSpatialGizmo(NavigationMeshInstance *p_navmesh = NULL);
};
class PinJointSpatialGizmo : public EditorSpatialGizmo {
class PinJointSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(PinJointSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(PinJointSpatialGizmo,EditorSpatialGizmo);
PinJoint* p3d;
PinJoint *p3d;
public:
void redraw();
PinJointSpatialGizmo(PinJoint* p_p3d=NULL);
PinJointSpatialGizmo(PinJoint *p_p3d = NULL);
};
class HingeJointSpatialGizmo : public EditorSpatialGizmo {
class HingeJointSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(HingeJointSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(HingeJointSpatialGizmo,EditorSpatialGizmo);
HingeJoint* p3d;
HingeJoint *p3d;
public:
void redraw();
HingeJointSpatialGizmo(HingeJoint* p_p3d=NULL);
HingeJointSpatialGizmo(HingeJoint *p_p3d = NULL);
};
class SliderJointSpatialGizmo : public EditorSpatialGizmo {
class SliderJointSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(SliderJointSpatialGizmo,EditorSpatialGizmo);
OBJ_TYPE(SliderJointSpatialGizmo, EditorSpatialGizmo);
SliderJoint* p3d;
SliderJoint *p3d;
public:
void redraw();
SliderJointSpatialGizmo(SliderJoint* p_p3d=NULL);
SliderJointSpatialGizmo(SliderJoint *p_p3d = NULL);
};
class ConeTwistJointSpatialGizmo : public EditorSpatialGizmo {
class ConeTwistJointSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(ConeTwistJointSpatialGizmo,EditorSpatialGizmo);
OBJ_TYPE(ConeTwistJointSpatialGizmo, EditorSpatialGizmo);
ConeTwistJoint* p3d;
ConeTwistJoint *p3d;
public:
void redraw();
ConeTwistJointSpatialGizmo(ConeTwistJoint* p_p3d=NULL);
ConeTwistJointSpatialGizmo(ConeTwistJoint *p_p3d = NULL);
};
class Generic6DOFJointSpatialGizmo : public EditorSpatialGizmo {
class Generic6DOFJointSpatialGizmo : public EditorSpatialGizmo {
OBJ_TYPE(Generic6DOFJointSpatialGizmo, EditorSpatialGizmo);
OBJ_TYPE(Generic6DOFJointSpatialGizmo,EditorSpatialGizmo);
Generic6DOFJoint* p3d;
Generic6DOFJoint *p3d;
public:
void redraw();
Generic6DOFJointSpatialGizmo(Generic6DOFJoint* p_p3d=NULL);
Generic6DOFJointSpatialGizmo(Generic6DOFJoint *p_p3d = NULL);
};
class SpatialEditorGizmos {
class SpatialEditorGizmos {
public:
Ref<FixedMaterial> create_line_material(const Color& p_base_color);
Ref<FixedMaterial> create_solid_material(const Color& p_base_color);
Ref<FixedMaterial> create_line_material(const Color &p_base_color);
Ref<FixedMaterial> create_solid_material(const Color &p_base_color);
Ref<FixedMaterial> handle2_material;
Ref<FixedMaterial> handle_material;
Ref<FixedMaterial> light_material;
@ -500,7 +425,6 @@ public:
Ref<TriangleMesh> test_cube_tm;
Ref<SpatialEditorGizmo> get_gizmo(Spatial *p_spatial);
SpatialEditorGizmos();