From 0c7b75d8d82d7a0c2b9347c7a2096a86a349fe7f Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 15 Sep 2014 11:33:30 -0300 Subject: 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. --- platform/iphone/detect.py | 2 +- platform/iphone/gl_view.mm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'platform/iphone') diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index 9df9dc16c1..2065d459cd 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -28,7 +28,7 @@ def get_opts(): ('ios_gles22_override', 'Force GLES2.0 on iOS', 'yes'), ('ios_GLES1_override', 'Force legacy GLES (1.1) on iOS', 'no'), ('ios_appirater', 'Enable Appirater', 'no'), - ('ios_exceptions', 'Use exceptions when compiling on playbook', 'no'), + ('ios_exceptions', 'Use exceptions when compiling on playbook', 'yes'), ] def get_flags(): diff --git a/platform/iphone/gl_view.mm b/platform/iphone/gl_view.mm index 500c7c7174..06b679c305 100755 --- a/platform/iphone/gl_view.mm +++ b/platform/iphone/gl_view.mm @@ -70,7 +70,7 @@ bool _play_video(String p_path, float p_volume) { float player_volume = p_volume * AudioServer::get_singleton()->get_singleton()->get_stream_global_volume_scale(); video_previous_volume = [[MPMusicPlayerController applicationMusicPlayer] volume]; - [[MPMusicPlayerController applicationMusicPlayer] setVolume: player_volume]; + //[[MPMusicPlayerController applicationMusicPlayer] setVolume: player_volume]; p_path = Globals::get_singleton()->globalize_path(p_path); @@ -113,7 +113,7 @@ void _pause_video() { void _stop_video() { [_instance.moviePlayerController stop]; [_instance.moviePlayerController.view removeFromSuperview]; - [[MPMusicPlayerController applicationMusicPlayer] setVolume: video_previous_volume]; + //[[MPMusicPlayerController applicationMusicPlayer] setVolume: video_previous_volume]; video_playing = false; } @@ -554,7 +554,7 @@ static void clear_touches() { [_instance.moviePlayerController stop]; [_instance.moviePlayerController.view removeFromSuperview]; - [[MPMusicPlayerController applicationMusicPlayer] setVolume: video_previous_volume]; + //[[MPMusicPlayerController applicationMusicPlayer] setVolume: video_previous_volume]; video_playing = false; } -- cgit v1.2.3