Commit graph

405 commits

Author SHA1 Message Date
Nik Henson a3c15e8208 Slight tweak to changes made to sound board synchronisation code in previous commit. The previous change was necessary to ensure no deadlock when waiting for sound board thread to exit but it introduced unwanted buffer overruns (with the end result being that the sound was often speeded up) so have added an extra check in WakeSoundBoardThread to prevent this. 2012-07-24 20:18:30 +00:00
Nik Henson 108ac64de8 - CModel3::StopThreads was rather gracelessly killing threads while they were waiting on their semaphores, which works okay Windows but not on Mac OS-X where it was preventing Supermodel from exiting properly. Hence, have instead altered StopThreads to signal to threads that they should exit and wait until until they have all done so. This is much better and is what I should have done the first time around had I not been so lazy :-)!
- Also fixed a small race condition in WakeSoundBoardThread.  Previously if it happened to be called just before the sound board thread had finished processing a frame's worth of audio but before it had got around to waiting on the sync condition variable then the wake notification would be lost.
2012-07-23 20:35:10 +00:00
Bart Trzynadlowski f1e93bcd8f - Fixed Win32 GCC Makefile.
- Reverted Nik's polygon palette index change in Models.cpp. Subtracting 1 was breaking Scud Race.
- Added an explicit typecast in Inputs.cpp, which GCC requires for some reason.
2012-07-16 02:27:55 +00:00
Nik Henson 183dca563d Committing various small updates that have been hanging around in my source tree for a while now:
- Added 'crosshairs' command line and config option.
- Added 'vsync' command line and config option (so far only tested on NVidia cards on Windows 7 - other graphics drivers, O/Ss or driver settings may simply chose to ignore this).
- Added fullscreen toggle within game using Alt+Enter key combination.
- Added framework for lamp outputs and 'outputs' command line and config option.  So far only the lamps for driving games are hooked up in the emulator (others to be added later).
- Added an initial outputs implementation for Windows that sends MAMEHooker compatible messages (-outputs=win to enable)
- Fixed fps calculation in Main.cpp that was producing incorrect results and so giving the impression that frame throttling wasn't working properly when in fact it was.
- Fixed palette indexed colours as the index was always off by one, causing incorrect colours in various games, eg drivers' suits and flashing Start sign in Daytona 2.
- Altered caching of models so that models with palette indexed colours use the dynamic cache rather than the static one.  This is so that changes in palette indexed colours appear on screen, eg the flashing Start sign on the advanced course of Daytona 2 (although currently the START message itself is not visible due to other problems with texture decoding).
- Fixed small bug in TileGen.cpp which meant both palettes were being completely recomputed pretty much with every frame.  This was a significant performance hit, particularly as palette recomputation is currently being done in SyncSnapshots (it should be moved out of here at some point, although for now it's no big deal).
- Made sure all OpenGL objects and resources are deleted in Render2D/3D destructors, in particular the deleting of the VBO buffer in DestroyModelCache.
- Made sure that GLSL uniforms are always checked to see if they are bound before using them in order to stop unecessary (but harmless) GL errors.
- Altered the default texture sheet handling to use a single large GL texture holding multiple Model3 texture sheets rather than multiple GL textures as before (if required, the old behaviour can still be selected with the mulisheet fragment shader).  I believe this fixes the disappearing crosshairs/corrupt GL state problem which the multisheet fragment shader seemed to be triggering somehow.
- Fixed a bug in debugger which meant memory watches were not triggering properly
2012-07-15 21:04:46 +00:00
Bart Trzynadlowski 772c94d122 - Committing Nik's timing changes: the PowerPC's DEC and TBR now count at the correct rate and time is accurately maintained between calls to the emulator. A VBlank bit was identified in the Real3D status register space and is now timed. Unfortunately, there are still some problems and not all games are perfect, but FV2, VS2, and others are working much better or perfectly.
- Added a new dump of Scud Race Plus (scudp1). Strangely, this one uses an MPC106 instead of the MPC105 used by every other Step 1.5 game...
2012-07-12 06:13:24 +00:00
John Peterson 3963a7a53c Applied a series of patches by John Peterson:
- Fixed a printf statement in ConsoleDebugger.cpp.
- Fixed memory watches not breaking in CPUDebug.h.
- Added some helpful batch files to the VS2008 directory.
- Added support for automatic loading of parent ROM sets.
2012-07-12 05:28:08 +00:00
Bart Trzynadlowski 93b71c8429 Applied Nik's fix for cyclical scene graphs. Improves Harley Davidson, Ski Champ, Emergency Call Ambulance, and Ocean Hunter. 2012-03-31 19:41:55 +00:00
Bart Trzynadlowski 1bce444668 Brought in the near clipping plane for Step 1.5+. Objects close to camera are no longer cut-off (e.g., driver arms and steering wheels in cockpit views). Note: This change should probably be applied to Step 1.0 as well in the future. For now, I am leaving the old distance because Step 1.0 coordinates need closer investigation. Bringing in the near clipping plane extends the view frustum depth and will worsen Z-buffer accuracy. Be on the lookout for Z-fighting that did not previously exist. 2012-02-28 04:34:32 +00:00
Nik Henson f9c3b9b5f8 DirectInputSystem's initial state wasn't being initialized properly, which would sometimes result in invalid input values until keyboard or mouse was successfully acquired 2012-02-27 20:32:15 +00:00
Bart Trzynadlowski 69610ef8dd Added a clear() method to VBORef and removed unsafe memset() clear. 2012-02-25 06:36:04 +00:00
Nik Henson 3b41239cfb This update fixes (hopefully) the last of the texture upload lags that were affecting some games, in particular Daytona 2 and Spikeout.
To achieve this UploadTextures no longer clears the model cache when called.  Instead the cache is kept in-tact (which should help improve cache hits) and all textures referenced by models being rendered are (re-)decoded with every frame.
To help with tracking all the unique texture references contained in a model a new class TextureRefs has been added.
2012-02-23 23:20:21 +00:00
Bart Trzynadlowski aba801ebb4 Byte swapped sample ROMs. This should fix the audio distortion that many users noticed. The differences are particularly noticeable in Scud Race and Daytona 2. 2012-02-23 03:08:57 +00:00
Bart Trzynadlowski 16e4fcab06 Forgot to update to-do list in previous revision. Added a comment to mark CRender2D::WriteVRAM() as deprecated. 2012-02-23 00:12:46 +00:00
Bart Trzynadlowski fcf1d955a9 Previous "optimization" contained a mistake and made things worse. Removed unnecessary clear of the bottom layer buffer. Now, if there is no bottom layer, it will not be displayed at all and glClear(GL_COLOR_BUFFER_BIT) is used instead. 2012-02-22 01:34:42 +00:00
Bart Trzynadlowski c085be59af Further optimization/simplification of the 2D renderer's main loop. 2012-02-20 04:09:11 +00:00
Bart Trzynadlowski 453df4f5f5 - Finished cleaning up and optimizing the 2D renderer.
- Fixed up color offset register support for new 2D rendering system. Now maintains 2 computed palettes for layers A/A' and B/B'.
- Fixed a minor bug in InitPalette(); VRAM was not being typecast properly.
- Fixed specular lighting bug that occurred on some OpenGL drivers because integers were not being interpreted as floats in the vertex shader.
- Began to update copyright date in some files.
- Graphics modules now use the C++-style names for C standard library headers (e.g., stdio.h -> cstdio) consistent with the rest of Supermodel.
2012-02-20 03:45:48 +00:00
Bart Trzynadlowski 0257f1f9e8 Contour processing (discarding of pixels when alpha==0) enabled for A4L4 texture formats. Improves smoke and fire in Daytona 2. 2012-02-17 07:45:50 +00:00
Bart Trzynadlowski 5709010cb2 Default SCSP balance set to 0. Was erroneously set at +50%. 2012-02-14 09:13:36 +00:00
Bart Trzynadlowski 79d24d403f - NOTE: In this revision (possibly earlier), I've started to notice some intermittent geometry glitches in Spikeout and slowdown while playing certain characters.
- Added multi-texture fragment shader to repo.
- Added a multiTexture option (enabled by default) to use multi-texturing to decode textures.
- Added some comments regarding timing to the PowerPC execution loop.
2012-02-14 03:28:52 +00:00
Nik Henson 30130f2bd5 Updated fragment shaders' floating point comparisons and also some knock-on changes from SVN revision 246. 2012-02-13 23:51:32 +00:00
Nik Henson 8a4ea64994 Added OSD/Video.h to provide OSD-dependent video functionality. The static functions in here get called by Model3.cpp from within the render thread so that any OSD related rendering can also be run in parallel for a further speed increase.
Updated OSD/SDL/Main.cpp to provide the SDL implementations of the functions in OSD/Video.h.
2012-02-13 23:37:48 +00:00
Nik Henson 84eb017744 Added support for multiple texture sheets (with up to one per Model 3 texture format) as a rather brute-force way to handle overlapping texture formats in the current 3D engine. This fixes some corrupt textures in Daytona 2 and Virtua Striker 2 (and possibly other games) and also offers a small speed increase when some scenes load multiple overlapping textures.
This feature only enables itself when a compatible shader script is loaded.  Since none have been checked in yet this means it is currently disabled.
2012-02-13 21:54:26 +00:00
Bart Trzynadlowski 35a47bc7e3 Added command line options to force windowed mode and to control GPU multi-threading. 2012-02-11 16:40:09 +00:00
Bart Trzynadlowski 1b8740165c Added a wide screen hack that can be enabled with the -'wide-screen' argument or WideScreen in the config file. 2012-02-10 19:53:51 +00:00
Bart Trzynadlowski 40a51287df Tweaked help text slightly. 2012-02-09 17:15:15 +00:00
Bart Trzynadlowski 09f9bd81fd Fixed left/right stereo channels -- they were reversed by default. 2012-02-09 17:12:13 +00:00
Bart Trzynadlowski c5d0cb0d97 Added front/rear speaker balance (actually the master/slave SCSP balance). Balance setting is stored in CSoundBoardConfig and can be set on the command line (-balance) or config file (Balance). Valid range is 100 (front speaker volume doubled, rear muted) to -100. The default is 0, both sets at full volume. Balance is applied in the SCSP core before overall sound and music volume settings. 2012-02-09 07:58:07 +00:00
Bart Trzynadlowski 6814ef1ed8 Added preliminary specular lighting to shaders. The "no spotlight" shader has not yet been updated. 2012-02-06 02:54:43 +00:00
Bart Trzynadlowski 9fc0d7b3cc Updated some comments regarding the VF3 ROM patches. It seems many of them are no longer necessary. The single necessary patch affects timing (note how the warning screen stays up longer when it is removed). This needs to be investigated -- perhaps it can lead to a timing fix for vf3, vs2, and fvipers2? 2012-02-01 18:08:13 +00:00
Bart Trzynadlowski 0fcb9686f9 Documented the tile generator. 2012-01-27 22:27:38 +00:00
Bart Trzynadlowski 8a8609f383 - Added specular highlight support to the 3D engine. A shininess parameter is now be passed to the shaders. Does not work correctly and I will save the shaders themselves for a future commit.
- Added support for layer priorities. Highly unoptimal! This absolutely needs to be polished up before any release (and properly documented). For now, priorities in the popular games seem to be fixed but not all possible priority settings have been figured out yet.
2012-01-27 05:52:59 +00:00
Bart Trzynadlowski c38ec7d5af Removed unused dirty rectangle code. 2012-01-26 02:57:02 +00:00
Bart Trzynadlowski e00a372cef Removed unused dirty rectangle code. 2012-01-26 02:49:07 +00:00
Bart Trzynadlowski b7980aa562 Removed unused dirty rectangle code. 2012-01-26 02:48:16 +00:00
Bart Trzynadlowski 3315fb463b Small correction to lighting model in shaders. Light intensity is no longer clipped. 2012-01-22 01:05:59 +00:00
Bart Trzynadlowski b57ba51e44 Removed unused (and non-functional) 'stack machine' scene graph traversal. 2012-01-18 08:12:23 +00:00
Bart Trzynadlowski 611ef43ba5 Now compiles with MinGW. Among other things, the use of __uuidof() was removed. 2012-01-18 04:59:42 +00:00
Nik Henson d1d5175548 New multi-threaded rendering changes that parallelise graphics rendering and PPC execution in order to increase performance on multi-core machines.
New gpuMultiThreaded config option to enable/disable multi-threaded rendering (enabled by default, disabling it reverts to previous behaviour).
Other rendering optimisations:
 - texture uploads now only affect appropriate region in the texture sheet, rather than uploading the whole sheet each time
 - performance of clearing the model caches has been improved
New Alt+O key input added to toggle outputting of frame timings for debugging purposes.
2012-01-16 23:21:14 +00:00
Nik Henson 0835e38b94 Removed unecessary SDL include 2012-01-16 23:04:37 +00:00
Nik Henson b7242d27e8 Added CThread::Sleep && CThread::GetTicks methods 2012-01-16 22:07:17 +00:00
Bart Trzynadlowski 2ece814f43 Assigned new version number: 0.3a-WIP. 2011-12-27 19:16:22 +00:00
Bart Trzynadlowski 532eafef55 Fixed a bug w/ Read16() -- was not casting to a pointer properly, caused Scud Race to crash. 2011-12-26 07:15:32 +00:00
Bart Trzynadlowski bdf11c765f Preliminary backface culling fix. Matrices which effectively change the polygon winding without changing the Z component of the polygon normal are tested for when appending items to the display list. If necessary, the polygon winding is changed on the fly to ensure visibility is correct. This code desperately needs to be optimized. Note: Not yet thoroughly tested. 2011-12-26 06:10:55 +00:00
Bart Trzynadlowski a71af94edb Fixed ROM banking -- appears to fix the sounds in Daytona 2 PE and VON2 but otherwise has not been extensively tested. The high 8MB of the 68K address is treated as a single window into the 16MB sample ROM, and can point either to the low or high 8MB bank. 2011-12-23 21:06:45 +00:00
Bart Trzynadlowski 4c3d6e1abf Fixed a MAGIC_NUMBER comment typo. 2011-12-23 21:03:24 +00:00
Nik Henson 885d946458 Small bug fix 2011-12-23 19:34:50 +00:00
Nik Henson 68554108ac Small tweak to improve startup time 2011-12-23 12:39:34 +00:00
Nik Henson b9375bb09b Optimisations to improve performance when running with debugger. Now runs at about 2/3 speed of full speed of emulator, rather than 1/3 like before. 2011-12-23 12:01:31 +00:00
Nik Henson dfa77e9207 Added support for joystick sliders to input system.
Added extra debugging output to calibration input detection routine (activated by pressing Shift).
2011-11-01 23:24:37 +00:00
Nik Henson e431b79f57 Fixed small bug which meant wasn't correctly clearing SCSP structures on initialisation. 2011-11-01 23:16:36 +00:00
Nik Henson e6fd2e2240 Added DirectInputConstForceLeftMax and DirectInputConstForceRightMax options to allow different force feedback strengths in each direction. DirectInputConstForceMax still works as before but these new options will override it for the given direction if they are specified. 2011-10-02 20:53:12 +00:00
Nik Henson 0c4f93897f Force feedback fixes in DirectInputSystem.cpp:
- Fixed bug which meant right constant force was not being capped to DI_EFFECTS_MAX
- Made sure all values are being clamped to sensible ranges
2011-09-25 22:46:58 +00:00
Bart Trzynadlowski d2b381ce8b - Documentation updates.
- Added fflush() to config dialog output where it was missing.
2011-09-24 20:54:47 +00:00
Bart Trzynadlowski 7f97346fc9 - Tweaked some error messages and comments. Hopefully, this is the last update for v0.2a's code.
- Documentation updates.
2011-09-24 01:49:48 +00:00
Bart Trzynadlowski 83067f076f - Only player 1 crosshair is shown by default now.
- Tweaked Makefiles a bit.
- More documentation updates.
- Changed version string to 0.2a in preparation for the final release :)
2011-09-23 07:18:40 +00:00
Bart Trzynadlowski 33f35effaf - Tweaked text in input configuration dialog.
- Changed version string to 0.2a-RC3 because RC2 build was sent out to testers earlier.
2011-09-22 18:15:29 +00:00
Bart Trzynadlowski 4527014e75 - Getting/setting MPEG playback position also includes the end offset. Hopefully will fix save states from crashing when reloaded sometimes in DSB1 and DSB2 games. 2011-09-22 18:04:39 +00:00
Bart Trzynadlowski a1346b57f5 - Changed spelling of some messages in drive board code.
- Added an extra blank line after info display in CModel3.
- Cleaned up comments in Main.cpp.
- More document updates. Fixed '-no-music'->'-no-dsb', 'EmulateMusic'->'EmulateDSB'.
2011-09-22 17:28:49 +00:00
Bart Trzynadlowski 2a314041ad Commented out verbose/debug output in drive board code for release. 2011-09-22 09:02:50 +00:00
Bart Trzynadlowski d00b03f65b Force feedback no longer available as an option on non-Windows builds. 2011-09-22 07:24:15 +00:00
Bart Trzynadlowski 46bc52bb12 - Changed save state error messages slightly.
- Wrapped rows that exceed 80 columns in Supermodel.ini.
- Added some member and function comments to a few header files. 
- Changed version string to 0.2a-RC2 in anticipation of sending another release candidate build to testers.
- Added GAME_INPUT_RALLY flag to dirtdvlsa, eca, and ecax.
- Configuration dialog no longer refers to Sega Rally 2 and Dirt Devils; instead, "Miscellaneous Driving Game Buttons"
- More additions to README.txt.
2011-09-22 06:11:47 +00:00
Nik Henson 206ef1aca4 Changes to get debugger classes to compile under Linux 2011-09-21 23:49:55 +00:00
Nik Henson 232da52dd0 Changes to get debugger classes to compile under Linux 2011-09-21 23:48:33 +00:00
Nik Henson eaa3bbf8b7 Changes to get debugger classes to compile under Linux 2011-09-21 23:47:11 +00:00
Nik Henson 773c2ec9ad Fix to get InputSystem.cpp to compile under Linux again after updates today 2011-09-21 23:45:49 +00:00
Nik Henson 55e6a843bb Added copyright headers to all debugger files and replaced C standard library headers with c++ versions 2011-09-21 22:53:41 +00:00
Nik Henson cb2b8f9235 Tweaked header comment! 2011-09-21 22:32:16 +00:00
Nik Henson dba953d1a0 Added copyright header to file 2011-09-21 22:31:27 +00:00
Nik Henson b87f24cdf2 Removed DirectInputEffectsGain force feedback configuration parameter as it's not that useful as it's easier to adjust effects individually 2011-09-21 22:28:13 +00:00
Nik Henson 0528a4f0c6 Changes to input system:
- altered PrintSettings to output all settings for attached controls, even if no different to defaults
- added option on calibration screen to detect an axis simply by moving the axis
2011-09-21 22:15:16 +00:00
Nik Henson c0dc0b83b6 Changes to DirectInputSystem:
- corrected axis identification code as was not enumerating axes properly in all cases
- added fallback which just adds all axes if there is any hint of an irregularity whilst enumerating axes
2011-09-21 22:08:36 +00:00
Bart Trzynadlowski 24f46e9f86 Updated UNIX Makefile, fixed some syntax errors. 2011-09-21 19:12:50 +00:00
Bart Trzynadlowski ee471539c5 - Fixed newlines in logs.
- Set default PowerPC frequency to 50 MHz.
- Minor tweak to help text.
- More README.txt updates.
2011-09-19 03:56:15 +00:00
Nik Henson c61c4d6ce1 Fixed mistake in previous commit! 2011-09-18 23:38:15 +00:00
Nik Henson d80c7b97ad Added missing memory regions for DSB CPUs 2011-09-18 23:35:22 +00:00
Nik Henson f695ff7094 CModel3::StopThreads() now makes sures threads are paused before deleting thread objects. 2011-09-18 22:49:21 +00:00
Nik Henson 5a0f038171 Changes to allow debugging of Musashi 68K core:
- added methods to attach/debug debugger.
- added instruction hook & callback to m68kconf.h and added hooks into CMusashi68KDebug to allow debugger to control execution.
- added methods to allow reading/writing of 68K registers (for all registers and for a given context, rather than just current one).
2011-09-18 22:44:20 +00:00
Nik Henson c155ae7503 Small cosmetic changes... 2011-09-18 22:31:42 +00:00
Nik Henson 65536fd0fe Changes to allow debugging of Z80 core:
- added methods to attach/detach debugger.
- added hooks into CZ80Debug to allow debugger to control execution.
- added methods to allow reading/writing of Z80 registers.
2011-09-18 22:21:14 +00:00
Nik Henson 041e6659b3 Changes due to updates in debugger classes. 2011-09-18 22:13:20 +00:00
Nik Henson 5f82fd79c3 Small bug fix in INIFile.cpp - was not parsing negative numbers. 2011-09-18 22:03:06 +00:00
Nik Henson c8f4fbc901 Added includes for new debugger header files Musashi68KDebug.h & Z80Debug.h 2011-09-18 22:01:35 +00:00
Nik Henson e8e02ba685 Changes to debugger classes:
- updated debugger classes to compile again with all recent changes.
- improved debugger classes to allow them to work in multi-threaded emulator and be able to handle CPUs on different threads.
- added debug classes for new Z80 and Musashi 68K CPU cores.
- added logging of cycle counts and frames.
- moved all Supermodel specific code & configuration to CSupermodelDebugger.
- added all Model 3 CPUs (PPC, sound board 68K, DSB 68K/Z80 and drive board Z80) to CSupermodelDebugger.
- added persisting of custom entry points in saved debug state to CCodeAnalyser.
- fixed bug with listing I/O ports in CConsoleDebugger and added displaying of cycle counts and CPU speeds when listing CPUs.
2011-09-18 21:59:23 +00:00
Nik Henson b9430cd988 Changes to input system:
- Joystick axis saturation values can now range from 1-200 rather than just 1-100.  This lets the user make axis less sensitive, if required.
- Added joystick axes calibration menus to -config-inputs.
- Moved DirectInput & XInput feedback settings out of CDirectInputSystem and into COSDConfig (so that they can be configured per-game).
- DirectInput mode now only grabs background access to keyboard, mice and joystick when configuring inputs, otherwise it only grabs foreground access.
Other changes:
- Main.cpp now ensures all Model3 threads are paused before shutting down.
2011-09-18 21:44:40 +00:00
Bart Trzynadlowski f0697dbc84 - Tweaked formatting of help message 2011-09-17 23:42:42 +00:00
Bart Trzynadlowski 45603b5549 - Tweaked comments in Supermodel.ini
- More work on README.txt
- Tweaked some error/info messages.
2011-09-17 23:41:12 +00:00
Nik Henson 58954ee4cc Small updates:
- added methods to CModel3 to access sound board and drive board
 - added methods to CSoundBoard to access 68K and DSB (if attached)
 - added methods to CDSB1 & CDSB2 to access Z80 & 68K respectively
 - small code tweak in DriveBoard.cpp
 - comment tweaks in Model3.h & Model3.cpp
