Commit Graph

1652 Commits

Author SHA1 Message Date
3d4fe805ca readme 2018-07-28 13:24:03 +03:00
d8682ff85b some emscripten support returns 2018-07-28 00:20:46 +03:00
dbc923ba24 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-07-26 00:04:38 +03:00
5ea4dc4d35 read FPS from config file for SDL version 2018-07-26 00:04:34 +03:00
5612dcb851 Re-enabling PerPixelMath_sse (issue #84) 2018-07-25 21:09:58 +02:00
4a4490221a Fix for travis 2018-07-25 20:17:08 +02:00
990c99d105 - Fix for travis
- Convert glProgramUniform* for OGL 3.x compatibility
2018-07-25 19:38:17 +02:00
a6484e08d7 Revert commit ae242a5 2018-07-25 19:32:44 +02:00
185aadcca9 GL_LUMINANCE is deprecated, replacement by GL_RGB 2018-07-23 20:31:09 +02:00
ae242a51c8 Fix border issue 2018-07-23 19:31:43 +02:00
92f3fb4e2d some cleanups. fixed dylib loader path for SDL2 so we can bundle it together. fix some minor syntax things. remove cg code. 2018-07-23 14:29:08 +03:00
201a92fa53 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-07-23 12:57:03 +03:00
15cf62b33f bleh 2018-07-23 12:53:04 +03:00
b0d11fa652 Fix travis building 2018-07-23 08:18:36 +02:00
99dccdf101 Blur shaders ported to GLSL
All presets unifoms corrected
Shader rendering fixed
2018-07-23 08:07:14 +02:00
542900a9c3 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
56830d87b1 Add testing switches:
- fake audio
- unlock FPS (linux only)
2018-07-18 21:46:01 +02:00
d9d3ba8427 Removing Cg leftovers 2018-07-18 21:41:47 +02:00
3ed82ca079 Disabling PerPixelMath_sse (issue #84) 2018-07-18 20:50:53 +02:00
cc60a7a8e9 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
c925d092e4 add libprojectM xcode project 2018-06-17 14:02:41 +02:00
78702bed97 merge master 2018-06-17 14:00:27 +02:00
aeb3f4523d this doesn't belong in this branch 2018-06-17 13:57:46 +02:00
af2e10b39c this doesn't belong in this branch 2018-06-17 13:57:27 +02:00
90324a9036 this doesn't belong in this branch 2018-06-17 13:57:11 +02:00
ba97dfcc5f FTGL/Cg flags gone 2018-06-17 13:56:13 +02:00
1edac3e1dc this doesn't belong in this branch 2018-06-17 13:54:28 +02:00
f17e1bd74a this doesn't belong in this branch 2018-06-17 13:54:13 +02:00
aa9ed342a3 this doesn't belong in this branch 2018-06-17 13:53:27 +02:00
e4759a560b this doesn't belong in this branch 2018-06-17 13:52:57 +02:00
3b1ef085b1 load from correct presets dir 2018-06-17 13:52:38 +02:00
1a32b440e3 have xcode copy all presets to $BUILT_PRODUCTS_DIR 2018-06-17 13:48:24 +02:00
59a65a1dc7 Version 3.0.0 - GLES/OpenGL 3 v3.0.0 2018-06-17 13:02:31 +02:00
e4b1bba02a removing cg shaders from makefile 2018-06-14 11:12:57 +03:00
00857ed232 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-06-14 11:12:24 +03:00
a410acc14c Merge pull request #72 from projectM-visualizer/gles3
switching glsl version depends of --enable-gles configure flag
2018-06-13 08:28:09 +03:00
ba4adecf97 WIP: shader code update (extract from milkdrop sources) 2018-06-12 22:12:06 +02:00
0c9a8d3bfb WIP: several fixes 2018-06-12 21:45:32 +02:00
b0b22ac302 sort of progress w/ comp/warp shader programs 2018-06-12 09:35:08 +03:00
42c583bd8d load warp and comp shaders from preset into programs 2018-06-11 22:30:11 +03:00
b6f5483701 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-06-10 21:25:24 +03:00
e9cfc89224 Fix build errors (again) 2018-06-10 20:08:20 +02:00
6055a00790 Fix build errors 2018-06-10 20:01:00 +02:00
bbc9bd51c0 WIP: making preset shader program 2018-06-10 20:25:52 +03:00
444759fad6 switching glsl version depends of --enable-gles configure flag
fix vao memleak
2018-06-10 19:23:41 +02:00
f1635797ab WIP 2018-06-10 20:00:05 +03:00
0916ebe1fe Merge branch 'gl-modernize' into glsl 2018-06-10 18:06:52 +03:00
c4c45b50db cleanup 2018-06-10 18:06:41 +03:00
36babd1427 cleanup 2018-06-10 18:04:33 +03:00
3cad9c3b85 WIP preset shader loading 2018-06-10 18:00:54 +03:00