Commit Graph

63 Commits

Author SHA1 Message Date
420c939369 SDL include, remove my copyrights that xcode added :/ 2018-04-08 10:28:48 -07:00
c1ee4bd6dd libprojectM xcode project 2018-04-08 08:17:38 -07:00
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
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
87441ad231 fixing some linux build stuff 2017-09-22 15:33:50 -07:00
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
2d1b7c6d3d safe guard against expressions like x = 2*sin(bas)+5* 2012-11-13 23:26:35 -05: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
d59c08c2fb 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
4073001eee 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
ad281133b5 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
c5c03e8c93 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
2e9b501860 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
ea33adbdc8 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
3c4f09bd2b 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
cf83c16e3e 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
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
86469c4f42 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
da6dd94653 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
ff83e0f3ef houston we have some life on the screen
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1169 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-19 02:56:54 +00:00
369627fa6d it runs, but with a black screen. qt now allows loading of .so files.
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1168 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-19 01:35:32 +00:00
cb749dcafa preset loader now has url based preset accessor method.
one of many to come bug fixes in the projectm top level.



git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/represet@1165 6778bc44-b910-0410-a7a0-be141de4315d
2008-09-18 08:02:23 +00:00