Commit Graph

28 Commits

Author SHA1 Message Date
35d3112463 Use correct casing 2022-05-29 15:29:54 +02:00
e97bf85bf4 Fix "idle" preset by re-enabling custom textures on shapes.
Renamed the parameter to "image" and fixed texture wrapping/sizing.
2022-04-14 15:58:40 +02:00
67f26977a5 Replaced Perlin noise textures with the original Milkdrop noise textures. 2021-12-05 23:02:01 +01:00
e49720ecfa Preset subdirs (#385)
Scanning textures/presets dirs for textures and scanning preset dir for presets.
Scanning is now done recursively, so presets and textures can be organized into subdirectories instead of needing to be flattened into a single directory.

On POSIX systems makes use of [ftw](https://linux.die.net/man/3/ftw) which should be relatively efficient. Otherwise falls back to recursing with `dirent` (for windows).

Probably should have made an autoconf check for `ftw` instead of doing `#ifdef WIN32`. 

* Scan subdirectories in presets directory

* remove preset subdir config

* Recursively scan for textures too, add c++-17 compatibility

* Refactor directory scanning code so it's reused by texture loader and preset loader. Make cross-platform (maybe)

* filescanner in makefile

* extension filter for file loader

* make extensions match up'

* need string.h

* Add FileScanner.cpp to win build (maybe)

* scan all dirs

* #ifndef #ifdef is def fun

* bogus comment

* bleh

* bleh

* itunes plugin with c++17

* EyeTunes needs to know about the FileScanner

Co-authored-by: milkdropper.com <milkdropper.com@gmail.com>
Co-authored-by: milkdropper <59471060+milkdropper@users.noreply.github.com>
2020-07-28 22:01:56 +03:00
a03f2d0d80 There was a bug that existed in open GL ES 2.0 implementations and random textures (#239)
* There was a bug that existed in open GL ES 2.0 implementations
where glTexImage2D could not convert GL_RGB formed textures into GL_RGBA
while generating the noise textures.   The GL error
was GL_INVALID_OPERATION(0x502)
This probably made the noise textures blank.
So a new class was added that has the alpha channel for the values.

* Added a fudge for render farming milkdrop where we control the time and the ticks.

* User defined time: Got rid of testing code

* Attempt to fix WIN32 compile - it doesnt use or need the ability to control the time

* Got rid of debug - got rid of minor warning

* projectM.hpp - type in ifdef
projectM_SDL_main.cpp - there is code added to make the initial random number dependent on the time of day, making
the sequence of visualizers more unexpected.  But the posix command time does not exist in Win32 land, so we disable it.
2019-10-01 10:01:45 +03:00
ecf6e0d131 build all platforms for windows store 2019-05-23 16:57:15 -04:00
fdc5bf709c Add NSMicrophoneUsageDescription for macOS - required to capture audio input 2019-05-11 22:41:46 +03:00
ce60556dae Windows build with MSVC (#181)
credit: @mancoast 

* msvc

* include glew for windows

* fix usage of std namespace with win32

* Update pmSDL.hpp

fix warning with win32

* update dirent for win32

* libs required for win32 linkage

* Update pmSDL.hpp

SDL_MAIN_HANDLED

* Update ShaderEngine.cpp

init glew to create shaders

* fake SDL audio with win32

* Update Renderer.vcxproj

use wildcards for source filenames

* Create config.h

* Update Expr.cpp

fix win32 breaks

* cleanup broken max function

* Update Makefile.am

remove ref to win32-dirent
2019-03-22 08:55:35 +01:00
406e4b85a2 Allocate PerlinNoise dynamically / Fix thread detach after join (#170) 2019-03-03 22:58:57 +02:00
4e37c109f0 memleak fix 2018-11-17 11:41:59 +01:00
b56a1c848d fixup! added: allow specifying datadir in settings on runtime 2018-10-15 15:24:14 +02:00
7bf0a3f35d added: allow specifying datadir in settings on runtime 2018-10-04 16:33:47 +02:00
f7b971359c Fix texture management 2018-08-22 20:07:11 +02:00
7628fd018c - Fix for travis
- Convert glProgramUniform* for OGL 3.x compatibility
2018-07-25 19:38:17 +02:00
0fda4a58ff GL_LUMINANCE is deprecated, replacement by GL_RGB 2018-07-23 20:31:09 +02:00
3142b36e79 Blur shaders ported to GLSL
All presets unifoms corrected
Shader rendering fixed
2018-07-23 08:07:14 +02:00
ddcd9fb735 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
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
db7430668b can build libprojectM+renderer+presetfactories and projectM-SDL with some Make. cmake status: BTFO 2017-09-18 15:18:51 -07:00
d49fff223f disabling projectM logo idle preset 2016-08-08 22:26:40 -07:00
8d041fcfd1 upgrading soil to soil2 2015-11-28 10:56:21 -08:00
135f298579 fix GL and dirent header inclusion on emscripten, define it 2014-06-19 00:47:57 -07:00
6e7860f6fa core: Fix compilation on MacOS
Thanks to Clementine devs for the patch!


git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1381 6778bc44-b910-0410-a7a0-be141de4315d
2012-01-05 21:07:42 +00:00
8dbfbc670b win32 fixes
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1326 6778bc44-b910-0410-a7a0-be141de4315d
2009-12-07 04:45:38 +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