removing cruft, updating readme

This commit is contained in:
Mischa Spiegelmock
2017-09-18 15:29:38 -07:00
parent df34e61024
commit 17029ce961
6 changed files with 2 additions and 361 deletions

View File

@ -1,7 +0,0 @@
PROJECT(projectM-complete)
cmake_minimum_required(VERSION 2.8.0)
include(src/cmake/CPack-projectM.cmake)
add_subdirectory(src)

View File

@ -49,23 +49,14 @@ Helix
* [OSX Build instructions](https://github.com/projectM-visualizer/projectm/raw/master/BUILDING_OSX.txt)
## Linux
* `sudo apt-get install cmake-curses-gui libsdl2-dev libglew-dev libftgl-dev libsdl2-dev libdevil-dev`
* `sudo apt-get install libsdl2-dev libglew-dev libftgl-dev libsdl2-dev libdevil-dev`
## Building From Source
Requires [cmake](https://cmake.org/download/).
Uses [build](https://github.com/c3d/build) Make scripts
```
cmake .
make
make install
```
## Configure With cmake
If you wish to configure build options run:
`ccmake .`
This will present you with a simple console-based interface of options for projectM.
Review the options and change what you think is necessary. Press 'g' to generate the make files and exit.
***
# Using the library
At its core projectM is a library, [libprojectM](src/libprojectM). This library is responsible for parsing presets, analyzing audio PCM data with beat detection and FFT, applying the preset to the audio feature data and rendering the resulting output with openGL. It can render to an openGL context or a texture.
@ -78,13 +69,11 @@ There are many other applications that make use of libprojectM that can be found
# Todo
* Top priority has for a long time been to [port the calls from OpenGL immediate-mode (old-school) to be compatible with OpenGL ES](https://github.com/projectM-visualizer/projectm/issues/11), using [vertex buffer objects](http://duriansoftware.com/joe/An-intro-to-modern-OpenGL.-Chapter-2.1:-Buffers-and-Textures.html). There's a [branch](https://github.com/projectM-visualizer/projectm/tree/gles) and [todo list of function calls to replace](https://github.com/projectM-visualizer/projectm/blob/gles/glES-porting.txt).
* [macOS Sierra broke the iTunes plugin somehow](https://github.com/projectM-visualizer/projectm/issues/7)
* Build a [libSDL2-based app](src/projectM-sdl) that can use audio from any input device and visualize it. Maybe using [portaudio](http://www.portaudio.com/) or the super new [audio capture support](https://wiki.libsdl.org/SDL_OpenAudioDevice) in libSDL 2.0.5.
* Currently shader support is done via nVidia's Cg shader toolkit. This is ancient and no longer supported and very lame. Use standard OpenGL facilities for compiling and executing the shader-based presets.
* Support for the missing Milkdrop waveforms to get full compatibility with Milkdrop presets.
* Steal cool stuff from the recently-released Milkdrop source.
* Emscripten (transpile to JavaScript and use WebGL) support. [Some of the work is done](https://github.com/projectM-visualizer/projectm/tree/emscripten) on this but it requires OpenGL ES (see item 1).
* Update the [various applications using libprojectM](src).
* Getting rid of CMake would be awesome. CMake sucks. [build](https://github.com/c3d/build) could be nice.
***

View File

@ -1,228 +0,0 @@
<?xml version = '1.0'?>
<kdevelop>
<general>
<author>Carmelo Piccione</author>
<email>carmelo.piccione@gmail.com</email>
<version>1</version>
<projectmanagement>KDevCustomProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<ignoreparts/>
<projectname>projectMTrunk</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<description/>
<defaultencoding/>
<versioncontrol/>
</general>
<kdevcustomproject>
<run>
<directoryradio>executable</directoryradio>
<mainprogram>/home/struktured/workspace/projectm_trunk/src</mainprogram>
<programargs/>
<globaldebugarguments/>
<globalcwd>/home/struktured/workspace/projectm_trunk/src</globalcwd>
<useglobalprogram>false</useglobalprogram>
<terminal>false</terminal>
<autocompile>true</autocompile>
<autoinstall>true</autoinstall>
<autokdesu>false</autokdesu>
<envvars/>
</run>
<filetypes>
<filetype>*.java</filetype>
<filetype>*.h</filetype>
<filetype>*.H</filetype>
<filetype>*.hh</filetype>
<filetype>*.hxx</filetype>
<filetype>*.hpp</filetype>
<filetype>*.c</filetype>
<filetype>*.C</filetype>
<filetype>*.cc</filetype>
<filetype>*.cpp</filetype>
<filetype>*.c++</filetype>
<filetype>*.cxx</filetype>
<filetype>Makefile</filetype>
<filetype>CMakeLists.txt</filetype>
</filetypes>
<blacklist/>
<build>
<buildtool>make</buildtool>
<builddir>/home/struktured/workspace/projectm_trunk/src/</builddir>
</build>
<other>
<prio>0</prio>
<otherbin/>
<defaulttarget/>
<otheroptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
</environments>
</other>
<make>
<abortonerror>true</abortonerror>
<numberofjobs>2</numberofjobs>
<prio>0</prio>
<dontact>false</dontact>
<makebin/>
<defaulttarget/>
<makeoptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
</environments>
</make>
</kdevcustomproject>
<kdevdebugger>
<general>
<dbgshell/>
<gdbpath/>
<configGdbScript/>
<runShellScript/>
<runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
<raiseGDBOnStart>false</raiseGDBOnStart>
</general>
<display>
<staticmembers>false</staticmembers>
<demanglenames>true</demanglenames>
<outputradix>10</outputradix>
</display>
</kdevdebugger>
<kdevdoctreeview>
<ignoretocs>
<toc>ada</toc>
<toc>ada_bugs_gcc</toc>
<toc>bash</toc>
<toc>bash_bugs</toc>
<toc>clanlib</toc>
<toc>fortran_bugs_gcc</toc>
<toc>gnome1</toc>
<toc>gnustep</toc>
<toc>gtk</toc>
<toc>gtk_bugs</toc>
<toc>haskell</toc>
<toc>haskell_bugs_ghc</toc>
<toc>java_bugs_gcc</toc>
<toc>java_bugs_sun</toc>
<toc>kde2book</toc>
<toc>opengl</toc>
<toc>pascal_bugs_fp</toc>
<toc>php</toc>
<toc>php_bugs</toc>
<toc>perl</toc>
<toc>perl_bugs</toc>
<toc>python</toc>
<toc>python_bugs</toc>
<toc>qt-kdev3</toc>
<toc>ruby</toc>
<toc>ruby_bugs</toc>
<toc>sdl</toc>
<toc>sw</toc>
<toc>w3c-dom-level2-html</toc>
<toc>w3c-svg</toc>
<toc>w3c-uaag10</toc>
<toc>wxwidgets_bugs</toc>
</ignoretocs>
<ignoreqt_xml>
<toc>Guide to the Qt Translation Tools</toc>
<toc>Qt Assistant Manual</toc>
<toc>Qt Designer Manual</toc>
<toc>Qt Reference Documentation</toc>
<toc>qmake User Guide</toc>
</ignoreqt_xml>
<ignoredoxygen>
<toc>KDE Libraries (Doxygen)</toc>
</ignoredoxygen>
</kdevdoctreeview>
<kdevfilecreate>
<filetypes/>
<useglobaltypes>
<type ext="ui" />
<type ext="cpp" />
<type ext="h" />
</useglobaltypes>
</kdevfilecreate>
<kdevcppsupport>
<qt>
<used>true</used>
<version>4</version>
<includestyle>4</includestyle>
<root>/usr/qt/3</root>
<designerintegration>ExternalDesigner</designerintegration>
<qmake>/usr/bin/qmake-qt4</qmake>
<designer>/usr/bin/designer-qt4</designer>
<designerpluginpaths/>
</qt>
<codecompletion>
<automaticCodeCompletion>false</automaticCodeCompletion>
<automaticArgumentsHint>true</automaticArgumentsHint>
<automaticHeaderCompletion>true</automaticHeaderCompletion>
<codeCompletionDelay>300</codeCompletionDelay>
<argumentsHintDelay>400</argumentsHintDelay>
<headerCompletionDelay>250</headerCompletionDelay>
<showOnlyAccessibleItems>false</showOnlyAccessibleItems>
<completionBoxItemOrder>0</completionBoxItemOrder>
<howEvaluationContextMenu>true</howEvaluationContextMenu>
<showCommentWithArgumentHint>true</showCommentWithArgumentHint>
<statusBarTypeEvaluation>true</statusBarTypeEvaluation>
<namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
<processPrimaryTypes>true</processPrimaryTypes>
<processFunctionArguments>true</processFunctionArguments>
<preProcessAllHeaders>true</preProcessAllHeaders>
<parseMissingHeadersExperimental>true</parseMissingHeadersExperimental>
<resolveIncludePathsUsingMakeExperimental>true</resolveIncludePathsUsingMakeExperimental>
<alwaysParseInBackground>true</alwaysParseInBackground>
<usePermanentCaching>true</usePermanentCaching>
<alwaysIncludeNamespaces>true</alwaysIncludeNamespaces>
<includePaths>.;</includePaths>
</codecompletion>
<creategettersetter>
<prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
<inlineGet>true</inlineGet>
<inlineSet>true</inlineSet>
</creategettersetter>
<splitheadersource>
<enabled>false</enabled>
<synchronize>true</synchronize>
<orientation>Vertical</orientation>
</splitheadersource>
<references>
<pcs>automatic_%2Fhome%2Fstruktured%2Fworkspace%2Fprojectm_trunk</pcs>
</references>
</kdevcppsupport>
<cppsupportpart>
<filetemplates>
<interfacesuffix>.hpp</interfacesuffix>
<implementationsuffix>.cpp</implementationsuffix>
</filetemplates>
</cppsupportpart>
<kdevdocumentation>
<projectdoc>
<docsystem/>
<docurl/>
<usermanualurl/>
</projectdoc>
</kdevdocumentation>
<ctagspart>
<customArguments/>
<customTagfilePath>/home/carm/projects/projectM/trunk/tags</customTagfilePath>
<activeTagsFiles/>
</ctagspart>
<kdevfileview>
<groups>
<hidenonprojectfiles>false</hidenonprojectfiles>
<hidenonlocation>false</hidenonlocation>
</groups>
<tree>
<hidepatterns>*.o,*.lo,CVS</hidepatterns>
<hidenonprojectfiles>false</hidenonprojectfiles>
<showvcsfields>false</showvcsfields>
</tree>
</kdevfileview>
</kdevelop>

Binary file not shown.

View File

@ -1,110 +0,0 @@
<?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession>
<KDevPrjSession>
<DocsAndViews NumberOfDocuments="21" >
<Doc0 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp" >
<View0 Encoding="" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/Parser.cpp" >
<View0 Encoding="" Type="Source" />
</Doc1>
<Doc2 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp" >
<View0 Encoding="" Type="Source" />
</Doc2>
<Doc3 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/ParamUtils.hpp" >
<View0 Encoding="" Type="Source" />
</Doc3>
<Doc4 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/Renderer/Renderer.cpp" >
<View0 Encoding="" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/Renderer/Renderer.hpp" >
<View0 Encoding="" Type="Source" />
</Doc5>
<Doc6 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/Renderer/Renderable.cpp" >
<View0 Encoding="" Type="Source" />
</Doc6>
<Doc7 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/Renderer/Renderable.hpp" >
<View0 Encoding="" Type="Source" />
</Doc7>
<Doc8 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/Renderer/RenderItemMatcher.cpp" >
<View0 Encoding="" Type="Source" />
</Doc8>
<Doc9 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/Renderer/Shader.cpp" >
<View0 Encoding="" Type="Source" />
</Doc9>
<Doc10 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/Renderer/ShaderEngine.cpp" >
<View0 Encoding="" Type="Source" />
</Doc10>
<Doc11 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/projectM-jack/qprojectM-jack.cpp" >
<View0 Encoding="" Type="Source" />
</Doc11>
<Doc12 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/projectM.cpp" >
<View0 Encoding="" Type="Source" />
</Doc12>
<Doc13 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/PresetChooser.cpp" >
<View0 Encoding="" Type="Source" />
</Doc13>
<Doc14 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/PresetChooser.hpp" >
<View0 Encoding="" Type="Source" />
</Doc14>
<Doc15 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/RandomNumberGenerators.hpp" >
<View0 Encoding="" Type="Source" />
</Doc15>
<Doc16 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/projectM.hpp" >
<View0 Encoding="" Type="Source" />
</Doc16>
<Doc17 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/PresetLoader.cpp" >
<View0 Encoding="" Type="Source" />
</Doc17>
<Doc18 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp" >
<View0 Encoding="" Type="Source" />
</Doc18>
<Doc19 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp" >
<View0 Encoding="" Type="Source" />
</Doc19>
<Doc20 NumberOfViews="1" URL="file:///home/struktured/workspace/projectm_trunk/src/libprojectM/MilkdropPresetFactory/Parser.hpp" >
<View0 Encoding="" line="173" Type="Source" />
</Doc20>
</DocsAndViews>
<pluginList>
<kdevdebugger>
<breakpointList/>
<showInternalCommands value="0" />
</kdevdebugger>
<kdevastyle>
<Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" />
<AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" />
</kdevastyle>
<kdevbookmarks>
<bookmarks>
<bookmark url="/home/carm/projects/projectM/trunk/src/projectM-engine/PresetChooser.hpp" >
<mark line="127" />
</bookmark>
<bookmark url="/home/carm/projects/projectM/trunk/src/qprojectM-pulseaudio/qprojectM-pulseaudio.cpp" >
<mark line="133" />
</bookmark>
<bookmark url="/home/carm/projects/projectM/trunk/src/projectM-engine/KeyHandler.cpp" >
<mark line="180" />
<mark line="181" />
</bookmark>
<bookmark url="/home/carm/projects/projectM/trunk/src/qprojectM/qplaylistmodel.cpp" >
<mark line="3" />
</bookmark>
<bookmark url="/home/carm/projects/projectM/trunk/src/qprojectM/qprojectm_mainwindow.cpp" >
<mark line="290" />
<mark line="517" />
</bookmark>
<bookmark url="/home/carm/projects/projectM/trunk/src/qprojectM-pulseaudio/QPulseAudioThread.cpp" >
<mark line="187" />
<mark line="265" />
</bookmark>
</bookmarks>
</kdevbookmarks>
<kdevvalgrind>
<executable path="" params="" />
<valgrind path="/usr/bin/valgrind" params=" --tool=memcheck --leak-check=yes" />
<calltree path="/usr/bin/valgrind" params="--tool=callgrind" />
<kcachegrind path="/usr/kde/3.5/bin/kcachegrind" />
</kdevvalgrind>
</pluginList>
</KDevPrjSession>

View File

@ -17,9 +17,6 @@ SOURCES= \
CPPFLAGS+= -I. -I..
#LDFLAGS+=-lftgl -lgl -lfreetype -lprojectM
#LIBRARIES=../libprojectM
PRODUCTS=MilkdropPresetFactory.lib
include $(BUILD)rules.mk