ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Visual Studio project file for Controller refactoring. 

- Some minor code refactoring/changes
 - Updated changelog and bumped version number.
This commit is contained in:
Stephen Anthony 2017-07-30 11:48:52 -02:30
parent 218da3576c
commit 91c5020a38
8 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes.txt
View File

@ -14,6 +14,9 @@
5.0.1 to 5.x: (xxxx yy, 2017)
* Improved emulation of Trakball controller, eliminating bias in left/
right directions. Thanks to Thomas Jentzsch for the idea and code.
* Fixed an annoying bug in Linux, where Alt-Tab'ing out of a window and
then back again would pass a 'Tab' key event to the app, which in
most cases would navigate to the next UI element.

2
src/common/Version.hxx
View File

@ -18,7 +18,7 @@
#ifndef VERSION_HXX
#define VERSION_HXX
#define STELLA_VERSION "5.0.1"
#define STELLA_VERSION "5.0.2_pre"
#define STELLA_BUILD "3487"
#endif

4
src/emucore/AmigaMouse.hxx
View File

@ -34,12 +34,10 @@ namespace {
public:
static constexpr Controller::Type controllerType = Controller::AmigaMouse;
static constexpr uInt8 counterDivide = 2;
};
}
typedef PointingDevice<AmigaMouseHelper> AmigaMouse;
using AmigaMouse = PointingDevice<AmigaMouseHelper>;
#endif // AMIGAMOUSE_HXX

4
src/emucore/AtariMouse.hxx
View File

@ -34,12 +34,10 @@ namespace {
public:
static constexpr Controller::Type controllerType = Controller::AtariMouse;
static constexpr uInt8 counterDivide = 2;
};
}
typedef PointingDevice<AtariMouseHelper> AtariMouse;
using AtariMouse = PointingDevice<AtariMouseHelper>;
#endif // ATARIMOUSE_HXX

5
src/emucore/PointingDevice.hxx
View File

@ -27,8 +27,11 @@
This code was heavily borrowed from z26.
@author Stephen Anthony & z26 team
Template-ification by Christian Speckner, based on ideas by
Thomas Jentzsch
*/
template<class T> class PointingDevice : public Controller
template<class T>
class PointingDevice : public Controller
{
public:
PointingDevice(Jack jack, const Event& event, const System& system);

7
src/emucore/TrakBall.hxx
View File

@ -29,18 +29,15 @@ namespace {
static constexpr uInt32 ourTableH[2][2] = {{ 0x40, 0x00 }, { 0xc0, 0x80 }};
static constexpr uInt32 ourTableV[2][2] = {{ 0x00, 0x10 }, { 0x20, 0x30 }};
return ourTableV[countV & 0x01][down] |
ourTableH[countH & 0x01][left];
return ourTableV[countV & 0x01][down] | ourTableH[countH & 0x01][left];
}
public:
static constexpr Controller::Type controllerType = Controller::TrakBall;
static constexpr uInt8 counterDivide = 4;
};
}
typedef PointingDevice<TrakBallHelper> TrakBall;
using TrakBall = PointingDevice<TrakBallHelper>;
#endif // TRAKBALL_HXX

3
src/windows/Stella.vcxproj
View File

@ -292,8 +292,6 @@
<ClCompile Include="..\debugger\gui\RiotRamWidget.cxx" />
<ClCompile Include="..\debugger\gui\RomListSettings.cxx" />
<ClCompile Include="..\debugger\gui\SaveKeyWidget.cxx" />
<ClCompile Include="..\emucore\AmigaMouse.cxx" />
<ClCompile Include="..\emucore\AtariMouse.cxx" />
<ClCompile Include="..\emucore\Cart3EPlus.cxx" />
<ClCompile Include="..\emucore\Cart4KSC.cxx" />
<ClCompile Include="..\emucore\CartBF.cxx" />
@ -326,7 +324,6 @@
<ClCompile Include="..\emucore\tia\Playfield.cxx" />
<ClCompile Include="..\emucore\tia\TIA.cxx" />
<ClCompile Include="..\emucore\tia\VblankManager.cxx" />
<ClCompile Include="..\emucore\TrakBall.cxx" />
<ClCompile Include="..\gui\ColorWidget.cxx" />
<ClCompile Include="..\gui\FileListWidget.cxx" />
<ClCompile Include="..\gui\JoystickDialog.cxx" />

9
src/windows/Stella.vcxproj.filters
View File

@ -816,15 +816,6 @@
<ClCompile Include="..\emucore\tia\VblankManager.cxx">
<Filter>Source Files\emucore\tia</Filter>
</ClCompile>
<ClCompile Include="..\emucore\AmigaMouse.cxx">
<Filter>Source Files\emucore</Filter>
</ClCompile>
<ClCompile Include="..\emucore\AtariMouse.cxx">
<Filter>Source Files\emucore</Filter>
</ClCompile>
<ClCompile Include="..\emucore\TrakBall.cxx">
<Filter>Source Files\emucore</Filter>
</ClCompile>
<ClCompile Include="..\debugger\gui\CartBUSWidget.cxx">
<Filter>Source Files\debugger</Filter>
</ClCompile>