Commit Graph

119 Commits

Author SHA1 Message Date
MaikelChan
5789492021
Adjusted screen coordinates so menu doesn't overlap (#66)
* Optimized final blit to the screen render target.

When bumping the table, instead of offseting the table pixels by CPU, just memcpy all the pixels to vScreenTex once, and then render two separate quads from that texture: one for the board and the other for the sidebar. Then change the coordinates of the board quad when bumping.

* Main menu bar doesn't cover game area

* Forgot to also take into account changing UI scale.
2021-10-24 18:38:23 +03:00
MaikelChan
38cf08e298
Optimized final blit to the screen render target. (#65)
When bumping the table, instead of offseting the table pixels by CPU, just memcpy all the pixels to vScreenTex once, and then render two separate quads from that texture: one for the board and the other for the sidebar. Then change the coordinates of the board quad when bumping.
2021-10-24 07:13:51 +03:00
Muzychenko Andrey
5cd01807b2 winmain: converted int to bool.
Cleaned up some of the PR changes.
2021-10-23 09:02:51 +03:00
toxie
57af3af800
Increase precision of mode_countdown_ handling (#52)
* fix harmless warnings and properly try/catch allocations via new

otherwise the error handling will never be triggered

* increase precision of mode_countdown_ handling

potentially there could be modes running a bit too long, depending on passed in ms (which were implicitly truncated before when passing in)

also fix some harmless warnings

* document warnings that i cannot handle on my own

* revert changes to have a new cleaner PR after review/cherry picks

* increase precision of mode_countdown_ handling

potentially there could be modes running a bit too long, depending on passed in ms (which were implicitly truncated before when passing in)

also fix some harmless warnings and add comments where original code is 'correct' but weird
2021-10-23 07:33:04 +03:00
Desgging
8e07b7fc3f
Full Tilt hack - ball doesn't delay at ramp hole (#63) 2021-10-23 07:31:25 +03:00
Muzychenko Andrey
685dfe78c2 TPlunger: removed duplicated code.
Ref PR#52.
2021-10-18 10:52:13 +03:00
Muzychenko Andrey
348d79ef38 Bugs and suggestions from PR# 48. 2021-10-18 09:31:47 +03:00
Muzychenko Andrey
06b760e8dd Player controls: added mouse and game controller remapping.
Fixed duplicate button id.
2021-10-17 18:18:29 +03:00
Muzychenko Andrey
d06aa1c736 Changed SDL_mixer version guard.
SDL_MIXER_COMPILEDVERSION is not in Windows release of mixer v2.0.1, so it is back to basics with SDL_MIXER_PATCHLEVEL.
MIX_INIT_FLUIDSYNTH was renamed in 2.0.2, according to headers from Windows releases.
Ref PR #42, #46
2021-10-17 12:00:30 +03:00
Mariotaku
787c623cfe
Backward compatibility for mixer version check (#46)
SDL_MIXER_VERSION_ATLEAST isn't available in SDL Mixer 2.0.1, which will cause build errors.
2021-10-17 09:00:49 +03:00
Mariotaku
f56abf0596
Compatibility and game controller patches (#42)
* Compatibility for old CMake versions (3.0)
Compatibility for SDL Mixer 2.0.1
Basic controller support: LB, RB for flippers, A for plunger, DPAD for table bump

* Update SpaceCadetPinball/Sound.cpp

Co-authored-by: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com>
2021-10-17 07:52:05 +03:00
Muzychenko Andrey
f302687c7f high_score: fixed new score not shifting older scores.
Issue #33.
2021-10-15 13:30:55 +03:00
Muzychenko Andrey
5947727f80 Tweaked ball mouse control cheat. 2021-10-10 17:13:43 +03:00
Muzychenko Andrey
69ecce88df Score: inject 3DPB msg font into dat struct.
Fixed double free in sound.
2021-10-10 12:22:21 +03:00
Muzychenko Andrey
43593b168d Sound: added channel recycling.
Added sound channel count (aka voices) user option.
Added 3DPB font to sprite viewer.
Added version number to about dialog.
2021-10-09 17:28:30 +03:00
Muzychenko Andrey
d80074b9b6 Added Windows subsystem entry point for release builds. 2021-10-09 12:33:33 +03:00
Muzychenko Andrey
ac289c7f48 Fixed TLightGroup message 45 and 46, used by TLightBargraph.
Issue #25.
2021-10-07 14:17:43 +03:00
Nixola
87e44b700b
Mingw cross compilation (#24)
* Fixed icon filename capitalization

* Created mingw cmake toolchain

* Adjusted CMakeLists.txt for compatibility

* Small mingwcc.cmake cleanup

* Added cross-compilation instructions to readme

* Update README.md

Fixed typo

Co-authored-by: Nicola Orlando <nicolaorlando24@gmail.com>
Co-authored-by: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com>
2021-10-07 12:53:56 +03:00
Muzychenko Andrey
48721e5811 Fixed flipper animation frame skip bug.
It is from original 3DPB, not present in FT.
2021-10-07 08:01:34 +03:00
Muzychenko Andrey
7ee508118c Fixed TKickout temporary Z in FT mode. 2021-10-06 12:42:22 +03:00
Muzychenko Andrey
8c4f38c0af Cheats: flipped literals, made some toggle, added GUI. 2021-10-05 16:48:13 +03:00
Muzychenko Andrey
167a2c2bd1 Demangled and simplified pbctrl_bdoor_controller. 2021-10-04 17:04:09 +03:00
Muzychenko Andrey
f1c6c48b36 Enabled icon in Windows build. 2021-10-03 18:57:19 +03:00
Muzychenko Andrey
8d2745fc33 Added support for sub-millisecond frame times. 2021-10-03 18:06:19 +03:00
Muzychenko Andrey
261457a959 TPinballComponent: replaced calloc operator new with member initialization. 2021-10-02 18:58:54 +03:00
oz
93de90b680 Replaced memory with new.
Cleaned up gdrv, zdrv, render.
2021-10-02 17:45:31 +03:00
Muzychenko Andrey
c3b6daefc9 Added uncapped UPS option.
Issue #18.
2021-10-02 07:42:08 +03:00
Muzychenko Andrey
81c2034a16 Replaced objlist_class with std::vector.
Fixed minor bug in TLightGroup.
Cleaned up some warnings.
2021-10-01 18:55:44 +03:00
Muzychenko Andrey
8a421a2623 Implemented player controls dialog.
This last missing major feature brings v2 into feature parity with the original and closer to release.
Ref issues #16, #17.
2021-10-01 09:05:38 +03:00
Muzychenko Andrey
a281000308 midi: added support for FULLTILT16 music. 2021-09-30 08:51:48 +03:00
Muzychenko Andrey
03deda2f9d Added event wait timeout when idle.
Added show menu button to prevent lockout; this somewhat ruins no menu aesthetic.
Cleaned up 3DPB vs. FT methods in midi.
2021-09-29 17:53:49 +03:00
Muzychenko Andrey
ba5a0f3044 Compressed and encoded embedded 3DPB font.
Exposed ImGui function for decompressing embedded data.
2021-09-29 10:08:45 +03:00
Muzychenko Andrey
b37f5d6d76 Fixed ShowMenu option interrupting ImGui::NewFrame. 2021-09-29 07:46:13 +03:00
Muzychenko Andrey
593b4d161c
Merge pull request #14 from prototux/option_nogui
Add an option to show or hide the menu
2021-09-29 07:32:01 +03:00
prototux
7c29c05d64 Fixed the keyboard shortcut for show menu 2021-09-29 06:09:24 +02:00
prototux
89f4b6d535 Fixed the keyboard shortcut for show menu 2021-09-29 06:06:08 +02:00
Muzychenko Andrey
65037e0e69 Bug-fix: storage for non-inline static constexpr.
Somehow none of the compilers I test with cought this.
2021-09-29 06:07:00 +03:00
prototux
b843e9a6cb Added an option to show or hide the menu. 2021-09-29 02:21:21 +02:00
Muzychenko Andrey
b4cb827d73 winmain: reworked main loop for smoother frame times.
imgui_sdl: added handling for device lost.
midi: load PINBALL.MID in uppercase and using absolute path.
Added UPS/FPS options, by default 120/60.
2021-09-28 08:14:18 +03:00
Muzychenko Andrey
22ce8ac538 gdrv: blit no more, present render:vScreen directly.
Improved split bitmap handling.
2021-09-25 16:52:19 +03:00
Muzychenko Andrey
fd9de493e6 Added linear filter option for vScreen texture.
Rollback blit to backing storage – its persistence is not guaranteed.
Added project URL to About dialog.
Added source ports table to readme.
2021-09-23 12:16:58 +03:00
Muzychenko Andrey
4c196a9290 Added table resolution and UI scale options.
gdrv: blit directly to backing store of vScreen texture.
Added missing cheat_bump_rank sub, oops.
Fixed some warnings.
2021-09-22 15:50:07 +03:00
Muzychenko Andrey
c63c6701ac gdrv: RGBA buffers, pre-applied palettes, SDL bitmap origin.
Refactored partman.
Added sprite viewer.
2021-09-21 13:14:39 +03:00
Muzychenko Andrey
8bae7a5b05 Added user settings persistence.
Using ImGui .ini writer.
2021-09-16 10:57:46 +03:00
Muzychenko Andrey
af5a70785e Enabled pch in CMake.
No need to remove old pch includes.
2021-09-15 12:20:57 +03:00
Muzychenko Andrey
c5b7c0ad16 Fixed some of the memory leaks and Clang warnings.
DrMemory and Valgrind work with regular debug builds.
2021-09-14 15:33:18 +03:00
Muzychenko Andrey
28e2417ef9 Made it compile with GCC on Linux.
Fixed GCC warnings and Windows specifics.
Restored C++11, switch to 14 was not supposed to happen.
Not 100% sure about my Find* module section.
2021-09-09 11:40:54 +03:00
Muzychenko Andrey
2fe6d6d33a Removed windows.h dependency.
Added support for music in MDS format.
2021-09-06 16:27:58 +03:00
Muzychenko Andrey
e0638c598d Added GUI, some menus dont work yet.
Fixed uniform scaling.
Removed splash screen.
2021-09-05 10:47:05 +03:00
Muzychenko Andrey
9a10d72e1f gdrv: simplified bitmap, fixed blit, improved SDL present.
Removed some Windows dependencies.
2021-09-01 11:02:57 +03:00