summaryrefslogtreecommitdiffstats
path: root/drivers/register_driver_types.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-09-15 11:33:30 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-09-15 11:33:30 -0300
commit8cab401d08f8e25aa9b2dc710204785858ff3dbb (patch)
tree1a4cec868f937fb24d340ee33fbeba2f1c6fa9f2 /drivers/register_driver_types.cpp
parent1a2cb755e2d8b9d59178f36702f6dff7235b9088 (diff)
downloadredot-engine-8cab401d08f8e25aa9b2dc710204785858ff3dbb.tar.gz
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 'drivers/register_driver_types.cpp')
-rw-r--r--drivers/register_driver_types.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp
index e2af1e5336..e4bb1a343a 100644
--- a/drivers/register_driver_types.cpp
+++ b/drivers/register_driver_types.cpp
@@ -43,9 +43,11 @@
#endif
#ifdef THEORA_ENABLED
-#include "theora/video_stream_theora.h"
+//#include "theora/video_stream_theora.h"
+#include "theoraplayer/video_stream_theoraplayer.h"
#endif
+
#include "drivers/trex/regex.h"
#ifdef MUSEPACK_ENABLED
@@ -88,7 +90,8 @@ static ResourceFormatLoaderAudioStreamSpeex *speex_stream_loader=NULL;
#endif
#ifdef THEORA_ENABLED
-static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL;
+//static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL;
+static ResourceFormatLoaderVideoStreamTheoraplayer* theoraplayer_stream_loader = NULL;
#endif
#ifdef MUSEPACK_ENABLED
@@ -202,11 +205,15 @@ void register_driver_types() {
#endif
#ifdef THEORA_ENABLED
- theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora );
- ResourceLoader::add_resource_format_loader(theora_stream_loader);
- ObjectTypeDB::register_type<VideoStreamTheora>();
+ //theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora );
+ //ResourceLoader::add_resource_format_loader(theora_stream_loader);
+ //ObjectTypeDB::register_type<VideoStreamTheora>();
+ theoraplayer_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheoraplayer );
+ ResourceLoader::add_resource_format_loader(theoraplayer_stream_loader);
+ ObjectTypeDB::register_type<VideoStreamTheoraplayer>();
#endif
+
#ifdef TOOLS_ENABLED
#ifdef SQUISH_ENABLED
@@ -234,8 +241,8 @@ void unregister_driver_types() {
#endif
#ifdef THEORA_ENABLED
-
- memdelete (theora_stream_loader);
+ //memdelete (theora_stream_loader);
+ memdelete (theoraplayer_stream_loader);
#endif
#ifdef MUSEPACK_ENABLED