diff options
Diffstat (limited to 'platform/haiku/os_haiku.cpp')
| -rw-r--r-- | platform/haiku/os_haiku.cpp | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index b9b95ddac..0853fac39 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -28,16 +28,15 @@ /*************************************************************************/ #include <Screen.h> -#include "servers/visual/visual_server_raster.h" -#include "servers/visual/visual_server_wrap_mt.h" #include "drivers/gles2/rasterizer_gles2.h" #include "servers/physics/physics_server_sw.h" +#include "servers/visual/visual_server_raster.h" +#include "servers/visual/visual_server_wrap_mt.h" //#include "servers/physics_2d/physics_2d_server_wrap_mt.h" #include "main/main.h" #include "os_haiku.h" - OS_Haiku::OS_Haiku() { #ifdef MEDIA_KIT_ENABLED AudioDriverManager::add_driver(&driver_media_kit); @@ -53,8 +52,8 @@ void OS_Haiku::run() { context_gl->release_current(); // TODO: clean up - BMessenger* bms = new BMessenger(window); - BMessage* msg = new BMessage(); + BMessenger *bms = new BMessenger(window); + BMessage *msg = new BMessage(); bms->SendMessage(LOCKGL_MSG, msg); window->StartMessageRunner(); @@ -76,7 +75,7 @@ int OS_Haiku::get_video_driver_count() const { return 1; } -const char* OS_Haiku::get_video_driver_name(int p_driver) const { +const char *OS_Haiku::get_video_driver_name(int p_driver) const { return "GLES2"; } @@ -84,7 +83,7 @@ OS::VideoMode OS_Haiku::get_default_video_mode() const { return OS::VideoMode(800, 600, false); } -void OS_Haiku::initialize(const VideoMode& p_desired, int p_video_driver, int p_audio_driver) { +void OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { main_loop = NULL; current_video_mode = p_desired; @@ -143,8 +142,8 @@ void OS_Haiku::initialize(const VideoMode& p_desired, int p_video_driver, int p_ if (AudioDriverManager::get_driver(p_audio_driver)->init() != OK) { ERR_PRINT("Initializing audio failed."); } - - power_manager = memnew( PowerHaiku ); + + power_manager = memnew(PowerHaiku); } void OS_Haiku::finalize() { @@ -171,13 +170,13 @@ void OS_Haiku::finalize() { #endif } -void OS_Haiku::set_main_loop(MainLoop* p_main_loop) { +void OS_Haiku::set_main_loop(MainLoop *p_main_loop) { main_loop = p_main_loop; input->set_main_loop(p_main_loop); window->SetMainLoop(p_main_loop); } -MainLoop* OS_Haiku::get_main_loop() const { +MainLoop *OS_Haiku::get_main_loop() const { return main_loop; } @@ -235,7 +234,7 @@ void OS_Haiku::set_current_screen(int p_screen) { Point2 OS_Haiku::get_screen_position(int p_screen) const { // TODO: make this work with the p_screen parameter - BScreen* screen = new BScreen(window); + BScreen *screen = new BScreen(window); BRect frame = screen->Frame(); delete screen; return Point2i(frame.left, frame.top); @@ -243,13 +242,13 @@ Point2 OS_Haiku::get_screen_position(int p_screen) const { Size2 OS_Haiku::get_screen_size(int p_screen) const { // TODO: make this work with the p_screen parameter - BScreen* screen = new BScreen(window); + BScreen *screen = new BScreen(window); BRect frame = screen->Frame(); delete screen; return Size2i(frame.IntegerWidth() + 1, frame.IntegerHeight() + 1); } -void OS_Haiku::set_window_title(const String& p_title) { +void OS_Haiku::set_window_title(const String &p_title) { window->SetTitle(p_title.utf8().get_data()); } @@ -269,7 +268,7 @@ Point2 OS_Haiku::get_window_position() const { return Point2i(point.x, point.y); } -void OS_Haiku::set_window_position(const Point2& p_position) { +void OS_Haiku::set_window_position(const Point2 &p_position) { window->MoveTo(p_position.x, p_position.y); } @@ -316,7 +315,7 @@ bool OS_Haiku::is_window_maximized() const { return !window->IsMinimized(); } -void OS_Haiku::set_video_mode(const VideoMode& p_video_mode, int p_screen) { +void OS_Haiku::set_video_mode(const VideoMode &p_video_mode, int p_screen) { ERR_PRINT("set_video_mode() NOT IMPLEMENTED"); } |
