summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--platform/osx/SCsub2
-rw-r--r--platform/osx/joypad_osx.cpp (renamed from platform/osx/joystick_osx.cpp)3
-rw-r--r--platform/osx/joypad_osx.h (renamed from platform/osx/joystick_osx.h)0
-rw-r--r--platform/osx/os_osx.mm6
-rw-r--r--platform/uwp/SCsub2
-rw-r--r--platform/uwp/joypad_uwp.cpp (renamed from platform/uwp/joystick_uwp.cpp)2
-rw-r--r--platform/uwp/joypad_uwp.h (renamed from platform/uwp/joystick_uwp.h)2
-rw-r--r--platform/windows/SCsub2
-rw-r--r--platform/windows/joypad.cpp (renamed from platform/windows/joystick.cpp)0
-rw-r--r--platform/windows/joypad.h (renamed from platform/windows/joystick.h)0
-rw-r--r--platform/x11/SCsub2
-rw-r--r--platform/x11/joypad_linux.cpp (renamed from platform/x11/joystick_linux.cpp)4
-rw-r--r--platform/x11/joypad_linux.h (renamed from platform/x11/joystick_linux.h)3
-rw-r--r--platform/x11/os_x11.h2
-rw-r--r--tools/editor/icons/2x/icon_joypad.png (renamed from tools/editor/icons/2x/icon_joystick.png)bin380 -> 380 bytes
-rw-r--r--tools/editor/icons/icon_joypad.png (renamed from tools/editor/icons/icon_joystick.png)bin239 -> 239 bytes
-rw-r--r--tools/editor/icons/source/icon_joypad.svg (renamed from tools/editor/icons/source/icon_joystick.svg)2
17 files changed, 17 insertions, 15 deletions
diff --git a/platform/osx/SCsub b/platform/osx/SCsub
index c8e0e17612..00f23687cf 100644
--- a/platform/osx/SCsub
+++ b/platform/osx/SCsub
@@ -9,7 +9,7 @@ files = [
'sem_osx.cpp',
# 'context_gl_osx.cpp',
'dir_access_osx.mm',
- 'joystick_osx.cpp',
+ 'joypad_osx.cpp',
]
env.Program('#bin/godot', files)
diff --git a/platform/osx/joystick_osx.cpp b/platform/osx/joypad_osx.cpp
index 18c714e922..4a8744d3aa 100644
--- a/platform/osx/joystick_osx.cpp
+++ b/platform/osx/joypad_osx.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* joypad_osx.cpp */
+/* joypad_osx.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -27,6 +27,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "joypad_osx.h"
+
#include <machine/endian.h>
#define GODOT_JOY_LOOP_RUN_MODE CFSTR("GodotJoypad")
diff --git a/platform/osx/joystick_osx.h b/platform/osx/joypad_osx.h
index aafd82880d..aafd82880d 100644
--- a/platform/osx/joystick_osx.h
+++ b/platform/osx/joypad_osx.h
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 548d33ebfa..a66f6abba5 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1122,7 +1122,7 @@ void OS_OSX::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
physics_2d_server->init();
input = memnew( InputDefault );
- joystick_osx = memnew( JoystickOSX );
+ joypad_osx = memnew( JoypadOSX );
_ensure_data_dir();
@@ -1165,7 +1165,7 @@ void OS_OSX::finalize() {
spatial_sound_2d_server->finish();
memdelete(spatial_sound_2d_server);
- memdelete(joystick_osx);
+ memdelete(joypad_osx);
memdelete(input);
memdelete(sample_manager);
@@ -1738,7 +1738,7 @@ void OS_OSX::run() {
while (!force_quit) {
process_events(); // get rid of pending events
- last_id = joystick_osx->process_joysticks(last_id);
+ last_id = joypad_osx->process_joypads(last_id);
if (Main::iteration()==true)
break;
};
diff --git a/platform/uwp/SCsub b/platform/uwp/SCsub
index 430d4ef9e7..0167ea9e02 100644
--- a/platform/uwp/SCsub
+++ b/platform/uwp/SCsub
@@ -8,7 +8,7 @@ files = [
'#platform/windows/packet_peer_udp_winsock.cpp',
'#platform/windows/stream_peer_winsock.cpp',
'#platform/windows/key_mapping_win.cpp',
- 'joystick_uwp.cpp',
+ 'joypad_uwp.cpp',
'gl_context_egl.cpp',
'app.cpp',
'os_uwp.cpp',
diff --git a/platform/uwp/joystick_uwp.cpp b/platform/uwp/joypad_uwp.cpp
index e26b81bb6d..7f0837d7be 100644
--- a/platform/uwp/joystick_uwp.cpp
+++ b/platform/uwp/joypad_uwp.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* joypad_uwp.cpp */
+/* joypad_uwp.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
diff --git a/platform/uwp/joystick_uwp.h b/platform/uwp/joypad_uwp.h
index 7e15e5ddb1..90505b409a 100644
--- a/platform/uwp/joystick_uwp.h
+++ b/platform/uwp/joypad_uwp.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* joypad_uwp.h */
+/* joypad_uwp.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index 32c23b906a..ae8c07384f 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -11,7 +11,7 @@ common_win = [
"tcp_server_winsock.cpp",
"packet_peer_udp_winsock.cpp",
"stream_peer_winsock.cpp",
- "joystick.cpp",
+ "joypad.cpp",
]
restarget = "godot_res" + env["OBJSUFFIX"]
diff --git a/platform/windows/joystick.cpp b/platform/windows/joypad.cpp
index 9324031142..9324031142 100644
--- a/platform/windows/joystick.cpp
+++ b/platform/windows/joypad.cpp
diff --git a/platform/windows/joystick.h b/platform/windows/joypad.h
index 8875e6d0cf..8875e6d0cf 100644
--- a/platform/windows/joystick.h
+++ b/platform/windows/joypad.h
diff --git a/platform/x11/SCsub b/platform/x11/SCsub
index 0defd4f025..4ae8ac07f7 100644
--- a/platform/x11/SCsub
+++ b/platform/x11/SCsub
@@ -7,7 +7,7 @@ common_x11 = [\
"context_gl_x11.cpp",\
"os_x11.cpp",\
"key_mapping_x11.cpp",\
- "joystick_linux.cpp",\
+ "joypad_linux.cpp",\
]
env.Program('#bin/godot', ['godot_x11.cpp'] + common_x11)
diff --git a/platform/x11/joystick_linux.cpp b/platform/x11/joypad_linux.cpp
index bef2ef3fc6..f07d34b5e0 100644
--- a/platform/x11/joystick_linux.cpp
+++ b/platform/x11/joypad_linux.cpp
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* joypad_linux.cpp */
+/* joypad_linux.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,7 +30,7 @@
//author: Andreas Haas <hondres, liugam3@gmail.com>
#ifdef JOYDEV_ENABLED
-#include "joystick_linux.h"
+#include "joypad_linux.h"
#include <linux/input.h>
#include <unistd.h>
diff --git a/platform/x11/joystick_linux.h b/platform/x11/joypad_linux.h
index ebd1e82104..92687995fb 100644
--- a/platform/x11/joystick_linux.h
+++ b/platform/x11/joypad_linux.h
@@ -1,5 +1,5 @@
/*************************************************************************/
-/* joypad_linux.h */
+/* joypad_linux.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@@ -30,6 +30,7 @@
//author: Andreas Haas <hondres, liugam3@gmail.com>
#ifndef JOYPAD_LINUX_H
#define JOYPAD_LINUX_H
+
#ifdef JOYDEV_ENABLED
#include "main/input_default.h"
#include "os/thread.h"
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 4f9ff71298..66974da3c1 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -48,7 +48,7 @@
#include "servers/physics_2d/physics_2d_server_sw.h"
#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
#include "main/input_default.h"
-#include "joystick_linux.h"
+#include "joypad_linux.h"
#include <X11/keysym.h>
#include <X11/Xlib.h>
diff --git a/tools/editor/icons/2x/icon_joystick.png b/tools/editor/icons/2x/icon_joypad.png
index 285d048544..285d048544 100644
--- a/tools/editor/icons/2x/icon_joystick.png
+++ b/tools/editor/icons/2x/icon_joypad.png
Binary files differ
diff --git a/tools/editor/icons/icon_joystick.png b/tools/editor/icons/icon_joypad.png
index 5df471109a..5df471109a 100644
--- a/tools/editor/icons/icon_joystick.png
+++ b/tools/editor/icons/icon_joypad.png
Binary files differ
diff --git a/tools/editor/icons/source/icon_joystick.svg b/tools/editor/icons/source/icon_joypad.svg
index 5395060175..fb84462919 100644
--- a/tools/editor/icons/source/icon_joystick.svg
+++ b/tools/editor/icons/source/icon_joypad.svg
@@ -18,7 +18,7 @@
inkscape:export-filename="/home/djrm/Projects/godot/tools/editor/icons/icon_key.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
- sodipodi:docname="icon_joystick.svg">
+ sodipodi:docname="icon_joypad.svg">
<defs
id="defs4" />
<sodipodi:namedview
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:20:41 +0000