mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-13 02:45:15 +00:00
Code Issues Projects Releases Wiki Activity
1,722 Commits 21 Branches 41 Tags
d4d74f6d056b9b9e52e4ce88199b1bb03b07eb68
Commit Graph

77 Commits

Author SHA1 Message Date
deltaoscarmike
d4d74f6d05 Build warnings cleanup 2018-11-17 11:42:28 +01:00
Arne Morten Kvarving
7bf0a3f35d added: allow specifying datadir in settings on runtime 2018-10-04 16:33:47 +02:00
Mischa Spiegelmock
c7b2508fb5 Merge pull request #26 from projectM-visualizer/glsl 
Re-enable shaders on modern platforms by transpiling HLSL to GLSL on the fly.
Better GLES support.
Running successfully on embedded systems with GLES and shaders. Compiles and almost runs with emscripten now (#92).
Mega props 👏 => @deltaoscarmike <= 👏
 2018-09-08 11:09:28 +03:00
Mischa Spiegelmock
ca3877151f removing incredibly outdated FAQ 2018-09-03 00:06:44 +03:00
deltaoscarmike
9f8db27a3b Fix for glsl threading crash #97 2/? 2018-09-02 20:05:30 +02:00
deltaoscarmike
73dc5ccbd9 Fix for glsl threading crash #97 2018-09-02 19:54:08 +02:00
deltaoscarmike
01ea43f5dc Fix unlock FPS flag 
Add comments for test flags
 2018-08-25 20:19:10 +02:00
deltaoscarmike
fd0a987259 Small fixes 2018-08-22 21:05:42 +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
e0619ea9c4 Merge branch 'master' into glsl 2018-07-28 20:06:25 +02:00
deltaoscarmike
3142b36e79 Blur shaders ported to GLSL 
All presets unifoms corrected
Shader rendering fixed
 2018-07-23 08:07:14 +02:00
Mischa Spiegelmock
1593d10656 sort of progress w/ comp/warp shader programs 2018-06-12 09:35:08 +03:00
deltaoscarmike
2ce0e70a98 memleaks fixes 2018-06-10 22:02:06 +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
420c939369 SDL include, remove my copyrights that xcode added :/ 2018-04-08 10:28:48 -07:00
Mischa Spiegelmock
c1ee4bd6dd libprojectM xcode project 2018-04-08 08:17:38 -07:00
Mischa Spiegelmock
2df0738cce Cross-platform GL include (#41) 
* qt autoconf

* WIP: Qt5 makefile

* go away cmake

* testing bsd define

* readme

* replacing __linux__ with __unix__

* sdl/libGLU

* Revert "WIP: Qt5 makefile"

This reverts commit aaa44566b9.

* Revert "qt autoconf"

This reverts commit a82dae3c54.

* Revert "go away cmake"

This reverts commit 1392d5e658.

* fix amflags for m4 dir

* opengl header

* opengl header

* use one header for dealing with cross-platform GL includes

* include opengl header in dist

* fix _WIN32 (maybe?)
 2018-03-12 22:20:19 +02:00
Mischa Spiegelmock
8eaa232dda Use autotools to build (#27) 
* remove c3d/build

* autotools start

* ignore

* autoreconf? idk

* linux/osx gcc/clang

* no glut, need glew tho

* fix test matrix

* fix linux conditional includes?

* sdl makefile am

* SDL2 m4/autoconf

* idk more m4 crap

* ignore more junk

* ug

* go away idk

* renderer makefile

* fixing SDL's broken-ass sdl2.m4 lol

* progress

* cmake go away

* full autotools build working yay

* autogen script, readme update

* fix linux ifdefs

* stuff

* fix linux -ldl

* mac sdl dep for travis

* whoops

* brewwww

* no osx gcc

* no test

* kinda working linux library build

* travis apt packages

* ignore old SDL2 for travis

* typo

* autogen for osx build readme
 2018-02-09 14:25:54 -08:00
Mischa Spiegelmock
87441ad231 fixing some linux build stuff 2017-09-22 15:33:50 -07:00
ray cutler
8dd0b68f69 fixes 
fixed a bug causing a crash with PerlinNoise/ShaderEngine.cpp :: calling projectM::projectM_resetGL() applies the new dimensions to the window width/height in the settings :: modified the parser to return an error rather than abort and terminate the process to prevent a crash with the provided sample presets
 2016-05-17 07:23:52 -04:00
carm
2d1b7c6d3d safe guard against expressions like x = 2*sin(bas)+5* 2012-11-13 23:26:35 -05:00
ximion
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
w1z7ard
4af1ca5d0f support for +/- keys to edit ratings. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1362 6778bc44-b910-0410-a7a0-be141de4315d
 2011-10-28 02:57:24 +00:00
w1z7ard
a353959f6b fix fps value bug (kudos to pete), made some methods public 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1358 6778bc44-b910-0410-a7a0-be141de4315d
 2011-08-29 01:08:12 +00:00
ximion
8197b8c79f Set LC_NUMERIC to "C" in libprojectM 
This is a workaround for some strange behaviour appearing on
some systems with a different numeric format.

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1354 6778bc44-b910-0410-a7a0-be141de4315d
 2011-04-10 14:07:51 +00:00
ximion
24b03c9d2d Add API to change projectM preset duration 
Required by some media players such as Clementine


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1352 6778bc44-b910-0410-a7a0-be141de4315d
 2011-04-10 14:04:19 +00:00
ximion
c57e41ac45 Add API to change projectM texture size 
Required by some media players such as Clementine


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1351 6778bc44-b910-0410-a7a0-be141de4315d
 2011-04-10 14:03:27 +00:00
w1z7ard
c28c4b9efe playlist file / directory error handling fixes, resize playlist refresh fix 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1342 6778bc44-b910-0410-a7a0-be141de4315d
 2010-07-29 01:46:44 +00:00
w1z7ard
10992123c2 call Preset(name) super constructor 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1334 6778bc44-b910-0410-a7a0-be141de4315d
 2010-02-09 06:24:16 +00:00
psperl
062b42c364 Fix bug introduced in 1330 for some compilation scenarios 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1332 6778bc44-b910-0410-a7a0-be141de4315d
 2010-02-08 18:09:19 +00:00
psperl
a562c0074c preset lock 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1304 6778bc44-b910-0410-a7a0-be141de4315d
 2009-11-29 15:55:51 +00:00
w1z7ard
a8636cbd65 cmake build flag for testing stuff 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1303 6778bc44-b910-0410-a7a0-be141de4315d
 2009-10-13 05:07:22 +00:00
w1z7ard
328d3be221 comment out render item freeing until some final stability issues are resolved. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1302 6778bc44-b910-0410-a7a0-be141de4315d
 2009-10-13 04:03:06 +00:00
w1z7ard
302411bbb5 took out some debug, temp hack fixes. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1298 6778bc44-b910-0410-a7a0-be141de4315d
 2009-10-11 22:57:29 +00:00
w1z7ard
36fedb2e02 commented out what I thought was a correct memory freeing technique. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1296 6778bc44-b910-0410-a7a0-be141de4315d
 2009-10-11 05:07:34 +00:00
w1z7ard
10a9a20a33 potential bug fix for preset switch / render sync issue 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1293 6778bc44-b910-0410-a7a0-be141de4315d
 2009-10-09 02:45:40 +00:00
w1z7ard
7d0daf3339 refactored libprojectM preset rating interface to support generic number of ratings. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1289 6778bc44-b910-0410-a7a0-be141de4315d
 2009-10-04 02:20:03 +00:00
w1z7ard
1829b879a4 super new, unpolished "breedability" feature. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1288 6778bc44-b910-0410-a7a0-be141de4315d
 2009-09-16 05:42:18 +00:00
w1z7ard
d4337e1a26 removed more debugging. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1282 6778bc44-b910-0410-a7a0-be141de4315d
 2009-09-07 15:38:52 +00:00
w1z7ard
176e4a279d debugging code clean up, small optimizations. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1281 6778bc44-b910-0410-a7a0-be141de4315d
 2009-09-07 15:36:16 +00:00
w1z7ard
d08a9648e7 context menu for preset switching. bug fix selecting presets from 
projectM.  moved preset change related code from key handler to 
projectm. 


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1262 6778bc44-b910-0410-a7a0-be141de4315d
 2009-08-16 22:47:22 +00:00
w1z7ard
2bb3c84649 smooth preset switching hot keys of N/P/R. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1257 6778bc44-b910-0410-a7a0-be141de4315d
 2009-08-03 03:57:23 +00:00
psperl
f3d7fec84c I think this is better, video echo smoothing 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1252 6778bc44-b910-0410-a7a0-be141de4315d
 2009-08-02 17:30:11 +00:00
psperl
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
amoe
9a8318ee22 Bug #1849729. Adding class DLLEXPORT attributes, removing method-specific ones. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1249 6778bc44-b910-0410-a7a0-be141de4315d
 2009-07-25 11:18:57 +00:00
w1z7ard
64cb23d8c8 trunk build again (woops) 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1247 6778bc44-b910-0410-a7a0-be141de4315d
 2009-07-11 15:56:12 +00:00
w1z7ard
3dfb4d4df7 renamed PresetMerge to PipelineMerger. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1246 6778bc44-b910-0410-a7a0-be141de4315d
 2009-07-11 13:48:35 +00:00
w1z7ard
92a6f210f0 temporary ignore a memleak. 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1243 6778bc44-b910-0410-a7a0-be141de4315d
 2009-07-10 05:59:15 +00:00
w1z7ard
32545102f0 segfault fix when no merge function exists 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1242 6778bc44-b910-0410-a7a0-be141de4315d
 2009-07-10 05:56:41 +00:00
psperl
12974fb928 reverse smoothing 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1241 6778bc44-b910-0410-a7a0-be141de4315d
 2009-07-10 05:42:13 +00:00