noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

NavMesh

Browse Source 
-=-=-=-

-Fixed NavMesh API
-New NavMesh demo
-Support for animated Particles2D
-Fixes for native video playback on iOS
This commit is contained in:
Juan Linietsky
2014-11-17 07:46:11 -03:00
parent 56b30b31e4
commit d5cb758d36
14 changed files with 224 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/bind/core_bind.cpp
View File

@@ -577,9 +577,9 @@ float _OS::get_frames_per_second() const {
return OS::get_singleton()->get_frames_per_second();
}
Error _OS::native_video_play(String p_path, float p_volume) {
Error _OS::native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track) {
return OS::get_singleton()->native_video_play(p_path, p_volume);
return OS::get_singleton()->native_video_play(p_path, p_volume, p_audio_track, p_subtitle_track);
};
bool _OS::native_video_is_playing() {

2
core/bind/core_bind.h
View File

@@ -108,7 +108,7 @@ public:
bool is_video_mode_resizable(int p_screen=0) const;
Array get_fullscreen_mode_list(int p_screen=0) const;
Error native_video_play(String p_path, float p_volume);
Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track);
bool native_video_is_playing();
void native_video_pause();
void native_video_stop();

2
core/os/os.cpp
View File

@@ -438,7 +438,7 @@ int OS::get_processor_count() const {
return 1;
}
Error OS::native_video_play(String p_path, float p_volume) {
Error OS::native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track) {
return FAILED;
};

2
core/os/os.h
View File

@@ -323,7 +323,7 @@ public:
virtual String get_unique_ID() const;
virtual Error native_video_play(String p_path, float p_volume);
virtual Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track);
virtual bool native_video_is_playing() const;
virtual void native_video_pause();
virtual void native_video_stop();