Commit Graph

567 Commits

Author SHA1 Message Date
8931bd4608 Refactored switchPreset to have more logical naming 2020-09-01 00:35:09 -07:00
1dd41ee97a Add mitigation for shader compilation failure 2020-08-31 23:57:22 -07:00
4eed6eb469 Merge pull request #359 from milkdropper/touch
Implement touching / clicking (interaction with presets).
2020-08-31 21:24:12 +04:00
d50d23ed43 Merge pull request #406 from milkdropper/tweak
tweak beat sensitivity to be more sensitive / granular
2020-08-31 21:23:48 +04:00
e3adb438a3 Revert "Fix blank preset bug (#412)"
This reverts commit f8cea68105.
2020-08-31 21:07:45 +04:00
c80533c947 Merge branch 'master' into touch 2020-08-31 20:53:06 +04:00
a0dc91231d review requests by @revmisha 2020-08-31 20:51:25 +04:00
f8cea68105 Fix blank preset bug (#412)
I haven't tested this because my only linux box is headless, but this compiles and is the same fix I applied to the Android branch in Feb 2020.  It makes sure than an interrupted peset blend doesn't accidentally leave the master alpha set to a non-1.0 value.  The fix is not very elegant, but it is quite effective.

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
2020-08-29 11:23:18 +03:00
c1f40eb0d5 tweak beat sensitivity to be more sensitive / granular 2020-08-16 19:59:36 +04:00
b7a04c0425 #396 check for fts.h more portably (#397)
* #396 check for fts.h more portably

* Xcode -DHAVE_FTS_H

* Xcode -DHAVE_FTS_H
2020-08-14 13:35:25 +03:00
0937f3959c Allow home / end to jump to top / bottom of preset list. 2020-08-11 20:33:00 +04:00
c05c457ad4 Rename & expected random handling. 2020-08-09 14:07:27 +04:00
7c8059f408 Help Menu 2020-08-08 14:27:28 +04:00
5c89399872 Help Menu 2020-08-08 14:22:30 +04:00
001d58843e Prioritize toasts; pass color to drawText; determine max lines on reset of renderer; draw preset menu 2020-08-07 15:49:52 +04:00
09a39933f7 Pass a list of presets to the renderer. But only enough to fill the screen. 2020-08-07 15:44:53 +04:00
c2a232f6fd Handle keys: m, page up, and page down. 2020-08-07 15:44:31 +04:00
77617e4109 Merge pull request #358 from milkdropper/return_random
Previous keyboard shortcut in SDL now acts as expected when in shuffle (random) mode.
2020-07-29 22:27:12 +04:00
28c9a229a7 Merge pull request #388 from milkdropper/more-toast
More Toasts - hard cut / soft cut clarification.
2020-07-29 22:25:18 +04:00
f8d1684461 xcode update for glm headers 2020-07-28 22:16:50 +03:00
b888c52326 Make SDL sdl2pmKeycode understand uppercase (by supplying keymod) 2020-07-28 23:09:52 +04:00
c5533e3efe Little things (#368)
* Noise not needed - F4 shows if shaders are compiled.

* Don't compile native presets by default in Visual Studio

* Debug / duplicate info

* Missed a debug native preset.

* Make texture errors more clear - we failed looking for multiple extensions.

* Move images from presets folder to textures folder

* Documented missing textures.

* Undo Visual Studio version bump.

* Renable NativePresetFactory (but the example native presets remain disabled)

* Comment

* Fixes / updates to audio device toggling.

* Stop crashing if there is no input microphone. Make fake audio dynamic so it can be enabled if there is no mic.

* Remove debug output.

* Document VC++ redist requirement.

* F4 missing from SDL help menu.

* Windows app instead of Console (no more cmd.exe pop-up when launching).

* Fullscreen for built-in settings.

* New icon (based on github and idle preset and consistent with Steam)

* Change language for loopback / audio changing.

* default fullscreen for built-in settings.

* Revert "Fullscreen for built-in settings."

This reverts commit b1936e76ab.

* Revert "default fullscreen for built-in settings."

This reverts commit ea89584174.

* Revert "9a9151b9"

* 9a9151b9

* fake_audio to fakeAudio
2020-07-28 22:05:35 +03:00
e49720ecfa Preset subdirs (#385)
Scanning textures/presets dirs for textures and scanning preset dir for presets.
Scanning is now done recursively, so presets and textures can be organized into subdirectories instead of needing to be flattened into a single directory.

On POSIX systems makes use of [ftw](https://linux.die.net/man/3/ftw) which should be relatively efficient. Otherwise falls back to recursing with `dirent` (for windows).

Probably should have made an autoconf check for `ftw` instead of doing `#ifdef WIN32`. 

* Scan subdirectories in presets directory

* remove preset subdir config

* Recursively scan for textures too, add c++-17 compatibility

* Refactor directory scanning code so it's reused by texture loader and preset loader. Make cross-platform (maybe)

* filescanner in makefile

* extension filter for file loader

* make extensions match up'

* need string.h

* Add FileScanner.cpp to win build (maybe)

* scan all dirs

* #ifndef #ifdef is def fun

* bogus comment

* bleh

* bleh

* itunes plugin with c++17

* EyeTunes needs to know about the FileScanner

Co-authored-by: milkdropper.com <milkdropper.com@gmail.com>
Co-authored-by: milkdropper <59471060+milkdropper@users.noreply.github.com>
2020-07-28 22:01:56 +03:00
4c180cb0aa Toast for shuffle enable/disable and beat sensitivity +/- 2020-07-28 22:26:43 +04:00
c63637624b #378 fix aligned alloc on macOS when building without XCode (#384) 2020-07-25 19:30:31 +03:00
c9b1f5fa71 Disable lines again 2020-07-15 21:04:29 +04:00
c7fcaea3b2 New vision for touching 2020-07-15 20:59:37 +04:00
a7f58984da Right click destroys the waveform you placed on the renderer with left click. 2020-07-14 23:14:10 +04:00
734d01e031 Touch now supports dragging (wave more fun than just clicking). 2020-05-26 13:38:50 +04:00
f9dc5d27db Recommended change. Not sure why I wrote that! 2020-05-24 19:48:04 +04:00
4ae0823e4f Cap preset random history to 10. 2020-05-24 19:46:19 +04:00
60ba92e552 Merge branch 'master' into touch 2020-05-24 19:13:11 +04:00
342f3577c7 Conflict1 again 2020-05-24 19:04:04 +04:00
3a3ea44200 Conflict1 2020-05-24 19:03:03 +04:00
5b18d21de5 Not needed. 2020-05-24 18:37:57 +04:00
5074405c7b Less random colours (less ugly) + better documentation on touch. 2020-05-24 18:12:42 +04:00
cdd52d3a57 Touch support for renderer. 2020-05-24 17:44:11 +04:00
d22caa6ebe projectM can pass touch to the renderer. 2020-05-24 17:42:38 +04:00
1d994941ef Help menu (#357)
* beatfix

* Flexible help menu

* SDL set help menu.
2020-05-24 11:31:02 +03:00
e5f21477b5 remove debug line 2020-05-23 21:24:55 +04:00
3314143f20 Realstic random tracking. 2020-05-23 21:03:19 +04:00
98e5945a01 Previous on Random == Last Ransom Preset. 2020-05-23 19:55:01 +04:00
43c294791a beatfix (#355) 2020-05-15 21:00:54 +03:00
366a70b678 beatfix 2020-05-15 21:45:09 +04:00
758348f25a Beat sensitivity implemented (#348)
* Beat detect sensitivity fix.

* Default: 1.0

* ReadMe beat sensitivity min/max.

* Beat sensitivity from config or settings isn't initialized.

* Smarter position.

* Make PCMScale (vol_history) also impacted by beat_sensitivity.

* Enhance and clarify Hard Cuts and better separate beat sensitivity.

* Forgot one config.

* Consistency with defaults.

* Even more clear about the default for Beat Sensitivity.
2020-05-15 17:49:28 +03:00
9760ae934f Implement toast messages (#351)
* Bette

* Removing test message.

* New timing functions. Handle drawing text that's too big.

* SDL space and switch libprojectM to use setPresetLock for L.
2020-05-14 22:08:50 +03:00
a24dcca470 Display status (#347)
* Display some useful stats.

* Document F4 key in README
2020-05-07 23:31:44 +03:00
a98ba2c716 support highDPI displays retina 2020-02-28 12:11:35 -05:00
11a9c7b041 revise 2020-02-28 09:24:28 -05:00
a92dba3e93 Update project.pbxproj 2020-02-27 16:23:37 -05:00