Commit Graph

35 Commits

Author SHA1 Message Date
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
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
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
bbc9bd51c0 WIP: making preset shader program 2018-06-10 20:25:52 +03:00
f1635797ab WIP 2018-06-10 20:00:05 +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
dacf7582b8 checkpoint 2018-06-10 17:27:02 +03:00
6cb0123537 cleanups 2018-06-10 17:07:36 +03:00
3511da0939 Merging GLES3 changes in 2018-06-10 16:59:12 +03:00
13cc40da73 C++11 nullptr to NULL
C++11 lambda conversion
2018-06-08 16:25:07 +02:00
2513161489 fixing up GL bits and pieces 2018-06-07 10:38:10 +03:00
7614c28368 OpenGL ES 3.0 support 2018-06-06 20:25:31 +02:00
453b9e9767 WIP I don't know what I'm doing lol help 2018-06-03 15:05:59 +02:00
02e29f50c2 lot more modernization work I have no idea if it's correct lol 2018-06-02 21:24:11 +02:00
c30c6f680f start of GL3/GLES modernization 2018-06-02 16:09:01 +02:00
c41007bfcf not quite working HLSL->GLSL translation... has some issues 2018-05-28 00:41:52 +03:00
78058b95e7 Merge branch 'master' into glsl
Merge master + work on HLSL->GLSL transpilation
2018-05-27 22:17:07 +03:00
88d8c3174c track shader filenames so we know where the shader compilation errors come from 2018-04-08 11:43:26 -07:00
0732b62374 ditching Cg, sort of hooking up GL shaders 2017-10-01 12:10:01 -07:00
5d6a228e9a emscripten version actually kind of runs in a browser now. pretty messed up looking, but it's a start. 2014-06-22 01:22:41 -07:00
89c8ba94e5 emscripten compiles and runs now. doesn't produce any visual output, not sure why not 2014-06-21 23:57:34 -07:00
1bd3b02e44 Add possibility to use system fonts & fix font-loading bug in renderer
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1396 6778bc44-b910-0410-a7a0-be141de4315d
2012-04-14 14:26:11 +00:00
135e01d5d5 Allow to render to a texture through its own fbo
WHEN NOT using this "projectM::renderToTexture":
projectM now also handles the case where the user is using its own couple texture/fbo rendering.

Thanks to Julien Isorce for the patch!


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1394 6778bc44-b910-0410-a7a0-be141de4315d
2012-04-03 21:48:25 +00:00
1ca6c8d200 renderer: Improve font error-handling
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1377 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 18:35:53 +00:00
4c663aabe6 might have fixed some crasing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1261 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-16 02:00:42 +00:00
ee5e28f716 oops reverting some files
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1255 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 02:11:45 +00:00
1de30574bb even better composite renderitem smoothing
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1254 6778bc44-b910-0410-a7a0-be141de4315d
2009-08-03 02:10:06 +00:00
69feaf00f7 I must apologize to our users. The state of projectM in trunk has been dismal until late. The preset merging code was a mess. A fundamental flaw in the way we were handling Milkdrop preset state was preventing smooth switching from achieving correct behavior. Some confusing trace led me to the culprit, MilkdropPresetFactory. HE would reuse the same PresetOutputs struct for every preset, leading our Pipeline infrastructure astray at every turn. A simple adjustment should suffice. Some extra thought was put into PipelineMerger on top of these corrections. A release is now imminent. Preset Merging is still nascent in this release, but now it is worth looking at.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1250 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-28 04:26:52 +00:00
3b987daaac fixes to represet
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1196 6778bc44-b910-0410-a7a0-be141de4315d
2008-10-25 08:08:27 +00:00
c7b0a57e2b correct but temp hacky cmake list for renderer module
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1178 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-20 06:27:29 +00:00
c9ea485f51 am I done moving files around?
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1175 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-19 23:14:42 +00:00