2011-09-15 21:10:38 +00:00
Bart Trzynadlowski 1629cd711c - Updated README (far from finished).
- Music volume cannot be changed if game has no DSB.
- Extra hardware (DSB, drive board) is printed in information display when ROM is loaded.
2011-09-15 07:13:19 +00:00
Bart Trzynadlowski 9ff9f3c28f Now always saves feedback effect configuration (this way, defaults do not have to be defined in multiple places). 2011-09-14 23:29:04 +00:00
Bart Trzynadlowski ab719720c7 Renamed drive board ROMs to MAME's naming convention. 2011-09-14 22:46:15 +00:00
Bart Trzynadlowski 2f5bf43bda Updated copyright information and added headers to all remaining files except debugger. 2011-09-14 19:08:43 +00:00
Bart Trzynadlowski 5bf4a6d52b - Added mutex for MIDI FIFO access to SCSP.cpp. 2011-09-14 07:38:56 +00:00
Bart Trzynadlowski d200dff89e - Changed EmulateSCSP -> EmulateSound and -no-scsp -> -no-sound.
- Changed gear shifting behavior: neutral gear has its own button now.
- Removed SUPERMODEL_SOUND.
- DirectInput is the default input system for Windows now.
- Multi-threading is on by default, replaced -multi-threaded w/ -no-threads.
- Made crosshairs larger and more visible.
- Added Nik to co-author list and began updating file copyright notices.
- Fixed Virtua Striker 2 input names (player 2 inputs end with the number 2 instead of 1).
- Added documentation to a Docs/ subdirectory.
- Exported all default input configurations to Supermodel.ini and added that to the repository. Internally, Supermodel initializes all controls to "NONE" now.
2011-09-14 06:16:22 +00:00
Nik Henson d34223ebd2 Improved way constant force and vibrate effects are combined to control left and right vibration motors under XInput 2011-09-13 22:50:50 +00:00
Nik Henson f6af182467 Added comment 2011-09-13 22:46:21 +00:00
Nik Henson ca8d838826 Added stopping of all force feedback effects on reset (just in case some were playing at that point) 2011-09-13 22:45:32 +00:00
Bart Trzynadlowski c10e839dc0 Added a scissor box to clip viewable area. Prevents garbage in the "overscan" areas due to renderer creating viewports that exceed intended display area. 2011-09-13 06:30:42 +00:00
Bart Trzynadlowski fdedc60f84 Constant force commands for XInput devices fixed so that they will stop when 0 force is applied. 2011-09-13 02:39:48 +00:00
Bart Trzynadlowski 02c0c32398 Fixed a possible INI file problem: unterminated strings will end at a newline now. 2011-09-12 23:09:06 +00:00
Nik Henson e223d388eb Driveboard changes:
- added notification message if drive board is disabled when loading incompatible save state
- removed some superflous print statements, but have kept in printing out of force feedback commands for now (which have also been made more visual)
- made sure that feedback state is reset in SendStopAll()
2011-09-12 21:07:03 +00:00
Nik Henson 75d446c272 Changes to Audio.cpp:
- audio buffer is now kept as full as possible with new audio buffering method rather than just half full like before (this is okay now that buffer overruns have been eliminated)
- altered minimum size of audio buffer so that audio still works with a zero latency setting (obviously there will still be some latency)
2011-09-12 21:03:16 +00:00
Nik Henson b0bda2c356 Added note to command line options indicating that force feedback is experimental still 2011-09-12 20:08:50 +00:00
Nik Henson dc368c1edd Added configuring of DirectInput and XInput force feedback parameters via config file 2011-09-12 20:05:58 +00:00
Nik Henson 8dfb033034 Changed drive board logic slightly for stopping vibrate effect as wasn't always cancelling the effect in Daytona 2 2011-09-12 19:55:53 +00:00
Bart Trzynadlowski e6f19c40ef Fixed 68K save state problem: pending interrupts were not being saved, sometimes causing the DSB2 to take an invalid interrupt (from the sound board 68K) after loading a save state. Save states are no longer compatible with previous revision. 2011-09-12 18:14:49 +00:00
Bart Trzynadlowski cf73207c98 - Nik's new decoupled audio code with fixes to minimize overruns.
- VBlank timing: increased to 20% of a frame.
2011-09-12 05:43:37 +00:00
Nik Henson 4c18925679 Fixed bug with loading/saving of state - it wasn't persisting the ram array properly 2011-09-11 18:55:13 +00:00
Nik Henson 5b5d24293f Fixed bug which was crashing emulator when loading/saving state of games that do not use the drive board 2011-09-10 21:00:33 +00:00
Bart Trzynadlowski 0716285fc2 Fixed error reporting for -input-system option. 2011-09-09 21:59:23 +00:00
Bart Trzynadlowski e724d0ec0b Fixed error message when multiple files detected on command line. 2011-09-09 20:41:55 +00:00
Nik Henson 0495421cbc DriveBoard changes:
- fixed bug in SendConstantForce which was sending incorrect values at times
- removed friction effect for now, until can determine its exact command seq
- added checking of compatibility of saved state and temporary disabling of drive board if not compatible
2011-09-09 07:18:52 +00:00
Bart Trzynadlowski b76b43cc93 - Fixed drive board. Now determines whether it is attached and enabled in Reset(). 2011-09-08 17:58:25 +00:00
Bart Trzynadlowski 11d1d61bc2 - Removed BOOL and replaced it with native C++ type, bool.
- Removed TRUE and FALSE, changed to 'true' and 'false' keywords.
2011-09-08 06:34:18 +00:00
Bart Trzynadlowski abd86a5624 - Cleaned up game names (primary sets no longer have revision labels in title).
- Added volume controls to UI.
- Renamed "Sega Rally Controls" to "Sega Rally/Dirt Devils Controls" (even though Dirt Devils has no hand brake).
- Hooked up gear shifting and view change for Dirt Devils.
- Removed debug printf()'s from DSB.cpp.
- Removed debug printf() from Real3D.cpp.
- Disabled assertions in SCSPDSP.cpp.
- Converted all error messages in Amp library to Supermodel format.
2011-09-08 05:08:16 +00:00
Bart Trzynadlowski 4040b7eeee Forgot to disable drive board if ROM not loaded. 2011-09-08 01:13:25 +00:00
Bart Trzynadlowski 70ec09de92 - Added drive board ROM loading.
- Changed EnableFFeedback -> ForceFeedback to be more consistent with the other options.
- Updated help text.
2011-09-08 01:07:06 +00:00
Bart Trzynadlowski cd5bf4c1dd - Updated help text.
- Corrected a typo: EnableFeedback -> EnableFFeedback.
2011-09-07 16:44:20 +00:00
Nik Henson 532c6e7edb Added method to fetch current PC value 2011-09-07 07:36:08 +00:00
Nik Henson 0a512d79eb Added -force-feedback command line option 2011-09-07 07:28:34 +00:00
Nik Henson d7ee278f69 Added handling of drive board (if attached) 2011-09-07 07:21:56 +00:00
Nik Henson 4948c66a67 Added drive board header 2011-09-07 07:08:32 +00:00
Nik Henson d08ba050bd Added in drive board config 2011-09-07 07:07:19 +00:00
Nik Henson 5c8af8d259 Initial version of drive board (still work-in-progress) 2011-09-07 07:06:40 +00:00
Nik Henson c5d585440c Changes to CDirectInputSystem:
- Added parameters for DirectInput and XInput force feedback effects (although still need to add code to persist them in configuration file)
- Added extra friction feedback effect and tidied up existing effects
2011-09-06 19:05:22 +00:00
Nik Henson 48e98ff75d Added friction effect to feedback enumeration 2011-09-06 18:56:25 +00:00
Nik Henson c6e1c9a2ad - Changes to let SCSP.cpp compile under Visual Studio 64-bit
- Fixed unsigned int overflow bug in SCSP.cpp that was causing VF3 to crash on selection screen when running 64-bit
2011-09-05 20:55:33 +00:00
Bart Trzynadlowski 9f6a01eb55 Made save states 64-bit safe. 2011-09-05 20:07:14 +00:00
Bart Trzynadlowski 498d90d667 Multithreading was always enabled in the CModel3 constructor. Disabled this behavior. 2011-09-05 19:05:47 +00:00
Bart Trzynadlowski 99149124e6 First part of SCSP clean up: pointer arithmetic made more safe (I hope). To-do: convert data types to Supermodel standards. 2011-09-05 06:53:26 +00:00
Nik Henson 7b58fd0644 Fixed bug which meant that a buffer over-run occuring under certain conditions would leave the write position dangling past the end of the buffer, causing no further sound to be written to the buffer and leaving playback looping indefinitely. 2011-09-01 21:58:10 +00:00
Bart Trzynadlowski bda9efebac - getbass now uses MPC106.
- Fixed some error messages in 53C810.cpp.
- Fixed stereo (was swapped) and added a flip stereo option.
2011-09-01 06:43:01 +00:00
Nik Henson b25cbb2391 Removed setting of writeWrapped to false always on buffer under-run when underRunLoop is true as this is wrong. Suspect this may have been causing looping bug. 2011-08-31 22:30:45 +00:00
Bart Trzynadlowski de3e56fc96 Inadvertently left SUPERMODEL_LOG_SOUND enabled. Now disabled. 2011-08-29 16:32:24 +00:00
Bart Trzynadlowski b647cd5a4b - Added Spikeout Final Edition.
- Minor change to DSB save state loading: only loopEnd is checked before using MPEG_SetLoop().
2011-08-28 20:56:36 +00:00
Bart Trzynadlowski 87dc5b4181 - Fixed format strings for messages involving __LINE__.
- Fixed an MPEG related crash when loading save states. If usingLoopStart is 0, it is important not to call MPEG_SetLoop()!
- -input-system is working again.
- Changed the format of some messages here and there.
2011-08-28 04:37:41 +00:00
Bart Trzynadlowski 8be2966ecb - Added crosshairs for light gun games and disabled mouse cursor in full screen mode (no way to re-enable it now).
- Fixed Real3D FIFO buffer overflow bug.
- Input system cannot be changed for non-Windows builds (only SDL is available).
- Added Spikeout-specific controls.
2011-08-27 21:37:37 +00:00
Bart Trzynadlowski b19f600fec - Added mappings for individual joysticks in Virtual On for dual-joystick gamepads.
- Input settings are now only read from "global" to avoid confusion.
2011-08-26 05:06:34 +00:00
Bart Trzynadlowski a2ce64745f Detailed config is logged. 2011-08-20 16:56:40 +00:00
Bart Trzynadlowski bedbfd26d3 Detailed config is logged. 2011-08-20 16:53:52 +00:00
Bart Trzynadlowski dbc1dbb0e8 - Forgot to add OSDConfig.h.
- Changed more C standard library headers to C++ versions.
2011-08-19 23:47:33 +00:00
Bart Trzynadlowski d318efe58c - Program settings are now managed by the CConfig class.
- Moved Logger.h to OSD/, cleaned up comments.
- Command line and config file parsing have been rewritten.
- Began replacing C standard library headers with C++ versions (eg. stdio.h -> cstdio). I think I got most of them, but not all.
2011-08-19 20:43:07 +00:00
Bart Trzynadlowski 5e1ea75374 Fixed memory pool macros to (hopefully) work with gcc. 2011-08-15 05:59:33 +00:00
Bart Trzynadlowski 6c5b4293eb Musashi context is now cleared in M68KCtx constructor. The internal Musashi context is zeroed out initially but the dynamically allocated external contexts would sometimes be filled with garbage, which would trigger interrupts at the very first instruction after reset, making the 68K go off into the weeds. This fixes a nasty randomly-occurring bug I was seeing. 2011-08-14 23:59:01 +00:00
Bart Trzynadlowski 4e7b7cc59b - Fixed DSB2 save states: M68K context wasn't being set.
- INI file changes: added support for opening and creating files, for a default section alias, and for sections appearing multiple times in the section list (may prevent some bugs).
2011-08-10 07:46:42 +00:00
Bart Trzynadlowski 12e4d82471 - DSB2 save state support.
- krom made a minor optimization of the byte reverse routines in ppc.cpp.
2011-08-10 05:35:42 +00:00
Bart Trzynadlowski 91c9b9869b R. Belmont's changes to compile under MacOS and Linux. 2011-08-10 04:24:15 +00:00
Bart Trzynadlowski 06f6bf093b Save state support for 68K, Z80, sound board, DSB1, and MPEG playback. 2011-08-09 18:36:29 +00:00
Bart Trzynadlowski 52cd9d834b Save state support for 68K, Z80, sound board, DSB1, and MPEG playback. 2011-08-09 18:16:06 +00:00
Nik Henson 07fd26003e Added option to loop play position back to beginning of audio buffer when a buffer under-run occurs, rather than stalling output as before. This option is now the default behaviour. 2011-08-07 23:09:18 +00:00
Bart Trzynadlowski 6c71ec28af Protection now works for ecax. 2011-08-07 03:10:07 +00:00
Nik Henson 416fead447 Fixed mistake in previous commit! 2011-08-07 01:07:48 +00:00
Nik Henson 466997b318 Small bug fix to get MIDI music to play at correct speed (68K was running at wrong frequency) 2011-08-07 00:30:52 +00:00
Bart Trzynadlowski 603bd1bb86 - Added a patch for vs215. 2011-08-05 06:49:51 +00:00
Bart Trzynadlowski d859115074 - krom's patches for vf3a, harleyb, and ecax. 2011-08-05 06:22:34 +00:00
Bart Trzynadlowski 67c1b94b35 - Fixed DSB2 music looping. 2011-08-04 05:52:26 +00:00
Bart Trzynadlowski 915a6c5a17 - Fixed a DSB2 bug: masking of bytes when constructing start/end addresses is now correct (previously was allowing uninitialized garbage into upper 8 bits, which ought to be 0). 2011-08-03 06:06:18 +00:00
Bart Trzynadlowski 6a6788952c - Fixed Daytona 2 Advertise song. DSB2 MPEG state machine can now begin playing songs from state ST_GOTA4.
- krom: Minor fixes to Main.cpp to support wider ROM set names (up to 9 chars) and compilation under MinGW.
2011-08-03 04:29:33 +00:00
Bart Trzynadlowski 6b55cfb765 - krom added remaining ROM sets. Spikeout Final Edition disabled because it is a bad dump.
- Added patches for scuda and scudj.
- Added a TO-DO reminder in INIFile.cpp.
2011-08-03 03:18:51 +00:00
Bart Trzynadlowski fce3c7ad7c - skichamp now works, but controls are not hooked up and seems to overload the display lists like many non-working Step 2.x games do. To bypass the drive board error, enter the test menu and exit again. It will reboot and run.
- Added some notes on the cause of the "NO DAUGHTER BOARD DETECTED" error in Real3D.cpp.
- Removed some debug code from texture uploader.
2011-08-02 03:33:40 +00:00
Bart Trzynadlowski 2ca7898f1a - Changes submitted by krom: cleaned up spacing in Games.cpp, optimized byte swapping functions in Supermodel.h, minor changes to fix compiler errors in gcc. 2011-08-01 19:12:44 +00:00
Bart Trzynadlowski 4c02a8af05 - Fixed Ski Champ loading. Fails with a "NO DAUGHTERBOARD" error. 2011-07-31 19:19:59 +00:00
Bart Trzynadlowski d8960ad133 - Commented out debug log stuff. Now produces less noisy debug.log files. 2011-07-31 17:16:15 +00:00
Bart Trzynadlowski 357536ea5a - Added a C fallback for inline assembly code when the compiler is not MSVC. 2011-07-31 17:12:02 +00:00
Bart Trzynadlowski cbf28944a5 - Alphabetized ROM sets (thanks to krom) and added DSB ROMs to Spikeout. 2011-07-31 17:08:05 +00:00
Bart Trzynadlowski c5d823f054 - Fixed compilation when DEBUG is defined. 2011-07-31 17:07:17 +00:00
Bart Trzynadlowski 4b994a873e - Removed an unneeded printf() statement. 2011-07-31 04:58:39 +00:00
Bart Trzynadlowski ddd6fa92ef - Improved 68K interface. Now supports context switching.
- CSoundBoard is not derived from CBus.
- Optimized sound board memory handlers (now using switch statements).
- Added DSB emulation (based on R. Belmont's M1 source code).
- Improved ROM loading: only unique ROMs (those not shared amongst games) are used to identify games. The ROM loader will no longer get confused as easily.
- General cleanup here and there, removed unused Render.h file.
2011-07-31 02:37:31 +00:00
Nik Henson 62f695cc96 Added instruction cycle counting to new Z80 core 2011-07-26 21:47:59 +00:00
Bart Trzynadlowski 79e8172340 - Textures are no longer decoded for un-textured polygons (not sure if this fixes anything yet). 2011-07-22 19:01:45 +00:00
Bart Trzynadlowski d2ecec7997 - Textures are no longer decoded for un-textured polygons (not sure if this fixes anything yet). 2011-07-22 18:56:35 +00:00
Bart Trzynadlowski 5b373f687f - Sega Bass Fishing now uses an MPC106, allowing it to boot. 2011-07-22 06:43:53 +00:00
Bart Trzynadlowski a033058deb - Texture offsets: models are now decoded for each individual texture offset state and texture coordinates are adjusted while generating the vertex data.
- Model LUT now capable of differentiating between texture offset states (linked list of different texture offsets for each model address).
- Removed texOffset uniform attribute from vertex shader -- no longer needed.
2011-07-21 08:12:16 +00:00
Nik Henson b94537341d - Added check of reserved flag back into PPC stwcx. instruction 2011-07-20 21:40:10 +00:00
Nik Henson 45dd662dee - Updated debugger classes to get them to compile with latest changes
- Moved CPU debugger for Turbo68K into separate class CTurbo68KDebug and made C68KDebug base class for later addition of Musashi core
- Fixed typos in ConsoleDebugger
2011-07-20 21:39:11 +00:00
Nik Henson 03fa9532eb - Added function-based interface Audio for OSD sound output, together with SDL implementation
- Added object interface CThread for OSD threading and synchronization, together with SDL implementation
- Added multi-threading to CModel3 so that separate CPUs (PPC of main board, 68K of sound board and Z80 of drive board) can be run in separate threads if requested to improve performance on multi-core PCs
- Added -multi-threaded command line option (default is to run single-threaded still)
2011-07-20 21:14:00 +00:00
Bart Trzynadlowski 12693a70f6 - Patched out a decrementer loop that was preventing Spikeout from starting up. 2011-07-20 06:20:40 +00:00
Bart Trzynadlowski 097b87e3c9 - CPU/Z80.h included from Supermodel.h 2011-07-18 19:59:37 +00:00
Bart Trzynadlowski 99b9c7838f - Added Z80 emulator from YAZE-AG.
- CBus now has IO bus functions to support the Z80.cpp
- Bus.h moved to CPU/ directory.
2011-07-18 19:48:57 +00:00
Bart Trzynadlowski 004339e601 - Added sound ROMs to Daytona 2 (BOTE and PE).
- Implemented bank switching for sample ROMs. It is probably incorrect because there is still 2MB of unaccounted-for space.
- Added a few important TO-DO notes.
2011-07-16 04:53:12 +00:00
Bart Trzynadlowski 325f9ab2e8 - stwcx. now always writes to memory.
- Added PPC/68K communication and automatically generated sound IRQs. Sound is now mostly working :)
- Increased SCSP MIDI buffer length to 128 to simulate a large FIFO for PPC->68K commands.
- Added sound ROMs to those games which have 8 MB of sample ROMs.
2011-07-13 07:11:27 +00:00
Bart Trzynadlowski b2afd274cb 2011-07-13 05:29:02 +00:00
Bart Trzynadlowski c73cb830dc - Added the Musashi 68K emulator by Karl Stenerud. Obtained Karl's explicit permission to relicense the code under GPL.
- Added a 68K interface, CPU/68K/M68K.*.
- Moved Turbo68K source files to CPU/68K/Turbo68K. It is no longer used but is being retained in the source tree for now. The LSR instruction has not been fixed in this update.
- Changed sound board code to use the new 68K interface (and hence, Musashi).
- Changed version string from 0.2-WIP to 0.2a-WIP. This is still an alpha version.
- Above changes have broken the 68K debugger.
2011-07-12 04:57:12 +00:00
Bart Trzynadlowski 95d61ce8bb Several ROM sets were added (contributed by krom@gbadev.org). 2011-07-06 05:08:02 +00:00
Bart Trzynadlowski b0e8755afc Added Spikeout protection data.
Added code to detect and abort erroneous 0-length texture transfers (was causing Spikeout to hang the emulator).
2011-07-06 05:07:04 +00:00
Bart Trzynadlowski a90075830c Texture offsets. 2011-07-06 05:05:38 +00:00
Bart Trzynadlowski cd2621b2ce Added texture offsets. Vertex shader has been updated in Shaders/Vertex.glsl.
Added palette initialization to 2D renderer. Fixes 2D graphics corruption when loading states (most visible in Scud Race).
2011-07-04 20:53:37 +00:00
Nik Henson 97ac46c82a Changes to debugger classes:
- Added CPrintBreakpoint
Changes to console-based debugger:
 - Added new scp command and tidied up some other commands
 - Tidied up event logging
 - Sorted commands into common groups
 - Added ReadMe.txt help file
