diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-04-02 12:59:23 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-02 12:59:23 -0300 |
commit | 68e42f53badd6a501021e545c09b2c41ad21e1e0 (patch) | |
tree | 11947092ec325e1970a468c91eaf9bb539d37e59 /platform/server/os_server.cpp | |
parent | 1572238adb5b68e18cf20ec73b2f437736e21152 (diff) |
Beta1 Attempt #1
-=-==-=-=-=-=-=-
-Small fixes in canvas item light shader
-Fixed compilation in server target
-Export for Android makes 32 bits display as default
-changed version to 1.1beta1
Diffstat (limited to 'platform/server/os_server.cpp')
-rw-r--r-- | platform/server/os_server.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 7bc8f61744..1aabf5337b 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -56,7 +56,6 @@ void OS_Server::initialize(const VideoMode& p_desired,int p_video_driver,int p_a args=OS::get_singleton()->get_cmdline_args(); current_videomode=p_desired; main_loop=NULL; - rasterizer = memnew( RasterizerDummy ); @@ -163,6 +162,12 @@ OS::VideoMode OS_Server::get_video_mode(int p_screen) const { return current_videomode; } + +Size2 OS_Server::get_window_size() const { + + return Vector2(current_videomode.width,current_videomode.height) ; +} + void OS_Server::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) const { |