mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-06 14:35:23 +00:00
Code Issues Projects Releases Wiki Activity
2,038 Commits 13 Branches 41 Tags
4dc22c58f37da978ea0ce76b0db102f86b8d6887
Commit Graph

57 Commits

Author SHA1 Message Date
Kevin Balke
4dc22c58f3 Moved ShaderEngine static shaders to separate manager 2020-08-09 04:30:49 -07:00
Kevin Balke
093164d583 Backport GLSL shaders to version 1.2 to support older hardware. 2020-08-05 01:12:19 -07:00
milkdropper
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
Mischa Spiegelmock
0ccb8bde65 typo fix 2019-10-05 21:23:42 +03:00
Benedikt Rötsch
d9fb429abd GLSL and emscripten - JavaScript and WebGL support (#92) 
* add glm lib in vendor folder

* fix makefile

* add more help and context to emscripten readme

* add correct output parameter to emcc

* add how to restart the process to the readme

* simplify emscripten compilation

* apply patch

* fix blur shaders to work with WebGL
 2019-05-11 19:07:49 +03:00
mancoast
33cb7026bd modify for WINRT support 2019-04-26 14:57:58 -04:00
mancoast
ce60556dae Windows build with MSVC (#181) 
credit: @mancoast 

* msvc

* include glew for windows

* fix usage of std namespace with win32

* Update pmSDL.hpp

fix warning with win32

* update dirent for win32

* libs required for win32 linkage

* Update pmSDL.hpp

SDL_MAIN_HANDLED

* Update ShaderEngine.cpp

init glew to create shaders

* fake SDL audio with win32

* Update Renderer.vcxproj

use wildcards for source filenames

* Create config.h

* Update Expr.cpp

fix win32 breaks

* cleanup broken max function

* Update Makefile.am

remove ref to win32-dirent
 2019-03-22 08:55:35 +01:00
deltaoscarmike
7d279db9bb Merge pull request #123 from projectM-visualizer/gles_fixes 
DX to openGL/openGLES transpilation fixes
 2018-11-23 12:27:57 +01:00
deltaoscarmike
271f1f2f68 - Matrix assignment: DX to GL adaptation 
- GLES fix
 2018-11-20 20:34:36 +01:00
deltaoscarmike
10ee34683e DX to openGL/openGLES transpilation fixes 2018-11-17 13:13:25 +01:00
deltaoscarmike
d4d74f6d05 Build warnings cleanup 2018-11-17 11:42:28 +01:00
deltaoscarmike
01ea43f5dc Fix unlock FPS flag 
Add comments for test flags
 2018-08-25 20:19:10 +02:00
deltaoscarmike
bfa33f0bee Fix native presets 2018-08-22 21:20:13 +02:00
deltaoscarmike
f7b971359c Fix texture management 2018-08-22 20:07:11 +02:00
deltaoscarmike
d4ccf8909f Add a fast preset switching test flag to check for shader compilation issues 2018-08-21 19:27:40 +02:00
deltaoscarmike
9f524298af Downgrade glsl required version to 3.3 supported by OGL 3.3. 
It's for old hardware compatiblity since OGL 4.x features are not used.
 2018-07-28 19:56:46 +02:00
deltaoscarmike
7628fd018c - Fix for travis 
- Convert glProgramUniform* for OGL 3.x compatibility
 2018-07-25 19:38:17 +02:00
deltaoscarmike
3142b36e79 Blur shaders ported to GLSL 
All presets unifoms corrected
Shader rendering fixed
 2018-07-23 08:07:14 +02:00
deltaoscarmike
ddcd9fb735 Texture manager rewrite to add sampler support (used by shaders) 
Renderer target rewrite to remove FBO support (better fps)
Render to texture support restored
 2018-07-22 09:16:06 +02:00
deltaoscarmike
28f34f53d3 WIP: now some presets shaders are compiled 
- HLSL: Lots of HLSLparser fixes
- HLSL: Add Preprocessor macro support
- HLSL: Add functions: modf, tan
- HLSL: Add while loops support
- Shader static code fixes
- Add define DUMP_SHADERS_ON_ERROR
- ShaderEngine.hpp cleanup
- Restore current preset message
- Remove useless messages
 2018-06-22 19:38:54 +02:00
Mischa Spiegelmock
a56010bf81 merge master 2018-06-17 14:00:27 +02:00
deltaoscarmike
7516a705c4 WIP: shader code update (extract from milkdrop sources) 2018-06-12 22:12:06 +02:00
deltaoscarmike
26da73984f WIP: several fixes 2018-06-12 21:45:32 +02:00
Mischa Spiegelmock
1593d10656 sort of progress w/ comp/warp shader programs 2018-06-12 09:35:08 +03:00
Mischa Spiegelmock
233e9e289b load warp and comp shaders from preset into programs 2018-06-11 22:30:11 +03:00
Mischa Spiegelmock
0522afe064 WIP: making preset shader program 2018-06-10 20:25:52 +03:00
deltaoscarmike
794363f87d switching glsl version depends of --enable-gles configure flag 
fix vao memleak
 2018-06-10 19:23:41 +02:00
Mischa Spiegelmock
f7b8425963 WIP 2018-06-10 20:00:05 +03:00
Mischa Spiegelmock
048498c816 WIP preset shader loading 2018-06-10 18:00:54 +03:00
Mischa Spiegelmock
d5f81cd9bb checkpoint 2018-06-10 17:27:02 +03:00
Mischa Spiegelmock
c2c00a1e1a Merging GLES3 changes in 2018-06-10 16:59:12 +03:00
deltaoscarmike
ec7d5188a8 Merge branch 'gles3' of https://github.com/projectM-visualizer/projectm into gles3 2018-06-09 22:52:49 +02:00
deltaoscarmike
b650e2323d Restore vertex layout location 2018-06-09 22:50:29 +02:00
Mischa Spiegelmock
47084821da fix undefined VAO error 2018-06-09 23:28:16 +03:00
Mischa Spiegelmock
269181d9d9 progress - glsl 410 2018-06-09 21:54:13 +03:00
deltaoscarmike
c9fef28a89 Downgrade shaders to glsl 1.3 2018-06-09 14:19:46 +02:00
Mischa Spiegelmock
44bcae39b8 GL 1.3 stuff 2018-06-09 15:08:34 +03:00
Mischa Spiegelmock
0054ddbe09 SDL GL 2018-06-09 14:09:58 +03:00
deltaoscarmike
1a01c7fd0c OpenGL ES 3.0 support 2018-06-06 20:25:31 +02:00
Mischa Spiegelmock
863fe4c364 WIP I don't know what I'm doing lol help 2018-06-03 15:05:59 +02:00
Mischa Spiegelmock
9a6d4db43f lot more modernization work I have no idea if it's correct lol 2018-06-02 21:24:11 +02:00
Mischa Spiegelmock
b91100782a cleanup 2018-06-02 17:10:22 +02:00
Mischa Spiegelmock
a9ca405b72 (basic) shaders compiling 2018-06-02 16:52:15 +02:00
Mischa Spiegelmock
dc06f9a7d7 start of GL3/GLES modernization 2018-06-02 16:09:01 +02:00
Mischa Spiegelmock
b03fb81711 not quite working HLSL->GLSL translation... has some issues 2018-05-28 00:41:52 +03:00
Mischa Spiegelmock
376699dfc4 Merge branch 'master' into glsl 
Merge master + work on HLSL->GLSL transpilation
 2018-05-27 22:17:07 +03:00
Mischa Spiegelmock
4b5f671775 track shader filenames so we know where the shader compilation errors come from 2018-04-08 11:43:26 -07:00
Mischa Spiegelmock
820e40053f fixing cg/shaders for dev run of SDL app 2018-04-08 10:56:48 -07:00
Mischa Spiegelmock
1c3f72f2c1 shader load path for debug 2018-04-08 10:45:22 -07:00
Mischa Spiegelmock
ce837ddac3 can build libprojectM with xcode now 2018-04-08 08:57:03 -07:00