Commit Graph

20 Commits

Author SHA1 Message Date
c2c00a1e1a Merging GLES3 changes in 2018-06-10 16:59:12 +03:00
d89114c168 C++11 nullptr to NULL
C++11 lambda conversion
2018-06-08 16:25:07 +02:00
b301cd8b0c fixing up GL bits and pieces 2018-06-07 10:38:10 +03:00
1a01c7fd0c OpenGL ES 3.0 support 2018-06-06 20:25:31 +02:00
b03fb81711 not quite working HLSL->GLSL translation... has some issues 2018-05-28 00:41:52 +03:00
376699dfc4 Merge branch 'master' into glsl
Merge master + work on HLSL->GLSL transpilation
2018-05-27 22:17:07 +03:00
4b5f671775 track shader filenames so we know where the shader compilation errors come from 2018-04-08 11:43:26 -07:00
0370b661c0 ditching Cg, sort of hooking up GL shaders 2017-10-01 12:10:01 -07:00
e343f1c80e 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
d857741e96 emscripten compiles and runs now. doesn't produce any visual output, not sure why not 2014-06-21 23:57:34 -07:00
b2c0fcd7bb 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
ace5e5e7fe 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
acb200345b 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
78b0cee568 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
308e797deb 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
1925d77549 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
fca7e835b3 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
88b1e1805d 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
bac352e6ad 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
ce060e3df1 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