mirror of
https://github.com/godotengine/godot.git
synced 2025-01-20 00:41:05 +00:00
Finish replacement of joystick by joypad
Some parts were forgotten in 547a577.
This commit is contained in:
Rémi Verschelde
parent
c2310b41fa
commit
5bfa4227b3
@ -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)
|
||||
|
||||
@ -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")
|
||||
@ -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;
|
||||
};
|
||||
|
||||
@ -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',
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*************************************************************************/
|
||||
/* joypad_uwp.cpp */
|
||||
/* joypad_uwp.cpp */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
@ -1,5 +1,5 @@
|
||||
/*************************************************************************/
|
||||
/* joypad_uwp.h */
|
||||
/* joypad_uwp.h */
|
||||
/*************************************************************************/
|
||||
/* This file is part of: */
|
||||
/* GODOT ENGINE */
|
||||
@ -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"]
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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>
|
||||
@ -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"
|
||||
@ -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>
|
||||
|
||||
|
Before Width: | Height: | Size: 380 B After Width: | Height: | Size: 380 B |
|
Before Width: | Height: | Size: 239 B After Width: | Height: | Size: 239 B |
@ -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
|
||||
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
Loading…
Reference in New Issue
Block a user