diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-09-15 11:33:30 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-09-15 11:33:30 -0300 |
commit | 8cab401d08f8e25aa9b2dc710204785858ff3dbb (patch) | |
tree | 1a4cec868f937fb24d340ee33fbeba2f1c6fa9f2 /scene/main/viewport.h | |
parent | 1a2cb755e2d8b9d59178f36702f6dff7235b9088 (diff) |
3D Physics Rework, Other Stuff
-=-=-=-=-=-=-=-=-=-=-=-=-=-
3D Physics:
-Fixed "Bounce" parameter in 3D
-Fixed bug affecting Area (sometims it would not detect properly)
-Vehicle Body has seen heavy work
-Added Query API for doing space queries in 3D. Needs some docs though.
-Added JOINTS! Adapted Bullet Joints: and created easy gizmos for setting them up:
-PinJoint
-HingeJoint (with motor)
-SliderJoint
-ConeTwistJoint
-Generic6DOFJoint
-Added OBJECT PICKING! based on the new query API. Any physics object now (Area or Body) has the following signals and virtual functions:
-input_event (mouse or multitouch input over the body)
-mouse_enter (mouse entered the body area)
-mouse_exit (mouse exited body area)
For Area it needs to be activated manually, as it isn't by default (ray goes thru).
Other:
-Begun working on Windows 8 (RT) port. Compiles but does not work yet.
-Added TheoraPlayer library for improved to-texture and portable video support.
-Fixed a few bugs in the renderer, collada importer, collada exporter, etc.
Diffstat (limited to 'scene/main/viewport.h')
-rw-r--r-- | scene/main/viewport.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 6feb89b084..5d68438f0d 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -116,6 +116,13 @@ friend class RenderTargetTexture; bool render_target_filter; bool render_target_gen_mipmaps; + bool physics_object_picking; + List<InputEvent> physics_picking_events; + ObjectID physics_object_capture; + ObjectID physics_object_over; + Vector2 physics_last_mousepos; + void _test_new_mouseover(ObjectID new_collider); + void _update_rect(); void _parent_resized(); @@ -234,6 +241,9 @@ public: void set_render_target_to_screen_rect(const Rect2& p_rect); Rect2 get_render_target_to_screen_rect() const; + void set_physics_object_picking(bool p_enable); + bool get_physics_object_picking(); + Viewport(); ~Viewport(); |