Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

get_window_position() + set_window_position() added

Browse source
This commit is contained in:
hurikhan 2015-01-11 15:47:27 +08:00
parent 291d7992ce
commit ac558c15ea
6 changed files with 74 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/bind/core_bind.cpp
View file

@ -176,6 +176,14 @@ bool _OS::is_video_mode_fullscreen(int p_screen) const {
}
Point2 _OS::get_window_position() const {
return OS::get_singleton()->get_window_position();
}
void _OS::set_window_position(const Point2& p_position) {
OS::get_singleton()->set_window_position(p_position);
}
void _OS::set_fullscreen(bool p_enabled,int p_screen) {
OS::get_singleton()->set_fullscreen(p_enabled, p_screen);
}
@ -641,6 +649,8 @@ void _OS::_bind_methods() {
ObjectTypeDB::bind_method(_MD("get_fullscreen_mode_list","screen"),&_OS::get_fullscreen_mode_list,DEFVAL(0));
//MSC
ObjectTypeDB::bind_method(_MD("get_window_position"),&_OS::get_window_position);
ObjectTypeDB::bind_method(_MD("set_window_position"),&_OS::set_window_position);
ObjectTypeDB::bind_method(_MD("set_fullscreen","enabled","screen"),&_OS::set_fullscreen,DEFVAL(0));
ObjectTypeDB::bind_method(_MD("is_fullscreen"),&_OS::is_fullscreen);

2
core/bind/core_bind.h
View file

@ -109,6 +109,8 @@ public:
Array get_fullscreen_mode_list(int p_screen=0) const;
//MSC
virtual Point2 get_window_position() const;
virtual void set_window_position(const Point2& p_position);
void set_fullscreen(bool p_enabled, int p_screen=0);
bool is_fullscreen() const;

7
core/os/os.h
View file

@ -69,12 +69,11 @@ public:
};
struct VideoMode {
int x,y,width,height;
int width,height;
bool fullscreen;
bool resizable;
float get_aspect() const { return (float)width/(float)height; }
VideoMode(int p_x=0, int p_y=0,int p_width=640,int p_height=480,bool p_fullscreen=false, bool p_resizable = true)
{ x=p_x; y=p_y; width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; }
VideoMode(int p_width=640,int p_height=480,bool p_fullscreen=false, bool p_resizable = true) {width=p_width; height=p_height; fullscreen=p_fullscreen; resizable = p_resizable; }
};
protected:
friend class Main;
@ -152,6 +151,8 @@ public:
virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const=0;
//MSC
virtual Point2 get_window_position() const=0;
virtual void set_window_position(const Point2& p_position)=0;
virtual void set_fullscreen(bool p_enabled,int p_screen=0)=0;
virtual bool is_fullscreen() const=0;