godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made InputEvent use floating point coordinates.

This commit is contained in:
Juan Linietsky 2017-01-12 00:12:54 -03:00
parent bfef8de1bc
commit c84d618b4e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/os/input_event.h
View File

@ -205,8 +205,8 @@ struct InputEventMouse {
InputModifierState mod; InputModifierState mod;
int button_mask; int button_mask;
int x,y; float x,y;
int global_x,global_y; float global_x,global_y;
int pointer_index; int pointer_index;
}; };
@ -221,7 +221,7 @@ struct InputEventMouseButton : public InputEventMouse {
struct InputEventMouseMotion : public InputEventMouse { struct InputEventMouseMotion : public InputEventMouse {
int relative_x,relative_y; float relative_x,relative_y;
float speed_x,speed_y; float speed_x,speed_y;
}; };
@ -241,14 +241,14 @@ struct InputEventJoypadButton {
struct InputEventScreenTouch { struct InputEventScreenTouch {
int index; int index;
int x,y; float x,y;
bool pressed; bool pressed;
}; };
struct InputEventScreenDrag { struct InputEventScreenDrag {
int index; int index;
int x,y; float x,y;
int relative_x,relative_y; float relative_x,relative_y;
float speed_x,speed_y; float speed_x,speed_y;
}; };

12
core/variant_op.cpp
View File

@ -2836,18 +2836,18 @@ void Variant::get_property_list(List<PropertyInfo> *p_list) const {
if (ie.type==InputEvent::MOUSE_MOTION || ie.type==InputEvent::MOUSE_BUTTON) { if (ie.type==InputEvent::MOUSE_MOTION || ie.type==InputEvent::MOUSE_BUTTON) {
p_list->push_back( PropertyInfo(Variant::INT,"button_mask") ); p_list->push_back( PropertyInfo(Variant::INT,"button_mask") );
p_list->push_back( PropertyInfo(Variant::INT,"x") ); p_list->push_back( PropertyInfo(Variant::REAL,"x") );
p_list->push_back( PropertyInfo(Variant::INT,"y") ); p_list->push_back( PropertyInfo(Variant::REAL,"y") );
p_list->push_back( PropertyInfo(Variant::VECTOR2,"pos") ); p_list->push_back( PropertyInfo(Variant::VECTOR2,"pos") );
p_list->push_back( PropertyInfo(Variant::INT,"global_x") ); p_list->push_back( PropertyInfo(Variant::REAL,"global_x") );
p_list->push_back( PropertyInfo(Variant::INT,"global_y") ); p_list->push_back( PropertyInfo(Variant::REAL,"global_y") );
p_list->push_back( PropertyInfo(Variant::VECTOR2,"global_pos") ); p_list->push_back( PropertyInfo(Variant::VECTOR2,"global_pos") );
if (ie.type==InputEvent::MOUSE_MOTION) { if (ie.type==InputEvent::MOUSE_MOTION) {
p_list->push_back( PropertyInfo(Variant::INT,"relative_x") ); p_list->push_back( PropertyInfo(Variant::REAL,"relative_x") );
p_list->push_back( PropertyInfo(Variant::INT,"relative_y") ); p_list->push_back( PropertyInfo(Variant::REAL,"relative_y") );
p_list->push_back( PropertyInfo(Variant::VECTOR2,"relative_pos") ); p_list->push_back( PropertyInfo(Variant::VECTOR2,"relative_pos") );
p_list->push_back( PropertyInfo(Variant::REAL,"speed_x") ); p_list->push_back( PropertyInfo(Variant::REAL,"speed_x") );
p_list->push_back( PropertyInfo(Variant::REAL,"speed_y") ); p_list->push_back( PropertyInfo(Variant::REAL,"speed_y") );