3D Import Import & UDP

-=-=-=-=-=-=-=-=-=-=-

-Animation Import filter support
-Animation Clip import support
-Animation Optimizer Fixes, Improvements and Visibile Options
-Extremely Experimental UDP support.

5 files changed, 16 insertions, 2 deletions

diff --git a/servers/audio/audio_server_sw.cpp b/servers/audio/audio_server_sw.cpp
index f50813731..55dde1b35 100644
--- a/servers/audio/audio_server_sw.cpp
+++ b/servers/audio/audio_server_sw.cpp
@@ -332,6 +332,7 @@ void AudioServerSW::driver_process_chunk(int p_frames,int32_t *p_buffer) {
 void AudioServerSW::driver_process(int p_frames,int32_t *p_buffer) {
 
 
+	_output_delay=p_frames/double(AudioDriverSW::get_singleton()->get_mix_rate());
 	//process in chunks to make sure to never process more than INTERNAL_BUFFER_SIZE
 	int todo=p_frames;
 	while(todo) {
@@ -795,6 +796,8 @@ void AudioServerSW::init() {
 	mixer = memnew( AudioMixerSW( sample_manager, latency, AudioDriverSW::get_singleton()->get_mix_rate(),mix_chans,mixer_use_fx,mixer_interp,_mixer_callback,this ) );
 	mixer_step_usecs=mixer->get_step_usecs();
 
+	_output_delay=0;
+
 	stream_volume=0.3;
 	// start the audio driver
 	if (AudioDriverSW::get_singleton())
@@ -911,6 +914,11 @@ float AudioServerSW::get_event_voice_global_volume_scale() const {
 	return event_voice_volume_scale;
 }
 
+double AudioServerSW::get_output_delay() const {
+
+	return _output_delay;
+}
+
 double AudioServerSW::get_mix_time() const {
 
 	return AudioDriverSW::get_singleton()->get_mix_time();
diff --git a/servers/audio/audio_server_sw.h b/servers/audio/audio_server_sw.h
index d137c1563..d47c1b4b3 100644
--- a/servers/audio/audio_server_sw.h
+++ b/servers/audio/audio_server_sw.h
@@ -92,6 +92,8 @@ class AudioServerSW : public AudioServer {
 	float peak_left,peak_right;
 	uint32_t max_peak;
 
+	double _output_delay;
+
 	VoiceRBSW voice_rb;
 
 	bool exit_update_thread;
@@ -206,6 +208,9 @@ public:
 
 	virtual double get_mix_time() const; //useful for video -> audio sync
 
+	virtual double get_output_delay() const;
+
+
 	AudioServerSW(SampleManagerSW *p_sample_manager);
 	~AudioServerSW();
 
diff --git a/servers/audio_server.h b/servers/audio_server.h
index 85289de58..511340678 100644
--- a/servers/audio_server.h
+++ b/servers/audio_server.h
@@ -274,6 +274,7 @@ public:
 	static AudioServer *get_singleton();
 
 	virtual double get_mix_time() const=0; //useful for video -> audio sync
+	virtual double get_output_delay() const=0;
 
 	AudioServer();
 	virtual ~AudioServer();
diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp
index 2760f9bea..22fb4fc0a 100644
--- a/servers/physics_2d_server.cpp
+++ b/servers/physics_2d_server.cpp
@@ -514,7 +514,7 @@ void Physics2DServer::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("joint_get_type","joint"),&Physics2DServer::joint_get_type);
 
-	ObjectTypeDB::bind_method(_MD("free","rid"),&Physics2DServer::free);
+	ObjectTypeDB::bind_method(_MD("free_rid","rid"),&Physics2DServer::free);
 
 	ObjectTypeDB::bind_method(_MD("set_active","active"),&Physics2DServer::set_active);
 
diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp
index e6b2927fb..79de253d3 100644
--- a/servers/physics_server.cpp
+++ b/servers/physics_server.cpp
@@ -655,7 +655,7 @@ void PhysicsServer::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("joint_get_type","joint"),&PhysicsServer::joint_get_type);
 */
-	ObjectTypeDB::bind_method(_MD("free","rid"),&PhysicsServer::free);
+	ObjectTypeDB::bind_method(_MD("free_rid","rid"),&PhysicsServer::free);
 
 	ObjectTypeDB::bind_method(_MD("set_active","active"),&PhysicsServer::set_active);