2011-06-29 23:21:50 +00:00
Nik Henson 8e2e8adeb3 Changes to debugger classes:
- fixed step-out to work properly
- added ability to enable/disable debugging of individual CPUs
Changes to console-based debugger:
- tidied up syntax and split some commands out to make easier to use
- implemented missing commands (loademustate, saveemustate, resetemu, configinput, configallinputs, help)
- added new commands (nextframe, enablecpu, disablecpu, removeallcomments)
- added ability to redirect command output to a file
2011-06-28 23:20:19 +00:00
Nik Henson 0153a02b19 Added version of ConfigInputs that doesn't take display dimensions 2011-06-28 23:16:40 +00:00
Nik Henson 9416f9c521 New debugger classes - implementations for ppc and Turbo68K CPU cores 2011-06-28 00:29:20 +00:00
Nik Henson 8a9924b884 Changes for new built-in console-based debugger (only compiled in if SUPERMODEL_DEBUGGER defined):
- added code to create debugger object and attach it to system,
 - added new command lines options -enter-debugger and -disable-debugger,
 - added new UI input to halt execution and enter debugger (default Alt+B),
 - added new CLogger class to route all output via debugger if required.
2011-06-27 23:44:51 +00:00
Nik Henson 036c371592 Added headers for new debugger classes 2011-06-27 23:22:50 +00:00
Nik Henson 2465354ef6 New CLogger class that handles logging from Supermodel. Added so that log messages can be routed through debugger if required, rather than printed to console. 2011-06-27 23:21:43 +00:00
Nik Henson aa0c598a4c Added hooks into debugger classes 2011-06-27 23:19:22 +00:00
Nik Henson 46944e8c96 Added option to call user supplied debug function before every instruction 2011-06-27 23:10:51 +00:00
Nik Henson 809892c69c Added check for error that occurs when calling CoInitialize from a managed context 2011-06-27 23:06:08 +00:00
Nik Henson 7f53bd4816 Added new UI input to break execution and enter debugger (default mapping Alt+B) 2011-06-27 23:04:34 +00:00
Nik Henson efefc65ecf Removed couple of debugger commands that not yet working 2011-06-27 23:01:15 +00:00
Nik Henson eddc1df03a New debugger classes 2011-06-27 22:55:03 +00:00
Nik Henson 187f0016fb Fixed small bug with formatting in DecodeSigned16 2011-06-27 19:53:24 +00:00
Nik Henson 2800f86935 Small change to allow Supermodel to compile under Linux 2011-06-22 20:46:53 +00:00
Nik Henson 2e14ec3e6e Small code tidy up (moved some code out of header file into cpp file where it belongs) 2011-06-22 20:18:40 +00:00
Nik Henson e8782b98fa Changes relating to input system:
- Added ability to configure axis min, centre and max values in INI file.  This allows some types of steering wheel pedals that use an inverted value range to work properly with the emulator.
 - Modified CINIFile to read and write signed numbers (needed for above change).
 - Added check at configuration start for "bad" input sources such as axes that are wrongly calibrated or buttons that are always triggering a value.  Otherwise they cause the configuration loop to wait indefinitely for the axis or button to be released.
 - Removed superfluous check for XInput devices when XInput is not enabled in CDirectInputSystem.
 - Improved force beedback code in CDirectInputSystem and also added the extra feedback effects needed so far for drive board emulation.
2011-06-22 13:06:52 +00:00
Nik Henson 5e247021be Changes relating to input system:
- Fixed bug with mapping of multiple assignments.
- Added new ! operator for input mappings, which lets the user specify that an input must not be active.
- Added option to print info about input system (such as settings and detected keyboards, mice and joysticks) during input configuration.
- Added new trigger input for lightgun games with a configurable option to automatically pull trigger when offscreen input is activated (this makes playing with the mouse easier as the gun can be reloaded with single mouse button, rather than having to press both
 buttons at the same time).
- Added -xinput command line option that switches to using XInput API rather than DirectInput for XBox 360 controllers (this allows the XBox 360 controller's two triggers to be read independently which works better for driving games when they are mapped to accele
rator and brake).
- Added initial version of force feedback implementation to DirectInputSystem (this still needs work).
2011-06-05 20:53:39 +00:00
Bart Trzynadlowski 783446fca2 Fixing import mistake: moving source code to trunk/Src. 2011-04-24 01:19:40 +00:00