Commit Graph

66 Commits

Author SHA1 Message Date
99dccdf101 Blur shaders ported to GLSL
All presets unifoms corrected
Shader rendering fixed
2018-07-23 08:07:14 +02:00
b0b22ac302 sort of progress w/ comp/warp shader programs 2018-06-12 09:35:08 +03:00
02e29f50c2 lot more modernization work I have no idea if it's correct lol 2018-06-02 21:24:11 +02:00
b927222580 SDL include, remove my copyrights that xcode added :/ 2018-04-08 10:28:48 -07:00
95282e040e libprojectM xcode project 2018-04-08 08:17:38 -07:00
5792fb33d9 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
154d50caf4 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
c4957fbe4a fixing some linux build stuff 2017-09-22 15:33:50 -07:00
668f9935aa 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
936ebd4751 safe guard against expressions like x = 2*sin(bas)+5* 2012-11-13 23:26:35 -05: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
b3aecc5f09 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
5d8364a605 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
90aa2c8f38 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
c5d4802407 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
8551d6568a 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
e2ee27efd4 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
0d453ce9db 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
910dd9f640 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
22e96e5301 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
351b36ea78 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
de4d35645c 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
f94f112503 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
1a02f1ad9d 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
0aa355f5a7 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
905344d512 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
c2d9d2dac2 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
7d1fb1cb90 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
fa3808584b 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
445a53892a 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
e374f93c6c 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
a2061dca65 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
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
2b8fd5d365 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
f273a1c306 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
1b345a7239 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
ad0584941d 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
f7d16a7a24 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
ad88c78a5f 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
8c946c844b yet another mem leak fix.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1240 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:33:20 +00:00
dd8a2e8a76 mem leak fix again
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1239 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:31:59 +00:00
697893c5b0 mem leak fix and less debugging
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1238 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:30:21 +00:00
8eab940b82 preset merge uses new preset merge functions.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1237 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 05:13:23 +00:00
64c91aa364 not much really
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1235 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 04:40:49 +00:00
24f0775b3e merge function partial implementation in projectm toplevel.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1233 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 04:19:14 +00:00
96f98abffd Config-file less constructor
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1231 6778bc44-b910-0410-a7a0-be141de4315d
2009-07-10 02:58:36 +00:00
2ef79b643d first buildable implementation of a render item object optimal matching algorithm.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1207 6778bc44-b910-0410-a7a0-be141de4315d
2009-02-18 09:31:41 +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
62f26f90b9 make install fixes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1185 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-26 17:59:53 +00:00
ab5e0ae5eb trying to decouple things properly
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1179 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-20 19:05:57 +00:00