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

Merge pull request #18089 from guilhermefelipecgs/same_cursor_to_diferent_shape 

Allow set_custom_mouse_cursor to use same cursor(image) with different shapes
This commit is contained in:
Rémi Verschelde 2018-04-10 08:07:50 +02:00 committed by GitHub
parent 2cfc284d52 19d2a44e5d
commit b1d4e1be6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/input_default.cpp
View File

@ -413,10 +413,6 @@ void InputDefault::set_mouse_position(const Point2 &p_posf) {
mouse_speed_track.update(p_posf - mouse_pos);
mouse_pos = p_posf;
if (custom_cursor.is_valid()) {
//removed, please insist that we implement hardware cursors
// VisualServer::get_singleton()->cursor_set_pos(get_mouse_position());
}
}
Point2 InputDefault::get_mouse_position() const {
@ -503,11 +499,6 @@ void InputDefault::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_sh
if (Engine::get_singleton()->is_editor_hint())
return;
if (custom_cursor == p_cursor)
return;
custom_cursor = p_cursor;
OS::get_singleton()->set_custom_mouse_cursor(p_cursor, (OS::CursorShape)p_shape, p_hotspot);
}

1
main/input_default.h
View File

@ -115,7 +115,6 @@ class InputDefault : public Input {
SpeedTrack mouse_speed_track;
Map<int, Joypad> joy_names;
int fallback_mapping;
RES custom_cursor;
public:
enum HatMask {