Commit Graph

541 Commits

Author SHA1 Message Date
4dc22c58f3 Moved ShaderEngine static shaders to separate manager 2020-08-09 04:30:49 -07:00
093164d583 Backport GLSL shaders to version 1.2 to support older hardware. 2020-08-05 01:12:19 -07: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
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
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
1e1b428f0b Merge pull request #315 from projectM-visualizer/beatdetect_309
Beatdetect 309
2020-02-07 08:55:42 +02:00
324a5c19f3 getPCMScale() too large? 2020-02-02 12:26:34 -08:00
9ba6dceac7 Merge pull request #312 from projectM-visualizer/beatdetect_309
new BeatDetect implementation
2020-02-01 22:59:13 +02:00
5fd9bc13ec some feedback improvements 2020-02-01 12:47:18 -08:00
e8343b3f72 Fix off by 1 qvar errors, var names 2020-01-31 22:41:37 -05:00
0758b042be add preset name to window title, add mac build debug Make target with xcodebuild 2020-01-27 22:12:22 +02:00
0eec9ed694 comments on frequency ranges 2020-01-26 17:31:06 -08:00
197b2f2736 fix getPCMScale() to match getBeatVals() 2020-01-26 10:20:16 -08:00
b779be76ee attempt to improve freq responsiveness 2020-01-25 17:26:40 -08:00
f5dd470fb0 #296 - Turning on -fno-stack-check for High Sierra compat 2020-01-19 13:01:59 +02:00
260a0285b0 Milkdrop keys (#279) 2020-01-19 12:54:58 +02:00
b4a3fd6d0f Menu and FPS changes (#303)
* Set build target to 10 (generic) instead the specific build the original author used.

* Move help menu down a line and indent to align with preset title and FPS.

* More accurate FPS:
 - by resetting timers whenever F5 is pushed.
 - by performing math based on percise seconds that passed, rather than assuming it will trigger exactly 250 milliseconds.

* Set idle preset name so it's displayed with F3.
2020-01-18 12:57:57 +02:00
8c4763e79a Display FPS (#297)
* Display FPS

* Updates based on feedback from Mischa.

* Quick typo fix.
2020-01-09 15:26:44 +02:00
72cff7c94e Updated the keybindings similar to MilkDrop (#124)
1. Updated keybinding for previous preset to BACKSPACE
2. Updated keybinding for hard cut next preset to H
2019-11-16 08:22:39 +02:00
0ffad4dc4e Fix git (#278)
* presets: remove problematic community presets

* Breaks a lot of things including test apps and kodi addon.
  Link is provided in README.md for those who want it

Signed-off-by: Matt Filetto <matt.filetto@gmail.com>

* fix for freeze (issue 243) (#276)
2019-11-16 07:13:03 +02:00
ec0a52a51f Update Renderer.cpp 2019-11-03 20:02:13 -05:00
cac6b3454d Update Renderer.cpp 2019-11-03 18:52:52 -05:00
07a2bacb6f USE_TEXT_MENU PreprocessorDefinitions 2019-11-03 18:50:20 -05:00
435fee23e8 Update gltext.h 2019-11-03 18:42:28 -05:00
6728416e9d Update gltext.h
define GLSL_VERSION "330" not 410
2019-11-03 17:52:31 -05:00
994a186038 update gltext library to operate with both opengl and opengles fragment and vertex shaders
confirmed functional on iphone, pc, xbox
2019-11-03 17:44:31 -05:00
96417708c3 Update gltext.h 2019-11-03 16:10:13 -05:00
38ca4626ce confirm build w/o fonts 2019-11-03 16:05:36 -05:00
0dc84cbee5 test gltext 2019-11-03 15:53:05 -05:00
251ceca5ab Update projectM-opengl.h
#define GLM_FORCE_CXX03 msvc2019 compilation error
2019-10-31 22:26:11 -04:00
21ad4c3795 rework windows store build for msvc 2019 toolchain 2019-10-31 12:00:31 -04:00