From b324ff7ea584676fcc3292808d7e7ea609982f8e Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 14 May 2014 01:22:15 -0300 Subject: A bit of everything: -IMA-ADPCM support for samples, this means that sound effects can be compressed and use 4 timess less RAM. -New 3D import workflow based on Wavefront OBJ. Import single objects as mesh resources instead of full scenes. Many people prefers to work this way. Just like the rest of the imported resources, these are updated in realtime if modified externally. -Mesh resources now support naming surfaces. This helps reimporting to identify which user-created materials must be kept. -Several fixes and improvements to SurfaceTool. -Anti Aliasing added to WorldEnvironment effects (using FXAA) -2D Physics bodies (RigidBody, KinematicBody, etc), Raycasts, Tilemap, etc support collision layers. This makes easy to group which objects collide against which. -2D Trigger shapes can now also trigger collision reporting in other 2D bodies (it used to be in Area2D before) -Viewport render target textures can now be filtered. -Few fixes in GDscript make it easier to work with static functions and class members. -Several and many bugfixes. --- core/os/main_loop.h | 3 ++- core/os/os.cpp | 4 ++-- core/os/os.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'core/os') diff --git a/core/os/main_loop.h b/core/os/main_loop.h index b84d2841e1..6eb5881175 100644 --- a/core/os/main_loop.h +++ b/core/os/main_loop.h @@ -50,7 +50,8 @@ public: NOTIFICATION_WM_FOCUS_IN = 5, NOTIFICATION_WM_FOCUS_OUT = 6, NOTIFICATION_WM_QUIT_REQUEST = 7, - NOTIFICATION_WM_UNFOCUS_REQUEST = 8 + NOTIFICATION_WM_UNFOCUS_REQUEST = 8, + NOTIFICATION_OS_MEMORY_WARNING = 9, }; virtual void input_event( const InputEvent& p_event ); diff --git a/core/os/os.cpp b/core/os/os.cpp index 65d6ed50b2..11290409d5 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -225,7 +225,7 @@ void OS::print_all_resources(String p_to_file) { void OS::print_resources_in_use(bool p_short) { - //ResourceCache::dump(NULL,p_short); + ResourceCache::dump(NULL,p_short); } void OS::dump_resources_to_file(const char* p_file) { @@ -438,7 +438,7 @@ int OS::get_processor_count() const { return 1; } -Error OS::native_video_play(String p_path) { +Error OS::native_video_play(String p_path, float p_volume) { return FAILED; }; diff --git a/core/os/os.h b/core/os/os.h index e7fe0cb09e..24e2b4f2d4 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -321,7 +321,7 @@ public: virtual String get_unique_ID() const; - virtual Error native_video_play(String p_path); + virtual Error native_video_play(String p_path, float p_volume); virtual bool native_video_is_playing() const; virtual void native_video_pause(); virtual void native_video_stop(); -- cgit v1.2.3