Merge branch 'sdl2' of https://github.com/midwan/amiberry into sdl2
This commit is contained in:
Dimitris Panokostas
commit
a950551682
7 changed files with 47 additions and 360 deletions
7
.gitattributes
vendored
7
.gitattributes
vendored
|
|
@ -1,13 +1,6 @@
|
|||
# Auto detect text files and perform LF normalization
|
||||
* text=auto
|
||||
|
||||
# Explicitly declare text files you want to always be normalized and converted
|
||||
# to native line endings on checkout.
|
||||
*.c text
|
||||
*.h text
|
||||
*.cpp text
|
||||
*.hpp text
|
||||
|
||||
# Declare files that will always have CRLF line endings on checkout.
|
||||
*.sln text eol=crlf
|
||||
|
||||
|
|
|
|||
30
README.md
30
README.md
|
|
@ -1,7 +1,12 @@
|
|||
Amiga emulator for the Raspberry Pi
|
||||
=================================
|
||||
Warning: this branch is still Work In Progress - it requires a few extra steps to build and some things may not be finished yet! :)
|
||||
If you're looking for the latest "stable" version, please use the master branch for now.
|
||||
Once this branch is complete, it will be merged back to the master and replace it.
|
||||
|
||||
# History (newest first)
|
||||
- Ported to SDL2
|
||||
- Added new Picasso resolutions
|
||||
- Added NetBeans project
|
||||
- Added Visual Studio solution using VC++ for Linux
|
||||
- Fixed bugs related to video and audio glitches
|
||||
|
|
@ -22,10 +27,13 @@ Amiga emulator for the Raspberry Pi
|
|||
- Optimizations for Pi 3 added
|
||||
- New target platform: Pi 3
|
||||
|
||||
To get full screen SDL2 support from the console on the Raspberry Pi, you will have to compile SDL2 from source. First you will need to get all the necessary tools:
|
||||
# Compiling from source
|
||||
To get full screen SDL2 support from the console on the Raspberry Pi, you will have to compile SDL2 from source. That is because the OpenGL driver is on higher priority than the OpenGL ES2 one on the Pi, and the OpenGL driver requires X11. If you don't mind that and you want to run the emulator under X11 only, then you can skip this step and install SDL2 from the package manager instead. Otherwise, you can just copy paste the following commands in your terminal.
|
||||
|
||||
First you will need to get all the necessary tools and requirements for SDL2:
|
||||
|
||||
sudo apt-get update && sudo apt-get upgrade
|
||||
sudo apt-get install build-essential libfreeimage-dev libopenal-dev libpango1.0-dev libsndfile-dev libudev-dev libasound2-dev libjpeg8-dev libtiff5-dev libwebp-dev automake
|
||||
sudo apt-get install build-essential libfreeimage-dev libopenal-dev libpango1.0-dev libsndfile-dev libudev-dev libasound2-dev libtiff5-dev libwebp-dev automake libegl1-mesa-dev libgl1-mesa-dev libgles2-mesa-dev
|
||||
|
||||
Then download the SDL2 source tarball (currently on v2.0.5):
|
||||
|
||||
|
|
@ -34,9 +42,9 @@ Then download the SDL2 source tarball (currently on v2.0.5):
|
|||
tar zxvf SDL2-2.0.5.tar.gz
|
||||
cd SDL2-2.0.5 && mkdir build && cd build
|
||||
|
||||
Next, configure SDL2 to use only the OpenGL ES backend directly from the console:
|
||||
Next, configure SDL2 to disable OpenGL, in order to be able to open screens directly from the console using OpenGL ES2 instead:
|
||||
|
||||
../configure --disable-pulseaudio --disable-esd --disable-video-mir --disable-video-wayland --disable-video-x11 --disable-video-opengl
|
||||
../configure --disable-pulseaudio --disable-esd --disable-video-x11 --disable-video-opengl
|
||||
|
||||
Compile and install SDL2:
|
||||
|
||||
|
|
@ -45,14 +53,14 @@ Compile and install SDL2:
|
|||
Next, we need SDL2_image (currently v2.0.1):
|
||||
|
||||
cd ~
|
||||
wget http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz
|
||||
wget https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.tar.gz
|
||||
tar zxvf SDL2_image-2.0.1.tar.gz
|
||||
cd SDL2_image-2.0.1 && mkdir build && cd build
|
||||
../configure
|
||||
make -j 4
|
||||
sudo make install
|
||||
|
||||
And finally, SDL2_ttf (currently v2.0.14):
|
||||
Next, SDL2_ttf (currently v2.0.14):
|
||||
|
||||
cd ~
|
||||
wget https://libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.14.tar.gz
|
||||
|
|
@ -62,6 +70,16 @@ And finally, SDL2_ttf (currently v2.0.14):
|
|||
make -j 4
|
||||
sudo make install
|
||||
|
||||
Finally, SDL2_mixer (currently v2.0.1):
|
||||
|
||||
cd ~
|
||||
wget https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.1.tar.gz
|
||||
tar zxvf SDL2_mixer-2.0.1.tar.gz
|
||||
cd SDL2_mixer-2.0.1 && mkdir build && cd build
|
||||
../configure
|
||||
make -j 4
|
||||
sudo make install
|
||||
|
||||
With SDL2 installed, you can proceed to install Amiberry as follows:
|
||||
|
||||
Install the following packages:
|
||||
|
|
|
|||
|
|
@ -1,331 +0,0 @@
|
|||
UAE4ARM - Pandora edition
|
||||
|
||||
Version 1.0.0.12
|
||||
|
||||
Thanks to all for working on the different versions of UAE this emulator based on:
|
||||
- Toni Wilen
|
||||
- Chui for the UAE4all emulator
|
||||
- Notaz for the GP2X port
|
||||
- Pickle for the Wiz port
|
||||
- john4p for his work on the Pandora version
|
||||
- tuki_cat for improved keyboard gfx and betatesting
|
||||
- lubomyr for the Android version
|
||||
- all people from aranym project for the ARM JIT
|
||||
|
||||
|
||||
Description
|
||||
|
||||
A fast and optimized Amiga Emulator
|
||||
|
||||
Features: AGA/OCS/ECS, 68000, 68020 and 68040 emulation, harddisk-support, WHDLoad-support, Chip/Slow/Fast-mem settings,
|
||||
savestates, vsync, most games (not AGA) run fullspeed at 600 MHz with no frameskip and lot of AGA games run fullspeed
|
||||
at 1000 MHz, smooth 50Hz scrolling, custom controls, custom screen modes, screen positioning, heavy/medium/light manual
|
||||
autofire, nub mouse input, support for stylus input
|
||||
|
||||
This version based on UAE4ALL for Pandora. Instead of implement the changes in UAE4ALL, I decided to start a new project.
|
||||
UAE4ALL is in a stable state and there are fundamental changes like switching to a new 68000 core for the new version
|
||||
which may cause new bugs, performance losses and breaks compatibility to few games.
|
||||
|
||||
The main differences to UAE4ALL:
|
||||
- Different 68000 core (newcpu instead of FAME/C) with support for 32 bit addressing mode
|
||||
- Support for 68030 and 68040 cpus
|
||||
- FPU (68881, 68882 and internal 68040)
|
||||
- JIT
|
||||
- Autodetect Amiga ROMs
|
||||
- Up to 5 HDDs
|
||||
- Lot of new audio options
|
||||
- Picasso96
|
||||
- GUI
|
||||
- bsdsockets
|
||||
- RDB hardfiles
|
||||
- Support for rp9
|
||||
- CD32 support
|
||||
|
||||
What's missing compared to WinUAE:
|
||||
- Cycle exact emulation of cpu and blitter
|
||||
- SCSI support
|
||||
- AHI
|
||||
- Builtin debugger
|
||||
and some more...
|
||||
|
||||
|
||||
Index
|
||||
|
||||
1. Setup
|
||||
|
||||
2. Controls
|
||||
2.1 General and quick keys (outside of GUI)
|
||||
2.2 Nubs as mouse
|
||||
2.3 dPad as mouse
|
||||
2.4 Mousehack enabled
|
||||
2.5 Specific controls inside GUI
|
||||
|
||||
3. GUI
|
||||
3.1 Paths
|
||||
3.2 Configurations
|
||||
3.3 CPU and FPU
|
||||
3.4 Chipset
|
||||
3.5 ROM
|
||||
3.6 RAM
|
||||
3.7 Floppy drives
|
||||
3.8 Hard drives / CD
|
||||
3.9 Display
|
||||
3.10 Sound
|
||||
3.11 Input
|
||||
3.12 Miscellaneous
|
||||
3.13 Savestates
|
||||
|
||||
|
||||
------------------------------------
|
||||
|
||||
1. Setup
|
||||
|
||||
Place the UAE4ARM PND in the required directory (menu, desktop or apps). Running it for the first time will create the
|
||||
necessary folders in pandora/appdata on you SD card.
|
||||
|
||||
In order to use UAE4ARM you need an Amiga Bios image (kickstart rom). Place all your roms and the keyfiles (if required)
|
||||
in the appdata folder of UAE4ARM and select this folder with the GUI (goto page Paths, choose folder in option "System ROMS"
|
||||
and click on "Rescan ROMs").
|
||||
|
||||
To use rp9, you have to copy the rp9 files and the files workbench-135.hdf, workbench-211.hdf and workbench-311.hdf from
|
||||
the AmigaForever data folder to appdata/uae4arm/rp9.
|
||||
|
||||
|
||||
------------------------------------
|
||||
|
||||
2. Controls
|
||||
|
||||
2.1 General & Quick Keys (outside of GUI)
|
||||
|
||||
SELECT: Open GUI
|
||||
START: Play button of CD32
|
||||
Pandora Key: pressing this at any time (inside or outside the GUI) and it will minimise UAE4ARM
|
||||
Hold L+R + D-pad up/down: Move displayed gfx vertically
|
||||
Hold L+R + 1/2/3/4/5/6/7/8: select preset screenmode
|
||||
Hold L+R + 9/0: set number of displayed lines
|
||||
Hold L+R + w: change Amiga displayed width
|
||||
Hold L+R + r: toggle lores/hires
|
||||
L+START: RWD button of CD32
|
||||
R+START: FFW button of CD32
|
||||
L+c: Toggle custom controls
|
||||
L+d: Toggle status line
|
||||
L+f: Toggle frameskip
|
||||
L+l: Quick load
|
||||
L+s: Quick save
|
||||
R+D-pad: Arrow keys in all control modes
|
||||
|
||||
|
||||
2.2 Nubs as mouse
|
||||
|
||||
D-pad: Joystick movement
|
||||
X: 1st Joystick button / RED button on CD32 controller
|
||||
B: 2nd Joystick button / BLUE button on CD32 controller
|
||||
A: GREEN button on CD32 controller
|
||||
Y: Space bar / YELLOW button on CD32 controller
|
||||
R+D-pad: Arrow keys
|
||||
R+A: Ctrl
|
||||
R+B: left Alt
|
||||
R+X: Help
|
||||
|
||||
|
||||
2.3 dPad as mouse
|
||||
|
||||
D-pad: Move mouse pointer
|
||||
A: left mouse click
|
||||
B: right mouse click
|
||||
Y: Space bar
|
||||
D-pad left or right: Left flipper (Pinball Dreams/Fantasies)
|
||||
A/B: Right flipper (Pinball Dreams/Fantasies)
|
||||
X: Pull spring (Pinball Dreams/Fantasies)
|
||||
|
||||
|
||||
2.4 Mousehack enabled
|
||||
|
||||
Tap screen: left click
|
||||
L/R: Hold and tap with stylus performs right click
|
||||
|
||||
Other buttons same as in 2.1.
|
||||
|
||||
|
||||
2.5 Specific controls inside GUI
|
||||
|
||||
Q: Quits the emulator.
|
||||
R: Reset Amiga
|
||||
SELECT: Continue emulation
|
||||
|
||||
|
||||
------------------------------------
|
||||
|
||||
3. GUI
|
||||
|
||||
You can navigate through the controls with the D-pad and select an option by pressing X.
|
||||
|
||||
There are always three buttons visible:
|
||||
- Reset: Reset the Amiga
|
||||
- Quit: Quit emulator
|
||||
- Start/Resume: Start of emulation / resume emulation
|
||||
|
||||
|
||||
3.1 Paths
|
||||
|
||||
Specify the location of your kickstart roms and the folder where the configurations files should be stored.
|
||||
After changing the location of the kickstart roms, click on "Rescan ROMS" to refresh the list of the available ROMs.
|
||||
|
||||
|
||||
3.2 Configurations
|
||||
|
||||
To load a configuration, select the entry in the list and then click on "Load". If you doubleclick on an entry in the list,
|
||||
the emulation starts with this configuration.
|
||||
If you want to create a new configuration, setup all options, enter a new name in "Name", provide a short description and
|
||||
then click on "Save".
|
||||
"Delete" will delete the selected configuration.
|
||||
|
||||
|
||||
3.3 CPU and FPU
|
||||
|
||||
Select the required Amiga CPU (68000 - 68040).
|
||||
|
||||
If you select 68020, you can choose between 24-bit addressing (68EC020) or 32-bit addressing (68020).
|
||||
|
||||
The option "More compatible" is only available if 68000 is selected and emulates simple prefetch of the 68000. This may
|
||||
improve compatibility in few situations but it's not required for most games and demos.
|
||||
|
||||
JIT enables the Just-in-time compiler. This may breaks compatibility in some games. You will not notice a big performance
|
||||
improvement as long as you didn't select "Fastest" in "CPU Speed".
|
||||
|
||||
What options are available for FPU depends on the selected CPU.
|
||||
|
||||
Note: In current version, you will not see a difference in the performance for 68020, 68030 and 68040. The cpu cycles for
|
||||
the opcodes are based on 68020. The different cycles for 68030 and 68040 will come in a later version.
|
||||
|
||||
|
||||
3.4 Chipset
|
||||
|
||||
If you want to emulate an Amiga 1200, select AGA. For most Amiga 500 games, select "Full ECS". Some older Amiga games
|
||||
requires "OCS" or "ECS Agnus". You have to play with these options if a game won't work as expected.
|
||||
For some games you have to switch to "NTSC" (60 Hz instead of 50 Hz) for correct timing.
|
||||
|
||||
When you see some graphic issues in a game, try "Immediate" for blitter and/or disable "Fast copper".
|
||||
"Fast copper" uses a prediction algorithm instead of checking the copper state on a more regular basis. This may cause
|
||||
issues but brings a big performance improvement. The option was removed in WinUAE in an early state, but for most games,
|
||||
it works fine and the better performance is helpful for 600 MHz Pandoras.
|
||||
|
||||
For "Collision Level", select "Sprites and Sprites vs. Playfield" which is fine for nearly all games.
|
||||
|
||||
|
||||
3.5 ROM
|
||||
|
||||
Select the required kickstart ROM for the Amiga you want to emulate.
|
||||
|
||||
"Extended ROM File" is required for CD32.
|
||||
|
||||
|
||||
3.6 RAM
|
||||
|
||||
Select the amount of RAM for each type you want in your Amiga.
|
||||
"Slow" is the simple memory extension of an Amiga 500.
|
||||
"Z3 fast" and "RTG" are only available when a 32-bit CPU is selected.
|
||||
"RTG" is the graphics memory used by Picasso96.
|
||||
|
||||
|
||||
3.7 Floppy drives
|
||||
|
||||
You can enable/disable each drive by clicking the checkbox next to DFx or select the drive type in the dropdown control.
|
||||
"3.5'' DD" is the right choose for nearly all ADF and ADZ files.
|
||||
The option "Write-protected" indicates if the emulator can write to the ADF.
|
||||
The button "..." opens a dialog to select the required disk file.
|
||||
With the big dropdown control, you can select one of the disks you recently used.
|
||||
|
||||
You can reduce the loading time for lot of games by increasing the floppy drive emulation speed. A few games will not load
|
||||
with higher drive speed and you have to select 100%.
|
||||
|
||||
"Save config for disk" will create a new configuration file with the name of the disk in DF0. This configuration will be
|
||||
loaded each time you select the disk and have the option "Load config with same name as disk" enabled.
|
||||
|
||||
|
||||
3.8 Hard drives / CD
|
||||
|
||||
Use "Add Directory" to add a folder or "Add Hardfile" to add a HDF file as a hard disk.
|
||||
|
||||
To edit the settings of a HDD, click on "..." left to the entry in the list.
|
||||
|
||||
With "Create Hardfile", you can create a new formatted HDF file up to 2 GB. For large files, it will take some time to
|
||||
create the new hard disk. You have to format the new HDD in Amiga via the Workbench.
|
||||
|
||||
Select "CD drive" to emulate CD for CD32. Use "Eject"" to remove currentCD and click on "..." to open a dialog to select
|
||||
the iso/cue file for CD emulation.
|
||||
Note: in current version, only WAV is supported for audio tracks. MP3 and FLAC may be supported in a later version.
|
||||
|
||||
|
||||
3.9 Display
|
||||
|
||||
Select the required width and height of the Amiga screen.
|
||||
If you select "NTSC", a value greater than 240 for "Height" makes no sense.
|
||||
When the game, demo or workbench uses Hires mode and you selected a "Width" lower than 640, you will only see half of the
|
||||
pixels.
|
||||
With "Vert. offset" you can adjust the position of the first drawn line of the Amiga screen. You can also change this during
|
||||
emulation with L+R + dpad up/down.
|
||||
When you activate "Frameskip", only every second frame is drawn. This will improve performance and some more games are
|
||||
playable.
|
||||
|
||||
|
||||
3.10 Sound
|
||||
|
||||
You can turn on sound emulation with different levels of accuracy and choose between mono and stereo.
|
||||
|
||||
The different types of interpolation have different impact on the performance. Play with the settings to find the type you
|
||||
like most. You may need headphones the really hear the differences between the interpolations.
|
||||
|
||||
With "Filter", you can select the type of the Amiga audio filter.
|
||||
|
||||
With "Stereo separation" and "Stereo delay" you can adjust how the left and right audio channels of the Amiga are mixed to
|
||||
the left and right channels of the Pandora. A value of 70% for separation and no delay is a good start.
|
||||
|
||||
|
||||
3.11 Input
|
||||
|
||||
You can select the control type for both ports.
|
||||
Set the emulated mouse speed to .25x, .5x, 1x 2x and 4x to slow down or speed up the mouse.
|
||||
When "Enable mousehack" is activated, you can use the stylus to set the mouse pointer to the exact position. This works
|
||||
very well on Workbench, but many games using there own mouse handling and will not profit from this code.
|
||||
"Tap Delay" specifies the time between taping the screen and an emulated mouse button click.
|
||||
|
||||
When enabling "Custom Control", you can define which Amiga key should be emulated by pressing one of the ABXY- or D-pad
|
||||
buttons. Useful to setup controls for pinball games. During emulation, you can switch between regular behaviour of the
|
||||
buttons and custom settings by pressing left shoulder button and 'c'.
|
||||
|
||||
|
||||
3.12 Miscellaneous
|
||||
|
||||
"Status Line" shows/hides the status line indicator. During emulation, you can show/hide this by pressing left shoulder
|
||||
button and 'd'. The first value in the status line shows the idle time of the Pandora CPU in %, the second value is the
|
||||
current frame rate. When you have a HDD in your Amiga emulation, the HD indicator shows read (blue) and write (red) access
|
||||
to the HDD. The next values are showing the track number for each disk drive and indicates disk access.
|
||||
|
||||
When you deactivate the option "Show GUI on startup" and use this configuration by specifying it with the command line
|
||||
parameter "-config=<file>", the emulations starts directly without showing the GUI.
|
||||
|
||||
Set the speed for the Pandora CPU to overclock it for games which need more power. Be careful with this parameter.
|
||||
|
||||
"bsdsocket.library" enables network functions (i.e. for web browsers in OS3.9).
|
||||
|
||||
|
||||
3.13 Savestates
|
||||
|
||||
Savestates are stored with the name of the disk in drive DF0 attached with the selected number.
|
||||
|
||||
Note: Savestates will not work with HDDs.
|
||||
|
||||
|
||||
------------------------------------
|
||||
|
||||
4. Command line options
|
||||
|
||||
-config=<file>
|
||||
or
|
||||
-f <file>
|
||||
Start emulator with specified configuration file instead of the default file.
|
||||
|
||||
-s <option>=<value>
|
||||
Set a specific option to the new value. Look at the configuration files to see the names of the available options and
|
||||
how the value for an option is provided.
|
||||
|
|
@ -114,9 +114,6 @@
|
|||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\src\filesys.asm" />
|
||||
<None Include="..\..\src\inputevents.def" />
|
||||
<None Include="..\..\src\table68k" />
|
||||
<None Include="Amiberry-Debug.vgdbsettings" />
|
||||
<None Include="Amiberry-Release.vgdbsettings" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -136,15 +136,6 @@
|
|||
<None Include="Amiberry-Release.vgdbsettings">
|
||||
<Filter>VisualGDB settings</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\filesys.asm">
|
||||
<Filter>Source files</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\inputevents.def">
|
||||
<Filter>Source files</Filter>
|
||||
</None>
|
||||
<None Include="..\..\src\table68k">
|
||||
<Filter>Source files</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\src\akiko.cpp">
|
||||
|
|
|
|||
|
|
@ -1046,7 +1046,8 @@ int cfgfile_yesno(const TCHAR* option, const TCHAR* value, const TCHAR* name, in
|
|||
return 0;
|
||||
|
||||
if (strcasecmp(value, _T("yes")) == 0 || strcasecmp(value, _T("y")) == 0
|
||||
|| strcasecmp(value, _T("true")) == 0 || strcasecmp(value, _T("t")) == 0)
|
||||
|| strcasecmp(value, _T("true")) == 0 || strcasecmp(value, _T("t")) == 0
|
||||
|| (numbercheck && strcasecmp(value, _T("1")) == 0))
|
||||
*location = 1;
|
||||
else if (strcasecmp(value, _T("no")) == 0 || strcasecmp(value, _T("n")) == 0
|
||||
|| strcasecmp(value, _T("false")) == 0 || strcasecmp(value, _T("f")) == 0
|
||||
|
|
|
|||
|
|
@ -499,6 +499,7 @@ static void read_joystick()
|
|||
else
|
||||
setjoystickstate(hostjoyid + 1, 1, val, 32767);
|
||||
|
||||
// cd32 red, blue, green, yellow
|
||||
setjoybuttonstate(hostjoyid + 1, 0, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 0) & 1));
|
||||
setjoybuttonstate(hostjoyid + 1, 1, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 1) & 1));
|
||||
setjoybuttonstate(hostjoyid + 1, 2, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 2) & 1));
|
||||
|
|
@ -511,8 +512,20 @@ static void read_joystick()
|
|||
|
||||
if (IsPS3Controller[hostjoyid])
|
||||
{
|
||||
setjoybuttonstate(hostjoyid + 1, 0, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 13) & 1));
|
||||
setjoybuttonstate(hostjoyid + 1, 1, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 14) & 1));
|
||||
// cd32 red, blue, green, yellow
|
||||
setjoybuttonstate(hostjoyid + 1, 0, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 14) & 1)); // south
|
||||
setjoybuttonstate(hostjoyid + 1, 1, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 13) & 1)); // east
|
||||
setjoybuttonstate(hostjoyid + 1, 2, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 15) & 1)); // west
|
||||
setjoybuttonstate(hostjoyid + 1, 3, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 12) & 1)); // north
|
||||
|
||||
// cd32 rwd, ffw, start
|
||||
setjoybuttonstate(hostjoyid + 1, 4, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 10) & 1)); // left shoulder
|
||||
setjoybuttonstate(hostjoyid + 1, 5, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 11) & 1)); // right shoulder
|
||||
setjoybuttonstate(hostjoyid + 1, 6, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 3) & 1)); // start
|
||||
|
||||
// mouse left and 'space'
|
||||
setjoybuttonstate(hostjoyid + 1, 7, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 8) & 1)); // left trigger
|
||||
setjoybuttonstate(hostjoyid + 1, 8, (SDL_JoystickGetButton(Joysticktable[hostjoyid], 9) & 1)); // right trigger
|
||||
|
||||
// Simulate a top with button 4
|
||||
if (SDL_JoystickGetButton(Joysticktable[hostjoyid], 4))
|
||||
|
|
@ -562,12 +575,17 @@ int input_get_default_joystick(struct uae_input_device* uid, int num, int port,
|
|||
if (mode == JSEM_MODE_JOYSTICK_CD32)
|
||||
{
|
||||
setid_af(uid, num, ID_BUTTON_OFFSET + 0, 0, port, port ? INPUTEVENT_JOY2_CD32_RED : INPUTEVENT_JOY1_CD32_RED, af, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 1, 0, port, port ? INPUTEVENT_JOY2_CD32_BLUE : INPUTEVENT_JOY1_CD32_BLUE, gp);
|
||||
//setid(uid, num, ID_BUTTON_OFFSET + 1, 0, port, port ? INPUTEVENT_JOY2_CD32_BLUE : INPUTEVENT_JOY1_CD32_BLUE, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 1, 0, port, port ? INPUTEVENT_JOY2_2ND_BUTTON : INPUTEVENT_JOY1_2ND_BUTTON, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 2, 0, port, port ? INPUTEVENT_JOY2_CD32_GREEN : INPUTEVENT_JOY1_CD32_GREEN, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 3, 0, port, port ? INPUTEVENT_JOY2_CD32_YELLOW : INPUTEVENT_JOY1_CD32_YELLOW, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 4, 0, port, port ? INPUTEVENT_JOY2_CD32_RWD : INPUTEVENT_JOY1_CD32_RWD, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 5, 0, port, port ? INPUTEVENT_JOY2_CD32_FFW : INPUTEVENT_JOY1_CD32_FFW, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 6, 0, port, port ? INPUTEVENT_JOY2_CD32_PLAY : INPUTEVENT_JOY1_CD32_PLAY, gp);
|
||||
|
||||
// mouse left and 'space' events (Not real but very useful?)
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 7, 0, port, port ? INPUTEVENT_JOY1_FIRE_BUTTON : INPUTEVENT_JOY2_FIRE_BUTTON, gp);
|
||||
setid(uid, num, ID_BUTTON_OFFSET + 8, 0, port, port ? INPUTEVENT_KEY_SPACE : INPUTEVENT_KEY_SPACE, gp);
|
||||
}
|
||||
if (num == 0)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue