mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-24 15:25:56 +00:00
Code Issues Projects Releases Wiki Activity

various touch ups, minor bug fix.

Browse Source 
git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@291 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
psperl
2007-08-05 05:04:35 +00:00
parent e961872101
commit f7fee506c9
11 changed files with 546 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/projectM-engine/Preset.cpp
View File

@ -40,9 +40,18 @@ Preset::Preset(const std::string & filename, const PresetInputs & presetInputs,
builtinParams(presetInputs, presetOutputs),
customWaves(&presetOutputs.customWaves),
customShapes(&presetOutputs.customShapes),
m_presetOutputs(presetOutputs)
m_presetOutputs(presetOutputs) {
{
m_presetOutputs.zoom_is_mesh = false;
m_presetOutputs.zoomexp_is_mesh =false;
m_presetOutputs.rot_is_mesh =false;
m_presetOutputs.sx_is_mesh =false;
m_presetOutputs.sy_is_mesh = false;
m_presetOutputs.dx_is_mesh = false;
m_presetOutputs.dy_is_mesh =false;
m_presetOutputs.cx_is_mesh = false;
m_presetOutputs.cy_is_mesh = false;
initialize(filename);
@ -51,12 +60,7 @@ Preset::Preset(const std::string & filename, const PresetInputs & presetInputs,
Preset::~Preset()
{
#if defined(PRESET_DEBUG) && defined(DEBUG)
DWRITE( "~preset(): in\n" );
#endif
std::cout << "Preset destructor!" << std::endl;
Algorithms::traverse<Algorithms::TraverseFunctors::DeleteFunctor<InitCond> >(init_cond_tree);
@ -75,12 +79,6 @@ Preset::~Preset()
for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos)
delete(pos->second);
#if defined(PRESET_DEBUG) && defined(DEBUG)
DWRITE( "~Preset(): out\n" );
#endif
}
/* Adds a per pixel equation according to its string name. This
will be used only by the parser */