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/resources/video_stream.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/resources/video_stream.h')
-rw-r--r-- | scene/resources/video_stream.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/scene/resources/video_stream.h b/scene/resources/video_stream.h index 32bc8670f0..eafacce159 100644 --- a/scene/resources/video_stream.h +++ b/scene/resources/video_stream.h @@ -33,19 +33,37 @@ -class VideoStream : public AudioStreamResampled { +class VideoStream : public Resource { - OBJ_TYPE(VideoStream,AudioStreamResampled); + OBJ_TYPE(VideoStream,Resource); protected: static void _bind_methods(); public: + virtual void stop()=0; + virtual void play()=0; + + virtual bool is_playing() const=0; + + virtual void set_paused(bool p_paused)=0; + virtual bool is_paused(bool p_paused) const=0; + + virtual void set_loop(bool p_enable)=0; + virtual bool has_loop() const=0; + + virtual float get_length() const=0; + + virtual float get_pos() const=0; + virtual void seek_pos(float p_time)=0; + virtual int get_pending_frame_count() const=0; virtual Image pop_frame()=0; virtual Image peek_frame() const=0; + virtual void update(float p_time)=0; + VideoStream(); }; |