From 0b757f588528ebe3d121bdcf925b553a6645982b Mon Sep 17 00:00:00 2001 From: psperl Date: Thu, 2 Aug 2007 02:56:18 +0000 Subject: [PATCH] merge of work/home changes git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@289 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine-backup/Algorithms.hpp | 50 - src/projectM-engine-backup/BeatDetect.cpp | 175 - src/projectM-engine-backup/BeatDetect.hpp | 72 - src/projectM-engine-backup/BuiltinFuncs.cpp | 166 - src/projectM-engine-backup/BuiltinFuncs.hpp | 226 -- src/projectM-engine-backup/BuiltinParams.cpp | 364 -- src/projectM-engine-backup/BuiltinParams.hpp | 85 - src/projectM-engine-backup/CMakeLists.txt | 33 - src/projectM-engine-backup/CValue.hpp | 38 - src/projectM-engine-backup/Common.hpp | 98 - src/projectM-engine-backup/CustomShape.cpp | 227 -- src/projectM-engine-backup/CustomShape.hpp | 117 - src/projectM-engine-backup/CustomWave.cpp | 531 --- src/projectM-engine-backup/CustomWave.hpp | 158 - src/projectM-engine-backup/Eval.cpp | 91 - src/projectM-engine-backup/Eval.hpp | 93 - src/projectM-engine-backup/Expr.cpp | 546 --- src/projectM-engine-backup/Expr.hpp | 125 - .../FindPkgConfig.cmake | 360 -- src/projectM-engine-backup/Func.cpp | 87 - src/projectM-engine-backup/Func.hpp | 58 - src/projectM-engine-backup/InitCond.cpp | 137 - src/projectM-engine-backup/InitCond.hpp | 59 - src/projectM-engine-backup/InitCondUtils.hpp | 69 - src/projectM-engine-backup/Makefile.am | 48 - src/projectM-engine-backup/Makefile.dist | 24 - src/projectM-engine-backup/Makefile.in | 621 --- src/projectM-engine-backup/PBuffer.cpp | 217 -- src/projectM-engine-backup/PBuffer.hpp | 94 - src/projectM-engine-backup/PCM.cpp | 325 -- src/projectM-engine-backup/PCM.hpp | 65 - src/projectM-engine-backup/Param.cpp | 243 -- src/projectM-engine-backup/Param.hpp | 110 - src/projectM-engine-backup/ParamUtils.hpp | 138 - src/projectM-engine-backup/Parser.cpp | 2143 ----------- src/projectM-engine-backup/Parser.hpp | 180 - src/projectM-engine-backup/PerFrameEqn.cpp | 102 - src/projectM-engine-backup/PerFrameEqn.hpp | 52 - src/projectM-engine-backup/PerPixelEqn.cpp | 90 - src/projectM-engine-backup/PerPixelEqn.hpp | 66 - src/projectM-engine-backup/PerPointEqn.cpp | 84 - src/projectM-engine-backup/PerPointEqn.hpp | 54 - src/projectM-engine-backup/Preset.cpp | 709 ---- src/projectM-engine-backup/Preset.hpp | 182 - src/projectM-engine-backup/PresetChooser.cpp | 14 - src/projectM-engine-backup/PresetChooser.hpp | 225 -- src/projectM-engine-backup/PresetFilters.hpp | 38 - src/projectM-engine-backup/PresetFrameIO.cpp | 203 - src/projectM-engine-backup/PresetFrameIO.hpp | 191 - src/projectM-engine-backup/PresetLoader.cpp | 137 - src/projectM-engine-backup/PresetLoader.hpp | 51 - src/projectM-engine-backup/Renderer.cpp | 1995 ---------- src/projectM-engine-backup/Renderer.hpp | 93 - src/projectM-engine-backup/SplayNode.hpp | 91 - src/projectM-engine-backup/StaticArray.hpp | 212 -- src/projectM-engine-backup/browser.cpp | 145 - src/projectM-engine-backup/browser.h | 45 - src/projectM-engine-backup/carbontoprojectM.h | 104 - src/projectM-engine-backup/compare.h | 114 - src/projectM-engine-backup/config | 22 - .../console_interface.cpp | 230 -- .../console_interface.h | 39 - src/projectM-engine-backup/dlldefs.h | 40 - src/projectM-engine-backup/editor.cpp | 870 ----- src/projectM-engine-backup/editor.h | 43 - src/projectM-engine-backup/event.h | 151 - src/projectM-engine-backup/fatal.h | 43 - src/projectM-engine-backup/fftsg.cpp | 3314 ----------------- src/projectM-engine-backup/fftsg.h | 35 - src/projectM-engine-backup/fonts | 1 - src/projectM-engine-backup/glConsole.cpp | 1028 ----- src/projectM-engine-backup/glConsole.h | 114 - src/projectM-engine-backup/libprojectM.dsp | 348 -- src/projectM-engine-backup/libprojectM.ncb | Bin 254976 -> 0 bytes src/projectM-engine-backup/libprojectM.opt | Bin 55808 -> 0 bytes src/projectM-engine-backup/libprojectM.plg | 78 - .../libprojectM/Debug/libprojectM.pch | Bin 186940 -> 0 bytes .../libprojectM/Debug/vc60.idb | Bin 246784 -> 0 bytes .../libprojectM/Debug/vc60.pdb | Bin 110592 -> 0 bytes .../libprojectM/libprojectM.plg | 16 - src/projectM-engine-backup/lvtoprojectM.h | 156 - src/projectM-engine-backup/menu.cpp | 1033 ----- src/projectM-engine-backup/menu.h | 118 - src/projectM-engine-backup/presets | 1 - src/projectM-engine-backup/projectM.cpp | 704 ---- src/projectM-engine-backup/projectM.dsp | 381 -- src/projectM-engine-backup/projectM.hpp | 242 -- src/projectM-engine-backup/sdltoprojectM.h | 165 - src/projectM-engine-backup/timer.cpp | 44 - src/projectM-engine-backup/timer.h | 49 - src/projectM-engine-backup/win32-dirent.cpp | 231 -- src/projectM-engine-backup/win32-dirent.h | 59 - src/projectM-engine-backup/wipemalloc.cpp | 44 - src/projectM-engine-backup/wipemalloc.h | 60 - src/projectM-engine/CustomWave.cpp | 3 +- src/projectM-engine/Parser.cpp | 14 +- src/projectM-engine/Preset.cpp | 79 +- src/projectM-engine/Preset.hpp | 55 +- src/projectM-engine/PresetFrameIO.hpp | 7 +- 99 files changed, 71 insertions(+), 22916 deletions(-) delete mode 100644 src/projectM-engine-backup/Algorithms.hpp delete mode 100755 src/projectM-engine-backup/BeatDetect.cpp delete mode 100755 src/projectM-engine-backup/BeatDetect.hpp delete mode 100644 src/projectM-engine-backup/BuiltinFuncs.cpp delete mode 100644 src/projectM-engine-backup/BuiltinFuncs.hpp delete mode 100644 src/projectM-engine-backup/BuiltinParams.cpp delete mode 100644 src/projectM-engine-backup/BuiltinParams.hpp delete mode 100644 src/projectM-engine-backup/CMakeLists.txt delete mode 100755 src/projectM-engine-backup/CValue.hpp delete mode 100755 src/projectM-engine-backup/Common.hpp delete mode 100755 src/projectM-engine-backup/CustomShape.cpp delete mode 100755 src/projectM-engine-backup/CustomShape.hpp delete mode 100755 src/projectM-engine-backup/CustomWave.cpp delete mode 100755 src/projectM-engine-backup/CustomWave.hpp delete mode 100755 src/projectM-engine-backup/Eval.cpp delete mode 100755 src/projectM-engine-backup/Eval.hpp delete mode 100755 src/projectM-engine-backup/Expr.cpp delete mode 100755 src/projectM-engine-backup/Expr.hpp delete mode 100644 src/projectM-engine-backup/FindPkgConfig.cmake delete mode 100755 src/projectM-engine-backup/Func.cpp delete mode 100755 src/projectM-engine-backup/Func.hpp delete mode 100755 src/projectM-engine-backup/InitCond.cpp delete mode 100755 src/projectM-engine-backup/InitCond.hpp delete mode 100644 src/projectM-engine-backup/InitCondUtils.hpp delete mode 100755 src/projectM-engine-backup/Makefile.am delete mode 100644 src/projectM-engine-backup/Makefile.dist delete mode 100755 src/projectM-engine-backup/Makefile.in delete mode 100755 src/projectM-engine-backup/PBuffer.cpp delete mode 100755 src/projectM-engine-backup/PBuffer.hpp delete mode 100755 src/projectM-engine-backup/PCM.cpp delete mode 100755 src/projectM-engine-backup/PCM.hpp delete mode 100755 src/projectM-engine-backup/Param.cpp delete mode 100755 src/projectM-engine-backup/Param.hpp delete mode 100644 src/projectM-engine-backup/ParamUtils.hpp delete mode 100755 src/projectM-engine-backup/Parser.cpp delete mode 100755 src/projectM-engine-backup/Parser.hpp delete mode 100755 src/projectM-engine-backup/PerFrameEqn.cpp delete mode 100755 src/projectM-engine-backup/PerFrameEqn.hpp delete mode 100755 src/projectM-engine-backup/PerPixelEqn.cpp delete mode 100755 src/projectM-engine-backup/PerPixelEqn.hpp delete mode 100755 src/projectM-engine-backup/PerPointEqn.cpp delete mode 100755 src/projectM-engine-backup/PerPointEqn.hpp delete mode 100755 src/projectM-engine-backup/Preset.cpp delete mode 100644 src/projectM-engine-backup/Preset.hpp delete mode 100644 src/projectM-engine-backup/PresetChooser.cpp delete mode 100644 src/projectM-engine-backup/PresetChooser.hpp delete mode 100644 src/projectM-engine-backup/PresetFilters.hpp delete mode 100644 src/projectM-engine-backup/PresetFrameIO.cpp delete mode 100644 src/projectM-engine-backup/PresetFrameIO.hpp delete mode 100644 src/projectM-engine-backup/PresetLoader.cpp delete mode 100644 src/projectM-engine-backup/PresetLoader.hpp delete mode 100644 src/projectM-engine-backup/Renderer.cpp delete mode 100644 src/projectM-engine-backup/Renderer.hpp delete mode 100644 src/projectM-engine-backup/SplayNode.hpp delete mode 100644 src/projectM-engine-backup/StaticArray.hpp delete mode 100755 src/projectM-engine-backup/browser.cpp delete mode 100755 src/projectM-engine-backup/browser.h delete mode 100755 src/projectM-engine-backup/carbontoprojectM.h delete mode 100755 src/projectM-engine-backup/compare.h delete mode 100644 src/projectM-engine-backup/config delete mode 100755 src/projectM-engine-backup/console_interface.cpp delete mode 100755 src/projectM-engine-backup/console_interface.h delete mode 100755 src/projectM-engine-backup/dlldefs.h delete mode 100755 src/projectM-engine-backup/editor.cpp delete mode 100755 src/projectM-engine-backup/editor.h delete mode 100755 src/projectM-engine-backup/event.h delete mode 100755 src/projectM-engine-backup/fatal.h delete mode 100755 src/projectM-engine-backup/fftsg.cpp delete mode 100755 src/projectM-engine-backup/fftsg.h delete mode 120000 src/projectM-engine-backup/fonts delete mode 100755 src/projectM-engine-backup/glConsole.cpp delete mode 100755 src/projectM-engine-backup/glConsole.h delete mode 100755 src/projectM-engine-backup/libprojectM.dsp delete mode 100755 src/projectM-engine-backup/libprojectM.ncb delete mode 100755 src/projectM-engine-backup/libprojectM.opt delete mode 100755 src/projectM-engine-backup/libprojectM.plg delete mode 100755 src/projectM-engine-backup/libprojectM/Debug/libprojectM.pch delete mode 100755 src/projectM-engine-backup/libprojectM/Debug/vc60.idb delete mode 100755 src/projectM-engine-backup/libprojectM/Debug/vc60.pdb delete mode 100755 src/projectM-engine-backup/libprojectM/libprojectM.plg delete mode 100755 src/projectM-engine-backup/lvtoprojectM.h delete mode 100755 src/projectM-engine-backup/menu.cpp delete mode 100755 src/projectM-engine-backup/menu.h delete mode 120000 src/projectM-engine-backup/presets delete mode 100755 src/projectM-engine-backup/projectM.cpp delete mode 100755 src/projectM-engine-backup/projectM.dsp delete mode 100755 src/projectM-engine-backup/projectM.hpp delete mode 100755 src/projectM-engine-backup/sdltoprojectM.h delete mode 100755 src/projectM-engine-backup/timer.cpp delete mode 100755 src/projectM-engine-backup/timer.h delete mode 100755 src/projectM-engine-backup/win32-dirent.cpp delete mode 100755 src/projectM-engine-backup/win32-dirent.h delete mode 100755 src/projectM-engine-backup/wipemalloc.cpp delete mode 100755 src/projectM-engine-backup/wipemalloc.h diff --git a/src/projectM-engine-backup/Algorithms.hpp b/src/projectM-engine-backup/Algorithms.hpp deleted file mode 100644 index e7aed3712..000000000 --- a/src/projectM-engine-backup/Algorithms.hpp +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef PROJECTM_ALGORITHMS_HPP -#define PROJECTM_ALGORITHMS_HPP - -namespace Algorithms -{ - - template - void traverse(Container & container) - { - - TraverseFunctor functor; - - for (typename Container::iterator pos = container.begin(); pos != container.end(); ++pos) - { - functor(pos->second); - } - - } - - - template - void traverse(Container & container, TraverseFunctor & functor) - { - - for (typename Container::iterator pos = container.begin(); pos != container.end(); ++pos) - { - functor(pos->second); - } - - } - - namespace TraverseFunctors - { - template - class DeleteFunctor - { - - public: - - void operator() (Data * data) - { - delete(data); - } - - }; - } - - -} -#endif diff --git a/src/projectM-engine-backup/BeatDetect.cpp b/src/projectM-engine-backup/BeatDetect.cpp deleted file mode 100755 index fbfad1b28..000000000 --- a/src/projectM-engine-backup/BeatDetect.cpp +++ /dev/null @@ -1,175 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * Takes sound data from wherever and returns beat detection values - * Uses statistical Energy-Based methods. Very simple - * - * Some stuff was taken from Frederic Patin's beat-detection article, - * you'll find it online - */ - -#include -#include - -#include "wipemalloc.h" - -#include "Common.hpp" -#include "projectM.hpp" -#include "BeatDetect.hpp" -#include "PCM.hpp" - -DLLEXPORT BeatDetect::BeatDetect() { - int x,y; - - this->vol_instant=0; - this->vol_history=0; - - for (y=0;y<80;y++) - { - this->vol_buffer[y]=0; - } - - this->beat_buffer_pos=0; - - for (x=0;x<32;x++) { - this->beat_instant[x]=0; - this->beat_history[x]=0; - this->beat_val[x]=1.0; - this->beat_att[x]=1.0; - this->beat_variance[x]=0; - for (y=0;y<80;y++) { - this->beat_buffer[x][y]=0; - } - } - - this->treb = 0; - this->mid = 0; - this->bass = 0; - this->bass_old = 0; - this->beat_sensitivity = 8.00; - this->treb_att = 0; - this->mid_att = 0; - this->bass_att = 0; - this->vol = 0; - - this->pcm = new PCM(); - } - -void BeatDetect::reset() { - this->treb = 0; - this->mid = 0; - this->bass = 0; - this->treb_att = 0; - this->mid_att = 0; - this->bass_att = 0; - } - -void BeatDetect::detectFromSamples() { - bass_old = bass; - bass=0;mid=0;treb=0; - - getBeatVals(pcm->pcmdataL,pcm->pcmdataR); - } - -void BeatDetect::getBeatVals( float *vdataL,float *vdataR ) { - - int linear=0; - int x,y; - float temp2=0; - - vol_instant=0; - for ( x=0;x<16;x++) - { - - beat_instant[x]=0; - for ( y=linear*2;y<(linear+8+x)*2;y++) - { - beat_instant[x]+=((vdataL[y]*vdataL[y])+(vdataR[y]*vdataR[y]))*(1.0/(8+x)); -// printf( "beat_instant[%d]: %f %f %f\n", x, beat_instant[x], vdataL[y], vdataR[y] ); - vol_instant+=((vdataL[y]*vdataL[y])+(vdataR[y]*vdataR[y]))*(1.0/512.0); - - } -//printf("1"); - linear=y/2; - beat_history[x]-=(beat_buffer[x][beat_buffer_pos])*.0125; - beat_buffer[x][beat_buffer_pos]=beat_instant[x]; - beat_history[x]+=(beat_instant[x])*.0125; - - beat_val[x]=(beat_instant[x])/(beat_history[x]); - - beat_att[x]+=(beat_instant[x])/(beat_history[x]); - -//printf("2\n"); - - } -//printf("b\n"); - vol_history-=(vol_buffer[beat_buffer_pos])*.0125; - vol_buffer[beat_buffer_pos]=vol_instant; - vol_history+=(vol_instant)*.0125; - - mid=0; - for(x=1;x<10;x++) - { - mid+=(beat_instant[x]); - temp2+=(beat_history[x]); - - } - - mid=mid/(1.5*temp2); - temp2=0; - treb=0; - for(x=10;x<16;x++) - { - treb+=(beat_instant[x]); - temp2+=(beat_history[x]); - } -//printf("c\n"); - treb=treb/(1.5*temp2); -// *vol=vol_instant/(1.5*vol_history); - vol=vol_instant/(1.5*vol_history); - - bass=(beat_instant[0])/(1.5*beat_history[0]); - - if ( isnan( treb ) ) { - treb = 0.0; - } - if ( isnan( mid ) ) { - mid = 0.0; - } - if ( isnan( bass ) ) { - bass = 0.0; - } - treb_att=.6 * treb_att + .4 * treb; - mid_att=.6 * mid_att + .4 * mid; - bass_att=.6 * bass_att + .4 * bass; - - DWRITE( "BeatDetect::getBeatVals: treb: %f\tmid: %f\tbass: %f\n", - treb, mid, bass ); - DWRITE( "BeatDetect::getBeatVals: treb_att: %f\tmid_att: %f\tbass_att: %f\n", - treb_att, mid_att, bass_att ); - - // *vol=(beat_instant[3])/(beat_history[3]); - beat_buffer_pos++; - if( beat_buffer_pos>79)beat_buffer_pos=0; - -} - - diff --git a/src/projectM-engine-backup/BeatDetect.hpp b/src/projectM-engine-backup/BeatDetect.hpp deleted file mode 100755 index c43b9f8f1..000000000 --- a/src/projectM-engine-backup/BeatDetect.hpp +++ /dev/null @@ -1,72 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Beat detection class. Takes decompressed sound buffers and returns - * various characteristics - * - * $Log$ - * - */ - -#ifndef _BEAT_DETECT_H -#define _BEAT_DETECT_H - -#include "projectM.hpp" -#include "PCM.hpp" - -class BeatDetect { -public: - /** Vars */ - float beat_buffer[32][80], - beat_instant[32], - beat_history[32]; - float beat_val[32], - beat_att[32], - beat_variance[32]; - int beat_buffer_pos; - float vol_buffer[80], - vol_instant, - vol_history; - - float treb ; - float mid ; - float bass ; - float bass_old ; - float beat_sensitivity; - float treb_att ; - float mid_att ; - float bass_att ; - float vol; - - PCM *pcm; - - /** Methods */ - DLLEXPORT BeatDetect(); - void initBeatDetect(); - void reset(); - void detectFromSamples(); - void getBeatVals( float *vdataL, float *vdataR); - void freeBeatDetect(); - }; - -#endif /** !_BEAT_DETECT_H */ diff --git a/src/projectM-engine-backup/BuiltinFuncs.cpp b/src/projectM-engine-backup/BuiltinFuncs.cpp deleted file mode 100644 index 80494efe9..000000000 --- a/src/projectM-engine-backup/BuiltinFuncs.cpp +++ /dev/null @@ -1,166 +0,0 @@ -// -// C++ Implementation: BuiltinFuncs -// -// Description: -// -// -// Author: Carmelo Piccione , (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -/* Loads all builtin functions */ - - -/* Loads a builtin function */ -#include "BuiltinFuncs.hpp" -#include -#include "Algorithms.hpp" -#include - -using namespace Algorithms; - -std::map * BuiltinFuncs::builtin_func_tree = 0; - -int BuiltinFuncs::load_builtin_func(char * name, float (*func_ptr)(float*), int num_args) { - - Func * func; - int retval; - - /* Create new function */ - func = Func::create_func(name, func_ptr, num_args); - - if (func == NULL) - return PROJECTM_OUTOFMEM_ERROR; - - retval = insert_func( func ); - - return retval; - -} - - - -Func * BuiltinFuncs::find_func(char * name) { - - std::map::iterator pos = builtin_func_tree->find(std::string(name)); - - // Case: function not found, return null - if (pos == builtin_func_tree->end()) - return 0; - - // Case: function found, return a pointer to it - return pos->second; - -} - - - - -int BuiltinFuncs::load_all_builtin_func() { - - if (load_builtin_func("int", FuncWrappers::int_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("abs", FuncWrappers::abs_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("sin", FuncWrappers::sin_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("cos", FuncWrappers::cos_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("tan", FuncWrappers::tan_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("asin", FuncWrappers::asin_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("acos", FuncWrappers::acos_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("atan", FuncWrappers::atan_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("sqr", FuncWrappers::sqr_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("sqrt", FuncWrappers::sqrt_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("pow", FuncWrappers::pow_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("exp", FuncWrappers::exp_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("log", FuncWrappers::log_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("log10", FuncWrappers::log10_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("sign", FuncWrappers::sign_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("min", FuncWrappers::min_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("max", FuncWrappers::max_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("sigmoid", FuncWrappers::sigmoid_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("atan2", FuncWrappers::atan2_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("rand", FuncWrappers::rand_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("band", FuncWrappers::band_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("bor", FuncWrappers::bor_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("bnot", FuncWrappers::bnot_wrapper, 1) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("if", FuncWrappers::if_wrapper, 3) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("equal", FuncWrappers::equal_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("above", FuncWrappers::above_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("below", FuncWrappers::below_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("nchoosek", FuncWrappers::nchoosek_wrapper, 2) < 0) - return PROJECTM_ERROR; - if (load_builtin_func("fact", FuncWrappers::fact_wrapper, 1) < 0) - return PROJECTM_ERROR; - - return PROJECTM_SUCCESS; -} - - -/* Initialize the builtin function database. - Should only be necessary once */ -int BuiltinFuncs::init_builtin_func_db() { - int retval; - - builtin_func_tree = - new std::map(); - - if (builtin_func_tree == NULL) - return PROJECTM_OUTOFMEM_ERROR; - - retval = load_all_builtin_func(); - return PROJECTM_SUCCESS; -} - - - -/* Destroy the builtin function database. - Generally, do this on projectm exit */ -int BuiltinFuncs::destroy_builtin_func_db() { - -traverse >(*builtin_func_tree); -return PROJECTM_SUCCESS; -} - -/* Insert a function into the database */ -int BuiltinFuncs::insert_func( Func *func ) { - - std::pair::iterator, bool> inserteePair = - builtin_func_tree->insert(std::make_pair(std::string(func->name), func)); - - if (!inserteePair.second) { - std::cerr << "Failed to insert builtin function \"" << func->name << "\" into collection! Bailing..." << std::endl; - abort(); - - } - - return PROJECTM_SUCCESS; -} - - diff --git a/src/projectM-engine-backup/BuiltinFuncs.hpp b/src/projectM-engine-backup/BuiltinFuncs.hpp deleted file mode 100644 index fa369fa10..000000000 --- a/src/projectM-engine-backup/BuiltinFuncs.hpp +++ /dev/null @@ -1,226 +0,0 @@ -// -// C++ Interface: BuiltinFuncs -// -// Description: -// -// -// Author: Carmelo Piccione , (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#ifndef _BUILTIN_FUNCS_HPP -#define _BUILTIN_FUNCS_HPP - -#include "Common.hpp" -#include "Func.hpp" -#include -#include -#include "projectM.hpp" -/* Wrappers for all the builtin functions - The arg_list pointer is a list of floats. Its - size is equal to the number of arguments the parameter - takes */ -class FuncWrappers { - -/* Values to optimize the sigmoid function */ -static const int R = 32767; -static const int RR = 65534; - -public: - -static inline float int_wrapper(float * arg_list) { - -return floor(arg_list[0]); - -} - - -static inline float sqr_wrapper(float * arg_list) { - -return pow(2, arg_list[0]); -} - - -static inline float sign_wrapper(float * arg_list) { - -return -arg_list[0]; -} - -static inline float min_wrapper(float * arg_list) { - -if (arg_list[0] > arg_list[1]) -return arg_list[1]; - -return arg_list[0]; -} - -static inline float max_wrapper(float * arg_list) { - -if (arg_list[0] > arg_list[1]) -return arg_list[0]; - -return arg_list[1]; -} - -/* consult your AI book */ -static inline float sigmoid_wrapper(float * arg_list) { -return (RR / (1 + exp( -(((float)(arg_list[0])) * arg_list[1]) / R) - R)); -} - - -static inline float bor_wrapper(float * arg_list) { - -return (float)((int)arg_list[0] || (int)arg_list[1]); -} - -static inline float band_wrapper(float * arg_list) { -return (float)((int)arg_list[0] && (int)arg_list[1]); -} - -static inline float bnot_wrapper(float * arg_list) { -return (float)(!(int)arg_list[0]); -} - -static inline float if_wrapper(float * arg_list) { - -if ((int)arg_list[0] == 0) -return arg_list[2]; -return arg_list[1]; -} - - -static inline float rand_wrapper(float * arg_list) { -float l=1; - -// printf("RAND ARG:(%d)\n", (int)arg_list[0]); -if ((int)arg_list[0] > 0) -l = (float)((rand()) % ((int)arg_list[0])); -//printf("VAL: %f\n", l); -return l; -} - -static inline float equal_wrapper(float * arg_list) { - return (arg_list[0] == arg_list[1]); -} - - -static inline float above_wrapper(float * arg_list) { - -return (arg_list[0] > arg_list[1]); -} - - -static inline float below_wrapper(float * arg_list) { - -return (arg_list[0] < arg_list[1]); -} - -static inline float sin_wrapper(float * arg_list) { -return (sin (arg_list[0])); -} - - -static inline float cos_wrapper(float * arg_list) { -return (cos (arg_list[0])); -} - -static inline float tan_wrapper(float * arg_list) { -return (tan(arg_list[0])); -} - -static inline float asin_wrapper(float * arg_list) { -return (asin (arg_list[0])); -} - -static inline float acos_wrapper(float * arg_list) { -return (acos (arg_list[0])); -} - -static inline float atan_wrapper(float * arg_list) { -return (atan (arg_list[0])); -} - -static inline float atan2_wrapper(float * arg_list) { -return (atan2 (arg_list[0], arg_list[1])); -} - -static inline float pow_wrapper(float * arg_list) { -return (pow (arg_list[0], arg_list[1])); -} - -static inline float exp_wrapper(float * arg_list) { -return (exp(arg_list[0])); -} - -static inline float abs_wrapper(float * arg_list) { -return (fabs(arg_list[0])); -} - -static inline float log_wrapper(float* arg_list) { -return (log (arg_list[0])); -} - -static inline float log10_wrapper(float * arg_list) { -return (log10 (arg_list[0])); -} - -static inline float sqrt_wrapper(float * arg_list) { -return (sqrt (arg_list[0])); -} - - -static inline float nchoosek_wrapper(float * arg_list) { -unsigned long cnm = 1UL; -int i, f; -int n, m; - -n = (int)arg_list[0]; -m = (int)arg_list[1]; - -if (m*2 >n) m = n-m; -for (i=1 ; i <= m; n--, i++) -{ -if ((f=n) % i == 0) -f /= i; -else cnm /= i; -cnm *= f; -} -return (float)cnm; -} - - -static inline float fact_wrapper(float * arg_list) { - - -int result = 1; - -int n = (int)arg_list[0]; - -while (n > 1) { -result = result * n; -n--; -} -return (float)result; -} -}; - -#include -class BuiltinFuncs { - -public: - - static int init_builtin_func_db(); - static int destroy_builtin_func_db(); - static int load_all_builtin_func(); - static int load_builtin_func( char * name, float (*func_ptr)(float*), int num_args ); - - static int insert_func( Func *func ); - static int remove_func( Func *func ); - static Func *find_func( char *name ); -private: - static std::map * builtin_func_tree; -}; - -#endif diff --git a/src/projectM-engine-backup/BuiltinParams.cpp b/src/projectM-engine-backup/BuiltinParams.cpp deleted file mode 100644 index fc5ee6d57..000000000 --- a/src/projectM-engine-backup/BuiltinParams.cpp +++ /dev/null @@ -1,364 +0,0 @@ - - -#include "BuiltinParams.hpp" -#include "projectM.hpp" -#include -#include "Algorithms.hpp" - -using namespace Algorithms; - -BuiltinParams::BuiltinParams() {} - -BuiltinParams::BuiltinParams(const PresetInputs & presetInputs, PresetOutputs & presetOutputs) -{ - - int ret; - if ((ret = init_builtin_param_db(presetInputs, presetOutputs)) != PROJECTM_SUCCESS) - { - throw ret; - } - -} - -BuiltinParams::~BuiltinParams() -{ - destroy_builtin_param_db(); -} - -/* Loads a float parameter into the builtin database */ -int BuiltinParams::load_builtin_param_float(char * name, void * engine_val, void * matrix, short int flags, - float init_val, float upper_bound, float lower_bound, char * alt_name) -{ - - Param * param = NULL; - CValue iv, ub, lb; - - iv.float_val = init_val; - ub.float_val = upper_bound; - lb.float_val = lower_bound; - - /* Create new parameter of type float */ - if (BUILTIN_PARAMS_DEBUG == 2) - { - printf("load_builtin_param_float: (name \"%s\") (alt_name = \"%s\") ", name, alt_name); - fflush(stdout); - } - - if ((param = new Param(name, P_TYPE_DOUBLE, flags, engine_val, matrix, iv, ub, lb)) == NULL) - { - return PROJECTM_OUTOFMEM_ERROR; - } - - if (BUILTIN_PARAMS_DEBUG == 2) - { - printf("created..."); - fflush(stdout); - } - - /* Insert the paremeter into the database */ - - if (insert_builtin_param( param ) < 0) - { - delete param; - return PROJECTM_ERROR; - } - - if (BUILTIN_PARAMS_DEBUG == 2) - { - printf("inserted..."); - fflush(stdout); - } - - /* If this parameter has an alternate name, insert it into the database as link */ - - if (alt_name != NULL) - { - insert_param_alt_name(param,alt_name); - - if (BUILTIN_PARAMS_DEBUG == 2) - { - printf("alt_name inserted..."); - fflush(stdout); - } - - - } - - if (BUILTIN_PARAMS_DEBUG == 2) printf("finished\n"); - - /* Finished, return success */ - return PROJECTM_SUCCESS; -} - - - -/* Destroy the builtin parameter database. - Generally, do this on projectm exit */ -int BuiltinParams::destroy_builtin_param_db() -{ - - Algorithms::traverse >(*builtin_param_tree); - delete builtin_param_tree; - builtin_param_tree = NULL; - return PROJECTM_SUCCESS; -} - - -/* Insert a parameter into the database with an alternate name */ -int BuiltinParams::insert_param_alt_name(Param *param, char * alt_name) -{ - - assert(alt_name); - - aliasMap.insert(std::make_pair(std::string(alt_name), std::string(param->name))); - - return PROJECTM_SUCCESS; -} - -Param * BuiltinParams::find_builtin_param(const std::string & name) -{ - - AliasMap::iterator pos = aliasMap.find(name); - Param * param = 0; - - if (pos == aliasMap.end()) - { - std::map::iterator builtinPos = builtin_param_tree->find(name); - - if (builtinPos != builtin_param_tree->end()) - param = builtinPos->second; - } - else - { - - std::map::iterator builtinPos = builtin_param_tree->find(pos->second); - - if (builtinPos != builtin_param_tree->end()) - param = builtinPos->second; - } - return param; -} - - -/* Loads a integer parameter into the builtin database */ -int BuiltinParams::load_builtin_param_int(char * name, void * engine_val, short int flags, - int init_val, int upper_bound, int lower_bound, char * alt_name) -{ - - Param * param; - CValue iv, ub, lb; - - iv.int_val = init_val; - ub.int_val = upper_bound; - lb.int_val = lower_bound; - - param = new Param(name, P_TYPE_INT, flags, engine_val, NULL, iv, ub, lb); - - if (param == NULL) - { - return PROJECTM_OUTOFMEM_ERROR; - } - - if (insert_builtin_param( param ) < 0) - { - delete param; - return PROJECTM_ERROR; - } - - if (alt_name != NULL) - { - insert_param_alt_name(param,alt_name); - } - - return PROJECTM_SUCCESS; - -} - -/* Loads a boolean parameter */ -int BuiltinParams::load_builtin_param_bool(char * name, void * engine_val, short int flags, - int init_val, char * alt_name) -{ - - Param * param; - CValue iv, ub, lb; - - iv.int_val = init_val; - ub.int_val = TRUE; - lb.int_val = FALSE; - - param = new Param(name, P_TYPE_BOOL, flags, engine_val, NULL, iv, ub, lb); - - if (param == NULL) - { - return PROJECTM_OUTOFMEM_ERROR; - } - - if (insert_builtin_param(param) < 0) - { - delete param; - return PROJECTM_ERROR; - } - - if (alt_name != NULL) - { - insert_param_alt_name(param,alt_name); - } - - return PROJECTM_SUCCESS; - -} - -/* Inserts a parameter into the builtin database */ -int BuiltinParams::insert_builtin_param( Param *param ) -{ - std::pair::iterator, bool> inserteePos = builtin_param_tree->insert(std::make_pair(param->name, param)); - - return inserteePos.second; -} - - - -/* Initialize the builtin parameter database. - Should only be necessary once */ -int BuiltinParams::init_builtin_param_db(const PresetInputs & presetInputs, PresetOutputs & presetOutputs) -{ - - /* Create the builtin parameter splay tree (go Sleator...) */ - if ((this->builtin_param_tree = new std::map()) == NULL) - { - if (BUILTIN_PARAMS_DEBUG) printf("init_builtin_param_db: failed to initialize database (FATAL)\n"); - return PROJECTM_OUTOFMEM_ERROR; - } - - if (BUILTIN_PARAMS_DEBUG) - { - printf("init_builtin_param: loading database..."); - fflush(stdout); - } - - /* Loads all builtin parameters into the database */ - if (load_all_builtin_param(presetInputs, presetOutputs) < 0) - { - if (BUILTIN_PARAMS_DEBUG) printf("failed loading builtin parameters (FATAL)\n"); - return PROJECTM_ERROR; - } - - if (BUILTIN_PARAMS_DEBUG) printf("success!\n"); - - /* Finished, no errors */ - return PROJECTM_SUCCESS; -} - - - -/* Loads all builtin parameters, limits are also defined here */ -int BuiltinParams::load_all_builtin_param(const PresetInputs & presetInputs, PresetOutputs & presetOutputs) -{ - - load_builtin_param_float("fRating", (void*)&presetOutputs.fRating, NULL, P_FLAG_NONE, 0.0 , 5.0, 0.0, NULL); - load_builtin_param_float("fWaveScale", (void*)&presetOutputs.fWaveScale, NULL, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("gamma", (void*)&presetOutputs.fGammaAdj, NULL, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, "fGammaAdj"); - load_builtin_param_float("echo_zoom", (void*)&presetOutputs.fVideoEchoZoom, NULL, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, "fVideoEchoZoom"); - load_builtin_param_float("echo_alpha", (void*)&presetOutputs.fVideoEchoAlpha, NULL, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, "fVideoEchoAlpha"); - load_builtin_param_float("wave_a", (void*)&presetOutputs.fWaveAlpha, NULL, P_FLAG_NONE, 0.0, 1.0, 0, "fWaveAlpha"); - load_builtin_param_float("fWaveSmoothing", (void*)&presetOutputs.fWaveSmoothing, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, NULL); - load_builtin_param_float("fModWaveAlphaStart", (void*)&presetOutputs.fModWaveAlphaStart, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, NULL); - load_builtin_param_float("fModWaveAlphaEnd", (void*)&presetOutputs.fModWaveAlphaEnd, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, NULL); - load_builtin_param_float("fWarpAnimSpeed", (void*)&presetOutputs.fWarpAnimSpeed, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, NULL); - // load_builtin_param_float("warp", (void*)&presetOutputs.warp, warp_mesh, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - - load_builtin_param_float("fShader", (void*)&presetOutputs.fShader, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, NULL); - load_builtin_param_float("decay", (void*)&presetOutputs.decay, NULL, P_FLAG_NONE, 0.0, 1.0, 0, "fDecay"); - - load_builtin_param_int("echo_orient", (void*)&presetOutputs.nVideoEchoOrientation, P_FLAG_NONE, 0, 3, 0, "nVideoEchoOrientation"); - load_builtin_param_int("wave_mode", (void*)&presetOutputs.nWaveMode, P_FLAG_NONE, 0, 7, 0, "nWaveMode"); - - load_builtin_param_bool("wave_additive", (void*)&presetOutputs.bAdditiveWaves, P_FLAG_NONE, FALSE, "bAdditiveWaves"); - load_builtin_param_bool("bModWaveAlphaByVolume", (void*)&presetOutputs.bModWaveAlphaByVolume, P_FLAG_NONE, FALSE, NULL); - load_builtin_param_bool("wave_brighten", (void*)&presetOutputs.bMaximizeWaveColor, P_FLAG_NONE, FALSE, "bMaximizeWaveColor"); - load_builtin_param_bool("wrap", (void*)&presetOutputs.bTexWrap, P_FLAG_NONE, FALSE, "bTexWrap"); - load_builtin_param_bool("darken_center", (void*)&presetOutputs.bDarkenCenter, P_FLAG_NONE, FALSE, "bDarkenCenter"); - load_builtin_param_bool("bRedBlueStereo", (void*)&presetOutputs.bRedBlueStereo, P_FLAG_NONE, FALSE, NULL); - load_builtin_param_bool("brighten", (void*)&presetOutputs.bBrighten, P_FLAG_NONE, FALSE, "bBrighten"); - load_builtin_param_bool("darken", (void*)&presetOutputs.bDarken, P_FLAG_NONE, FALSE, "bDarken"); - load_builtin_param_bool("solarize", (void*)&presetOutputs.bSolarize, P_FLAG_NONE, FALSE, "bSolarize"); - load_builtin_param_bool("invert", (void*)&presetOutputs.bInvert, P_FLAG_NONE, FALSE, "bInvert"); - load_builtin_param_bool("bMotionVectorsOn", (void*)&presetOutputs.bMotionVectorsOn, P_FLAG_NONE, FALSE, NULL); - load_builtin_param_bool("wave_dots", (void*)&presetOutputs.bWaveDots, P_FLAG_NONE, FALSE, "bWaveDots"); - load_builtin_param_bool("wave_thick", (void*)&presetOutputs.bWaveThick, P_FLAG_NONE, FALSE, "bWaveThick"); - - load_builtin_param_float("zoom", (void*)&presetOutputs.zoom, presetOutputs.zoom_mesh, P_FLAG_PER_PIXEL |P_FLAG_DONT_FREE_MATRIX, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - load_builtin_param_float("rot", (void*)&presetOutputs.rot, presetOutputs.rot_mesh, P_FLAG_PER_PIXEL |P_FLAG_DONT_FREE_MATRIX, 0.0, MAX_DOUBLE_SIZE, MIN_DOUBLE_SIZE, NULL); - load_builtin_param_float("zoomexp", (void*)&presetOutputs.zoomexp, presetOutputs.zoomexp_mesh, P_FLAG_PER_PIXEL |P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, "fZoomExponent"); - - load_builtin_param_float("cx", (void*)&presetOutputs.cx, presetOutputs.cx_mesh, P_FLAG_PER_PIXEL | P_FLAG_DONT_FREE_MATRIX, 0.0, 1.0, 0, NULL); - load_builtin_param_float("cy", (void*)&presetOutputs.cy, presetOutputs.cy_mesh, P_FLAG_PER_PIXEL | P_FLAG_DONT_FREE_MATRIX, 0.0, 1.0, 0, NULL); - load_builtin_param_float("dx", (void*)&presetOutputs.dx, presetOutputs.dx_mesh, P_FLAG_PER_PIXEL | P_FLAG_DONT_FREE_MATRIX, 0.0, MAX_DOUBLE_SIZE, MIN_DOUBLE_SIZE, NULL); - load_builtin_param_float("dy", (void*)&presetOutputs.dy, presetOutputs.dy_mesh, P_FLAG_PER_PIXEL |P_FLAG_DONT_FREE_MATRIX, 0.0, MAX_DOUBLE_SIZE, MIN_DOUBLE_SIZE, NULL); - load_builtin_param_float("sx", (void*)&presetOutputs.sx, presetOutputs.sx_mesh, P_FLAG_PER_PIXEL |P_FLAG_DONT_FREE_MATRIX, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - load_builtin_param_float("sy", (void*)&presetOutputs.sy, presetOutputs.sy_mesh, P_FLAG_PER_PIXEL |P_FLAG_DONT_FREE_MATRIX, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - - load_builtin_param_float("wave_r", (void*)&presetOutputs.wave_r, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("wave_g", (void*)&presetOutputs.wave_g, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("wave_b", (void*)&presetOutputs.wave_b, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("wave_x", (void*)&presetOutputs.wave_x, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("wave_y", (void*)&presetOutputs.wave_y, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("wave_mystery", (void*)&presetOutputs.wave_mystery, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, "fWaveParam"); - - load_builtin_param_float("ob_size", (void*)&presetOutputs.ob_size, NULL, P_FLAG_NONE, 0.0, 0.5, 0, NULL); - load_builtin_param_float("ob_r", (void*)&presetOutputs.ob_r, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("ob_g", (void*)&presetOutputs.ob_g, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("ob_b", (void*)&presetOutputs.ob_b, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("ob_a", (void*)&presetOutputs.ob_a, NULL, P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - - load_builtin_param_float("ib_size", (void*)&presetOutputs.ib_size, NULL,P_FLAG_NONE, 0.0, .5, 0.0, NULL); - load_builtin_param_float("ib_r", (void*)&presetOutputs.ib_r, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("ib_g", (void*)&presetOutputs.ib_g, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("ib_b", (void*)&presetOutputs.ib_b, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("ib_a", (void*)&presetOutputs.ib_a, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - - load_builtin_param_float("mv_r", (void*)&presetOutputs.mv_r, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("mv_g", (void*)&presetOutputs.mv_g, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("mv_b", (void*)&presetOutputs.mv_b, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - load_builtin_param_float("mv_x", (void*)&presetOutputs.mv_x, NULL,P_FLAG_NONE, 0.0, 64.0, 0.0, "nMotionVectorsX"); - load_builtin_param_float("mv_y", (void*)&presetOutputs.mv_y, NULL,P_FLAG_NONE, 0.0, 48.0, 0.0, "nMotionVectorsY"); - load_builtin_param_float("mv_l", (void*)&presetOutputs.mv_l, NULL,P_FLAG_NONE, 0.0, 5.0, 0.0, NULL); - load_builtin_param_float("mv_dy", (void*)&presetOutputs.mv_dy, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, NULL); - load_builtin_param_float("mv_dx", (void*)&presetOutputs.mv_dx, NULL,P_FLAG_NONE, 0.0, 1.0, -1.0, NULL); - load_builtin_param_float("mv_a", (void*)&presetOutputs.mv_a, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, NULL); - - load_builtin_param_float("time", (void*)&presetInputs.time, NULL,P_FLAG_READONLY, 0.0, MAX_DOUBLE_SIZE, 0.0, NULL); - load_builtin_param_float("bass", (void*)&presetInputs.bass, NULL,P_FLAG_READONLY, 0.0, MAX_DOUBLE_SIZE, 0.0, NULL); - load_builtin_param_float("mid", (void*)&presetInputs.mid, NULL,P_FLAG_READONLY, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - load_builtin_param_float("bass_att", (void*)&presetInputs.bass_att, NULL,P_FLAG_READONLY, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - load_builtin_param_float("mid_att", (void*)&presetInputs.mid_att, NULL, P_FLAG_READONLY, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - load_builtin_param_float("treb_att", (void*)&presetInputs.treb_att, NULL, P_FLAG_READONLY, 0.0, MAX_DOUBLE_SIZE, 0, NULL); - load_builtin_param_int("frame", (void*)&presetInputs.frame, P_FLAG_READONLY, 0, MAX_INT_SIZE, 0, NULL); - load_builtin_param_float("progress", (void*)&presetInputs.progress, NULL,P_FLAG_READONLY, 0.0, 1, 0, NULL); - load_builtin_param_int("fps", (void*)&presetInputs.fps, P_FLAG_READONLY, 15, MAX_INT_SIZE, 0, NULL); - - load_builtin_param_float("x", (void*)&presetInputs.x_per_pixel, presetInputs.x_mesh, P_FLAG_PER_PIXEL |P_FLAG_ALWAYS_MATRIX | P_FLAG_READONLY | P_FLAG_DONT_FREE_MATRIX, - 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("y", (void*)&presetInputs.y_per_pixel, presetInputs.y_mesh, P_FLAG_PER_PIXEL |P_FLAG_ALWAYS_MATRIX |P_FLAG_READONLY | P_FLAG_DONT_FREE_MATRIX, - 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("ang", (void*)&presetInputs.ang_per_pixel, presetInputs.theta_mesh, P_FLAG_PER_PIXEL |P_FLAG_ALWAYS_MATRIX | P_FLAG_READONLY | P_FLAG_DONT_FREE_MATRIX, - 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("rad", (void*)&presetInputs.rad_per_pixel, presetInputs.rad_mesh, P_FLAG_PER_PIXEL |P_FLAG_ALWAYS_MATRIX | P_FLAG_READONLY | P_FLAG_DONT_FREE_MATRIX, - 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - - load_builtin_param_float("q1", (void*)&presetOutputs.q1, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("q2", (void*)&presetOutputs.q2, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("q3", (void*)&presetOutputs.q3, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("q4", (void*)&presetOutputs.q4, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("q5", (void*)&presetOutputs.q5, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("q6", (void*)&presetOutputs.q6, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("q7", (void*)&presetOutputs.q7, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - load_builtin_param_float("q8", (void*)&presetOutputs.q8, NULL, P_FLAG_PER_PIXEL |P_FLAG_QVAR, 0, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, NULL); - - /* variables added in 1.04 */ - load_builtin_param_int("meshx", (void*)&presetInputs.gx, P_FLAG_READONLY, 32, 96, 8, NULL); - load_builtin_param_int("meshy", (void*)&presetInputs.gy, P_FLAG_READONLY, 24, 72, 6, NULL); - - return PROJECTM_SUCCESS; - -} diff --git a/src/projectM-engine-backup/BuiltinParams.hpp b/src/projectM-engine-backup/BuiltinParams.hpp deleted file mode 100644 index b3fc3997f..000000000 --- a/src/projectM-engine-backup/BuiltinParams.hpp +++ /dev/null @@ -1,85 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - - -/** BuiltinParams.hpp :: a class to encapsulate and centralize - * all projectm builtin parameter methods and state. Used primarily - * by preset class -**/ -#ifndef _BUILTIN_PARAMS_HPP -#define _BUILTIN_PARAMS_HPP - -#include -#include "PresetFrameIO.hpp" -#include "Param.hpp" -#include -#include "Algorithms.hpp" - -class BuiltinParams { - -public: - typedef std::map AliasMap; - - /** Default constructor leaves database in an uninitialized state. */ - BuiltinParams(); - - /** Construct a new builtin parameter database with variables references given by - * the preset input and output structures */ - BuiltinParams(const PresetInputs & presetInputs, PresetOutputs & presetOutputs); - - ~BuiltinParams(); - - /** Param database initalizer / destructor functions */ - int init_builtin_param_db(const PresetInputs & presetInputs, PresetOutputs & presetOutputs); - int load_all_builtin_param(const PresetInputs & presetInputs, PresetOutputs & presetOutputs); - int destroy_builtin_param_db(); - - int insert_param_alt_name( Param *param, char *alt_name ); - Param *find_builtin_param( const std::string & name ); - int load_builtin_param_float( char *name, void *engine_val, void *matrix, - short int flags, - float init_val, float upper_bound, - float lower_bound, char *alt_name ); - int load_builtin_param_int( char *name, void *engine_val, short int flags, - int init_val, int upper_bound, - int lower_bound, char *alt_name ); - int load_builtin_param_bool( char *name, void *engine_val, short int flags, - int init_val, char *alt_name ); - int insert_builtin_param( Param *param ); - - template - void traverse(Fun & fun) { - Algorithms::traverse(*builtin_param_tree, fun); - } - - - void traverse(void (*func_ptr)(void*)); - -private: - static const bool BUILTIN_PARAMS_DEBUG = false; - - // Used to associate multiple string names to one parameter - AliasMap aliasMap; - - // Internal datastructure to store the parameters - std::map * builtin_param_tree; -}; -#endif diff --git a/src/projectM-engine-backup/CMakeLists.txt b/src/projectM-engine-backup/CMakeLists.txt deleted file mode 100644 index 8afd95f54..000000000 --- a/src/projectM-engine-backup/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -PROJECT(projectM) -ADD_LIBRARY(projectM SHARED projectM.cpp projectM.hpp PBuffer.cpp PBuffer.hpp InitCond.cpp InitCond.hpp - Expr.cpp PCM.cpp Parser.cpp Preset.cpp Common.hpp BeatDetect.cpp PCM.hpp PerPixelEqn.cpp Eval.hpp -Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.hpp CustomWave.hpp BeatDetect.hpp menu.cpp console_interface.h -Func.hpp Func.cpp Eval.cpp wipemalloc.h browser.cpp PerFrameEqn.cpp PerPointEqn.cpp editor.cpp fftsg.cpp glConsole.cpp console_interface.cpp -CValue.hpp Expr.hpp timer.cpp wipemalloc.cpp PerFrameEqn.hpp PerPixelEqn.hpp PerPointEqn.hpp browser.h BuiltinFuncs.hpp -BuiltinFuncs.cpp compare.h editor.h event.h fatal.h fftsg.h glConsole.h menu.h timer.h SplayNode.hpp BuiltinParams.hpp BuiltinParams.cpp Preset.hpp Renderer.cpp Renderer.hpp ParamUtils.hpp PresetLoader.cpp PresetLoader.hpp PresetChooser.hpp PresetChooser.cpp PresetFrameIO.cpp PresetFrameIO.hpp) - -OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON) - -ADD_DEFINITIONS(-DLINUX -DUSE_FBO) - -FIND_PACKAGE(OpenGL) - -INCLUDE(FindPkgConfig.cmake) - -TARGET_LINK_LIBRARIES(projectM GLEW m) - -IF(USE_FTGL) - pkg_search_module (FTGL ftgl) - ADD_DEFINITIONS(-DUSE_FTGL) - INCLUDE_DIRECTORIES(${FTGL_INCLUDE_DIRS}) - LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS}) - TARGET_LINK_LIBRARIES(projectM GLEW m ftgl) -ENDIF(USE_FTGL) - -INSTALL(TARGETS projectM DESTINATION lib) -INSTALL(FILES projectM.hpp PBuffer.hpp PCM.hpp BeatDetect.hpp Preset.hpp event.h console_interface.h dlldefs.h fatal.h PresetFrameIO.hpp PCM.hpp Renderer.hpp PresetChooser.hpp DESTINATION include/libprojectM) -INSTALL(FILES config DESTINATION share/projectM) -FILE(GLOB presets "presets/*.milk") -INSTALL(FILES ${presets} DESTINATION share/projectM/presets) -FILE(GLOB fonts "fonts/*.ttf") -INSTALL(FILES ${fonts} DESTINATION share/projectM/fonts) diff --git a/src/projectM-engine-backup/CValue.hpp b/src/projectM-engine-backup/CValue.hpp deleted file mode 100755 index bc55e11f7..000000000 --- a/src/projectM-engine-backup/CValue.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Value - * - * $Log$ - */ - -#ifndef _CVALUE_H -#define _CVALUE_H - -typedef union CValue_t { - int bool_val; - int int_val; - float float_val; - } CValue; - -#endif /** _CVALUE_H */ diff --git a/src/projectM-engine-backup/Common.hpp b/src/projectM-engine-backup/Common.hpp deleted file mode 100755 index 1dedc1124..000000000 --- a/src/projectM-engine-backup/Common.hpp +++ /dev/null @@ -1,98 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * $Log$ - */ - -#ifndef COMMON_H -#define COMMON_H - -#include - -#ifdef _MSC_VER -# define strcasecmp(s, t) _strcmpi(s, t) -#endif - -#ifdef DEBUG -extern FILE *debugFile; -#endif - -#ifdef MACOS -#include -extern FILE *fmemopen(void *buf, size_t len, const char *pMode); -#endif /** MACOS */ - -#include "dlldefs.h" - -#define DEFAULT_FONT_PATH "/home/carm/fonts/courier1.glf" -#define MAX_TOKEN_SIZE 512 -#define MAX_PATH_SIZE 4096 - -#define STRING_BUFFER_SIZE 1024*150 -#define STRING_LINE_SIZE 1024 - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - - -#define MAX_DOUBLE_SIZE 10000000.0 -#define MIN_DOUBLE_SIZE -10000000.0 - -#define MAX_INT_SIZE 10000000 -#define MIN_INT_SIZE -10000000 - -/* default float initial value */ -#define DEFAULT_DOUBLE_IV 0.0 - -/* default float lower bound */ -#define DEFAULT_DOUBLE_LB MIN_DOUBLE_SIZE - -/* default float upper bound */ -#define DEFAULT_DOUBLE_UB MAX_DOUBLE_SIZE - -#ifdef WIN32 -#include -#define isnan _isnan#endif /** WIN32 */ -#endif /** WIN32 */ - -inline void DWRITE( char *fmt, ... ) { - va_list args; - va_start( args, fmt ); -#ifdef DEBUG -//#ifdef MACOS - if ( debugFile != NULL ) {\ - vfprintf( debugFile, fmt, args );\ - fflush( debugFile );\ - } else {\ - vprintf( fmt, args );\ - } -//#endif -#endif - va_end( args ); - } - -#endif diff --git a/src/projectM-engine-backup/CustomShape.cpp b/src/projectM-engine-backup/CustomShape.cpp deleted file mode 100755 index 507786640..000000000 --- a/src/projectM-engine-backup/CustomShape.cpp +++ /dev/null @@ -1,227 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include -#include -#include - -#include "Common.hpp" -#include "fatal.h" - -#include "CustomShape.hpp" -#include "Eval.hpp" -#include "Expr.hpp" -#include "InitCond.hpp" -#include "Param.hpp" -#include "PerFrameEqn.hpp" -#include "Preset.hpp" -#include -#include "ParamUtils.hpp" -#include "InitCondUtils.hpp" -#include "wipemalloc.h" -#include "Algorithms.hpp" - - -using namespace Algorithms; - -void eval_custom_shape_init_conds(CustomShape * custom_shape); -void load_unspec_init_cond_shape(Param * param); - - -CustomShape::CustomShape( int id ) { - - Param * param; - - this->id = id; - this->per_frame_count = 0; - this->per_frame_eqn_string_index = 0; - this->per_frame_init_eqn_string_index = 0; - - /* Initialize tree data structures */ - this->param_tree = new - std::map(); - - this->per_frame_eqn_tree = - std::map(); - - this->init_cond_tree = - std::map(); - - this->per_frame_init_eqn_tree = - std::map(); - - /* Start: Load custom shape parameters */ - param = Param::new_param_float("r", P_FLAG_NONE, &this->r, NULL, 1.0, 0.0, 0.5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("g", P_FLAG_NONE, &this->g, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("b", P_FLAG_NONE, &this->b, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("a", P_FLAG_NONE, &this->a, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("border_r", P_FLAG_NONE, &this->border_r, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("border_g", P_FLAG_NONE, &this->border_g, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("border_b", P_FLAG_NONE, &this->border_b, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("border_a", P_FLAG_NONE, &this->border_a, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("r2", P_FLAG_NONE, &this->r2, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("g2", P_FLAG_NONE, &this->g2, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("b2", P_FLAG_NONE, &this->b2, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("a2", P_FLAG_NONE, &this->a2, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("x", P_FLAG_NONE, &this->x, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("y", P_FLAG_NONE, &this->y, NULL, 1.0, 0.0, .5); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_bool("thickOutline", P_FLAG_NONE, &this->thickOutline, 1, 0, 0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_bool("enabled", P_FLAG_NONE, &this->enabled, 1, 0, 0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_int("sides", P_FLAG_NONE, &this->sides, 100, 3, 3); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_bool("additive", P_FLAG_NONE, &this->additive, 1, 0, 0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_bool("textured", P_FLAG_NONE, &this->textured, 1, 0, 0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("rad", P_FLAG_NONE, &this->radius, NULL, MAX_DOUBLE_SIZE, 0, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("ang", P_FLAG_NONE, &this->ang, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("tex_zoom", P_FLAG_NONE, &this->tex_zoom, NULL, MAX_DOUBLE_SIZE, .00000000001, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("tex_ang", P_FLAG_NONE, &this->tex_ang, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t1", P_FLAG_TVAR, &this->t1, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t2", P_FLAG_TVAR, &this->t2, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t3", P_FLAG_TVAR, &this->t3, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t4", P_FLAG_TVAR, &this->t4, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t5", P_FLAG_TVAR, &this->t5, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t6", P_FLAG_TVAR, &this->t6, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t7", P_FLAG_TVAR, &this->t7, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - param = Param::new_param_float("t8", P_FLAG_TVAR, &this->t8, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0); - if ( ParamUtils::insert(param, this->param_tree) < 0 ) { - DWRITE( "%s\n", "failed to insert param!" ); - } - } - -/* Frees a custom shape form object */ -CustomShape::~CustomShape() { - - if (param_tree == NULL) - return; - - traverse >(per_frame_eqn_tree); - traverse >(init_cond_tree); - traverse >(*param_tree); - traverse >(per_frame_init_eqn_tree); - - return; - -} - -void CustomShape::load_custom_shape_init() { - - // NOTE: This is verified to be same behavior as trunk - - InitCondUtils::LoadUnspecInitCond fun(this->init_cond_tree, this->per_frame_init_eqn_tree); - - traverse(*param_tree, fun); -} - -void CustomShape::eval_custom_shape_init_conds() { - - // NOTE: This is verified to be same behavior as trunk - for (std::map::iterator pos = per_frame_init_eqn_tree.begin(); pos != per_frame_init_eqn_tree.end();++pos) - pos->second->evaluate(); -} diff --git a/src/projectM-engine-backup/CustomShape.hpp b/src/projectM-engine-backup/CustomShape.hpp deleted file mode 100755 index d8dca4256..000000000 --- a/src/projectM-engine-backup/CustomShape.hpp +++ /dev/null @@ -1,117 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Encapsulation of a custom shape - * - * $Log$ - */ - -#ifndef _CUSTOM_SHAPE_H -#define _CUSTOM_SHAPE_H - -#define CUSTOM_SHAPE_DEBUG 0 -#include -#include "Param.hpp" -#include "PerFrameEqn.hpp" -#include "InitCond.hpp" - -class Preset; - - -class CustomShape { -public: - /* Numerical id */ - int id; - int per_frame_count; - - /* Parameter tree associated with this custom shape */ - std::map * param_tree; - - /* Engine variables */ - int sides; - int thickOutline; - int enabled; - int additive; - int textured; - - float tex_zoom; - float tex_ang; - - float x; /* x position for per point equations */ - float y; /* y position for per point equations */ - float radius; - float ang; - - float r; /* red color value */ - float g; /* green color value */ - float b; /* blue color value */ - float a; /* alpha color value */ - - float r2; /* red color value */ - float g2; /* green color value */ - float b2; /* blue color value */ - float a2; /* alpha color value */ - - float border_r; /* red color value */ - float border_g; /* green color value */ - float border_b; /* blue color value */ - float border_a; /* alpha color value */ - - /* stupid t variables */ - float t1; - float t2; - float t3; - float t4; - float t5; - float t6; - float t7; - float t8; - - /* Data structure to hold per frame / per frame init equations */ - std::map init_cond_tree; - std::map per_frame_eqn_tree; - std::map per_frame_init_eqn_tree; - - /* Denotes the index of the last character for each stdring buffer */ - int per_frame_eqn_string_index; - int per_frame_init_eqn_string_index; - - - /* String buffers for per frame / per frame init equations */ - char per_frame_eqn_string_buffer[STRING_BUFFER_SIZE]; - char per_frame_init_eqn_string_buffer[STRING_BUFFER_SIZE]; - - /* Per point equation array */ - CustomShape( int id ); - ~CustomShape(); - - /** Checks all internal trees are built correctly */ - int checkTrees(); - - void load_custom_shape_init(); - void eval_custom_shape_init_conds(); - }; - - -#endif /** !_CUSTOM_SHAPE_H */ - diff --git a/src/projectM-engine-backup/CustomWave.cpp b/src/projectM-engine-backup/CustomWave.cpp deleted file mode 100755 index a04dc17b1..000000000 --- a/src/projectM-engine-backup/CustomWave.cpp +++ /dev/null @@ -1,531 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include -#include -#include - -#include "projectM.hpp" - -#include "Common.hpp" -#include "fatal.h" - -#include "CustomWave.hpp" -#include "Eval.hpp" -#include "Expr.hpp" -#include "InitCond.hpp" -#include "Param.hpp" -#include "PerFrameEqn.hpp" -#include "PerPointEqn.hpp" -#include "Preset.hpp" -#include -#include "ParamUtils.hpp" -#include "InitCondUtils.hpp" -#include "wipemalloc.h" - -#define MAX_SAMPLE_SIZE 4096 - - -int interface_id = 0; - -CustomWave::CustomWave(int _id): - id(_id), - per_frame_count(0), - samples(512), - bSpectrum(0), - sep(1), - smoothing(0.0), - bUseDots(0), - bAdditive(0), - r(0), - g(0), - b(0), - a(0), - scaling(1.0), - per_frame_eqn_string_index(0), - per_frame_init_eqn_string_index(0), - per_point_eqn_string_index(0), - param_tree(new std::map()) -{ - - Param * param; - - /// @bug deprecate the use of wipemalloc - this->r_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->g_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->b_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->a_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->x_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->y_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->value1 = (float*) wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->value2 = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - this->sample_mesh = (float*)wipemalloc(MAX_SAMPLE_SIZE*sizeof(float)); - - - /* Start: Load custom wave parameters */ - - if ((param = Param::new_param_float("r", P_FLAG_DONT_FREE_MATRIX | P_FLAG_PER_POINT, &this->r, this->r_mesh, 1.0, 0.0, .5)) == NULL) { - delete(this); - /// @bug make exception - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - /// @bug make exception - abort(); - } - - if ((param = Param::new_param_float("g", P_FLAG_DONT_FREE_MATRIX | P_FLAG_PER_POINT, &this->g, this->g_mesh, 1.0, 0.0, .5)) == NULL){ - delete(this); -/// @bug make exception - abort(); - - } - - if (ParamUtils::insert(param, param_tree) < 0) { - delete(this); -/// @bug make exception - abort(); - } - - if ((param = Param::new_param_float("b", P_FLAG_DONT_FREE_MATRIX | P_FLAG_PER_POINT, &this->b, this->b_mesh, 1.0, 0.0, .5)) == NULL){ - delete(this); -/// @bug make exception - abort(); - - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); -/// @bug make exception - abort(); - - } - - if ((param = Param::new_param_float("a", P_FLAG_DONT_FREE_MATRIX | P_FLAG_PER_POINT, &this->a, this->a_mesh, 1.0, 0.0, .5)) == NULL){ - delete(this); -/// @bug make exception - abort(); - - - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); -/// @bug make exception - abort(); - - } - - if ((param = Param::new_param_float("x", P_FLAG_DONT_FREE_MATRIX | P_FLAG_PER_POINT, &this->x, this->x_mesh, 1.0, 0.0, .5)) == NULL) { - delete(this); -/// @bug make exception - abort(); - - - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); -/// @bug make exception - abort(); - - } - - if ((param = Param::new_param_float("y", P_FLAG_DONT_FREE_MATRIX | P_FLAG_PER_POINT, &this->y, this->y_mesh, 1.0, 0.0, .5)) == NULL) { - delete(this); -/// @bug make exception - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - -/// @bug make exception - abort(); - - } - - if ((param = Param::new_param_bool("enabled", P_FLAG_NONE, &this->enabled, 1, 0, 0)) == NULL) { - delete(this); -/// @bug make exception - abort(); - - - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - -/// @bug make exception - abort(); - - } - - if ((param = Param::new_param_int("sep", P_FLAG_NONE, &this->sep, 100, -100, 0)) == NULL) { - delete(this); -/// @bug make exception - abort(); - - - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); -/// @bug make exception - abort(); - - - } - - if ((param = Param::new_param_bool("bSpectrum", P_FLAG_NONE, &this->bSpectrum, 1, 0, 0)) == NULL) { - delete(this); -/// @bug make exception - abort(); - - - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); -/// @bug make exception - abort(); - - } - - if ((param = Param::new_param_bool("bDrawThick", P_FLAG_NONE, &this->bDrawThick, 1, 0, 0)) == NULL) { - delete(this); -/// @bug make exception - abort(); - - - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); -/// @bug make exception - abort(); - - } - - if ((param = Param::new_param_bool("bUseDots", P_FLAG_NONE, &this->bUseDots, 1, 0, 0)) == NULL) { - delete(this); -/// @bug make exception - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_bool("bAdditive", P_FLAG_NONE, &this->bAdditive, 1, 0, 0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_int("samples", P_FLAG_NONE, &this->samples, 2048, 1, 512)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("sample", P_FLAG_READONLY | P_FLAG_DONT_FREE_MATRIX | P_FLAG_ALWAYS_MATRIX | P_FLAG_PER_POINT, - &this->sample, this->sample_mesh, 1.0, 0.0, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - printf("failed to insert sample\n"); - delete(this); - abort(); - } - - if ((param = Param::new_param_float("value1", P_FLAG_READONLY | P_FLAG_DONT_FREE_MATRIX | P_FLAG_ALWAYS_MATRIX | P_FLAG_PER_POINT, &this->v1, this->value1, 1.0, -1.0, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("value2", P_FLAG_READONLY | P_FLAG_DONT_FREE_MATRIX | P_FLAG_ALWAYS_MATRIX | P_FLAG_PER_POINT, &this->v2, this->value2, 1.0, -1.0, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("smoothing", P_FLAG_NONE, &this->smoothing, NULL, 1.0, 0.0, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("scaling", P_FLAG_NONE, &this->scaling, NULL, MAX_DOUBLE_SIZE, 0.0, 1.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("t1", P_FLAG_PER_POINT | P_FLAG_TVAR, &this->t1, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("t2", P_FLAG_PER_POINT |P_FLAG_TVAR, &this->t2, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("t3", P_FLAG_PER_POINT |P_FLAG_TVAR, &this->t3, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - if ((param = Param::new_param_float("t4", P_FLAG_PER_POINT |P_FLAG_TVAR, &this->t4, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - if ((param = Param::new_param_float("t5", P_FLAG_TVAR, &this->t5, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - if ((param = Param::new_param_float("t6", P_FLAG_TVAR | P_FLAG_PER_POINT, &this->t6, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - if ((param = Param::new_param_float("t7", P_FLAG_TVAR | P_FLAG_PER_POINT, &this->t7, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - if ((param = Param::new_param_float("t8", P_FLAG_TVAR | P_FLAG_PER_POINT, &this->t8, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL) { - delete(this); - abort(); - } - - if (ParamUtils::insert(param, this->param_tree) < 0) { - delete(this); - abort(); - } - - /* End of parameter loading. Note that the read only parameters associated - with custom waves (ie, sample) are variables stored in PresetFrameIO.hpp, - and not specific to the custom wave datastructure. */ - -} - -CustomWave::~CustomWave() { - - if (param_tree == NULL) - return; - - - for (std::map::iterator pos = per_point_eqn_tree.begin(); pos != per_point_eqn_tree.end(); ++pos) - delete(pos->second); - - for (std::map::iterator pos = per_frame_eqn_tree.begin(); pos != per_frame_eqn_tree.end(); ++pos) - delete(pos->second); - - for (std::map::iterator pos = init_cond_tree.begin(); pos != init_cond_tree.end(); ++pos) - delete(pos->second); - - for (std::map::iterator pos = per_frame_init_eqn_tree.begin(); pos != per_frame_init_eqn_tree.end(); ++pos) - delete(pos->second); - - for (std::map::iterator pos = param_tree->begin(); pos != param_tree->end(); ++pos) - delete(pos->second); - - - free(r_mesh); - free(g_mesh); - free(b_mesh); - free(a_mesh); - free(x_mesh); - free(y_mesh); - free(value1); - free(value2); - free(sample_mesh); - - r_mesh = NULL; - g_mesh = NULL; - b_mesh = NULL; - a_mesh = NULL; - x_mesh = NULL; - y_mesh = NULL; - value1 = NULL; - value2 = NULL; - sample_mesh = NULL; - - -} - - - - - -int CustomWave::add_per_point_eqn(char * name, GenExpr * gen_expr) { - - PerPointEqn * per_point_eqn; - int index; - Param * param = NULL; - - /* Argument checks */ - if (gen_expr == NULL) - return PROJECTM_FAILURE; - if (name == NULL) - return PROJECTM_FAILURE; - - if (CUSTOM_WAVE_DEBUG) printf("add_per_point_eqn: per pixel equation (name = \"%s\")\n", name); - - /* Search for the parameter so we know what matrix the per pixel equation is referencing */ - - if ((param = ParamUtils::find(name,param_tree)) == NULL) { - if (CUSTOM_WAVE_DEBUG) printf("add_per_point_eqn: failed to allocate a new parameter!\n"); - return PROJECTM_FAILURE; - - } - - /* Find most largest index in the splaytree */ - - std::map::iterator pos = --per_point_eqn_tree.end(); - - if (pos == per_point_eqn_tree.end()) - index = 0; - else - index = pos->second->index+1; - - /* Create the per pixel equation given the index, parameter, and general expression */ - - if ((per_point_eqn = new PerPointEqn(index, param, gen_expr, samples)) == NULL) - return PROJECTM_FAILURE; - if (CUSTOM_WAVE_DEBUG) - printf("add_per_point_eqn: created new equation (index = %d) (name = \"%s\")\n", per_point_eqn->index, per_point_eqn->param->name.c_str()); - - /* Insert the per pixel equation into the preset per pixel database */ - - per_point_eqn_tree.insert(std::make_pair(per_point_eqn->index, per_point_eqn)); - - /* Done */ - return PROJECTM_SUCCESS; -} - - -void CustomWave::eval_custom_wave_init_conds() { - - for (std::map::iterator pos = init_cond_tree.begin(); pos != init_cond_tree.end(); ++pos) - pos->second->evaluate(); - - for (std::map::iterator pos = per_frame_init_eqn_tree.begin(); pos != per_frame_init_eqn_tree.end(); ++pos) - pos->second->evaluate(); -} - -/** Evaluate per-point equations */ -void CustomWave::evalPerPointEqns() { - - int x; - - for (x = 0; x < samples; x++) - r_mesh[x] = r; - for (x = 0; x < samples; x++) - g_mesh[x] = g; - for (x = 0; x < samples; x++) - b_mesh[x] = b; - for (x = 0; x < samples; x++) - a_mesh[x] = a; - for (x = 0; x < samples; x++) - x_mesh[x] = x; - for (x = 0; x < samples; x++) - y_mesh[x] = y; - - /* Evaluate per pixel equations */ - for (std::map::iterator pos = per_point_eqn_tree.begin(); pos != per_point_eqn_tree.end();++pos) - pos->second->evaluate(); - -} - -void CustomWave::load_unspecified_init_conds() { - - InitCondUtils::LoadUnspecInitCond fun(this->init_cond_tree, this->per_frame_init_eqn_tree); - Algorithms::traverse(*param_tree, fun); -} - - - - diff --git a/src/projectM-engine-backup/CustomWave.hpp b/src/projectM-engine-backup/CustomWave.hpp deleted file mode 100755 index 3e6b2767d..000000000 --- a/src/projectM-engine-backup/CustomWave.hpp +++ /dev/null @@ -1,158 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Encapsulation of a custom wave - * - * $Log$ - */ - -#ifndef _CUSTOM_WAVE_H -#define _CUSTOM_WAVE_H - -#define CUSTOM_WAVE_DEBUG 0 - -#define X_POINT_OP 0 -#define Y_POINT_OP 1 -#define R_POINT_OP 2 -#define G_POINT_OP 3 -#define B_POINT_OP 4 -#define A_POINT_OP 5 -#define NUM_POINT_OPS 6 - -class CustomWave; -class GenExpr; -class PerPointEqn; -class Preset; - -#include "Common.hpp" -#include "Param.hpp" -#include "PerFrameEqn.hpp" - -#include - -class CustomWave { -public: - - /** Empty constructor leaves wave in undefined state **/ - CustomWave() {} - - /** Initializes a custom wave id given the integer id */ - CustomWave(int id); - - /** Destructor is necessary so we can free the per point matrices **/ - ~CustomWave(); - - /* Numerical id */ - int id; - int per_frame_count; - - /* Parameter tree associated with this custom wave */ - std::map * param_tree; - - /* Engine variables */ - float x; /* x position for per point equations */ - float y; /* y position for per point equations */ - float r; /* red color value */ - float g; /* green color value */ - float b; /* blue color value */ - float a; /* alpha color value */ - float * x_mesh; - float * y_mesh; - float * r_mesh; - float * b_mesh; - float * g_mesh; - float * a_mesh; - float * value1; - float * value2; - float * sample_mesh; - - int enabled; /* if nonzero then wave is visible, hidden otherwise */ - int samples; /* number of samples associated with this wave form. Usually powers of 2 */ - float sample; - int bSpectrum; /* spectrum data or pcm data */ - int bUseDots; /* draw wave as dots or lines */ - int bDrawThick; /* draw thicker lines */ - int bAdditive; /* add color values together */ - - float scaling; /* scale factor of waveform */ - float smoothing; /* smooth factor of waveform */ - int sep; /* no idea what this is yet... */ - - /* stupid t variables */ - float t1; - float t2; - float t3; - float t4; - float t5; - float t6; - float t7; - float t8; - float v1,v2; - - /* Data structures to hold per frame and per point equations */ - std::map init_cond_tree; - std::map per_frame_eqn_tree; - std::map per_point_eqn_tree; - std::map per_frame_init_eqn_tree; - - /* Denotes the index of the last character for each string buffer */ - int per_point_eqn_string_index; - int per_frame_eqn_string_index; - int per_frame_init_eqn_string_index; - - /* String buffers for per point and per frame equations */ - char per_point_eqn_string_buffer[STRING_BUFFER_SIZE]; - char per_frame_eqn_string_buffer[STRING_BUFFER_SIZE]; - char per_frame_init_eqn_string_buffer[STRING_BUFFER_SIZE]; - - /* Per point equation array */ - GenExpr * per_point_eqn_array[NUM_POINT_OPS]; - - void reset_per_point_eqn_array(CustomWave *custom_wave); - - int add_per_point_eqn(char * name, GenExpr * gen_expr); - void evalCustomWaveInitConditions(Preset *preset); - void evalPerPointEqns(); - - void load_unspecified_init_conds(); - - void eval_custom_wave_init_conds(); - void evalPerPointEqn(PerPointEqn * per_point_eqn); - - -}; - -/** Splaytree traversal helpers */ -inline void free_custom_wave_helper( void *custom_wave ) { - delete((CustomWave *)custom_wave); - } - -inline void load_custom_wave_init_helper( void *custom_wave ) { - ((CustomWave *)custom_wave)->load_unspecified_init_conds(); - } - -inline void eval_custom_wave_init_conds_helper( void *custom_wave ) { - ((CustomWave *)custom_wave)->eval_custom_wave_init_conds(); - } - -#endif /** !_CUSTOM_WAVE_H */ diff --git a/src/projectM-engine-backup/Eval.cpp b/src/projectM-engine-backup/Eval.cpp deleted file mode 100755 index a2cdf359a..000000000 --- a/src/projectM-engine-backup/Eval.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/* Evaluation Code */ - -#include -#include - -#include "projectM.hpp" -#include "Common.hpp" -#include "fatal.h" - -#include "Eval.hpp" -#include "Expr.hpp" -#include "Param.hpp" -#include "Func.hpp" -#include "BuiltinFuncs.hpp" -#include "wipemalloc.h" - -InfixOp *Eval::infix_add = NULL; -InfixOp *Eval::infix_minus = NULL; -InfixOp *Eval::infix_div = NULL; -InfixOp *Eval::infix_mult = NULL; -InfixOp *Eval::infix_or = NULL; -InfixOp *Eval::infix_and = NULL; -InfixOp *Eval::infix_mod = NULL; -InfixOp *Eval::infix_negative = NULL; -InfixOp *Eval::infix_positive = NULL; - -/* Initializes all infix operators */ -int Eval::init_infix_ops() { - - Eval::infix_add = new InfixOp(INFIX_ADD, 4); - Eval::infix_minus = new InfixOp(INFIX_MINUS, 3); - Eval::infix_div = new InfixOp(INFIX_DIV, 2); - Eval::infix_or = new InfixOp(INFIX_OR, 5); - Eval::infix_and = new InfixOp(INFIX_AND,4); - Eval::infix_mod = new InfixOp(INFIX_MOD, 1); - Eval::infix_mult = new InfixOp(INFIX_MULT, 2); - - /* Prefix operators */ - Eval::infix_positive = new InfixOp(INFIX_ADD, 0); - Eval::infix_negative = new InfixOp(INFIX_MINUS, 0); - - return PROJECTM_SUCCESS; -} - -/* Destroys the infix operator list. This should - be done on program exit */ -int Eval::destroy_infix_ops() -{ - - delete(Eval::infix_add); - delete(Eval::infix_minus); - delete(Eval::infix_div); - delete(Eval::infix_or); - delete(Eval::infix_and); - delete(Eval::infix_mod); - delete(Eval::infix_mult); - delete(Eval::infix_positive); - delete(Eval::infix_negative); - - Eval::infix_add = NULL; - Eval::infix_minus = NULL; - Eval::infix_div = NULL; - Eval::infix_or = NULL; - Eval::infix_and = NULL; - Eval::infix_mod = NULL; - Eval::infix_mult = NULL; - Eval::infix_positive = NULL; - Eval::infix_negative = NULL; - - return PROJECTM_SUCCESS; -} diff --git a/src/projectM-engine-backup/Eval.hpp b/src/projectM-engine-backup/Eval.hpp deleted file mode 100755 index bdf0113f1..000000000 --- a/src/projectM-engine-backup/Eval.hpp +++ /dev/null @@ -1,93 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Expression evaluators - * - * $Log$ - */ - -/* Eval.hpp: evaluation functions of expressions */ - -#ifndef _EVAL_H -#define _EVAL_H - -#include "projectM.hpp" -#include "Func.hpp" -#include "Param.hpp" - -//#define EVAL_DEBUG 2 -//#define EVAL_DEBUG_DOUBLE 2 - -#define VAL_T 1 -#define PREFUN_T 3 -#define TREE_T 4 -#define NONE_T 0 - -#define CONSTANT_TERM_T 0 -#define PARAM_TERM_T 1 - -#define INFIX_ADD 0 -#define INFIX_MINUS 1 -#define INFIX_MOD 2 -#define INFIX_DIV 3 -#define INFIX_MULT 4 -#define INFIX_OR 5 -#define INFIX_AND 6 - -class InfixOp; - -class Eval { -public: - static InfixOp *infix_add, - *infix_minus, - *infix_div, - *infix_mult, - *infix_or, - *infix_and, - *infix_mod, - *infix_negative, - *infix_positive; - - float eval_gen_expr(GenExpr * gen_expr); - inline GenExpr * opt_gen_expr(GenExpr * gen_expr, int ** param_list); - - GenExpr * const_to_expr(float val); - GenExpr * param_to_expr(Param * param); - GenExpr * prefun_to_expr(float (*func_ptr)(), GenExpr ** expr_list, int num_args); - - static TreeExpr * new_tree_expr(InfixOp * infix_op, GenExpr * gen_expr, TreeExpr * left, TreeExpr * right); - static GenExpr * new_gen_expr(int type, void * item); - static ValExpr * new_val_expr(int type, Term *term); - - static InfixOp * new_infix_op(int type, int precedence); - static int init_infix_ops(); - static int destroy_infix_ops(); - void reset_engine_vars(); - - GenExpr * clone_gen_expr(GenExpr * gen_expr); - TreeExpr * clone_tree_expr(TreeExpr * tree_expr); - ValExpr * clone_val_expr(ValExpr * val_expr); - PrefunExpr * clone_prefun_expr(PrefunExpr * prefun_expr); - }; - -#endif /** !_EVAL_H */ diff --git a/src/projectM-engine-backup/Expr.cpp b/src/projectM-engine-backup/Expr.cpp deleted file mode 100755 index aa289f297..000000000 --- a/src/projectM-engine-backup/Expr.cpp +++ /dev/null @@ -1,546 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include "wipemalloc.h" - -#include "Expr.hpp" -#include "Eval.hpp" -#include -#include - -float GenExpr::eval_gen_expr(int mesh_i, int mesh_j) { - float l; - - switch(type) { - case VAL_T: - return ((ValExpr*)item)->eval_val_expr(mesh_i, mesh_j); - case PREFUN_T: - l = ((PrefunExpr *)item)->eval_prefun_expr(mesh_i, mesh_j); - //if (EVAL_DEBUG) DWRITE( "eval_gen_expr: prefix function return value: %f\n", l); - return l; - case TREE_T: - return ((TreeExpr*)(item))->eval_tree_expr(mesh_i, mesh_j); - default: - #ifdef EVAL_DEBUG - DWRITE( "eval_gen_expr: general expression matched no cases!\n"); - #endif - return EVAL_ERROR; - } - -} - -/* Evaluates functions in prefix form */ -float PrefunExpr::eval_prefun_expr(int mesh_i, int mesh_j) { - - int i; - float rv; - - - /* This is slightly less than safe, since - who knows if the passed argument is valid. For - speed purposes we'll go with this */ - float *arg_list = (float *)wipemalloc( sizeof( float ) * num_args ); - - #ifdef EVAL_DEBUG_DOUBLE - DWRITE( "fn["); - #endif - /* Evaluate each argument before calling the function itself */ - for (i = 0; i < num_args; i++) { - arg_list[i] = expr_list[i]->eval_gen_expr(mesh_i, mesh_j); - #ifdef EVAL_DEBUG_DOUBLE - if (i < (num_args - 1)) - DWRITE( ", "); - #endif - } - - #ifdef EVAL_DEBUG_DOUBLE - DWRITE( "]"); - #endif - - /* Now we call the function, passing a list of - floats as its argument */ - - rv = (func_ptr)(arg_list); - free( arg_list ); - arg_list = NULL; - return rv; -} - - -/* Evaluates a value expression */ -float ValExpr::eval_val_expr(int mesh_i, int mesh_j) { - - /* Value is a constant, return the float value */ - if (type == CONSTANT_TERM_T) { - #ifdef EVAL_DEBUG - DWRITE( "%.4f", term.constant); - #endif - return (term.constant); - } - - /* Value is variable, dereference it */ - if (type == PARAM_TERM_T) { - switch (term.param->type) { - - case P_TYPE_BOOL: - #ifdef EVAL_DEBUG - DWRITE( "(%s:%.4f)", term.param->name.c_str(), (float)(*((int*)(term.param->engine_val)))); - #endif - - - return (float)(*((int*)(term.param->engine_val))); - case P_TYPE_INT: - #ifdef EVAL_DEBUG - DWRITE( "(%s:%.4f)", term.param->name.c_str(), (float)(*((int*)(term.param->engine_val)))); - #endif - - - return (float)(*((int*)(term.param->engine_val))); - case P_TYPE_DOUBLE: - - if (term.param->matrix_flag | (term.param->flags & P_FLAG_ALWAYS_MATRIX)) { - - /* Sanity check the matrix is there... */ - assert(term.param->matrix != NULL ); - - /// @slow boolean check could be expensive in this critical (and common) step of evaluation - if (mesh_i >= 0) { - if (mesh_j >= 0) { - return (((float**)term.param->matrix)[mesh_i][mesh_j]); - } else { - return (((float*)term.param->matrix)[mesh_i]); - } - } - } - //std::cout << term.param->name << ": " << (*((float*)term.param->engine_val)) << std::endl; - return *((float*)(term.param->engine_val)); - default: - return EVAL_ERROR; - } - } - /* Unknown type, return failure */ - return PROJECTM_FAILURE; -} - -/* Evaluates an expression tree */ -float TreeExpr::eval_tree_expr(int mesh_i, int mesh_j) { - - float left_arg, right_arg; - - /* A leaf node, evaluate the general expression. If the expression is null as well, return zero */ - if (infix_op == NULL) { - if (gen_expr == NULL) - return 0; - else - return gen_expr->eval_gen_expr( mesh_i, mesh_j); - } - - /* Otherwise, this node is an infix operator. Evaluate - accordingly */ - - #ifdef EVAL_DEBUG - DWRITE( "("); - #endif - - left_arg = left->eval_tree_expr(mesh_i, mesh_j); - - #ifdef EVAL_DEBUG - - switch (infix_op->type) { - case INFIX_ADD: - DWRITE( "+"); - break; - case INFIX_MINUS: - DWRITE( "-"); - break; - case INFIX_MULT: - DWRITE( "*"); - break; - case INFIX_MOD: - DWRITE( "%%"); - break; - case INFIX_OR: - DWRITE( "|"); - break; - case INFIX_AND: - DWRITE( "&"); - break; - case INFIX_DIV: - DWRITE( "/"); - break; - default: - DWRITE( "?"); - } - - #endif - - right_arg = right->eval_tree_expr(mesh_i, mesh_j); - - #ifdef EVAL_DEBUG - DWRITE( ")"); - #endif - -#ifdef EVAL_DEBUG - DWRITE( "\n" ); -#endif - - switch (infix_op->type) { - case INFIX_ADD: - return (left_arg + right_arg); - case INFIX_MINUS: - return (left_arg - right_arg); - case INFIX_MULT: - return (left_arg * right_arg); - case INFIX_MOD: - if ((int)right_arg == 0) { - #ifdef EVAL_DEBUG - DWRITE( "eval_tree_expr: modulo zero!\n"); - #endif - return PROJECTM_DIV_BY_ZERO; - } - return ((int)left_arg % (int)right_arg); - case INFIX_OR: - return ((int)left_arg | (int)right_arg); - case INFIX_AND: - return ((int)left_arg & (int)right_arg); - case INFIX_DIV: - if (right_arg == 0) { - #ifdef EVAL_DEBUG - DWRITE( "eval_tree_expr: division by zero!\n"); - #endif - return MAX_DOUBLE_SIZE; - } - return (left_arg / right_arg); - default: - #ifdef EVAL_DEBUG - DWRITE( "eval_tree_expr: unknown infix operator!\n"); - #endif - return EVAL_ERROR; - } - - return EVAL_ERROR; -} - -/* Converts a float value to a general expression */ -GenExpr * GenExpr::const_to_expr(float val) { - - GenExpr * gen_expr; - ValExpr * val_expr; - Term term; - - term.constant = val; - - if ((val_expr = ValExpr::new_val_expr(CONSTANT_TERM_T, &term)) == NULL) - return NULL; - - gen_expr = GenExpr::new_gen_expr(VAL_T, (void*)val_expr); - - if (gen_expr == NULL) { - delete val_expr; - } - - return gen_expr; -} - -/* Converts a regular parameter to an expression */ -GenExpr * GenExpr::param_to_expr(Param * param) { - - GenExpr * gen_expr = NULL; - ValExpr * val_expr = NULL; - Term term; - - if (param == NULL) - return NULL; - - /* This code is still a work in progress. We need - to figure out if the initial condition is used for - each per frame equation or not. I am guessing that - it isn't, and it is thusly implemented this way */ - - /* Current guess of true behavior (08/01/03) note from carm - First try to use the per_pixel_expr (with cloning). - If it is null however, use the engine variable instead. */ - - /* 08/20/03 : Presets are now objects, as well as per pixel equations. This ends up - making the parser handle the case where parameters are essentially per pixel equation - substitutions */ - - - term.param = param; - if ((val_expr = ValExpr::new_val_expr(PARAM_TERM_T, &term)) == NULL) - return NULL; - - if ((gen_expr = GenExpr::new_gen_expr(VAL_T, (void*)val_expr)) == NULL) { - delete val_expr; - return NULL; - } - return gen_expr; -} - -/* Converts a prefix function to an expression */ -GenExpr * GenExpr::prefun_to_expr(float (*func_ptr)(void *), GenExpr ** expr_list, int num_args) { - - GenExpr * gen_expr; - PrefunExpr * prefun_expr; - - - /* Malloc a new prefix function expression */ - prefun_expr = (PrefunExpr*)wipemalloc(sizeof(PrefunExpr)); - - if (prefun_expr == NULL) - return NULL; - - prefun_expr->num_args = num_args; - prefun_expr->func_ptr =(float (*)(void*)) func_ptr; - prefun_expr->expr_list = expr_list; - - gen_expr = new_gen_expr(PREFUN_T, (void*)prefun_expr); - - if (gen_expr == NULL) - delete prefun_expr; - - return gen_expr; -} - -/* Creates a new tree expression */ -TreeExpr *TreeExpr::new_tree_expr(InfixOp * infix_op, GenExpr * gen_expr, TreeExpr * left, TreeExpr * right) { - - TreeExpr * tree_expr; - tree_expr = (TreeExpr*)wipemalloc(sizeof(TreeExpr)); - - if (tree_expr == NULL) - return NULL; - tree_expr->infix_op = infix_op; - tree_expr->gen_expr = gen_expr; - tree_expr->left = left; - tree_expr->right = right; - return tree_expr; -} - - -/* Creates a new value expression */ -ValExpr *ValExpr::new_val_expr(int type, Term *term) { - - ValExpr * val_expr; - val_expr = (ValExpr*)wipemalloc(sizeof(ValExpr)); - - if (val_expr == NULL) - return NULL; - - val_expr->type = type; - val_expr->term.constant = term->constant; - val_expr->term.param = term->param; - - return val_expr; -} - -/* Creates a new general expression */ -GenExpr * GenExpr::new_gen_expr(int type, void * item) { - - GenExpr * gen_expr; - - gen_expr = (GenExpr*)wipemalloc(sizeof(GenExpr)); - if (gen_expr == NULL) - return NULL; - gen_expr->type = type; - gen_expr->item = item; - - return gen_expr; -} - -/* Frees a general expression */ -GenExpr::~GenExpr() { - - switch (type) { - case VAL_T: - delete ((ValExpr*)item); - break; - case PREFUN_T: - delete ((PrefunExpr*)item); - break; - case TREE_T: - delete ((TreeExpr*)item); - break; - } -} - -/* Frees a function in prefix notation */ -PrefunExpr::~PrefunExpr() { - - int i; - - /* Free every element in expression list */ - for (i = 0 ; i < num_args; i++) { - delete expr_list[i]; - } - free(expr_list); -} - -/* Frees values of type VARIABLE and CONSTANT */ -ValExpr::~ValExpr() { - } - -/* Frees a tree expression */ -TreeExpr::~TreeExpr() { - - /* free left tree */ - if ( left != NULL ) { - delete left; - } - - /* free general expression object */ - if ( gen_expr != NULL ) { - delete gen_expr; - } - - /* Note that infix operators are always - stored in memory unless the program - exits, so we don't remove them here */ - - /* free right tree */ - if ( right != NULL ) { - delete right; - } - } - -/* Initializes an infix operator */ -DLLEXPORT InfixOp::InfixOp(int type, int precedence) { - - this->type = type; - this->precedence = precedence; - } - -/* Clones a general expression */ -GenExpr *GenExpr::clone_gen_expr() { - - GenExpr * new_gen_expr; - ValExpr * val_expr; - TreeExpr * tree_expr; - PrefunExpr * prefun_expr; - - /* Out of memory */ - if ((new_gen_expr = (GenExpr*)wipemalloc(sizeof(GenExpr))) == NULL) - return NULL; - - /* Case on the type of general expression */ - switch (new_gen_expr->type = type) { - - case VAL_T: /* val expression */ - if ((val_expr = ((ValExpr*)item)->clone_val_expr()) == NULL) { - free(new_gen_expr); - new_gen_expr = NULL; - return NULL; - } - new_gen_expr->item = (void*)val_expr; - break; - - case PREFUN_T: /* prefix function expression */ - if ((prefun_expr = ((PrefunExpr*)item)->clone_prefun_expr()) == NULL) { - free(new_gen_expr); - new_gen_expr = NULL; - return NULL; - } - new_gen_expr->item = (void*)prefun_expr; - break; - - case TREE_T: /* tree expression */ - if ((tree_expr = ((TreeExpr*)item)->clone_tree_expr()) == NULL) { - free(new_gen_expr); - new_gen_expr = NULL; - return NULL; - } - new_gen_expr->item = (void*)tree_expr; - break; - - default: /* unknown type, ut oh.. */ - free(new_gen_expr); - new_gen_expr = NULL; - return NULL; - } - - return new_gen_expr; /* Return the new (cloned) general expression */ -} - - -/* Clones a tree expression */ -TreeExpr *TreeExpr::clone_tree_expr() { - - TreeExpr * new_tree_expr; - - /* Out of memory */ - if ((new_tree_expr = (TreeExpr*)wipemalloc(sizeof(TreeExpr))) == NULL) - return NULL; - - /* Set each argument in TreeExpr struct */ - new_tree_expr->infix_op = infix_op; /* infix operators are in shared memory */ - new_tree_expr->gen_expr = gen_expr->clone_gen_expr(); /* clone the general expression */ - new_tree_expr->left = left->clone_tree_expr(); /* clone the left tree expression */ - new_tree_expr->right = right->clone_tree_expr(); /* clone the right tree expression */ - - return new_tree_expr; /* Return the new (cloned) tree expression */ -} - -/* Clones a value expression, currently only passes the pointer to - the value that this object represents, not a pointer to a copy of the value */ -ValExpr *ValExpr::clone_val_expr() { - - ValExpr * new_val_expr; - - /* Allocate space, check for out of memory */ - if ((new_val_expr = (ValExpr*)wipemalloc(sizeof(ValExpr))) == NULL) - return NULL; - - /* Set the values in the ValExpr struct */ - new_val_expr->type = type; - new_val_expr->term = term; - - /* Return the new (cloned) value expression */ - return new_val_expr; -} - -/* Clones a prefix function with its arguments */ -PrefunExpr *PrefunExpr::clone_prefun_expr() { - - int i; - PrefunExpr * new_prefun_expr; - - /* Out of memory */ - if ((new_prefun_expr = (PrefunExpr*)wipemalloc(sizeof(PrefunExpr))) == NULL) - return NULL; - - /* Set the function argument paired with its number of arguments */ - new_prefun_expr->num_args = num_args; - new_prefun_expr->func_ptr = func_ptr; - - /* Allocate space for the expression list pointers */ - if ((new_prefun_expr->expr_list = (GenExpr**)wipemalloc(sizeof(GenExpr*)*new_prefun_expr->num_args)) == NULL) { - free( new_prefun_expr ); - new_prefun_expr = NULL; - return NULL; - } - - /* Now copy each general expression from the argument expression list */ - for (i = 0; i < new_prefun_expr->num_args;i++) - new_prefun_expr->expr_list[i] = expr_list[i]->clone_gen_expr(); - - /* Finally, return the new (cloned) prefix function expression */ - return new_prefun_expr; -} diff --git a/src/projectM-engine-backup/Expr.hpp b/src/projectM-engine-backup/Expr.hpp deleted file mode 100755 index 799eb43b3..000000000 --- a/src/projectM-engine-backup/Expr.hpp +++ /dev/null @@ -1,125 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Expression - * - * $Log$ - */ - -#ifndef _EXPR_H -#define _EXPR_H - -#include "dlldefs.h" -#include "CValue.hpp" - -class Param; - -#define CONST_STACK_ELEMENT 0 -#define EXPR_STACK_ELEMENT 1 - -#define EVAL_ERROR -1 - -/* Infix Operator Function */ -class InfixOp -{ -public: - int type; - int precedence; - - DLLEXPORT InfixOp( int type, int precedence ); -}; - -/** Term */ -class Term -{ -public: - float constant; /* static variable */ - Param *param; /* pointer to a changing variable */ - - Term() { this->constant = 0; this->param = 0; } -}; - -/* General Expression Type */ -class GenExpr -{ -public: - int type; - void * item; - - ~GenExpr(); - - static GenExpr *new_gen_expr( int type, void *item ); - GenExpr *clone_gen_expr(); - float eval_gen_expr(int mesh_i, int mesh_j); - - static GenExpr *const_to_expr( float val ); - static GenExpr *param_to_expr( Param *param ); - static GenExpr *prefun_to_expr( float (*func_ptr)(void *), GenExpr **expr_list, int num_args ); -}; - -/* Value expression, contains a term union */ -class ValExpr -{ -public: - int type; - Term term; - - ~ValExpr(); - static ValExpr *new_val_expr( int type, Term *term ); - ValExpr *clone_val_expr(); - - float eval_val_expr(int mesh_i, int mesh_j); -}; - -/* A binary expression tree ordered by operator precedence */ -class TreeExpr -{ -public: - InfixOp * infix_op; /* null if leaf */ - GenExpr * gen_expr; - TreeExpr *left, *right; - - ~TreeExpr(); - static TreeExpr *new_tree_expr( InfixOp *infix_op, GenExpr *gen_expr, - TreeExpr *left, TreeExpr *right ); - TreeExpr *clone_tree_expr(); - float eval_tree_expr(int mesh_i, int mesh_j); -}; - -/* A function expression in prefix form */ -class PrefunExpr -{ -public: - float (*func_ptr)(void*); - int num_args; - GenExpr **expr_list; - - ~PrefunExpr(); - PrefunExpr *clone_prefun_expr(); - - /* Evaluates functions in prefix form */ - float eval_prefun_expr(int mesh_i, int mesh_j); - -}; - -#endif /** _EXPR_H */ diff --git a/src/projectM-engine-backup/FindPkgConfig.cmake b/src/projectM-engine-backup/FindPkgConfig.cmake deleted file mode 100644 index afae15cb0..000000000 --- a/src/projectM-engine-backup/FindPkgConfig.cmake +++ /dev/null @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff --git a/src/projectM-engine-backup/Func.cpp b/src/projectM-engine-backup/Func.cpp deleted file mode 100755 index febc81d76..000000000 --- a/src/projectM-engine-backup/Func.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/* Function management */ - -#include -#include -#include - -#include "Common.hpp" -#include "fatal.h" - -#include "Func.hpp" -#include - -#include "wipemalloc.h" - - - - -/* Private function prototypes */ -void *Func::copy_func_key(char * string) { - - char * clone_string; - - if ((clone_string = (char*)wipemalloc(MAX_TOKEN_SIZE)) == NULL) - return NULL; - - strncpy(clone_string, string, MAX_TOKEN_SIZE-1); - - return (void*)clone_string; -} - -/* Compare string name with function name */ -int Func::compare_func(char * name, char * name2) { - - int cmpval; - - /* Uses string comparison function */ - cmpval = strncmp(name, name2, MAX_TOKEN_SIZE-1); - - return cmpval; -} - -Func * Func::create_func (char * name, float (*func_ptr)(float*), int num_args) { - - Func * func; - func = (Func*)wipemalloc(sizeof(Func)); - - if (func == NULL) - return NULL; - - - /* Clear name space */ - memset(func->name, 0, MAX_TOKEN_SIZE); - - /* Copy given name into function structure */ - strncpy(func->name, name, MAX_TOKEN_SIZE); - - /* Assign value pointer */ - func->func_ptr = func_ptr; - func->num_args = num_args; - /* Return instantiated function */ - return func; - -} - -/* Frees a function type, real complicated... */ -Func::~Func() { - } diff --git a/src/projectM-engine-backup/Func.hpp b/src/projectM-engine-backup/Func.hpp deleted file mode 100755 index 2d07e7215..000000000 --- a/src/projectM-engine-backup/Func.hpp +++ /dev/null @@ -1,58 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Function - * - * $Log$ - */ - -#ifndef _FUNC_H -#define _FUNC_H - -#include "Common.hpp" - -class Func; -//#include - -/* Function Type */ -class Func { -public: - char name[MAX_TOKEN_SIZE]; - float (*func_ptr)(float*); - int num_args; - - Func() {} - - /* Public Prototypes */ - DLLEXPORT ~Func(); - static Func *create_func ( char *name, float (*func_ptr)(float*), int num_args ); - static void * copy_func_key(char * string); - int compare_func(char * name, char * name2); - }; - -/** Splay traversal */ -inline void free_func_helper( void *func ) { - delete (Func *)func; -} - -#endif /** !_FUNC_H */ diff --git a/src/projectM-engine-backup/InitCond.cpp b/src/projectM-engine-backup/InitCond.cpp deleted file mode 100755 index 79ea005a3..000000000 --- a/src/projectM-engine-backup/InitCond.cpp +++ /dev/null @@ -1,137 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/* Library functions to manipulate initial condition values */ - -#include -#include -#include - -#include "Common.hpp" -#include "fatal.h" - -#include "Expr.hpp" -#include "InitCond.hpp" -#include "Param.hpp" -#include - -#include "wipemalloc.h" - -char InitCond::init_cond_string_buffer[STRING_BUFFER_SIZE]; -int InitCond::init_cond_string_buffer_index = 0; - -/* Creates a new initial condition */ -InitCond::InitCond( Param * param, CValue init_val ) { - - this->param = param; - this->init_val = init_val; - - if ( INIT_COND_DEBUG ) { - DWRITE( "InitCond::InitCond: %s -> %X -> %X\n", - this->param->name.c_str(), this->param, this->param->engine_val ); - } -} - -/* Frees initial condition structure */ -InitCond::~InitCond() { - } - -/* Evaluate an initial conditon */ -void InitCond::evaluate() { - - /* Parameter is of boolean type, either a 1 or 0 value integer */ - /* Set matrix flag to zero. This ensures - its constant value will be used rather than a matrix value - */ - param->matrix_flag = 0; - if (param->type == P_TYPE_BOOL) { - if (INIT_COND_DEBUG) { - DWRITE( "init_cond: %s = %d (TYPE BOOL)\n", param->name.c_str(), init_val.bool_val); - } - *((int*)param->engine_val) = init_val.bool_val; - return; - } - - /* Parameter is an integer type, just like C */ - - if ( param->type == P_TYPE_INT) { - if ((param->name == "wave_mode") == 0 ) { - } - if (INIT_COND_DEBUG) { - DWRITE( "init_cond: %s = %d (TYPE INT)\n", param->name.c_str(), init_val.int_val); - } - *((int*)param->engine_val) = init_val.int_val; - return; - } - - /* Parameter is of a float type, just like C */ - - if (param->type == P_TYPE_DOUBLE) { - if (INIT_COND_DEBUG) { - DWRITE( "init_cond: %s = %f (TYPE DOUBLE) -> %f -> %X -> %X\n", param->name.c_str(), - init_val.float_val, *((float *)param->engine_val), - param, param->engine_val ); - } - *((float*)param->engine_val) = init_val.float_val; - return; - } - - /* Unknown type of parameter */ - return; -} - -/* WIP */ -void InitCond::init_cond_to_string() { - - int string_length; - char string[MAX_TOKEN_SIZE]; - - /* Create a string "param_name=val" */ - switch (param->type) { - - case P_TYPE_BOOL: - sprintf(string, "%s=%d\n", param->name.c_str(), init_val.bool_val); - break; - case P_TYPE_INT: - sprintf(string, "%s=%d\n", param->name.c_str(), init_val.int_val); - break; - case P_TYPE_DOUBLE: - sprintf(string, "%s=%f\n", param->name.c_str(), init_val.float_val); - break; - default: - return; - } - - /* Compute the length of the string */ - string_length = strlen(string); - - /* Buffer overflow check */ - if ((init_cond_string_buffer_index + string_length + 1) > (STRING_BUFFER_SIZE - 1)) - return; - - /* Copy the string into the initial condition string buffer */ - - strncpy(init_cond_string_buffer + init_cond_string_buffer_index, string, string_length); - - /* Increment the string buffer, offset by one for the null terminator, which will be - overwritten by the next call to this function */ - init_cond_string_buffer_index+= string_length + 1; -} - diff --git a/src/projectM-engine-backup/InitCond.hpp b/src/projectM-engine-backup/InitCond.hpp deleted file mode 100755 index 66cc46b33..000000000 --- a/src/projectM-engine-backup/InitCond.hpp +++ /dev/null @@ -1,59 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Initial condition - * - * $Log$ - */ - -#ifndef _INIT_COND_HPP -#define _INIT_COND_HPP - - -//#define INIT_COND_DEBUG 2 -#define INIT_COND_DEBUG 0 - -#include "Param.hpp" - -class InitCond; -class Param; -#include - -class InitCond { -public: - Param *param; - CValue init_val; - - static char init_cond_string_buffer[STRING_BUFFER_SIZE]; - static int init_cond_string_buffer_index; - - InitCond( Param * param, CValue init_val ); - ~InitCond(); - void evaluate(); - - void init_cond_to_string(); - void write_init(); - }; - - -#endif /** !_INIT_COND_H */ diff --git a/src/projectM-engine-backup/InitCondUtils.hpp b/src/projectM-engine-backup/InitCondUtils.hpp deleted file mode 100644 index 4ff0d90c9..000000000 --- a/src/projectM-engine-backup/InitCondUtils.hpp +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef _INIT_COND_UTILS_HPP -#define _INIT_COND_UTILS_HPP -#include -#include "InitCond.hpp" - -namespace InitCondUtils { -class LoadUnspecInitCond { - public: - - LoadUnspecInitCond(std::map & initCondTree, std::map & perFrameInitEqnTree): - m_initCondTree(initCondTree), m_perFrameInitEqnTree(perFrameInitEqnTree) {} - - void operator()(Param * param); - - private: - std::map & m_initCondTree; - std::map & m_perFrameInitEqnTree; -}; - - -inline void LoadUnspecInitCond::operator() (Param * param) { - - InitCond * init_cond; - CValue init_val; - - /* Don't count these parameters as initial conditions */ - if (param->flags & P_FLAG_READONLY) - return; - if (param->flags & P_FLAG_QVAR) - return; - if (param->flags & P_FLAG_TVAR) - return; - if (param->flags & P_FLAG_USERDEF) - return; - - /* If initial condition was not defined by the preset file, force a default one - with the following code */ - - if (m_initCondTree.find(param->name) == m_initCondTree.end()) { - - /* Make sure initial condition does not exist in the set of per frame initial equations */ - if (m_perFrameInitEqnTree.find(param->name) != m_perFrameInitEqnTree.end()) - return; - - // Set an initial vialue via correct union member - if (param->type == P_TYPE_BOOL) - init_val.bool_val = 0; - - else if (param->type == P_TYPE_INT) - init_val.int_val = *(int*)param->engine_val; - - else if (param->type == P_TYPE_DOUBLE) - init_val.float_val = *(float*)param->engine_val; - - //printf("%s\n", param->name); - /* Create new initial condition */ - if ((init_cond = new InitCond(param, init_val)) == NULL) - return; - - /* Insert the initial condition into this presets tree */ - /// @bug check the reult status of insert - m_initCondTree.insert(std::make_pair(init_cond->param->name, init_cond)); - - } - - -} -} -#endif diff --git a/src/projectM-engine-backup/Makefile.am b/src/projectM-engine-backup/Makefile.am deleted file mode 100755 index 88b9f0087..000000000 --- a/src/projectM-engine-backup/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -lib_LTLIBRARIES = libprojectM.la - -libprojectM_la_SOURCES=\ -PCM.cc \ -beat_detect.cc \ -browser.cc \ -builtin_funcs.cc \ -console_interface.cc \ -custom_shape.cc \ -custom_wave.cc \ -editor.cc \ -eval.cc \ -fftsg.cc \ -func.cc \ -glConsole.cc \ -init_cond.cc \ -menu.cc \ -param.cc \ -parser.cc \ -pbuffer.cc \ -per_frame_eqn.cc \ -per_pixel_eqn.cc \ -preset.cc \ -projectM.cc \ -splaytree.cc \ -timer.cc \ -tree_types.cc \ -wipemalloc.cc - -libprojectMincludedir = $(includedir)/projectM -libprojectMinclude_HEADERS = projectM.h pbuffer.h event.h console_interface.h PCM.h - -libprojectM_la_LDFLAGS = -version-info 0:0:0 - -AM_LIBS = @GL_LIBS@ @FTGL_LIBS@ -AM_CXXFLAGS= -DLINUX -D__CPLUSPLUS @GL_CFLAGS@ @FTGL_CFLAGS@ - -libprojectM_la_LIBADD = $(AM_LIBS) - -libprojectMconfigdir = $(datadir)/projectM -libprojectMconfig_DATA = share/config share/config.fastcomputers share/config.slowcomputers - -libprojectMfontdir = $(datadir)/projectM/fonts -libprojectMfont_DATA = share/fonts/*.ttf - -libprojectMpresetdir = $(datadir)/projectM/presets -libprojectMpreset_DATA= share/presets/*.milk - diff --git a/src/projectM-engine-backup/Makefile.dist b/src/projectM-engine-backup/Makefile.dist deleted file mode 100644 index 1b8b8d0ae..000000000 --- a/src/projectM-engine-backup/Makefile.dist +++ /dev/null @@ -1,24 +0,0 @@ -# -# projectM -- Milkdrop-esque visualisation SDK -# Copyright (C)2003-2007 projectM Team -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# See 'LICENSE.txt' included within this release - -clean: - rm -rf Debug - rm -rf Release - rm projectM.ncb - rm projectM.opt diff --git a/src/projectM-engine-backup/Makefile.in b/src/projectM-engine-backup/Makefile.in deleted file mode 100755 index 0f72972a2..000000000 --- a/src/projectM-engine-backup/Makefile.in +++ /dev/null @@ -1,621 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = src -DIST_COMMON = $(libprojectMinclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_check_gl.m4 \ - $(top_srcdir)/m4/ax_lang_compiler_ms.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" \ - "$(DESTDIR)$(libprojectMconfigdir)" \ - "$(DESTDIR)$(libprojectMfontdir)" \ - "$(DESTDIR)$(libprojectMpresetdir)" \ - "$(DESTDIR)$(libprojectMincludedir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libprojectM_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libprojectM_la_OBJECTS = PCM.lo beat_detect.lo browser.lo \ - builtin_funcs.lo console_interface.lo custom_shape.lo \ - custom_wave.lo editor.lo eval.lo fftsg.lo func.lo glConsole.lo \ - init_cond.lo menu.lo param.lo parser.lo pbuffer.lo \ - per_frame_eqn.lo per_pixel_eqn.lo preset.lo projectM.lo \ - splaytree.lo timer.lo tree_types.lo wipemalloc.lo -libprojectM_la_OBJECTS = $(am_libprojectM_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libprojectM_la_SOURCES) -DIST_SOURCES = $(libprojectM_la_SOURCES) -libprojectMconfigDATA_INSTALL = $(INSTALL_DATA) -libprojectMfontDATA_INSTALL = $(INSTALL_DATA) -libprojectMpresetDATA_INSTALL = $(INSTALL_DATA) -DATA = $(libprojectMconfig_DATA) $(libprojectMfont_DATA) \ - $(libprojectMpreset_DATA) -libprojectMincludeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(libprojectMinclude_HEADERS) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FTGL_CFLAGS = @FTGL_CFLAGS@ -FTGL_LIBS = @FTGL_LIBS@ -GL_CFLAGS = @GL_CFLAGS@ -GL_LIBS = @GL_LIBS@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -POW_LIB = @POW_LIB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -ac_ct_RANLIB = @ac_ct_RANLIB@ -ac_ct_STRIP = @ac_ct_STRIP@ -acx_pthread_config = @acx_pthread_config@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -datadir = @datadir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -lib_LTLIBRARIES = libprojectM.la -libprojectM_la_SOURCES = \ -PCM.cc \ -beat_detect.cc \ -browser.cc \ -builtin_funcs.cc \ -console_interface.cc \ -custom_shape.cc \ -custom_wave.cc \ -editor.cc \ -eval.cc \ -fftsg.cc \ -func.cc \ -glConsole.cc \ -init_cond.cc \ -menu.cc \ -param.cc \ -parser.cc \ -pbuffer.cc \ -per_frame_eqn.cc \ -per_pixel_eqn.cc \ -preset.cc \ -projectM.cc \ -splaytree.cc \ -timer.cc \ -tree_types.cc \ -wipemalloc.cc - -libprojectMincludedir = $(includedir)/projectM -libprojectMinclude_HEADERS = projectM.h pbuffer.h event.h console_interface.h PCM.h -libprojectM_la_LDFLAGS = -version-info 0:0:0 -AM_LIBS = @GL_LIBS@ @FTGL_LIBS@ -AM_CXXFLAGS = -DLINUX -D__CPLUSPLUS @GL_CFLAGS@ @FTGL_CFLAGS@ -libprojectM_la_LIBADD = $(AM_LIBS) -libprojectMconfigdir = $(datadir)/projectM -libprojectMconfig_DATA = share/config share/config.fastcomputers share/config.slowcomputers -libprojectMfontdir = $(datadir)/projectM/fonts -libprojectMfont_DATA = share/fonts/*.ttf -libprojectMpresetdir = $(datadir)/projectM/presets -libprojectMpreset_DATA = share/presets/*.milk -all: all-am - -.SUFFIXES: -.SUFFIXES: .cc .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libprojectM.la: $(libprojectM_la_OBJECTS) $(libprojectM_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libprojectM_la_LDFLAGS) $(libprojectM_la_OBJECTS) $(libprojectM_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PCM.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/beat_detect.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/browser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/builtin_funcs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/console_interface.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/custom_shape.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/custom_wave.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/editor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eval.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fftsg.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/func.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glConsole.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init_cond.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menu.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/param.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pbuffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/per_frame_eqn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/per_pixel_eqn.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preset.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projectM.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splaytree.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree_types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wipemalloc.Plo@am__quote@ - -.cc.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cc.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: -@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: -install-libprojectMconfigDATA: $(libprojectMconfig_DATA) - @$(NORMAL_INSTALL) - test -z "$(libprojectMconfigdir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMconfigdir)" - @list='$(libprojectMconfig_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMconfigdir)/$$f'"; \ - $(libprojectMconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMconfigdir)/$$f"; \ - done - -uninstall-libprojectMconfigDATA: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMconfigdir)/$$f"; \ - done -install-libprojectMfontDATA: $(libprojectMfont_DATA) - @$(NORMAL_INSTALL) - test -z "$(libprojectMfontdir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMfontdir)" - @list='$(libprojectMfont_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMfontDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMfontdir)/$$f'"; \ - $(libprojectMfontDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMfontdir)/$$f"; \ - done - -uninstall-libprojectMfontDATA: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMfont_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMfontdir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMfontdir)/$$f"; \ - done -install-libprojectMpresetDATA: $(libprojectMpreset_DATA) - @$(NORMAL_INSTALL) - test -z "$(libprojectMpresetdir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMpresetdir)" - @list='$(libprojectMpreset_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMpresetDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMpresetdir)/$$f'"; \ - $(libprojectMpresetDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMpresetdir)/$$f"; \ - done - -uninstall-libprojectMpresetDATA: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMpreset_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMpresetdir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMpresetdir)/$$f"; \ - done -install-libprojectMincludeHEADERS: $(libprojectMinclude_HEADERS) - @$(NORMAL_INSTALL) - test -z "$(libprojectMincludedir)" || $(mkdir_p) "$(DESTDIR)$(libprojectMincludedir)" - @list='$(libprojectMinclude_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(libprojectMincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libprojectMincludedir)/$$f'"; \ - $(libprojectMincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libprojectMincludedir)/$$f"; \ - done - -uninstall-libprojectMincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(libprojectMinclude_HEADERS)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libprojectMincludedir)/$$f'"; \ - rm -f "$(DESTDIR)$(libprojectMincludedir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) -installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libprojectMconfigdir)" "$(DESTDIR)$(libprojectMfontdir)" "$(DESTDIR)$(libprojectMpresetdir)" "$(DESTDIR)$(libprojectMincludedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-libprojectMconfigDATA \ - install-libprojectMfontDATA install-libprojectMincludeHEADERS \ - install-libprojectMpresetDATA - -install-exec-am: install-libLTLIBRARIES - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-libprojectMconfigDATA uninstall-libprojectMfontDATA \ - uninstall-libprojectMincludeHEADERS \ - uninstall-libprojectMpresetDATA - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-libprojectMconfigDATA \ - install-libprojectMfontDATA install-libprojectMincludeHEADERS \ - install-libprojectMpresetDATA install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES uninstall-libprojectMconfigDATA \ - uninstall-libprojectMfontDATA \ - uninstall-libprojectMincludeHEADERS \ - uninstall-libprojectMpresetDATA - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/projectM-engine-backup/PBuffer.cpp b/src/projectM-engine-backup/PBuffer.cpp deleted file mode 100755 index 744517569..000000000 --- a/src/projectM-engine-backup/PBuffer.cpp +++ /dev/null @@ -1,217 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: pbuffer.c,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Render this methods - */ - -#include -//#include - -#include "Common.hpp" -#include "PBuffer.hpp" - -#ifdef MACOS -#include -#endif /** MACOS */ - -/** Creates new pbuffers */ -RenderTarget::RenderTarget(int texsize, int width, int height) : usePbuffers(true) { - - int mindim = 0; - int origtexsize = 0; - int usePbuffers = 1; - - this->texsize=texsize; - -#ifdef USE_FBO - if(this->usePbuffers) - { - glewInit(); - - GLuint fb, color_rb, depth_rb, rgba_tex, depth_tex, i, other_tex; - glGenFramebuffersEXT(1, &fb); - glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fb ); - - glGenRenderbuffersEXT(1, &depth_rb); - glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, depth_rb ); - glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, this->texsize,this->texsize ); - glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_rb ); - this->fbuffer[0] = depth_rb; - - glGenTextures(1, &other_tex); - glBindTexture(GL_TEXTURE_2D,other_tex); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //glGenerateMipmapEXT(GL_TEXTURE_2D); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - - - glGenTextures(1, &rgba_tex); - glBindTexture(GL_TEXTURE_2D, rgba_tex); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //glGenerateMipmapEXT(GL_TEXTURE_2D); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - - - glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, rgba_tex, 0 ); - this->textureID[0] = rgba_tex; - this->textureID[1] = other_tex; - - GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); - if (status == GL_FRAMEBUFFER_COMPLETE_EXT) { - return; - } - } -#endif - -fallback: - DWRITE( "using teximage hack fallback\n" ); - - /** Fallback pbuffer creation via teximage hack */ - /** Check the texture size against the viewport size */ - /** If the viewport is smaller, then we'll need to scale the texture size down */ - /** If the viewport is larger, scale it up */ - mindim = width < height ? width : height; - origtexsize = this->texsize; - this->texsize = nearestPower2( mindim, SCALE_MINIFY ); - - /* Create the texture that will be bound to the render this */ - if ( glIsTexture( this->textureID[0] ) ) { - DWRITE( "texture already exists\n" ); - if ( this->texsize != origtexsize ) { - DWRITE( "deleting existing texture due to resize\n" ); - glDeleteTextures( 1, &this->textureID[0] ); - } - } - - if ( !glIsTexture( this->textureID[0] ) ) { - glGenTextures(1, &this->textureID[0] ); - - DWRITE( "allocate texture: %d\ttexsize: %d x %d\n", - this->textureID[0], this->texsize, this->texsize ); - glBindTexture(GL_TEXTURE_2D, this->textureID[0] ); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - glTexImage2D(GL_TEXTURE_2D, - 0, - 3, - this->texsize, this->texsize, - 0, - GL_RGB, - GL_UNSIGNED_BYTE, - NULL); - } - - this->usePbuffers=0; - return; - } - -/** Destroys the pbuffer */ - -/** Locks the pbuffer */ -void RenderTarget::lock() { - -#ifdef USE_FBO - if(this->usePbuffers) - { - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, this->fbuffer[0]); - } - -#endif - } - -/** Unlocks the pbuffer */ -void RenderTarget::unlock() { - -#ifdef USE_FBO - if(this->usePbuffers) - { - glBindTexture( GL_TEXTURE_2D, this->textureID[1] ); - glCopyTexSubImage2D( GL_TEXTURE_2D, - 0, 0, 0, 0, 0, - this->texsize, this->texsize ); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - return; - } - -#endif - - /** Fallback texture path */ - DWRITE( "copying framebuffer to texture\n" ); - glBindTexture( GL_TEXTURE_2D, this->textureID[0] ); - glCopyTexSubImage2D( GL_TEXTURE_2D, - 0, 0, 0, 0, 0, - this->texsize, this->texsize ); - } - -/** - * Calculates the nearest power of two to the given number using the - * appropriate rule - */ -int RenderTarget::nearestPower2( int value, TextureScale scaleRule ) { - - int x = value; - int power = 0; - - DWRITE( "nearestPower2(): %d\n", value ); - - while ( ( x & 0x01 ) != 1 ) { - x >>= 1; - } - - if ( x == 1 ) { - return value; - } else { - x = value; - while ( x != 0 ) { - x >>= 1; - power++; - } - switch ( scaleRule ) { - case SCALE_NEAREST: - if ( ( ( 1 << power ) - value ) <= ( value - ( 1 << ( power - 1 ) ) ) ) { - return 1 << power; - } else { - return 1 << ( power - 1 ); - } - case SCALE_MAGNIFY: - return 1 << power; - case SCALE_MINIFY: - return 1 << ( power - 1 ); - default: - break; - } - } - return 0; - } diff --git a/src/projectM-engine-backup/PBuffer.hpp b/src/projectM-engine-backup/PBuffer.hpp deleted file mode 100755 index f5474860e..000000000 --- a/src/projectM-engine-backup/PBuffer.hpp +++ /dev/null @@ -1,94 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: PBuffer.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Opaque render target - * - */ - -#ifndef _RENDERTARGET_H -#define _RENDERTARGET_H - -#ifdef USE_FBO -#include -#endif - -#if defined(MACOS) && !defined(USE_FBO) -#include -#endif /** MACOS */ - -#ifdef WIN32 -#include -#include -#endif /** WIN32 */ - -#ifdef LINUX -#include -#include -#endif - -typedef enum { SCALE_NEAREST, SCALE_MAGNIFY, SCALE_MINIFY } TextureScale; -typedef enum { - AGL_CONTEXT, - CGL_CONTEXT, - NSGL_CONTEXT, - GLX_CONTEXT, - WGL_CONTEXT, - } ContextType; - -typedef enum { PBUFFER_PASS1, PBUFFER_PASS2 } PBufferPass; - -class RenderTarget { - - -public: - /** Texture size */ - int texsize; - - /** Application context */ - ContextType origContextType; - - -int usePbuffers; - - RenderTarget( int texsize, int width, int height ); - void lock(); - void unlock(); - int nearestPower2( int value, TextureScale scaleRule ); - - /** Opaque pbuffer context and pbuffer */ -/* -#ifdef MACOS - void *origContext; - void *pbufferContext; - void *pbuffer; -#endif -*/ - /** Render target texture ID for non-pbuffer systems */ - GLuint textureID[2]; - GLuint fbuffer[1]; - GLuint depthb[1]; - }; - - - -#endif /** !_RENDERTARGET_H */ diff --git a/src/projectM-engine-backup/PCM.cpp b/src/projectM-engine-backup/PCM.cpp deleted file mode 100755 index d4db5f17e..000000000 --- a/src/projectM-engine-backup/PCM.cpp +++ /dev/null @@ -1,325 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: PCM.c,v 1.3 2006/03/13 20:35:26 psperl Exp $ - * - * Takes sound data from wherever and hands it back out. - * Returns PCM Data or spectrum data, or the derivative of the PCM data - */ - -#include -#include - -#include "Common.hpp" -#include "wipemalloc.h" -#include "fftsg.h" -#include "PCM.hpp" - -//initPCM(int samples) -// -//Initializes the PCM buffer to -// number of samples specified. - -PCM::PCM() { - initPCM( 2048 ); - } - -void PCM::initPCM(int samples) { - int i; - - DWRITE( "initPCM()\n" ); - - waveSmoothing = 0; - - //Allocate memory for PCM data buffer - PCMd = (float **)wipemalloc(2 * sizeof(float *)); - PCMd[0] = (float *)wipemalloc(samples * sizeof(float)); - PCMd[1] = (float *)wipemalloc(samples * sizeof(float)); - - maxsamples=samples; - newsamples=0; - numsamples = maxsamples; - - //Initialize buffers to 0 - for (i=0;imaxsamples = 2048; -// this->numsamples = 0; -// this->pcmdataL = NULL; -// this->pcmdataR = NULL; - - /** Allocate PCM data structures */ - pcmdataL=(float *)wipemalloc(this->maxsamples*sizeof(float)); - pcmdataR=(float *)wipemalloc(this->maxsamples*sizeof(float)); - -} - - -void PCM::addPCMfloat(float *PCMdata, int samples) -{ - int i,j; - - - for(i=0;imaxsamples) newsamples=maxsamples; - numsamples = getPCMnew(pcmdataR,1,0,waveSmoothing,0,0); - getPCMnew(pcmdataL,0,0,waveSmoothing,0,1); - getPCM(vdataL,512,0,1,0,0); - getPCM(vdataR,512,1,1,0,0); -} - -void PCM::addPCM16Data(const short* pcm_data, short samples) { - int i, j; - - for (i = 0; i < samples; ++i) { - j=i+start; - PCMd[0][j % maxsamples]=(pcm_data[i * 2 + 0]/16384.0); - PCMd[1][j % maxsamples]=(pcm_data[i * 2 + 1]/16384.0); - } - - start = (start + samples) % maxsamples; - - newsamples+=samples; - if (newsamples>maxsamples) newsamples=maxsamples; - numsamples = getPCMnew(pcmdataR,1,0,waveSmoothing,0,0); - getPCMnew(pcmdataL,0,0,waveSmoothing,0,1); - getPCM(vdataL,512,0,1,0,0); - getPCM(vdataR,512,1,1,0,0); -} - - -void PCM::addPCM16(short PCMdata[2][512]) -{ - int i,j; - int samples=512; - - DWRITE( "start: %d\n", start ); - - for(i=0;imaxsamples) newsamples=maxsamples; - - numsamples = getPCMnew(pcmdataR,1,0,waveSmoothing,0,0); - getPCMnew(pcmdataL,0,0,waveSmoothing,0,1); - getPCM(vdataL,512,0,1,0,0); - getPCM(vdataR,512,1,1,0,0); -} - - -void PCM::addPCM8( unsigned char PCMdata[2][512]) -{ - int i,j; - int samples=512; - - - for(i=0;imaxsamples) newsamples=maxsamples; - numsamples = getPCMnew(pcmdataR,1,0,waveSmoothing,0,0); - getPCMnew(pcmdataL,0,0,waveSmoothing,0,1); - getPCM(vdataL,512,0,1,0,0); - getPCM(vdataR,512,1,1,0,0); -} - - -//puts sound data requested at provided pointer -// -//samples is number of PCM samples to return -//freq = 0 gives PCM data -//freq = 1 gives FFT data -//smoothing is the smoothing coefficient - -//returned values are normalized from -1 to 1 - -void PCM::getPCM(float *PCMdata, int samples, int channel, int freq, float smoothing, int derive) -{ - int i,index; - - index=start-1; - - if (index<0) index=maxsamples+index; - - PCMdata[0]=PCMd[channel][index]; - - for(i=1;i -#include -#include -#include -#include "projectM.hpp" - -#include "fatal.h" -#include "Common.hpp" - -#include "CustomShape.hpp" -#include "Eval.hpp" -#include "Expr.hpp" -#include "InitCond.hpp" -#include "Param.hpp" -#include "Preset.hpp" -#include - -#include "wipemalloc.h" - -/** Constructor */ -Param::Param( std::string _name, short int _type, short int _flags, void * _engine_val, void * _matrix, - CValue _default_init_val, CValue _upper_bound, CValue _lower_bound): - name(_name), - type(_type), - flags (_flags), - matrix_flag (0), - matrix (_matrix), - engine_val(_engine_val), - default_init_val (_default_init_val), - upper_bound (_upper_bound), - lower_bound (_lower_bound) - { - - /** @@FIX THIS */ - /// @bug listen to above's advice! - /// @NOTE this is a hack, but will probably work fine - this->gx = projectM::currentEngine->presetInputs.gx; - this->gy = projectM::currentEngine->presetInputs.gy; - -} - - -/* Creates a user defined parameter */ -Param::Param(std::string _name) : - type(P_TYPE_DOUBLE), - flags(P_FLAG_USERDEF), - matrix_flag(0), - matrix(0), - name(_name) - { - - engine_val = new float(); - - default_init_val.float_val = DEFAULT_DOUBLE_IV; - upper_bound.float_val = DEFAULT_DOUBLE_UB; - lower_bound.float_val = DEFAULT_DOUBLE_LB; - - - /** @@FIX THIS */ - /// @bug listen to above's advice! - /// @NOTE this is a hack, but will probably work fine - this->gx = projectM::currentEngine->presetInputs.gx; - this->gy = projectM::currentEngine->presetInputs.gy; -} - -/* Free's a parameter type */ -Param::~Param() { - - int x; - if (flags & P_FLAG_USERDEF) { - free(engine_val); - } - - //if (!(param->flags & P_FLAG_DONT_FREE_MATRIX)) { - if (matrix && !(flags & P_FLAG_DONT_FREE_MATRIX)) { - - if (flags & P_FLAG_PER_POINT) { - free(matrix); - } //FIX THIS NOW XMAS05 - else if (flags & P_FLAG_PER_PIXEL) { - for (x = 0; x < gx; x++) - free(((float**)matrix)[x]); - free(matrix); - matrix = NULL; - } - } - - if (PARAM_DEBUG) printf("~Param: freeing \"%s\".\n", name.c_str()); -} - - -/* Returns nonzero if the string is valid parameter name */ -int Param::is_valid_param_string( const char * string ) { - - if (string == NULL) - return FALSE; - - /* This ensures the first character is non numeric */ - if ( ((*string) >= 48) && ((*string) <= 57)) - return FALSE; - - /* These probably should never happen */ - if (*string == '.') - return FALSE; - - if (*string == '+') - return FALSE; - - if (*string == '-') - return FALSE; - - /* Could also add checks for other symbols. May do later */ - - return TRUE; - -} - -/* Sets the parameter engine value to value val. - clipping occurs if necessary */ -void Param::set_param( float val) { - - switch (type) { - - case P_TYPE_BOOL: - if (val < 0) - *((int*)engine_val) = 0; - else if (val > 0) - *((int*)engine_val) = 1; - else - *((int*)engine_val) = 0; - break; - case P_TYPE_INT: - /* Make sure value is an integer */ - val = floor(val); - if (val < lower_bound.int_val) - *((int*)engine_val) = lower_bound.int_val; - else if (val > upper_bound.int_val) - *((int*)engine_val) = upper_bound.int_val; - else - *((int*)engine_val) = (int)val; - break; - case P_TYPE_DOUBLE: - /* Make sure value is an integer */ - - - if (val < lower_bound.float_val) - *((float*)engine_val) = lower_bound.float_val; - else if (val > upper_bound.float_val) - *((float*)engine_val) = upper_bound.float_val; - else - *((float*)engine_val) = val; - break; - default: - abort(); - break; - - } - - return; -} - - -/* Loads a float parameter into the builtin database */ -Param * Param::new_param_float(char * name, short int flags, void * engine_val, void * matrix, - float upper_bound, float lower_bound, float init_val) { - - Param * param; - CValue iv, ub, lb; - - iv.float_val = init_val; - ub.float_val = upper_bound; - lb.float_val = lower_bound; - - if ((param = new Param(name, P_TYPE_DOUBLE, flags, engine_val, matrix,iv, ub, lb)) == NULL) - return NULL; - - - /* Finished, return success */ - return param; -} - -/* Creates a new parameter of type int */ -Param * Param::new_param_int(char * name, short int flags, void * engine_val, - int upper_bound, int lower_bound, int init_val) { - - Param * param; - CValue iv, ub, lb; - - iv.int_val = init_val; - ub.int_val = upper_bound; - lb.int_val = lower_bound; - - if ((param = new Param(name, P_TYPE_INT, flags, engine_val, NULL, iv, ub, lb)) == NULL) - return NULL; - - - /* Finished, return success */ - return param; -} - -/* Creates a new parameter of type bool */ -Param * Param::new_param_bool(char * name, short int flags, void * engine_val, - int upper_bound, int lower_bound, int init_val) { - - Param * param; - CValue iv, ub, lb; - - iv.bool_val = init_val; - ub.bool_val = upper_bound; - lb.bool_val = lower_bound; - - if ((param = new Param(name, P_TYPE_BOOL, flags, engine_val, NULL, iv, ub, lb)) == NULL) - return NULL; - - - /* Finished, return success */ - return param; -} - - diff --git a/src/projectM-engine-backup/Param.hpp b/src/projectM-engine-backup/Param.hpp deleted file mode 100755 index 09a8e895d..000000000 --- a/src/projectM-engine-backup/Param.hpp +++ /dev/null @@ -1,110 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Parameter used within a preset - * - * $Log$ - */ - -#ifndef _PARAM_H -#define _PARAM_H - -/* Debug level, zero for none */ -#define PARAM_DEBUG 0 - -#define P_CREATE 1 -#define P_NONE 0 - -#define P_TYPE_BOOL 0 -#define P_TYPE_INT 1 -#define P_TYPE_DOUBLE 2 - -#define P_FLAG_NONE 0 -#define P_FLAG_READONLY 1 -#define P_FLAG_USERDEF (1 << 1) -#define P_FLAG_QVAR (1 << 2) -#define P_FLAG_TVAR (1 << 3) -#define P_FLAG_ALWAYS_MATRIX (1 << 4) -#define P_FLAG_DONT_FREE_MATRIX (1 << 5) -#define P_FLAG_PER_PIXEL (1 << 6) -#define P_FLAG_PER_POINT (1 << 7) - -#include "Expr.hpp" -#include "Common.hpp" -#include -class InitCond; -class Param; -class Preset; -//#include - -/* Parameter Type */ -class Param { -public: - std::string name; /* name of the parameter, not necessary but useful neverthless */ - short int type; /* parameter number type (int, bool, or float) */ - short int flags; /* read, write, user defined, etc */ - short int matrix_flag; /* for optimization purposes */ - void * engine_val; /* pointer to the engine variable */ - void * matrix; /* per pixel / per point matrix for this variable */ - CValue default_init_val; /* a default initial condition value */ - CValue upper_bound; /* this parameter's upper bound */ - CValue lower_bound; /* this parameter's lower bound */ - int gx, gy; - - /* Function prototypes */ - Param(std::string name, short int type, short int flags, - void * eqn_val, void *matrix, - CValue default_init_val, CValue upper_bound, - CValue lower_bound); - - ~Param(); - - /** Create a user defined parameter **/ - Param( std::string name ); - static int init_user_param_db(); - static int destroy_user_param_db(); - - void load_unspec_init_cond_shape(); - - - int compare_param( char *name, char *name2 ); - static int is_valid_param_string( const char *string ); - void set_param( float val ); - - static Param *new_param_float( char *name, short int flags, void *engine_val, - void *matrix, float upper_bound, - float lower_bound, - float init_val ); - static Param *new_param_double( char *name, short int flags, void *engine_val, - void *matrix, double upper_bound, - double lower_bound, - double init_val ); - static Param * new_param_int( char * name, short int flags, void * engine_val, - int upper_bound, int lower_bound, int init_val ); - static Param * new_param_bool( char * name, short int flags, void * engine_val, - int upper_bound, int lower_bound, int init_val ); - -}; - -#endif /** !_PARAM_TYPES_H */ - diff --git a/src/projectM-engine-backup/ParamUtils.hpp b/src/projectM-engine-backup/ParamUtils.hpp deleted file mode 100644 index 866e3d143..000000000 --- a/src/projectM-engine-backup/ParamUtils.hpp +++ /dev/null @@ -1,138 +0,0 @@ -/** ParamUtils.hpp: - * A collection of utility functions to make using parameter types easier. - * In reality, this stuff belongs elsewhere, but one step at a time - */ -#ifndef _PARAM_UTILS_HPP -#define _PARAM_UTILS_HPP - -#include "Param.hpp" -#include -#include - - -class BuiltinParams; - -class ParamUtils -{ -public: - static bool insert(Param * param, std::map * paramTree) - { - - assert(param); - assert(paramTree); - - - return ((paramTree->insert(std::make_pair(param->name,param))).second); - - } - - static const int AUTO_CREATE = 1; - static const int NO_CREATE = 0; - - template - static Param * find(std::string name, std::map * paramTree) - { - - assert(paramTree); - - Param * param = NULL; - - /* First look in the builtin database */ - std::map::iterator pos = paramTree->find(name); - - - if ((FLAGS == AUTO_CREATE) && ((pos == paramTree->end()))) - { - /* Check if string is valid */ - if (!Param::is_valid_param_string(name.c_str())) - return NULL; - - /* Now, create the user defined parameter given the passed name */ - if ((param = new Param(name)) == NULL) - return NULL; - - /* Finally, insert the new parameter into this preset's proper splaytree */ - std::pair::iterator, bool> insertRetPair = - paramTree->insert(std::make_pair(param->name, param)); - - if (insertRetPair.second) - param = insertRetPair.first->second; - - } else - param = pos->second; - - - /* Return the found (or created) parameter. Note that this could be null */ - return param; - - - } - - /// Checks attempt - static Param * find(const std::string & name, BuiltinParams * builtinParams, std::map * insertionTree) - { - - Param * param; - - // Check first db - if ((param = builtinParams->find_builtin_param(name)) != 0) - return param; - - // Check second db, create if necessary - return find(name, insertionTree); - - } - - class LoadInitCondFunctor - { - public: - LoadInitCondFunctor(Preset * preset) :m_preset(preset) {} - - void operator() (Param * param) - { - - InitCond * init_cond; - CValue init_val; - - /* Don't count read only parameters as initial conditions */ - if (param->flags & P_FLAG_READONLY) - return; - - /* If initial condition was not defined by the preset file, force a default one - with the following code */ - std::map::iterator pos; - if ((pos = (m_preset->init_cond_tree.find(param->name))) == m_preset->init_cond_tree.end()) - { - - std::map::iterator per_frame_init_pos; - /* Make sure initial condition does not exist in the set of per frame initial equations */ - if ((per_frame_init_pos = (m_preset->per_frame_init_eqn_tree.find(param->name))) != m_preset->per_frame_init_eqn_tree.end()) - return; - - if (param->type == P_TYPE_BOOL) - init_val.bool_val = 0; - - else if (param->type == P_TYPE_INT) - init_val.int_val = *(int*)param->engine_val; - - else if (param->type == P_TYPE_DOUBLE) - init_val.float_val = *(float*)param->engine_val; - - /* Create new initial condition */ - if ((init_cond = new InitCond(param, init_val)) == NULL) - return; - - /* Insert the initial condition into this presets tree */ - /// @bug not error checking - m_preset->init_cond_tree.insert(std::make_pair(init_cond->param->name,init_cond)); - } - - } - - private : - Preset * m_preset; - }; - -}; - -#endif diff --git a/src/projectM-engine-backup/Parser.cpp b/src/projectM-engine-backup/Parser.cpp deleted file mode 100755 index 5732c1933..000000000 --- a/src/projectM-engine-backup/Parser.cpp +++ /dev/null @@ -1,2143 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU -* License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/* parser.c */ - -#include -#include -#include - -#include "Common.hpp" -#include "fatal.h" - -#include "BuiltinFuncs.hpp" -#include "CustomWave.hpp" -#include "CustomShape.hpp" -#include "Expr.hpp" -#include "Eval.hpp" -#include "Func.hpp" -#include "InitCond.hpp" -#include "Param.hpp" -#include "Preset.hpp" -#include "Parser.hpp" -#include "PerFrameEqn.hpp" -#include "PerPixelEqn.hpp" -#include -#include "ParamUtils.hpp" - -#include "wipemalloc.h" - -/* Grabs the next token from the file. The second argument points - to the raw string */ - -line_mode_t Parser::line_mode; -CustomWave *Parser::current_wave; -CustomShape *Parser::current_shape; -int Parser::string_line_buffer_index; -char Parser::string_line_buffer[STRING_LINE_SIZE]; -unsigned int Parser::line_count; -int Parser::per_frame_eqn_count; -int Parser::per_frame_init_eqn_count; -int Parser::last_custom_wave_id; -int Parser::last_custom_shape_id; -char Parser::last_eqn_type[MAX_TOKEN_SIZE]; -int Parser::last_token_size; - -token_t Parser::parseToken(FILE * fs, char * string) { - - char c; - int i; - - if (string != NULL) - memset(string, 0, MAX_TOKEN_SIZE); - - /* Loop until a delimiter is found, or the maximum string size is found */ - for (i = 0; i < MAX_TOKEN_SIZE;i++) { - c = fgetc(fs); - last_token_size++; - /* If the string line buffer is full, quit */ - if (string_line_buffer_index == (STRING_LINE_SIZE - 1)) - return tStringBufferFilled; - - /* Otherwise add this character to the string line buffer */ - string_line_buffer[string_line_buffer_index++] = c; - /* Now interpret the character */ - switch (c) { - - case '+': - return tPlus; - case '-': - return tMinus; - case '%': - return tMod; - case '/': - - /* check for line comment here */ - if ((c = fgetc(fs)) == '/') { - while(1) { - c = fgetc(fs); - if (c == EOF) { - line_mode = NORMAL_LINE_MODE; - return tEOF; - } - if (c == '\n') { - line_mode = NORMAL_LINE_MODE; - return tEOL; - } - } - - } - - /* Otherwise, just a regular division operator */ - ungetc(c, fs); - return tDiv; - - case '*': - return tMult; - case '|': - return tOr; - case '&': - return tAnd; - case '(': - return tLPr; - case ')': - return tRPr; - case '[': - return tLBr; - case ']': - return tRBr; - case '=': - return tEq; - case '\n': - line_count++; - line_mode = NORMAL_LINE_MODE; - return tEOL; - case ',': - return tComma; - case ';': - return tSemiColon; - case ' ': /* space, skip the character */ - i--; - break; - case EOF: - line_count = 1; - line_mode = NORMAL_LINE_MODE; - return tEOF; - - default: - if (string != NULL) - string[i] = c; - } - - } - - /* String reached maximum length, return special token error */ - return tStringTooLong; - -} - -/* Parse input in the form of "exp, exp, exp, ...)" - Returns a general expression list */ - -GenExpr **Parser::parse_prefix_args(FILE * fs, int num_args, Preset * preset) { - - int i, j; - GenExpr ** expr_list; /* List of arguments to function */ - GenExpr * gen_expr; - - /* Malloc the expression list */ - expr_list = (GenExpr**)wipemalloc(sizeof(GenExpr*)*num_args); - - /* Malloc failed */ - if (expr_list == NULL) - return NULL; - - - i = 0; - - while (i < num_args) { - //if (PARSE_DEBUG) printf("parse_prefix_args: parsing argument %d...\n", i+1); - /* Parse the ith expression in the list */ - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - //if (PARSE_DEBUG) printf("parse_prefix_args: failed to get parameter # %d for function (LINE %d)\n", i+1, line_count); - for (j = 0; j < i; j++) - delete expr_list[j]; - free(expr_list); - expr_list = NULL; - return NULL; - } - /* Assign entry in expression list */ - expr_list[i++] = gen_expr; - } - - //if (PARSE_DEBUG) printf("parse_prefix_args: finished parsing %d arguments (LINE %d)\n", num_args, line_count); - /* Finally, return the resulting expression list */ - return expr_list; -} - -/* Parses a comment at the top of the file. Stops when left bracket is found */ -int Parser::parse_top_comment(FILE * fs) { - - char string[MAX_TOKEN_SIZE]; - token_t token; - - /* Process tokens until left bracket is found */ - while ((token = parseToken(fs, string)) != tLBr) { - if (token == tEOF) - return PROJECTM_PARSE_ERROR; - } - - /* Done, return success */ - return PROJECTM_SUCCESS; -} - -/* Right Bracket is parsed by this function. - puts a new string into name */ -int Parser::parse_preset_name(FILE * fs, char * name) { - - token_t token; - - if (name == NULL) - return PROJECTM_FAILURE; - - if ((token = parseToken(fs, name)) != tRBr) - return PROJECTM_PARSE_ERROR; - -#ifdef DEBUG - if (PARSE_DEBUG) DWRITE("parse_preset_name: parsed preset (name = \"%s\")\n", name); -#endif - - return PROJECTM_SUCCESS; -} - - -/* Parses per pixel equations */ -int Parser::parse_per_pixel_eqn(FILE * fs, Preset * preset, char * init_string) { - - - char string[MAX_TOKEN_SIZE]; - GenExpr * gen_expr; - -#ifdef DEBUG - if (PARSE_DEBUG) DWRITE("parse_per_pixel: per_pixel equation parsing start...(LINE %d)\n", line_count); -#endif - -if (init_string != 0) { - strncpy(string, init_string, strlen(init_string)); -} else { - - if (parseToken(fs, string) != tEq) { /* parse per pixel operator name */ -#ifdef DEBUG - if (PARSE_DEBUG) DWRITE("parse_per_pixel: equal operator expected after per pixel operator \"%s\", but not found (LINE %d)\n", - string, line_count); -#endif - return PROJECTM_PARSE_ERROR; - } -} - - /* Parse right side of equation as an expression */ - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { -#ifdef DEBUG - if (PARSE_DEBUG) DWRITE("parse_per_pixel: equation evaluated to null? (LINE %d)\n", line_count); -#endif - return PROJECTM_PARSE_ERROR; - } - - /* Add the per pixel equation */ - if (preset->add_per_pixel_eqn(string, gen_expr) < 0) { - if (PARSE_DEBUG) { - DWRITE( "parse_per_pixel: no param associated with \"%s\" (LINE %d)", string, line_count); - - } - delete gen_expr; - return PROJECTM_PARSE_ERROR; - } - - return PROJECTM_SUCCESS; -} - -/* Parses an equation line, this function is way too big, should add some helper functions */ -int Parser::parse_line(FILE * fs, Preset * preset) { - - char eqn_string[MAX_TOKEN_SIZE]; - token_t token; - InitCond * init_cond; - PerFrameEqn * per_frame_eqn; - //PerFrameEqn * per_frame_init_eqn; - - /* Clear the string line buffer */ - memset(string_line_buffer, 0, STRING_LINE_SIZE); - string_line_buffer_index = 0; - - token = parseToken( fs, eqn_string ); - switch (token ) { - - /* Invalid Cases */ - case tRBr: - case tLPr: - case tRPr: - case tComma: - case tLBr: - case tPlus: - case tMinus: - case tMod: - case tMult: - case tOr: - case tAnd: - case tDiv: - - // if (PARSE_DEBUG) printf("parse_line: invalid token found at start of line (LINE %d)\n", line_count); - /* Invalid token found, return a parse error */ - return PROJECTM_PARSE_ERROR; - - - case tEOL: /* Empty line */ - line_mode = NORMAL_LINE_MODE; - return PROJECTM_SUCCESS; - - case tEOF: /* End of File */ - line_mode = NORMAL_LINE_MODE; - line_count = 1; - return EOF; - - case tSemiColon: /* Indicates end of expression */ - return PROJECTM_SUCCESS; - - /* Valid Case, either an initial condition or equation should follow */ - case tEq: - - /* CASE: PER FRAME INIT EQUATION */ - if (!strncmp(eqn_string, PER_FRAME_INIT_STRING, PER_FRAME_INIT_STRING_LENGTH)) { - - //if (PARSE_DEBUG) printf("parse_line: per frame init equation found...(LINE %d)\n", line_count); - - /* Parse the per frame equation */ - if ((init_cond = parse_per_frame_init_eqn(fs, preset, NULL)) == NULL) { - //if (PARSE_DEBUG) printf("parse_line: per frame init equation parsing failed (LINE %d)\n", line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Insert the equation in the per frame equation tree */ - preset->per_frame_init_eqn_tree.insert(std::make_pair(init_cond->param->name, init_cond)); - - if (update_string_buffer(preset->per_frame_init_eqn_string_buffer, - &preset->per_frame_init_eqn_string_index) < 0) - { return PROJECTM_FAILURE;} - line_mode = PER_FRAME_INIT_LINE_MODE; - return PROJECTM_SUCCESS; - } - - /* Per frame equation case */ - if (!strncmp(eqn_string, PER_FRAME_STRING, PER_FRAME_STRING_LENGTH)) { - - /* Sometimes per frame equations are implicitly defined without the - per_frame_ prefix. This informs the parser that one could follow */ - line_mode = PER_FRAME_LINE_MODE; - - //if (PARSE_DEBUG) printf("parse_line: per frame equation found...(LINE %d)\n", line_count); - - /* Parse the per frame equation */ - if ((per_frame_eqn = parse_per_frame_eqn(fs, ++per_frame_eqn_count, preset)) == NULL) { - if (PARSE_DEBUG) printf("parse_line: per frame equation parsing failed (LINE %d)\n", line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Insert the equation in the per frame equation tree */ - preset->per_frame_eqn_tree.insert(std::make_pair(per_frame_eqn_count, per_frame_eqn)); - - if (update_string_buffer(preset->per_frame_eqn_string_buffer, - &preset->per_frame_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - return PROJECTM_SUCCESS; - - } - - /* Wavecode initial condition case */ - if (!strncmp(eqn_string, WAVECODE_STRING, WAVECODE_STRING_LENGTH)) { - - line_mode = CUSTOM_WAVE_WAVECODE_LINE_MODE; - - //if (PARSE_DEBUG) - // printf("parse_line: wavecode prefix found: \"%s\"\n", eqn_string); - - // printf("string:%d\n", 5); - - //SUPER MYSTERIO-BUG - Don't Remove - printf(""); - - return parse_wavecode(eqn_string, fs, preset); - } - - /* Custom Wave Prefix */ - if ((!strncmp(eqn_string, WAVE_STRING, WAVE_STRING_LENGTH)) && - ((eqn_string[5] >= 48) && (eqn_string[5] <= 57))) { - - // if (PARSE_DEBUG) printf("parse_line wave prefix found: \"%s\"\n", eqn_string); - - return parse_wave(eqn_string, fs, preset); - - } - - - /* Shapecode initial condition case */ - if (!strncmp(eqn_string, SHAPECODE_STRING, SHAPECODE_STRING_LENGTH)) { - - line_mode = CUSTOM_SHAPE_SHAPECODE_LINE_MODE; - - if (PARSE_DEBUG) printf("parse_line: shapecode prefix found: \"%s\"\n", eqn_string); - - return parse_shapecode(eqn_string, fs, preset); - } - - /* Custom Shape Prefix */ - if ((!strncmp(eqn_string, SHAPE_STRING, SHAPE_STRING_LENGTH)) && - ((eqn_string[6] >= 48) && (eqn_string[6] <= 57))) { - - if (PARSE_DEBUG) printf("parse_line shape prefix found: \"%s\"\n", eqn_string); - return parse_shape(eqn_string, fs, preset); - - } - - /* Per pixel equation case */ - if (!strncmp(eqn_string, PER_PIXEL_STRING, PER_PIXEL_STRING_LENGTH)) { - line_mode = PER_PIXEL_LINE_MODE; - - if (parse_per_pixel_eqn(fs, preset, 0) < 0) - return PROJECTM_PARSE_ERROR; - - - if (update_string_buffer(preset->per_pixel_eqn_string_buffer, - &preset->per_pixel_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - if (PARSE_DEBUG) printf("parse_line: finished parsing per pixel equation (LINE %d)\n", line_count); - return PROJECTM_SUCCESS; - } - - /* Sometimes equations are written implicitly in milkdrop files, in the form - - per_frame_1 = p1 = eqn1; p2 = eqn2; p3 = eqn3;..; - - which is analagous to: - - per_frame_1 = p1 = eqn1; per_frame_2 = p2 = eqn2; per_frame_3 = p3 = eqn3; ...; - - The following line mode hack allows such implicit declaration of the - prefix that specifies the equation type. An alternative method - may be to associate each equation line as list of equations separated - by semicolons (and a new line ends the list). Instead, however, a global - variable called "line_mode" specifies the last type of equation found, - and bases any implicitly typed input on this fact - - Note added by Carmelo Piccione (cep@andrew.cmu.edu) 10/19/03 - */ - - /* Per frame line mode previously, try to parse the equation implicitly */ - if (line_mode == PER_FRAME_LINE_MODE) { - if ((per_frame_eqn = parse_implicit_per_frame_eqn(fs, eqn_string, ++per_frame_eqn_count, preset)) == NULL) - return PROJECTM_PARSE_ERROR; - - /* Insert the equation in the per frame equation tree */ - preset->per_frame_eqn_tree.insert(std::make_pair(per_frame_eqn_count, per_frame_eqn)); - - if (update_string_buffer(preset->per_frame_eqn_string_buffer, - &preset->per_frame_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - return PROJECTM_SUCCESS; - - } else if (line_mode == PER_FRAME_INIT_LINE_MODE) { - if (PARSE_DEBUG) printf("parse_line: parsing impliict per frame init eqn)\n"); - if ((init_cond = parse_per_frame_init_eqn(fs, preset, NULL)) == NULL) - return PROJECTM_PARSE_ERROR; - - ++per_frame_init_eqn_count; - - /* Insert the equation in the per frame equation tree */ - preset->per_frame_init_eqn_tree.insert(std::make_pair(init_cond->param->name, init_cond)); - - - if (update_string_buffer(preset->per_frame_init_eqn_string_buffer, - &preset->per_frame_init_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - return PROJECTM_SUCCESS; - } else if (line_mode == PER_PIXEL_LINE_MODE) { - - if (PARSE_DEBUG) printf("parse_line: implicit per pixel eqn\n", line_count); - return parse_per_pixel_eqn(fs, preset, eqn_string); - - - } else if (line_mode == CUSTOM_WAVE_PER_POINT_LINE_MODE) { - - if (PARSE_DEBUG) printf("parse_line: implicit cwave ppoint eqn found (LINE %d)\n", line_count); - //int len = strlen(eqn_string); - - if (parse_wave_helper(fs, preset, last_custom_wave_id, last_eqn_type, eqn_string) < 0) { - if (PARSE_DEBUG) printf("parse_line: failed to parse an implicit custom wave per point eqn\n"); - return PROJECTM_FAILURE; - } - return PROJECTM_SUCCESS; - } else if (line_mode == CUSTOM_WAVE_PER_FRAME_LINE_MODE) { - - //Added by PJS. I hope I did it right - CustomWave * custom_wave; - - /* Retrieve custom shape associated with this id */ - if ((custom_wave = Preset::find_custom_object(last_custom_wave_id, true, *preset->customWaves)) == NULL) - return PROJECTM_FAILURE; - return parse_wave_per_frame_eqn(fs, custom_wave, preset); - - } else if (line_mode == CUSTOM_WAVE_WAVECODE_LINE_MODE) { - if (PARSE_DEBUG) printf("unsupported line mode: CUSTOM_WAVE_WAVECODE_LINE_MODE\n"); - return PROJECTM_FAILURE; - } else if (line_mode == CUSTOM_SHAPE_SHAPECODE_LINE_MODE) { - if (PARSE_DEBUG) printf("unsupported line mode: CUSTOM_SHAPE_SHAPECODE_LINE_MODE\n"); - return PROJECTM_FAILURE; - } else if (line_mode == CUSTOM_SHAPE_PER_FRAME_LINE_MODE) { - - CustomShape * custom_shape; - - /* Retrieve custom shape associated with this id */ - if ((custom_shape = Preset::find_custom_object(last_custom_shape_id, true, *preset->customShapes)) == NULL) - return PROJECTM_FAILURE; - - return parse_shape_per_frame_eqn(fs, custom_shape, preset); - - } else if (line_mode == CUSTOM_SHAPE_PER_FRAME_INIT_LINE_MODE) { - - CustomShape * custom_shape; - - /* Retrieve custom shape associated with this id */ - if ((custom_shape = preset->find_custom_object(last_custom_shape_id, true, *preset->customShapes)) == NULL) - return PROJECTM_FAILURE; - - return parse_shape_per_frame_init_eqn(fs, custom_shape, preset); - - } - - //if (PARSE_DEBUG) printf("parse_line: found initial condition: name = \"%s\" (LINE %d)\n", eqn_string, line_count); - /* Evaluate the initial condition */ - if ((init_cond = parse_init_cond(fs, eqn_string, preset)) == NULL) { - if (PARSE_DEBUG) printf("parse_line: failed to parse initial condition (LINE %d)\n", line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Add equation to initial condition tree */ - preset->init_cond_tree.insert(std::make_pair(init_cond->param->name, init_cond)); - - /* Finished with initial condition line */ - // if (PARSE_DEBUG) printf("parse_line: initial condition parsed successfully\n"); - - return PROJECTM_SUCCESS; - - /* END INITIAL CONDITIONING PARSING */ - - default: /* an uncaught type or an error has occurred */ - if (PARSE_DEBUG) printf("parse_line: uncaught case, token val = %d\n", token); - return PROJECTM_PARSE_ERROR; - } - - /* Because of the default in the case statement, - control flow should never actually reach here */ - return PROJECTM_PARSE_ERROR; -} - - - -/* Parses a general expression, this function is the meat of the parser */ -GenExpr * Parser::parse_gen_expr ( FILE * fs, TreeExpr * tree_expr, Preset * preset) { - - int i; - char string[MAX_TOKEN_SIZE]; - token_t token; - GenExpr * gen_expr; - float val; - Param * param = NULL; - Func * func; - GenExpr ** expr_list; - - switch (token = parseToken(fs,string)) { - /* Left Parentice Case */ - case tLPr: - - /* CASE 1 (Left Parentice): See if the previous string before this parentice is a function name */ - if ((func = BuiltinFuncs::find_func(string)) != NULL) { - if (PARSE_DEBUG) { - DWRITE( "parse_gen_expr: found prefix function (name = %s) (LINE %d)\n", func->name, line_count); - - } - - /* Parse the functions arguments */ - if ((expr_list = parse_prefix_args(fs, func->num_args, preset)) == NULL) { - if (PARSE_DEBUG) { - DWRITE( "parse_prefix_args: failed to generate an expresion list! (LINE %d) \n", line_count); - - } - if ( tree_expr != NULL ) { - delete tree_expr; - } - return NULL; - } - - /* Convert function to expression */ - if ((gen_expr = GenExpr::prefun_to_expr((float (*)(void *))func->func_ptr, expr_list, func->num_args)) == NULL) { - if (PARSE_DEBUG) printf("parse_prefix_args: failed to convert prefix function to general expression (LINE %d) \n", - line_count); - delete tree_expr; - for (i = 0; i < func->num_args;i++) - delete expr_list[i]; - free(expr_list); - expr_list = NULL; - return NULL; - } - - - - token = parseToken(fs, string); - - if (*string != 0) { - if (PARSE_DEBUG) printf("parse_prefix_args: empty string expected, but not found...(LINE %d)\n", line_count); - /* continue anyway for now, could be implicit multiplication */ - } - - return parse_infix_op(fs, token, insert_gen_expr(gen_expr, &tree_expr), preset); - } - - - /* Case 2: (Left Parentice), a string coupled with a left parentice. Either an error or implicit - multiplication operator. For now treat it as an error */ - if (*string != 0) { - if (PARSE_DEBUG) printf("parse_gen_expr: implicit multiplication case unimplemented!\n"); - delete tree_expr; - return NULL; - } - - /* CASE 3 (Left Parentice): the following is enclosed parentices to change order - of operations. So we create a new expression tree */ - - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - //if (PARSE_DEBUG) printf("parse_gen_expr: found left parentice, but failed to create new expression tree \n"); - delete tree_expr; - return NULL; - } - - if (PARSE_DEBUG) printf("parse_gen_expr: finished enclosed expression tree...\n"); - token = parseToken(fs, string); - return parse_infix_op(fs, token, insert_gen_expr(gen_expr, &tree_expr), preset); - - /* Plus is a prefix operator check */ - case tPlus: - if (*string == 0) { - - //if (PARSE_DEBUG) printf("parse_gen_expr: plus used as prefix (LINE %d)\n", line_count); - - /* Treat prefix plus as implict 0 preceding operator */ - gen_expr = GenExpr::const_to_expr(0); - - return parse_infix_op(fs, tPositive, insert_gen_expr(gen_expr, &tree_expr), preset); - } - - /* Minus is a prefix operator check */ - case tMinus: - if (*string == 0) { - - /* Use the negative infix operator, but first add an implicit zero to the operator tree */ - gen_expr = GenExpr::const_to_expr(0); - //return parse_gen_expr(fs, insert_gen_expr(gen_expr, &tree_expr), preset); - return parse_infix_op(fs, tNegative, insert_gen_expr(gen_expr, &tree_expr), preset); - } - - /* All the following cases are strings followed by an infix operator or terminal */ - case tRPr: - case tEOL: - case tEOF: - case tSemiColon: - case tComma: - - /* CASE 1 (terminal): string is empty, but not null. Not sure if this will actually happen - any more. */ - if (*string == 0) { - //if (PARSE_DEBUG) printf("parse_gen_expr: empty string coupled with terminal (LINE %d) \n", line_count); - return parse_infix_op(fs, token, tree_expr, preset); - - } - - default: - - /* CASE 0: Empty string, parse error */ - if (*string == 0) { - if (PARSE_DEBUG) { - DWRITE( "parse_gen_expr: empty string coupled with infix op (ERROR!) (LINE %d) \n", line_count); - - } - delete tree_expr; - return NULL; - } - - /* CASE 1: Check if string is a just a floating point number */ - if (string_to_float(string, &val) != PROJECTM_PARSE_ERROR) { - if ((gen_expr = GenExpr::const_to_expr(val)) == NULL) { - delete tree_expr; - return NULL; - } - - /* Parse the rest of the line */ - return parse_infix_op(fs, token, insert_gen_expr(gen_expr, &tree_expr), preset); - - } - - - /* CASE 4: custom shape variable */ - if (current_shape != NULL) { - if ((param = ParamUtils::find(string, current_shape->param_tree)) == NULL) { - if ((param = preset->builtinParams.find_builtin_param(string)) == NULL) - if ((param = ParamUtils::find(string, current_shape->param_tree)) == NULL) { - delete tree_expr; - return NULL; - } - } - - if (PARSE_DEBUG) { - DWRITE( "parse_gen_expr: custom shape parameter (name = %s)... \n", param->name.c_str()); - - } - - /* Convert parameter to an expression */ - if ((gen_expr = GenExpr::param_to_expr(param)) == NULL) { - delete tree_expr; - return NULL; - } - - //if (PARSE_DEBUG) printf("converted to expression (LINE %d)\n", line_count); - - /* Parse the rest of the line */ - return parse_infix_op(fs, token, insert_gen_expr(gen_expr, &tree_expr), preset); - } - - /* CASE 5: custom wave variable */ - if (current_wave != NULL) { - if ((param = ParamUtils::find(string, current_wave->param_tree)) == NULL) { - if ((param = preset->builtinParams.find_builtin_param(string)) == NULL) - if ((param = ParamUtils::find(string, current_wave->param_tree)) == NULL) { - delete tree_expr; - return NULL; - } - } - - if (PARSE_DEBUG) { - DWRITE("parse_gen_expr: custom wave parameter (name = %s)... \n", param->name.c_str()); - - } - - /* Convert parameter to an expression */ - if ((gen_expr = GenExpr::param_to_expr(param)) == NULL) { - delete tree_expr; - return NULL; - } - - if (PARSE_DEBUG) printf("converted to expression (LINE %d)\n", line_count); - - /* Parse the rest of the line */ - return parse_infix_op(fs, token, insert_gen_expr(gen_expr, &tree_expr), preset); - - } - - /* CASE 6: regular parameter. Will be created if necessary and the string has no invalid characters */ - if ((param = ParamUtils::find(string, &preset->builtinParams, &preset->user_param_tree)) != NULL) { - - if (PARSE_DEBUG) { - DWRITE("parse_gen_expr: parameter (name = %s)...\n", param->name.c_str()); - - } - - /* Convert parameter to an expression */ - if ((gen_expr = GenExpr::param_to_expr(param)) == NULL) { - delete tree_expr; - return NULL; - } - - if (PARSE_DEBUG) printf("converted to expression (LINE %d)\n", line_count); - - /* Parse the rest of the line */ - return parse_infix_op(fs, token, insert_gen_expr(gen_expr, &tree_expr), preset); - - } - - /* CASE 7: Bad string, give up */ - if (PARSE_DEBUG) { - DWRITE( "parse_gen_expr: syntax error [string = \"%s\"] (LINE %d)\n", string, line_count); - - } - delete tree_expr; - return NULL; - } -} - - - -/* Inserts expressions into tree according to operator precedence. - If root is null, a new tree is created, with gen_expr as only element */ - -TreeExpr * Parser::insert_infix_op(InfixOp * infix_op, TreeExpr **root) { - - TreeExpr * new_root; - - /* Sanity check */ - if (infix_op == NULL) - return NULL; - - /* The root is null, so make this operator - the new root */ - - if (*root == NULL) { - new_root = TreeExpr::new_tree_expr(infix_op, NULL, NULL, NULL); - *root = new_root; - return new_root; - } - - /* The root node is not an infix function, - so we make this infix operator the new root */ - - if ((*root)->infix_op == NULL) { - new_root = TreeExpr::new_tree_expr(infix_op, NULL, *root, NULL); - (*root) = new_root; - return new_root; - } - - /* The root is an infix function. If the precedence - of the item to be inserted is greater than the root's - precedence, then make gen_expr the root */ - - if (infix_op->precedence > (*root)->infix_op->precedence) { - new_root = TreeExpr::new_tree_expr(infix_op, NULL, *root, NULL); - (*root) = new_root; - return new_root; - } - - /* If control flow reaches here, use a recursive helper - with the knowledge that the root is higher precedence - than the item to be inserted */ - - insert_infix_rec(infix_op, *root); - return *root; - -} - - -TreeExpr * Parser::insert_gen_expr(GenExpr * gen_expr, TreeExpr ** root) { - - TreeExpr * new_root; - - /* If someone foolishly passes a null - pointer to insert, return the original tree */ - - if (gen_expr == NULL) { - return *root; - } - - /* If the root is null, generate a new expression tree, - using the passed expression as the root element */ - - if (*root == NULL) { - new_root = TreeExpr::new_tree_expr(NULL, gen_expr, NULL, NULL); - *root = new_root; - return new_root; - } - - - /* Otherwise. the new element definitely will not replace the current root. - Use a recursive helper function to do insertion */ - - insert_gen_rec(gen_expr, *root); - return *root; -} - -/* A recursive helper function to insert general expression elements into the operator tree */ -int Parser::insert_gen_rec(GenExpr * gen_expr, TreeExpr * root) { - - /* Trivial Case: root is null */ - - if (root == NULL) { - ////if (PARSE_DEBUG) printf("insert_gen_rec: root is null, returning failure\n"); - return PROJECTM_FAILURE; - } - - - /* The current node's left pointer is null, and this - current node is an infix operator, so insert the - general expression at the left pointer */ - - if ((root->left == NULL) && (root->infix_op != NULL)) { - root->left = TreeExpr::new_tree_expr(NULL, gen_expr, NULL, NULL); - return PROJECTM_SUCCESS; - } - - /* The current node's right pointer is null, and this - current node is an infix operator, so insert the - general expression at the right pointer */ - - if ((root->right == NULL) && (root->infix_op != NULL)) { - root->right = TreeExpr::new_tree_expr(NULL, gen_expr, NULL, NULL); - return PROJECTM_SUCCESS; - } - - /* Otherwise recurse down to the left. If - this succeeds then return. If it fails, try - recursing down to the right */ - - if (insert_gen_rec(gen_expr, root->left) == PROJECTM_FAILURE) - return insert_gen_rec(gen_expr, root->right); - - /* Impossible for control flow to reach here, but in - the world of C programming, who knows... */ - //if (PARSE_DEBUG) printf("insert_gen_rec: should never reach here!\n"); - return PROJECTM_FAILURE; -} - - -/* A recursive helper function to insert infix arguments by operator precedence */ -int Parser::insert_infix_rec(InfixOp * infix_op, TreeExpr * root) { - - /* Shouldn't happen, implies a parse error */ - - if (root == NULL) - return PROJECTM_FAILURE; - - /* Also shouldn't happen, also implies a (different) parse error */ - - if (root->infix_op == NULL) - return PROJECTM_FAILURE; - - /* Left tree is empty, attach this operator to it. - I don't think this will ever happen */ - if (root->left == NULL) { - root->left = TreeExpr::new_tree_expr(infix_op, NULL, root->left, NULL); - return PROJECTM_SUCCESS; - } - - /* Right tree is empty, attach this operator to it */ - if (root->right == NULL) { - root->right = TreeExpr::new_tree_expr(infix_op, NULL, root->right, NULL); - return PROJECTM_SUCCESS; - } - - /* The left element can now be ignored, since there is no way for this - operator to use those expressions */ - - /* If the right element is not an infix operator, - then insert the expression here, attaching the old right branch - to the left of the new expression */ - - if (root->right->infix_op == NULL) { - root->right = TreeExpr::new_tree_expr(infix_op, NULL, root->right, NULL); - return PROJECTM_SUCCESS; - } - - /* Traverse deeper if the inserting operator precedence is less than the - the root's right operator precedence */ - if (infix_op->precedence < root->right->infix_op->precedence) - return insert_infix_rec(infix_op, root->right); - - /* Otherwise, insert the operator here */ - - root->right = TreeExpr::new_tree_expr(infix_op, NULL, root->right, NULL); - return PROJECTM_SUCCESS; - -} - -/* Parses an infix operator */ -GenExpr * Parser::parse_infix_op(FILE * fs, token_t token, TreeExpr * tree_expr, Preset * preset) { - - GenExpr * gen_expr; - - switch (token) { - /* All the infix operators */ - case tPlus: - //if (PARSE_DEBUG) printf("parse_infix_op: found addition operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_add, &tree_expr), preset); - case tMinus: - //if (PARSE_DEBUG) printf("parse_infix_op: found subtraction operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_minus, &tree_expr), preset); - case tMult: - //if (PARSE_DEBUG) printf("parse_infix_op: found multiplication operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_mult, &tree_expr), preset); - case tDiv: - //if (PARSE_DEBUG) printf("parse_infix_op: found division operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_div, &tree_expr), preset); - case tMod: - //if (PARSE_DEBUG) printf("parse_infix_op: found modulo operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_mod, &tree_expr), preset); - case tOr: - //if (PARSE_DEBUG) printf("parse_infix_op: found bitwise or operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_or, &tree_expr), preset); - case tAnd: - //if (PARSE_DEBUG) printf("parse_infix_op: found bitwise and operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_and, &tree_expr), preset); - case tPositive: - //if (PARSE_DEBUG) printf("parse_infix_op: found positive operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_positive, &tree_expr), preset); - case tNegative: - //if (PARSE_DEBUG) printf("parse_infix_op: found negative operator (LINE %d)\n", line_count); - return parse_gen_expr(fs, insert_infix_op(Eval::infix_negative, &tree_expr), preset); - - case tEOL: - case tEOF: - case tSemiColon: - case tRPr: - case tComma: - //if (PARSE_DEBUG) printf("parse_infix_op: terminal found (LINE %d)\n", line_count); - gen_expr = GenExpr::new_gen_expr(TREE_T, (void*)tree_expr); - return gen_expr; - default: - //if (PARSE_DEBUG) printf("parse_infix_op: operator or terminal expected, but not found (LINE %d)\n", line_count); - delete tree_expr; - return NULL; - } - - /* Will never happen */ - return NULL; - -} - -/* Parses an integer, checks for +/- prefix */ -int Parser::parse_int(FILE * fs, int * int_ptr) { - -char string[MAX_TOKEN_SIZE]; - token_t token; - int sign; - char * end_ptr = " "; - - token = parseToken(fs, string); - - - switch (token) { - case tMinus: - sign = -1; - token = parseToken(fs, string); - break; - case tPlus: - sign = 1; - token = parseToken(fs, string); - break; - default: - sign = 1; - break; - } - - - if (string[0] == 0) - return PROJECTM_PARSE_ERROR; - - /* Convert the string to an integer. *end_ptr - should end up pointing to null terminator of 'string' - if the conversion was successful. */ - // printf("STRING: \"%s\"\n", string); - - (*int_ptr) = sign*strtol(string, &end_ptr, 10); - - /* If end pointer is a return character or null terminator, all is well */ - if ((*end_ptr == '\r') || (*end_ptr == '\0')) - return PROJECTM_SUCCESS; - - return PROJECTM_PARSE_ERROR; - -} -/* Parses a floating point number */ -int Parser::string_to_float(char * string, float * float_ptr) { - - char ** error_ptr; - - if (*string == 0) - return PROJECTM_PARSE_ERROR; - - error_ptr = (char**)wipemalloc(sizeof(char**)); - - (*float_ptr) = strtod(string, error_ptr); - - /* These imply a succesful parse of the string */ - if ((**error_ptr == '\0') || (**error_ptr == '\r')) { - free(error_ptr); - error_ptr = NULL; - return PROJECTM_SUCCESS; - } - - (*float_ptr) = 0; - free(error_ptr); - error_ptr = NULL; - return PROJECTM_PARSE_ERROR; -} - -/* Parses a floating point number */ -int Parser::parse_float(FILE * fs, float * float_ptr) { - - char string[MAX_TOKEN_SIZE]; - char ** error_ptr; - token_t token; - int sign; - - error_ptr =(char**) wipemalloc(sizeof(char**)); - - token = parseToken(fs, string); - - switch (token) { - case tMinus: - sign = -1; - token = parseToken(fs, string); - break; - case tPlus: - sign = 1; - token = parseToken(fs, string); - break; - default: - sign = 1; - } - - if (string[0] == 0) { - free(error_ptr); - error_ptr = NULL; - return PROJECTM_PARSE_ERROR; - } - - (*float_ptr) = sign*strtod(string, error_ptr); - - /* No conversion was performed */ - if ((**error_ptr == '\0') || (**error_ptr == '\r')) { - free(error_ptr); - error_ptr = NULL; - return PROJECTM_SUCCESS; - } - - //if (PARSE_DEBUG) printf("parse_float: float conversion failed for string \"%s\"\n", string); - - (*float_ptr) = 0; - free(error_ptr); - error_ptr = NULL; - return PROJECTM_PARSE_ERROR; - -} - -/* Parses a per frame equation. That is, interprets a stream of data as a per frame equation */ -PerFrameEqn * Parser::parse_per_frame_eqn(FILE * fs, int index, Preset * preset) { - - char string[MAX_TOKEN_SIZE]; - Param * param; - PerFrameEqn * per_frame_eqn; - GenExpr * gen_expr; - - if (parseToken(fs, string) != tEq) { - //if (PARSE_DEBUG) printf("parse_per_frame_eqn: no equal sign after string \"%s\" (LINE %d)\n", string, line_count); - return NULL; - } - - /* Find the parameter associated with the string, create one if necessary */ - if ((param = ParamUtils::find(string, &preset->builtinParams, &preset->user_param_tree)) == NULL) { - return NULL; - } - - /* Make sure parameter is writable */ - if (param->flags & P_FLAG_READONLY) { - //if (PARSE_DEBUG) printf("parse_per_frame_eqn: parameter %s is marked as read only (LINE %d)\n", param->name, line_count); - return NULL; - } - - /* Parse right side of equation as an expression */ - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - //if (PARSE_DEBUG) printf("parse_per_frame_eqn: equation evaluated to null (LINE %d)\n", line_count); - return NULL; - } - - //if (PARSE_DEBUG) printf("parse_per_frame_eqn: finished per frame equation evaluation (LINE %d)\n", line_count); - - /* Create a new per frame equation */ - if ((per_frame_eqn = new PerFrameEqn(index, param, gen_expr)) == NULL) { - //if (PARSE_DEBUG) printf("parse_per_frame_eqn: failed to create a new per frame eqn, out of memory?\n"); - delete gen_expr; - return NULL; - } - - //if (PARSE_DEBUG) printf("parse_per_frame_eqn: per_frame eqn parsed succesfully\n"); - - return per_frame_eqn; -} - -/* Parses an 'implicit' per frame equation. That is, interprets a stream of data as a per frame equation without a prefix */ -PerFrameEqn * Parser::parse_implicit_per_frame_eqn(FILE * fs, char * param_string, int index, Preset * preset) { - - Param * param; - PerFrameEqn * per_frame_eqn; - GenExpr * gen_expr; - - if (fs == NULL) - return NULL; - if (param_string == NULL) - return NULL; - if (preset == NULL) - return NULL; - - //rintf("param string: %s\n", param_string); - /* Find the parameter associated with the string, create one if necessary */ - if ((param = ParamUtils::find(param_string, &preset->builtinParams, &preset->user_param_tree)) == NULL) { - return NULL; - } - - //printf("parse_implicit_per_frame_eqn: param is %s\n", param->name); - - /* Make sure parameter is writable */ - if (param->flags & P_FLAG_READONLY) { - //if (PARSE_DEBUG) printf("parse_implicit_per_frame_eqn: parameter %s is marked as read only (LINE %d)\n", param->name, line_count); - return NULL; - } - - /* Parse right side of equation as an expression */ - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - //if (PARSE_DEBUG) printf("parse_implicit_per_frame_eqn: equation evaluated to null (LINE %d)\n", line_count); - return NULL; - } - - //if (PARSE_DEBUG) printf("parse_implicit_per_frame_eqn: finished per frame equation evaluation (LINE %d)\n", line_count); - - /* Create a new per frame equation */ - if ((per_frame_eqn = new PerFrameEqn(index, param, gen_expr)) == NULL) { - //if (PARSE_DEBUG) printf("parse_implicit_per_frame_eqn: failed to create a new per frame eqn, out of memory?\n"); - delete gen_expr; - return NULL; - } - - //if (PARSE_DEBUG) printf("parse_implicit_per_frame_eqn: per_frame eqn parsed succesfully\n"); - - return per_frame_eqn; -} - -/* Parses an initial condition */ -InitCond * Parser::parse_init_cond(FILE * fs, char * name, Preset * preset) { - - Param * param; - CValue init_val; - InitCond * init_cond; - - if (name == NULL) - return NULL; - if (preset == NULL) - return NULL; - - /* Search for the paramater in the database, creating it if necessary */ - if ((param = ParamUtils::find(name, &preset->builtinParams, &preset->user_param_tree)) == NULL) { - return NULL; - } - - //if (PARSE_DEBUG) printf("parse_init_cond: parameter = \"%s\" (LINE %d)\n", param->name, line_count); - - if (param->flags & P_FLAG_READONLY) { - //if (PARSE_DEBUG) printf("parse_init_cond: builtin parameter \"%s\" marked as read only!\n", param->name); - return NULL; - } - - /* At this point, a parameter has been created or was found - in the database. */ - - //if (PARSE_DEBUG) printf("parse_init_cond: parsing initial condition value... (LINE %d)\n", line_count); - - /* integer value (boolean is an integer in C) */ - if ((param->type == P_TYPE_INT) || (param->type == P_TYPE_BOOL)) { - if ((parse_int(fs, (int*)&init_val.int_val)) == PROJECTM_PARSE_ERROR) { - //if (PARSE_DEBUG) printf("parse_init_cond: error parsing integer!\n"); - return NULL; - } - } - - /* float value */ - else if (param->type == P_TYPE_DOUBLE) { - if ((parse_float(fs, (float*)&init_val.float_val)) == PROJECTM_PARSE_ERROR) { - //if (PARSE_DEBUG) printf("parse_init_cond: error parsing float!\n"); - return NULL; - } - } - - /* Unknown value */ - else { - //if (PARSE_DEBUG) printf("parse_init_cond: unknown parameter type!\n"); - return NULL; - } - - /* Create new initial condition */ - if ((init_cond = new InitCond(param, init_val)) == NULL) { - //if (PARSE_DEBUG) printf("parse_init_cond: new_init_cond failed!\n"); - return NULL; - } - - /* Finished */ - return init_cond; -} - -/* Parses a per frame init equation, not sure if this works right now */ -InitCond * Parser::parse_per_frame_init_eqn(FILE * fs, Preset * preset, std::map * database) { - - char name[MAX_TOKEN_SIZE]; - Param * param = NULL; - CValue init_val; - InitCond * init_cond; - GenExpr * gen_expr; - float val; - token_t token; - - - if (preset == NULL) - return NULL; - if (fs == NULL) - return NULL; - - if ((token = parseToken(fs, name)) != tEq) - return NULL; - - - /* If a database was specified,then use ParamUtils::find_db instead */ - if ((database != NULL) && ((param = ParamUtils::find(name, database)) == NULL)) { - return NULL; - } - - /* Otherwise use the builtin parameter and user databases. This is confusing. Sorry. */ - if ((param == NULL) && ((param = ParamUtils::find(name, &preset->builtinParams, &preset->user_param_tree)) == NULL)) { - return NULL; - } - - if (PARSE_DEBUG) printf("parse_per_frame_init_eqn: parameter = \"%s\" (LINE %d)\n", param->name.c_str(), line_count); - - if (param->flags & P_FLAG_READONLY) { - //if (PARSE_DEBUG) printf("pars_per_frame_init_eqn: builtin parameter \"%s\" marked as read only!\n", param->name); - return NULL; - } - - /* At this point, a parameter has been created or was found - in the database. */ - - if (PARSE_DEBUG) printf("parse_per_frame_init_eqn: parsing right hand side of per frame init equation.. (LINE %d)\n", line_count); - - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - if (PARSE_DEBUG) printf("parse_per_frame_init_eqn: failed to parse general expresion!\n"); - return NULL; - } - - /* Compute initial condition value */ - val = gen_expr->eval_gen_expr(-1,-1); - - /* Free the general expression now that we are done with it */ - delete gen_expr; - - /* integer value (boolean is an integer in C) */ - if ((param->type == P_TYPE_INT) || (param->type == P_TYPE_BOOL)) { - init_val.int_val = (int)val; - } - - /* float value */ - else if (param->type == P_TYPE_DOUBLE) { - init_val.float_val = val; - } - - /* Unknown value */ - else { - if (PARSE_DEBUG) printf("pase_per_frame_init_eqn: unknown parameter type!\n"); - return NULL; - } - - - /* Create new initial condition */ - if ((init_cond = new InitCond(param, init_val)) == NULL) { - if (PARSE_DEBUG) printf("parse_per_frame_init_eqn: new_init_cond failed!\n"); - return NULL; - } - - - /* Finished */ - return init_cond; -} - -int Parser::parse_wavecode(char * token, FILE * fs, Preset * preset) { - - char * var_string; - InitCond * init_cond; - CustomWave * custom_wave; - int id; - CValue init_val; - Param * param; - - /* Null argument checks */ - if (preset == NULL) - return PROJECTM_FAILURE; - if (fs == NULL) - return PROJECTM_FAILURE; - if (token == NULL) - return PROJECTM_FAILURE; - - /* token should be in the form wavecode_N_var, such as wavecode_1_samples */ - - /* Get id and variable name from token string */ - if (parse_wavecode_prefix(token, &id, &var_string) < 0) - return PROJECTM_PARSE_ERROR; - - //if (PARSE_DEBUG) printf("parse_wavecode: wavecode id = %d, parameter = \"%s\"\n", id, var_string); - - /* Retrieve custom wave information from preset. The 3rd argument - if true creates a custom wave if one does not exist */ - if ((custom_wave = Preset::find_custom_object(id, true, *preset->customWaves)) == NULL) { - //if (PARSE_DEBUG) printf("parse_wavecode: failed to load (or create) custom wave (id = %d)!\n", id); - return PROJECTM_FAILURE; - } - //if (PARSE_DEBUG) printf("parse_wavecode: custom wave found (id = %d)\n", custom_wave->id); - - /* Retrieve parameter from this custom waves parameter db */ - if ((param = ParamUtils::find(var_string,custom_wave->param_tree)) == NULL) - return PROJECTM_FAILURE; - - //if (PARSE_DEBUG) printf("parse_wavecode: custom wave parameter found (name = %s)\n", param->name); - - /* integer value (boolean is an integer in C) */ - if ((param->type == P_TYPE_INT) || (param->type == P_TYPE_BOOL)) { - if ((parse_int(fs, (int*)&init_val.int_val)) == PROJECTM_PARSE_ERROR) { - //if (PARSE_DEBUG) printf("parse_wavecode: error parsing integer!\n"); - return PROJECTM_PARSE_ERROR; - } - } - - /* float value */ - else if (param->type == P_TYPE_DOUBLE) { - if ((parse_float(fs, (float*)&init_val.float_val)) == PROJECTM_PARSE_ERROR) { - //if (PARSE_DEBUG) printf("parse_wavecode: error parsing float!\n"); - return PROJECTM_PARSE_ERROR; - } - } - - /* Unknown value */ - else { - //if (PARSE_DEBUG) printf("parse_wavecode: unknown parameter type!\n"); - return PROJECTM_PARSE_ERROR; - } - - /* Create new initial condition */ - if ((init_cond = new InitCond(param, init_val)) == NULL) { - //if (PARSE_DEBUG) printf("parse_wavecode: new_init_cond failed!\n"); - return PROJECTM_FAILURE; - } - - custom_wave->init_cond_tree.insert(std::make_pair(param->name, init_cond)); - - line_mode = CUSTOM_WAVE_WAVECODE_LINE_MODE; - - //if (PARSE_DEBUG) printf("parse_wavecode: [success]\n"); - return PROJECTM_SUCCESS; -} - -int Parser::parse_shapecode(char * token, FILE * fs, Preset * preset) { - - char * var_string; - InitCond * init_cond; - CustomShape * custom_shape; - int id; - CValue init_val; - Param * param; - - /* Null argument checks */ - if (preset == NULL) - return PROJECTM_FAILURE; - if (fs == NULL) - return PROJECTM_FAILURE; - if (token == NULL) - return PROJECTM_FAILURE; - - /* token should be in the form shapecode_N_var, such as shapecode_1_samples */ - - /* Get id and variable name from token string */ - if (parse_shapecode_prefix(token, &id, &var_string) < 0) - return PROJECTM_PARSE_ERROR; - - last_custom_shape_id = id; - - //if (PARSE_DEBUG) printf("parse_shapecode: shapecode id = %d, parameter = \"%s\"\n", id, var_string); - - /* Retrieve custom shape information from preset. The 3rd argument - if true creates a custom shape if one does not exist */ - - if ((custom_shape = Preset::find_custom_object(id, true, *preset->customShapes)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shapecode: failed to load (or create) custom shape (id = %d)!\n", id); - return PROJECTM_FAILURE; - } - //if (PARSE_DEBUG) printf("parse_shapecode: custom shape found (id = %d)\n", custom_shape->id); - - /* Retrieve parameter from this custom shapes parameter db */ - - - if ((param = ParamUtils::find(var_string, custom_shape->param_tree)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shapecode: failed to create parameter.\n"); - return PROJECTM_FAILURE; - } - //if (PARSE_DEBUG) printf("parse_shapecode: custom shape parameter found (name = %s)\n", param->name); - - /* integer value (boolean is an integer in C) */ - if ((param->type == P_TYPE_INT) || (param->type == P_TYPE_BOOL)) { - if ((parse_int(fs, (int*)&init_val.int_val)) == PROJECTM_PARSE_ERROR) { - //if (PARSE_DEBUG) printf("parse_shapecode: error parsing integer!\n"); - return PROJECTM_PARSE_ERROR; - } - } - - /* float value */ - else if (param->type == P_TYPE_DOUBLE) { - if ((parse_float(fs, (float*)&init_val.float_val)) == PROJECTM_PARSE_ERROR) { - //if (PARSE_DEBUG) printf("parse_shapecode: error parsing float!\n"); - return PROJECTM_PARSE_ERROR; - } - } - - /* Unknown value */ - else { - //if (PARSE_DEBUG) printf("parse_shapecode: unknown parameter type!\n"); - return PROJECTM_PARSE_ERROR; - } - - /* Create new initial condition */ - if ((init_cond = new InitCond(param, init_val)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shapecode: new_init_cond failed!\n"); - return PROJECTM_FAILURE; - } - - custom_shape->init_cond_tree.insert(std::make_pair(param->name,init_cond)); - line_mode = CUSTOM_SHAPE_SHAPECODE_LINE_MODE; - - //if (PARSE_DEBUG) printf("parse_shapecode: [success]\n"); - return PROJECTM_SUCCESS; -} - - -int Parser::parse_wavecode_prefix(char * token, int * id, char ** var_string) { - - int len, i, j; - - if (token == NULL) - return PROJECTM_FAILURE; - /* - if (*var_string == NULL) - return PROJECTM_FAILURE; - */ - if (id == NULL) - return PROJECTM_FAILURE; - - len = strlen(token); - - /* Move pointer passed "wavecode_" prefix */ - if (len <= WAVECODE_STRING_LENGTH) - return PROJECTM_FAILURE; - i = WAVECODE_STRING_LENGTH; - j = 0; - (*id) = 0; - - /* This loop grabs the integer id for this custom wave */ - while ((i < len) && (token[i] >= 48) && (token[i] <= 57)) { - if (j >= MAX_TOKEN_SIZE) - return PROJECTM_FAILURE; - - (*id) = 10*(*id) + (token[i]-48); - j++; - i++; - } - - - if (i > (len - 2)) - return PROJECTM_FAILURE; - - *var_string = token + i + 1; - - return PROJECTM_SUCCESS; - -} - - -int Parser::parse_shapecode_prefix(char * token, int * id, char ** var_string) { - - int len, i, j; - - if (token == NULL) - return PROJECTM_FAILURE; - /* - if (*var_string == NULL) - return PROJECTM_FAILURE; - */ - if (id == NULL) - return PROJECTM_FAILURE; - - len = strlen(token); - - /* Move pointer passed "shapecode_" prefix */ - if (len <= SHAPECODE_STRING_LENGTH) - return PROJECTM_FAILURE; - i = SHAPECODE_STRING_LENGTH; - j = 0; - (*id) = 0; - - /* This loop grabs the integer id for this custom shape */ - while ((i < len) && (token[i] >= 48) && (token[i] <= 57)) { - if (j >= MAX_TOKEN_SIZE) - return PROJECTM_FAILURE; - - (*id) = 10*(*id) + (token[i]-48); - j++; - i++; - } - - - if (i > (len - 2)) - return PROJECTM_FAILURE; - - *var_string = token + i + 1; - - return PROJECTM_SUCCESS; - -} - -int Parser::parse_wave_prefix(char * token, int * id, char ** eqn_string) { - - int len, i, j; - - if (token == NULL) - return PROJECTM_FAILURE; - if (eqn_string == NULL) - return PROJECTM_FAILURE; - if (id == NULL) - return PROJECTM_FAILURE; - - len = strlen(token); - - if (len <= WAVE_STRING_LENGTH) - return PROJECTM_FAILURE; - - - i = WAVE_STRING_LENGTH; - j = 0; - (*id) = 0; - - /* This loop grabs the integer id for this custom wave */ - while ((i < len) && (token[i] >= 48) && (token[i] <= 57)) { - if (j >= MAX_TOKEN_SIZE) - return PROJECTM_FAILURE; - - (*id) = 10*(*id) + (token[i]-48); - j++; - i++; - } - - if (i > (len - 2)) - return PROJECTM_FAILURE; - - *eqn_string = token + i + 1; - - if (PARSE_DEBUG) printf("parse_wave_prefix: prefix = %s\n (LINE %d)", *eqn_string, line_count); - return PROJECTM_SUCCESS; - -} - -int Parser::parse_shape_prefix(char * token, int * id, char ** eqn_string) { - - int len, i, j; - - if (token == NULL) - return PROJECTM_FAILURE; - if (eqn_string == NULL) - return PROJECTM_FAILURE; - if (id == NULL) - return PROJECTM_FAILURE; - - len = strlen(token); - - if (len <= SHAPE_STRING_LENGTH) - return PROJECTM_FAILURE; - - - i = SHAPE_STRING_LENGTH; - j = 0; - (*id) = 0; - - /* This loop grabs the integer id for this custom wave */ - while ((i < len) && (token[i] >= 48) && (token[i] <= 57)) { - if (j >= MAX_TOKEN_SIZE) - return PROJECTM_FAILURE; - - (*id) = 10*(*id) + (token[i]-48); - j++; - i++; - } - - if (i > (len - 2)) - return PROJECTM_FAILURE; - - *eqn_string = token + i + 1; - - return PROJECTM_SUCCESS; - -} - -/* Parses custom wave equations */ -int Parser::parse_wave(char * token, FILE * fs, Preset * preset) { - - int id; - char * eqn_type; - - if (PARSE_DEBUG) printf("parse_wave:begin\n"); - - if (token == NULL) - return PROJECTM_FAILURE; - if (fs == NULL) - return PROJECTM_FAILURE; - if (preset == NULL) - return PROJECTM_FAILURE; - - /* Grab custom wave id and equation type (per frame or per point) from string token */ - if (parse_wave_prefix(token, &id, &eqn_type) < 0) { - if (PARSE_DEBUG) printf("parse_wave: syntax error in custom wave prefix!\n"); - return PROJECTM_FAILURE; - } - - int last_custom_wave_id = id; - strncpy(last_eqn_type, eqn_type, MAX_TOKEN_SIZE); - - return parse_wave_helper(fs, preset, id, eqn_type, 0); - -} - -int Parser::parse_wave_helper(FILE * fs, Preset * preset, int id, char * eqn_type, char * init_string) { - - Param * param; - GenExpr * gen_expr; - char string[MAX_TOKEN_SIZE]; - PerFrameEqn * per_frame_eqn; - CustomWave * custom_wave; - InitCond * init_cond; - - /* Retrieve custom wave associated with this id */ - if ((custom_wave = Preset::find_custom_object(id, true, *preset->customWaves)) == NULL) { - if (PARSE_DEBUG) printf("parse_wave_helper: custom wave id %d not found!\n", id); - return PROJECTM_FAILURE; - } - - /* per frame init equation case */ - if (!strncmp(eqn_type, WAVE_INIT_STRING, WAVE_INIT_STRING_LENGTH)) { - - if (PARSE_DEBUG) printf("parse_wave_helper (per frame init): [begin] (LINE %d)\n", line_count); - - /* Parse the per frame init equation */ - if ((init_cond = parse_per_frame_init_eqn(fs, preset, custom_wave->param_tree)) == NULL) { - if (PARSE_DEBUG) printf("parse_wave_helper (per frame init): equation parsing failed (LINE %d)\n", line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Insert the equation in the per frame equation tree */ - custom_wave->per_frame_init_eqn_tree.insert(std::make_pair(init_cond->param->name,init_cond)); - - if (update_string_buffer(custom_wave->per_frame_init_eqn_string_buffer, - &custom_wave->per_frame_init_eqn_string_index) < 0) { - if (PARSE_DEBUG) printf("parse_wave_helper: failed to update string buffer (LINE %d)\n", line_count); - return PROJECTM_FAILURE; - } - line_mode = CUSTOM_WAVE_PER_FRAME_INIT_LINE_MODE; - - return PROJECTM_SUCCESS; - - } - - /* per frame equation case */ - if (!strncmp(eqn_type, PER_FRAME_STRING_NO_UNDERSCORE, PER_FRAME_STRING_NO_UNDERSCORE_LENGTH)) { - - if (PARSE_DEBUG) printf("parse_wave_helper (per_frame): [start] (custom wave id = %d)\n", custom_wave->id); - - if (parseToken(fs, string) != tEq) { - //if (PARSE_DEBUG) printf("parse_wave (per_frame): no equal sign after string \"%s\" (LINE %d)\n", string, line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Find the parameter associated with the string in the custom wave database */ - if ((param = ParamUtils::find(string, custom_wave->param_tree)) == NULL) { - //if (PARSE_DEBUG) printf("parse_wave (per_frame): parameter \"%s\" not found or cannot be wipemalloc'ed!!\n", string); - return PROJECTM_FAILURE; - } - - - /* Make sure parameter is writable */ - if (param->flags & P_FLAG_READONLY) { - //if (PARSE_DEBUG) printf("parse_wave (per_frame): parameter %s is marked as read only (LINE %d)\n", param->name, line_count); - return PROJECTM_FAILURE; - } - - /* Parse right side of equation as an expression */ - - current_wave = custom_wave; - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - //if (PARSE_DEBUG) printf("parse_wave (per_frame): equation evaluated to null (LINE %d)\n", line_count); - current_wave = NULL; - return PROJECTM_PARSE_ERROR; - - } - - current_wave = NULL; - - //if (PARSE_DEBUG) printf("parse_wave (per_frame): [finished parsing equation] (LINE %d)\n", line_count); - - /* Create a new per frame equation */ - if ((per_frame_eqn = new PerFrameEqn(custom_wave->per_frame_count++, param, gen_expr)) == NULL) { - //if (PARSE_DEBUG) printf("parse_wave (per_frame): failed to create a new per frame eqn, out of memory?\n"); - delete gen_expr; - return PROJECTM_FAILURE; - } - - custom_wave->per_frame_eqn_tree.insert(std::make_pair(per_frame_eqn->index, per_frame_eqn)); - //if (PARSE_DEBUG) printf("parse_wave (per_frame): equation %d associated with custom wave %d [success]\n", - // per_frame_eqn->index, custom_wave->id); - - - /* Need to add stuff to string buffer so the editor can read the equations. - Why not make a nice little helper function for this? - here it is: */ - - if (update_string_buffer(custom_wave->per_frame_eqn_string_buffer, &custom_wave->per_frame_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - line_mode = CUSTOM_WAVE_PER_FRAME_LINE_MODE; - return PROJECTM_SUCCESS; - } - - - /* per point equation case */ - if (!strncmp(eqn_type, PER_POINT_STRING, PER_POINT_STRING_LENGTH)) { - - if (PARSE_DEBUG) printf("parse_wave_helper (per_point): per_pixel equation parsing start...(LINE %d)\n", line_count); - - /// HACK the parse_line code already parsed the per_pixel variable name. This handles that case - /// Parser needs reworked. Don't have time for it. So this is the result. - if (init_string) - strncpy(string, init_string, strlen(init_string)); - else { - if (parseToken(fs, string) != tEq) { /* parse per pixel operator name */ - if (PARSE_DEBUG) printf("parse_wave_helper (per_point): equal operator missing after per pixel operator. Last token = \"%s\" (LINE %d)\n", string, line_count); - - return PROJECTM_PARSE_ERROR; - } - } - - /* Parse right side of equation as an expression, First tell parser we are parsing a custom wave */ - current_wave = custom_wave; - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - if (PARSE_DEBUG) printf("parse_wave_helper (per_point): equation evaluated to null? (LINE %d)\n", line_count); - - return PROJECTM_PARSE_ERROR; - } - - - /* Add the per point equation */ - if (custom_wave->add_per_point_eqn(string, gen_expr) < 0) { - delete gen_expr; - - return PROJECTM_PARSE_ERROR; - } - // This tells the parser we are no longer parsing a custom wave - current_wave = NULL; - - if (update_string_buffer(custom_wave->per_point_eqn_string_buffer, &custom_wave->per_point_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - line_mode = CUSTOM_WAVE_PER_POINT_LINE_MODE; - if (PARSE_DEBUG) printf("parse_wave_helper (per_point): [finished] (custom wave id = %d)\n", custom_wave->id); - return PROJECTM_SUCCESS; - } - - return PROJECTM_FAILURE; -} - -/* Parses custom shape equations */ -int Parser::parse_shape(char * token, FILE * fs, Preset * preset) { - - int id; - char * eqn_type; - char string[MAX_TOKEN_SIZE]; - CustomShape * custom_shape; - InitCond * init_cond; - - if (token == NULL) - - return PROJECTM_FAILURE; - if (fs == NULL) - return PROJECTM_FAILURE; - if (preset == NULL) - return PROJECTM_FAILURE; - - /* Grab custom shape id and equation type (per frame or per point) from string token */ - if (parse_shape_prefix(token, &id, &eqn_type) < 0) { - //if (PARSE_DEBUG) printf("parse_shape: syntax error in custom shape prefix!\n"); - return PROJECTM_PARSE_ERROR; - } - - /* Retrieve custom shape associated with this id */ - if ((custom_shape = Preset::find_custom_object(id,true,*preset->customShapes)) == NULL) - return PROJECTM_FAILURE; - - - /* per frame init equation case */ - if (!strncmp(eqn_type, SHAPE_INIT_STRING, SHAPE_INIT_STRING_LENGTH)) { - return parse_shape_per_frame_init_eqn(fs, custom_shape, preset); - } - - /* per frame equation case */ - if (!strncmp(eqn_type, PER_FRAME_STRING_NO_UNDERSCORE, PER_FRAME_STRING_NO_UNDERSCORE_LENGTH)) { - return parse_shape_per_frame_eqn(fs, custom_shape, preset); - } - - - /* Syntax error, return parse error */ - return PROJECTM_PARSE_ERROR; -} - -/* Helper function to update the string buffers used by the editor */ -int Parser::update_string_buffer(char * buffer, int * index) { - - int string_length; - int skip_size; - - if (!buffer) - return PROJECTM_FAILURE; - if (!index) - return PROJECTM_FAILURE; - - - /* If the string line buffer used by the parser is already full then quit */ - if (string_line_buffer_index == (STRING_LINE_SIZE-1)) - return PROJECTM_FAILURE; - - if ((skip_size = get_string_prefix_len(string_line_buffer)) == PROJECTM_FAILURE) - return PROJECTM_FAILURE; - - string_line_buffer[string_line_buffer_index++] = '\n'; - - // string_length = strlen(string_line_buffer + strlen(eqn_string)+1); - if (skip_size >= STRING_LINE_SIZE) - return PROJECTM_FAILURE; - - string_length = strlen(string_line_buffer + skip_size); - - if (skip_size > (STRING_LINE_SIZE-1)) - return PROJECTM_FAILURE; - - /* Add line to string buffer */ - strncpy(buffer + (*index), - string_line_buffer + skip_size, string_length); - - /* Buffer full, quit */ - if ((*index) > (STRING_BUFFER_SIZE - 1)) { - //if (PARSE_DEBUG) printf("update_string_buffer: string buffer full!\n"); - return PROJECTM_FAILURE; - } - - /* Otherwise, increment string index by the added string length */ - (*index)+=string_length; - - return PROJECTM_SUCCESS; - -} - - -/* Helper function: returns the length of the prefix portion in the line - buffer (the passed string here). In other words, given - the string 'per_frame_1 = x = ....', return the length of 'per_frame_1 = ' - Returns -1 if syntax error -*/ - -int Parser::get_string_prefix_len(char * string) { - - int i = 0; - - /* Null argument check */ - if (string == NULL) - return PROJECTM_FAILURE; - - /* First find the equal sign */ - while (string[i] != '=') { - if (string[i] == 0) - return PROJECTM_FAILURE; - i++; - } - - /* If the string already ends at the next char then give up */ - if (string[i+1] == 0) - return PROJECTM_FAILURE; - - /* Move past the equal sign */ - i++; - - /* Now found the start of the LHS variable, ie skip the spaces */ - while(string[i] == ' ') { - i++; - } - - /* If this is the end of the string then its a syntax error */ - if (string[i] == 0) - return PROJECTM_FAILURE; - - /* Finished succesfully, return the length */ - return i; -} - -int Parser::parse_shape_per_frame_init_eqn(FILE * fs, CustomShape * custom_shape, Preset * preset) { - InitCond * init_cond; - - //if (PARSE_DEBUG) printf("parse_shape (per frame init): [begin] (LINE %d)\n", line_count); - - /* Parse the per frame equation */ - if ((init_cond = parse_per_frame_init_eqn(fs, preset, custom_shape->param_tree)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shape (per frame init): equation parsing failed (LINE %d)\n", line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Insert the equation in the per frame equation tree */ - custom_shape->per_frame_init_eqn_tree.insert(std::make_pair(init_cond->param->name,init_cond)); - if (update_string_buffer(custom_shape->per_frame_init_eqn_string_buffer, - &custom_shape->per_frame_init_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - line_mode = CUSTOM_SHAPE_PER_FRAME_INIT_LINE_MODE; - return PROJECTM_SUCCESS; - } - -int Parser::parse_shape_per_frame_eqn(FILE * fs, CustomShape * custom_shape, Preset * preset) { - -Param * param; -GenExpr * gen_expr; -PerFrameEqn * per_frame_eqn; - -char string[MAX_TOKEN_SIZE]; - -//if (PARSE_DEBUG) printf("parse_shape (per_frame): [start] (custom shape id = %d)\n", custom_shape->id); - - if (parseToken(fs, string) != tEq) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): no equal sign after string \"%s\" (LINE %d)\n", string, line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Find the parameter associated with the string in the custom shape database */ - if ((param = ParamUtils::find(string, custom_shape->param_tree)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): parameter \"%s\" not found or cannot be wipemalloc'ed!!\n", string); - return PROJECTM_FAILURE; - } - - - /* Make sure parameter is writable */ - if (param->flags & P_FLAG_READONLY) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): parameter %s is marked as read only (LINE %d)\n", param->name, line_count); - return PROJECTM_FAILURE; - } - - /* Parse right side of equation as an expression */ - - current_shape = custom_shape; - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): equation evaluated to null (LINE %d)\n", line_count); - current_shape = NULL; - return PROJECTM_PARSE_ERROR; - } - - current_shape = NULL; - - //if (PARSE_DEBUG) printf("parse_shape (per_frame): [finished parsing equation] (LINE %d)\n", line_count); - - /* Create a new per frame equation */ - if ((per_frame_eqn = new PerFrameEqn(custom_shape->per_frame_count++, param, gen_expr)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): failed to create a new per frame eqn, out of memory?\n"); - delete gen_expr; - return PROJECTM_FAILURE; - } - - custom_shape->per_frame_eqn_tree.insert(std::make_pair(per_frame_eqn->index, per_frame_eqn)); - - /* Need to add stuff to string buffer so the editor can read the equations. - Why not make a nice little helper function for this? - here it is: */ - - if (update_string_buffer(custom_shape->per_frame_eqn_string_buffer, &custom_shape->per_frame_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - line_mode = CUSTOM_SHAPE_PER_FRAME_LINE_MODE; - return PROJECTM_SUCCESS; -} - -int Parser::parse_wave_per_frame_eqn(FILE * fs, CustomWave * custom_wave, Preset * preset) { - -Param * param; -GenExpr * gen_expr; -PerFrameEqn * per_frame_eqn; - -char string[MAX_TOKEN_SIZE]; - -//if (PARSE_DEBUG) printf("parse_shape (per_frame): [start] (custom shape id = %d)\n", custom_shape->id); - - if (parseToken(fs, string) != tEq) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): no equal sign after string \"%s\" (LINE %d)\n", string, line_count); - return PROJECTM_PARSE_ERROR; - } - - /* Find the parameter associated with the string in the custom shape database */ - if ((param = ParamUtils::find(string, custom_wave->param_tree)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): parameter \"%s\" not found or cannot be wipemalloc'ed!!\n", string); - return PROJECTM_FAILURE; - } - - - /* Make sure parameter is writable */ - if (param->flags & P_FLAG_READONLY) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): parameter %s is marked as read only (LINE %d)\n", param->name, line_count); - return PROJECTM_FAILURE; - } - - /* Parse right side of equation as an expression */ - - current_wave = custom_wave; - if ((gen_expr = parse_gen_expr(fs, NULL, preset)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): equation evaluated to null (LINE %d)\n", line_count); - current_wave = NULL; - return PROJECTM_PARSE_ERROR; - } - - current_wave = NULL; - - //if (PARSE_DEBUG) printf("parse_shape (per_frame): [finished parsing equation] (LINE %d)\n", line_count); - - /* Create a new per frame equation */ - if ((per_frame_eqn = new PerFrameEqn(custom_wave->per_frame_count++, param, gen_expr)) == NULL) { - //if (PARSE_DEBUG) printf("parse_shape (per_frame): failed to create a new per frame eqn, out of memory?\n"); - delete gen_expr; - return PROJECTM_FAILURE; - } - - custom_wave->per_frame_eqn_tree.insert(std::make_pair(per_frame_eqn->index, per_frame_eqn)); - //if (PARSE_DEBUG) printf("parse_shape (per_frame): equation %d associated with custom shape %d [success]\n", - // per_frame_eqn->index, custom_shape->id); - - - /* Need to add stuff to string buffer so the editor can read the equations. - Why not make a nice little helper function for this? - here it is: */ - - if (update_string_buffer(custom_wave->per_frame_eqn_string_buffer, &custom_wave->per_frame_eqn_string_index) < 0) - return PROJECTM_FAILURE; - - line_mode = CUSTOM_WAVE_PER_FRAME_LINE_MODE; - return PROJECTM_SUCCESS; -} diff --git a/src/projectM-engine-backup/Parser.hpp b/src/projectM-engine-backup/Parser.hpp deleted file mode 100755 index 144df0289..000000000 --- a/src/projectM-engine-backup/Parser.hpp +++ /dev/null @@ -1,180 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Preset parser - * - * $Log$ - */ - -#ifndef _PARSER_H -#define _PARSER_H - -//#define PARSE_DEBUG 2 -#define PARSE_DEBUG 0 - -#include - -#include "Expr.hpp" -#include "PerFrameEqn.hpp" -#include "InitCond.hpp" -#include "Preset.hpp" - -/* Strings that prefix (and denote the type of) equations */ -#define PER_FRAME_STRING "per_frame_" -#define PER_FRAME_STRING_LENGTH 10 - -#define PER_PIXEL_STRING "per_pixel_" -#define PER_PIXEL_STRING_LENGTH 10 - -#define PER_FRAME_INIT_STRING "per_frame_init_" -#define PER_FRAME_INIT_STRING_LENGTH 15 - -#define WAVECODE_STRING "wavecode_" -#define WAVECODE_STRING_LENGTH 9 - -#define WAVE_STRING "wave_" -#define WAVE_STRING_LENGTH 5 - -#define PER_POINT_STRING "per_point" -#define PER_POINT_STRING_LENGTH 9 - -#define PER_FRAME_STRING_NO_UNDERSCORE "per_frame" -#define PER_FRAME_STRING_NO_UNDERSCORE_LENGTH 9 - -#define SHAPECODE_STRING "shapecode_" -#define SHAPECODE_STRING_LENGTH 10 - -#define SHAPE_STRING "shape_" -#define SHAPE_STRING_LENGTH 6 - -#define SHAPE_INIT_STRING "init" -#define SHAPE_INIT_STRING_LENGTH 4 - -#define WAVE_INIT_STRING "init" -#define WAVE_INIT_STRING_LENGTH 4 - -typedef enum { - NORMAL_LINE_MODE, - PER_FRAME_LINE_MODE, - PER_PIXEL_LINE_MODE, - PER_FRAME_INIT_LINE_MODE, - INIT_COND_LINE_MODE, - CUSTOM_WAVE_PER_POINT_LINE_MODE, - CUSTOM_WAVE_PER_FRAME_LINE_MODE, - CUSTOM_WAVE_WAVECODE_LINE_MODE, - CUSTOM_SHAPE_SHAPECODE_LINE_MODE, - CUSTOM_SHAPE_PER_FRAME_LINE_MODE, - CUSTOM_SHAPE_PER_FRAME_INIT_LINE_MODE, - CUSTOM_WAVE_PER_FRAME_INIT_LINE_MODE -} line_mode_t; - -/** Token enumeration type */ -typedef enum { - tEOL, /* end of a line, usually a '/n' or '/r' */ - tEOF, /* end of file */ - tLPr, /* ( */ - tRPr, /* ) */ - tLBr, /* [ */ - tRBr, /* ] */ - tEq, /* = */ - tPlus, /* + */ - tMinus, /* - */ - tMult, /* * */ - tMod, /* % */ - tDiv, /* / */ - tOr, /* | */ - tAnd, /* & */ - tComma, /* , */ - tPositive, /* + as a prefix operator */ - tNegative, /* - as a prefix operator */ - tSemiColon, /* ; */ - tStringTooLong, /* special token to indicate an invalid string length */ - tStringBufferFilled /* the string buffer for this line is maxed out */ - } token_t; - -class CustomShape; -class CustomWave; -class GenExpr; -class InfixOp; -class PerFrameEqn; -class Preset; -class TreeExpr; - -class Parser { -public: - static line_mode_t line_mode; - static CustomWave *current_wave; - static CustomShape *current_shape; - static int string_line_buffer_index; - static char string_line_buffer[STRING_LINE_SIZE]; - static unsigned int line_count; - static int per_frame_eqn_count; - static int per_frame_init_eqn_count; - static int last_custom_wave_id; - static int last_custom_shape_id; - static char last_eqn_type[MAX_TOKEN_SIZE]; - static int last_token_size; - - static PerFrameEqn *parse_per_frame_eqn( FILE * fs, int index, - Preset * preset); - static int parse_per_pixel_eqn( FILE * fs, Preset * preset, - char * init_string); - static InitCond *parse_init_cond( FILE * fs, char * name, Preset * preset ); - static int parse_preset_name( FILE * fs, char * name ); - static int parse_top_comment( FILE * fs ); - static int parse_line( FILE * fs, Preset * preset ); - - static int get_string_prefix_len(char * string); - static TreeExpr * insert_gen_expr(GenExpr * gen_expr, TreeExpr ** root); - static TreeExpr * insert_infix_op(InfixOp * infix_op, TreeExpr ** root); - static token_t parseToken(FILE * fs, char * string); - static GenExpr ** parse_prefix_args(FILE * fs, int num_args, Preset * preset); - static GenExpr * parse_infix_op(FILE * fs, token_t token, TreeExpr * tree_expr, Preset * preset); - static GenExpr * parse_sign_arg(FILE * fs); - static int parse_float(FILE * fs, float * float_ptr); - static int parse_int(FILE * fs, int * int_ptr); - static int insert_gen_rec(GenExpr * gen_expr, TreeExpr * root); - static int insert_infix_rec(InfixOp * infix_op, TreeExpr * root); - static GenExpr * parse_gen_expr(FILE * fs, TreeExpr * tree_expr, Preset * preset); - static PerFrameEqn * parse_implicit_per_frame_eqn(FILE * fs, char * param_string, int index, Preset * preset); - static InitCond * parse_per_frame_init_eqn(FILE * fs, Preset * preset, std::map * database); - static int parse_wavecode_prefix(char * token, int * id, char ** var_string); - static int parse_wavecode(char * token, FILE * fs, Preset * preset); - static int parse_wave_prefix(char * token, int * id, char ** eqn_string); - static int parse_wave_helper(FILE * fs, Preset * preset, int id, char * eqn_type, char * init_string); - static int parse_shapecode(char * eqn_string, FILE * fs, Preset * preset); - static int parse_shapecode_prefix(char * token, int * id, char ** var_string); - - static int parse_wave(char * eqn_string, FILE * fs, Preset * preset); - static int parse_shape(char * eqn_string, FILE * fs, Preset * preset); - static int parse_shape_prefix(char * token, int * id, char ** eqn_string); - - static int update_string_buffer(char * buffer, int * index); - static int string_to_float(char * string, float * float_ptr); - static int parse_shape_per_frame_init_eqn(FILE * fs, CustomShape * custom_shape, Preset * preset); - static int parse_shape_per_frame_eqn(FILE * fs, CustomShape * custom_shape, Preset * preset); - static int parse_wave_per_frame_eqn(FILE * fs, CustomWave * custom_wave, Preset * preset); - }; - -#endif /** !_PARSER_H */ - diff --git a/src/projectM-engine-backup/PerFrameEqn.cpp b/src/projectM-engine-backup/PerFrameEqn.cpp deleted file mode 100755 index b3c2b582f..000000000 --- a/src/projectM-engine-backup/PerFrameEqn.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include -#include -#include - -#include "fatal.h" -#include "Common.hpp" - -#include "Param.hpp" -#include "PerFrameEqn.hpp" - -#include "Eval.hpp" -#include "Expr.hpp" - -#include "wipemalloc.h" -#include - -/* Evaluate an equation */ -void PerFrameEqn::evaluate() { - - if (PER_FRAME_EQN_DEBUG) { - printf("per_frame_%d=%s= ", index, param->name.c_str()); - fflush(stdout); - } - - //*((float*)per_frame_eqn->param->engine_val) = eval_gen_expr(per_frame_eqn->gen_expr); - assert(gen_expr); - assert(param); - param->set_param(gen_expr->eval_gen_expr(-1,-1)); - if (PER_FRAME_EQN_DEBUG) printf(" = %.4f\n", *((float*)param->engine_val)); - -} - -/* -void eval_per_frame_init_eqn(PerFrameEqn * per_frame_eqn) { - - float val; - init_cond_t * init_cond; - if (per_frame_eqn == NULL) - return; - - if (PER_FRAME_EQN_DEBUG) { - printf("per_frame_init: %s = ", per_frame_eqn->param->name); - fflush(stdout); - } - - - val = *((float*)per_frame_eqn->param->engine_val) = eval_gen_expr(per_frame_eqn->gen_expr); - if (PER_FRAME_EQN_DEBUG) printf(" = %f\n", *((float*)per_frame_eqn->param->engine_val)); - - if (per_frame_eqn->param->flags & P_FLAG_QVAR) { - - per_frame_eqn->param->init_val.float_val = val; - if ((init_cond = new_init_cond(per_frame_eqn->param)) == NULL) - return; - - if ((list_append(init_cond_list, init_cond)) < 0) { - free_init_cond(init_cond); - return; - } - } -} -*/ - -/* Frees perframe equation structure. Warning: assumes gen_expr pointer is not freed by anyone else! */ -PerFrameEqn::~PerFrameEqn() { - - delete gen_expr; - - /** @bug Destroy param? - great question, don't know yet*/ -} - -/* Create a new per frame equation */ -PerFrameEqn::PerFrameEqn(int _index, Param * _param, GenExpr * _gen_expr) : - index(_index), param(_param), gen_expr(_gen_expr) { - - /* Set per frame eqn name */ - /// @bug why are we commented out? - // memset(per_frame_eqn->name, 0, MAX_TOKEN_SIZE); - //strncpy(per_frame_eqn->name, name, MAX_TOKEN_SIZE-1); - -} diff --git a/src/projectM-engine-backup/PerFrameEqn.hpp b/src/projectM-engine-backup/PerFrameEqn.hpp deleted file mode 100755 index d6f9c5d74..000000000 --- a/src/projectM-engine-backup/PerFrameEqn.hpp +++ /dev/null @@ -1,52 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Per-frame equation - * - * $Log$ - */ - -#ifndef _PER_FRAME_EQN_H -#define _PER_FRAME_EQN_H - -#define PER_FRAME_EQN_DEBUG 1 - -class GenExpr; -class Param; -class PerFrameEqn; - -class PerFrameEqn { -public: - int index; /* a unique id for each per frame eqn (generated by order in preset files) */ - Param *param; /* parameter to be assigned a value */ - GenExpr *gen_expr; /* expression that paremeter is equal to */ - - PerFrameEqn(int index, Param * param, GenExpr * gen_expr); - ~PerFrameEqn(); - - void evaluate(); - void eval_per_frame_init_eqn( PerFrameEqn *per_frame_eqn ); - }; - - -#endif /** !_PER_FRAME_EQN_H */ diff --git a/src/projectM-engine-backup/PerPixelEqn.cpp b/src/projectM-engine-backup/PerPixelEqn.cpp deleted file mode 100755 index 25f739800..000000000 --- a/src/projectM-engine-backup/PerPixelEqn.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include -#include -#include -#include -#include "projectM.hpp" - -#include "fatal.h" -#include "Common.hpp" - -#include "Expr.hpp" -#include "Eval.hpp" -#include "Param.hpp" -#include "PerPixelEqn.hpp" -#include - -#include "wipemalloc.h" -#include -/* Evaluates a per pixel equation */ -void PerPixelEqn::evaluate() { - - GenExpr * eqn_ptr = 0; - int x,y; - - eqn_ptr = this->gen_expr; - - float ** param_matrix = (float**)this->param->matrix; - - if (param_matrix == 0) { - if (PER_PIXEL_EQN_DEBUG) printf("evalPerPixelEqn: [begin initializing matrix] (index = %d) (name = %s)\n", - index, param->name.c_str()); - - param_matrix = (float**)wipemalloc(param->gx*sizeof(float*)); - for(x = 0; x < param->gx; x++) - param_matrix[x] = (float *)wipemalloc(param->gy * sizeof(float)); - - for (x = 0; x < param->gx; x++) - for (y = 0; y < param->gy; y++) { - /// @slow is this necessary? - param_matrix[x][y] = 0.0; - } - this->param->matrix = param_matrix; - } - - assert(!(eqn_ptr == NULL || param_matrix == NULL)); - -// param->matrix_flag = 0; /** Force matrix ignore to update time */ - for (int mesh_i = 0; mesh_i < param->gx; mesh_i++) { - for (int mesh_j = 0; mesh_j < param->gy; mesh_j++) { -// std::cout << "gx,gy is " << param->gx << "," << param->gy << std::endl; - param_matrix[mesh_i][mesh_j] = eqn_ptr->eval_gen_expr(mesh_i, mesh_j); - } - } - - /* Now that this parameter has been referenced with a per - pixel equation, we let the evaluator know by setting - this flag */ - /// @bug review and verify this behavior - param->matrix_flag = true; - param->flags |= P_FLAG_PER_PIXEL; -} - -PerPixelEqn::PerPixelEqn(int _index, Param * _param, GenExpr * _gen_expr):index(_index), param(_param), gen_expr(_gen_expr) { - - assert(index >= 0); - assert(param != 0); - assert(gen_expr != 0); - -} - diff --git a/src/projectM-engine-backup/PerPixelEqn.hpp b/src/projectM-engine-backup/PerPixelEqn.hpp deleted file mode 100755 index fbb2be15b..000000000 --- a/src/projectM-engine-backup/PerPixelEqn.hpp +++ /dev/null @@ -1,66 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Per-pixel equation - * - * $Log$ - */ - -#ifndef _PER_PIXEL_EQN_H -#define _PER_PIXEL_EQN_H - -#define PER_PIXEL_EQN_DEBUG 0 - -#define ZOOM_OP 0 -#define ZOOMEXP_OP 1 -#define ROT_OP 2 -#define CX_OP 3 -#define CY_OP 4 -#define SX_OP 5 -#define SY_OP 6 -#define DX_OP 7 -#define DY_OP 8 -#define WARP_OP 9 -#define NUM_OPS 10 /* obviously, this number is dependent on the number of existing per pixel operations */ - -class GenExpr; -class Param; -class PerPixelEqn; -class Preset; - -class PerPixelEqn { -public: - int index; /* used for splay tree ordering. */ - int flags; /* primarily to specify if this variable is user-defined */ - Param *param; - GenExpr *gen_expr; - - void evalPerPixelEqns( Preset *preset ); - void evaluate(); - - PerPixelEqn(int index, Param * param, GenExpr * gen_expr); - - }; - - -#endif /** !_PER_PIXEL_EQN_H */ diff --git a/src/projectM-engine-backup/PerPointEqn.cpp b/src/projectM-engine-backup/PerPointEqn.cpp deleted file mode 100755 index ba3736974..000000000 --- a/src/projectM-engine-backup/PerPointEqn.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include -#include -#include - -#include "projectM.hpp" - -#include "fatal.h" -#include "Common.hpp" - -#include "CustomWave.hpp" -#include "Eval.hpp" -#include "Expr.hpp" -#include "Param.hpp" -#include "PerPixelEqn.hpp" -#include "PerPointEqn.hpp" -#include - -#include "wipemalloc.h" - -/* Evaluates a per point equation for the current custom wave given by interface_wave ptr */ -void PerPointEqn::evaluate() { - - int size; - float * param_matrix; - GenExpr * eqn_ptr; - -// samples = CustomWave::interface_wave->samples; - - eqn_ptr = gen_expr; - - if (param->matrix == NULL) { - - if ((param_matrix = (float*) (param->matrix = wipemalloc(size = samples*sizeof(float)))) == NULL) - return; - - memset(param_matrix, 0, size); - } - else - param_matrix = (float*)param->matrix; - - for (int i = 0; i < samples; i++) { - // -1 is because per points only use one dimension - param_matrix[i] = eqn_ptr->eval_gen_expr(i, -1); - } - - /* Now that this parameter has been referenced with a per - point equation, we let the evaluator know by setting - this flag */ -if (!param->matrix_flag) - param->matrix_flag = true; -} - -PerPointEqn::PerPointEqn(int _index, Param * _param, GenExpr * _gen_expr, int _samples): - index(_index), - param(_param), - gen_expr(_gen_expr), - samples(_samples) -{} - - -PerPointEqn::~PerPointEqn() { - delete gen_expr; - } diff --git a/src/projectM-engine-backup/PerPointEqn.hpp b/src/projectM-engine-backup/PerPointEqn.hpp deleted file mode 100755 index 89ad22b47..000000000 --- a/src/projectM-engine-backup/PerPointEqn.hpp +++ /dev/null @@ -1,54 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Per-point equation - * - * $Log$ - */ - -#ifndef _PER_POINT_EQN_H -#define _PER_POINT_EQN_H - -class CustomWave; -class GenExpr; -class Param; -class PerPointEqn; - -class PerPointEqn { -public: - int index; - int samples; // the number of samples to iterate over - Param *param; - GenExpr * gen_expr; - - ~PerPointEqn(); - void evaluate(); - PerPointEqn( int index, Param *param, GenExpr *gen_expr, int samples); - }; - - -//inline void eval_per_point_eqn_helper( void *per_point_eqn ) { -// ((PerPointEqn *)per_point_eqn)->evalPerPointEqn(); -// } - -#endif /** !_PER_POINT_EQN_H */ diff --git a/src/projectM-engine-backup/Preset.cpp b/src/projectM-engine-backup/Preset.cpp deleted file mode 100755 index 3c358ad00..000000000 --- a/src/projectM-engine-backup/Preset.cpp +++ /dev/null @@ -1,709 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include -#include -#include -#ifdef WIN32 -#include "win32-dirent.h" -#else -#include -#endif /** WIN32 */ -#include - -#include "Preset.hpp" -#include "Parser.hpp" -#include "ParamUtils.hpp" -#include "fatal.h" -#include - -Preset::Preset(const std::string & filename, const PresetInputs & presetInputs, PresetOutputs & presetOutputs): - file_path(filename), - builtinParams(presetInputs, presetOutputs), - customWaves(&presetOutputs.customWaves), - customShapes(&presetOutputs.customShapes), - m_presetOutputs(presetOutputs) - -{ - - - initialize(filename); - -} - -Preset::~Preset() -{ - -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "~preset(): in\n" ); -#endif - - - - Algorithms::traverse >(init_cond_tree); - - Algorithms::traverse >(per_frame_init_eqn_tree); - - Algorithms::traverse >(per_pixel_eqn_tree); - - Algorithms::traverse >(per_frame_eqn_tree); - - Algorithms::traverse >(user_param_tree); - - /// @note no need to clear the actual container itself - for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) - delete(pos->second); - - 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 */ - -int Preset::add_per_pixel_eqn(char * name, GenExpr * gen_expr) -{ - - PerPixelEqn * per_pixel_eqn = NULL; - int index; - Param * param = NULL; - - /* Argument checks */ - if (gen_expr == NULL) - return PROJECTM_FAILURE; - if (name == NULL) - return PROJECTM_FAILURE; - - if (PER_PIXEL_EQN_DEBUG) printf("add_per_pixel_eqn: per pixel equation (name = \"%s\")\n", name); - - if (!strncmp(name, "dx", strlen("dx"))) - this->m_presetOutputs.dx_is_mesh = true; - else if (!strncmp(name, "dy", strlen("dy"))) - this->m_presetOutputs.dy_is_mesh = true; - else if (!strncmp(name, "cx", strlen("cx"))) - this->m_presetOutputs.cx_is_mesh = true; - else if (!strncmp(name, "cy", strlen("cy"))) - this->m_presetOutputs.cy_is_mesh = true; - else if (!strncmp(name, "zoom", strlen("zoom"))) - this->m_presetOutputs.zoom_is_mesh = true; - else if (!strncmp(name, "zoomexp", strlen("zoomexp"))) - this->m_presetOutputs.zoomexp_is_mesh = true; - else if (!strncmp(name, "rot", strlen("rot"))) - this->m_presetOutputs.rot_is_mesh= true; - else if (!strncmp(name, "sx", strlen("sx"))) - this->m_presetOutputs.sx_is_mesh = true; - else if (!strncmp(name, "sy", strlen("sy"))) - this->m_presetOutputs.sy_is_mesh = true; - - /* Search for the parameter so we know what matrix the per pixel equation is referencing */ - - param = ParamUtils::find(name, &this->builtinParams, &this->user_param_tree); - if ( !param ) - { - if (PER_PIXEL_EQN_DEBUG) printf("add_per_pixel_eqn: failed to allocate a new parameter!\n"); - return PROJECTM_FAILURE; - } - - if (per_pixel_eqn_tree.empty()) - { - index = 0; - } - else - { - std::map::iterator lastPos = per_pixel_eqn_tree.end(); - index = per_pixel_eqn_tree.size(); - } - - /* Create the per pixel equation given the index, parameter, and general expression */ - if ((per_pixel_eqn = new PerPixelEqn(index, param, gen_expr)) == NULL) - { - if (PER_PIXEL_EQN_DEBUG) printf("add_per_pixel_eqn: failed to create new per pixel equation!\n"); - return PROJECTM_FAILURE; - - } - - if (PER_PIXEL_EQN_DEBUG) printf("add_per_pixel_eqn: new equation (index = %d,matrix=%X) (param = \"%s\")\n", - per_pixel_eqn->index, per_pixel_eqn->param->matrix, per_pixel_eqn->param->name.c_str()); - - /* Insert the per pixel equation into the preset per pixel database */ - std::pair::iterator, bool> inserteeOption = per_pixel_eqn_tree.insert - (std::make_pair(per_pixel_eqn->index, per_pixel_eqn)); - - if (!inserteeOption.second) - { - printf("failed to add per pixel eqn!\n"); - delete(per_pixel_eqn); - return PROJECTM_FAILURE; - } - - /* Done */ - return PROJECTM_SUCCESS; -} - -void Preset::evalCustomShapeInitConditions() -{ - - for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) - pos->second->eval_custom_shape_init_conds(); -} - - -void Preset::evalCustomWaveInitConditions() -{ - - for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) - pos->second->eval_custom_wave_init_conds(); -} - - -void Preset::evalCustomWavePerFrameEquations() -{ - - /// @bug see above - for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) - { - - std::map & init_cond_tree = pos->second->init_cond_tree; - for (std::map::iterator _pos = init_cond_tree.begin(); _pos != init_cond_tree.end(); ++_pos) - _pos->second->evaluate(); - - std::map & per_frame_eqn_tree = pos->second->per_frame_eqn_tree; - for (std::map::iterator _pos = per_frame_eqn_tree.begin(); _pos != per_frame_eqn_tree.end(); ++_pos) - _pos->second->evaluate(); - } - -} - -void Preset::evalCustomShapePerFrameEquations() -{ - - for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) - { - - std::map & init_cond_tree = pos->second->init_cond_tree; - for (std::map::iterator _pos = init_cond_tree.begin(); _pos != init_cond_tree.end(); ++_pos) - _pos->second->evaluate(); - - std::map & per_frame_eqn_tree = pos->second->per_frame_eqn_tree; - for (std::map::iterator _pos = per_frame_eqn_tree.begin(); _pos != per_frame_eqn_tree.end(); ++_pos) - _pos->second->evaluate(); - } - -} - -void Preset::evalInitConditions() -{ - - for (std::map::iterator pos = per_frame_init_eqn_tree.begin(); pos != per_frame_init_eqn_tree.end(); ++pos) - pos->second->evaluate(); - -} - -void Preset::evalPerFrameEquations() -{ - - for (std::map::iterator pos = init_cond_tree.begin(); pos != init_cond_tree.end(); ++pos) - pos->second->evaluate(); - - for (std::map::iterator pos = per_frame_eqn_tree.begin(); pos != per_frame_eqn_tree.end(); ++pos) - pos->second->evaluate(); - -} - - -void Preset::initialize(const std::string & pathname) -{ - - // Clear equation trees - init_cond_tree.clear(); - user_param_tree.clear(); - per_frame_eqn_tree.clear(); - per_pixel_eqn_tree.clear(); - per_frame_init_eqn_tree.clear(); - - /* Set initial index values */ - this->per_pixel_eqn_string_index = 0; - this->per_frame_eqn_string_index = 0; - this->per_frame_init_eqn_string_index = 0; - - /* Clear string buffers */ - memset(this->per_pixel_eqn_string_buffer, 0, STRING_BUFFER_SIZE); - memset(this->per_frame_eqn_string_buffer, 0, STRING_BUFFER_SIZE); - memset(this->per_frame_init_eqn_string_buffer, 0, STRING_BUFFER_SIZE); - int retval; - - if ((retval = load_preset_file(pathname.c_str())) < 0) - { - -#ifdef PRESET_DEBUG - if (PRESET_DEBUG) std::cerr << "[Preset] failed to load file \"" << - pathname << "\"!" << std::endl; -#endif - //this->close_preset(); - /// @bug how should we handle this problem? a well define exception? - throw retval; - } - - /* It's kind of ugly to reset these values here. Should definitely be placed in the parser somewhere */ - this->per_frame_eqn_count = 0; - this->per_frame_init_eqn_count = 0; - -} - -/// @bug broken / unimplemented -void Preset::savePreset(char * filename) -{ - - return; - -#ifdef PANTS - FILE * fs; - - if (filename == NULL) - return; - - /* Open the file corresponding to pathname */ - if ((fs = fopen(filename, "w+")) == 0) - { -#ifdef PRESET_DEBUG - if (PRESET_DEBUG) printf("savePreset: failed to create filename \"%s\"!\n", filename); -#endif - return; - } - - write_stream = fs; - - if (write_preset_name(fs) < 0) - { - write_stream = NULL; - fclose(fs); - return; - } - - if (write_init_conditions(fs) < 0) - { - write_stream = NULL; - fclose(fs); - return; - } - - if (write_per_frame_init_equations(fs) < 0) - { - write_stream = NULL; - fclose(fs); - return; - } - - if (write_per_frame_equations(fs) < 0) - { - write_stream = NULL; - fclose(fs); - return; - } - - if (write_per_pixel_equations(fs) < 0) - { - write_stream = NULL; - fclose(fs); - return; - } - - write_stream = NULL; - fclose(fs); -#endif -} - -int Preset::write_preset_name(FILE * fs) -{ - - char s[256]; - int len; - - memset(s, 0, 256); - - if (fs == NULL) - return PROJECTM_FAILURE; - - /* Format the preset name in a string */ - /// @bug removed, code is dead - // sprintf(s, "[%s]\n", name); - - len = strlen(s); - - /* Write preset name to file stream */ - if (fwrite(s, 1, len, fs) != len) - return PROJECTM_FAILURE; - - return PROJECTM_SUCCESS; - -} - -#ifdef NEEDS_MOVED -int Preset::write_init_conditions(FILE * fs) -{ - - if (fs == NULL) - return PROJECTM_FAILURE; - - init_cond_tree.splay_traverse( (void (*)(void*))write_init); - - return PROJECTM_SUCCESS; -} - -void Preset::write_init( InitCond * init_cond ) -{ - - char s[512]; - int len; - - if (write_stream == NULL) - return; - - memset(s, 0, 512); - - if (init_cond->param->type == P_TYPE_BOOL) - sprintf(s, "%s=%d\n", init_cond->param->name, init_cond->init_val.bool_val); - - else if (init_cond->param->type == P_TYPE_INT) - sprintf(s, "%s=%d\n", init_cond->param->name, init_cond->init_val.int_val); - - else if (init_cond->param->type == P_TYPE_DOUBLE) - sprintf(s, "%s=%f\n", init_cond->param->name, init_cond->init_val.float_val); - -else { printf("write_init: unknown parameter type!\n"); return; } - - len = strlen(s); - - if ((fwrite(s, 1, len, write_stream)) != len) - printf("write_init: failed writing to file stream! Out of disk space?\n"); - -} - - -int Preset::write_per_frame_init_equations(FILE * fs) -{ - - int len; - - if (fs == NULL) - return PROJECTM_FAILURE; - - len = strlen(per_frame_init_eqn_string_buffer); - - if (fwrite(per_frame_init_eqn_string_buffer, 1, len, fs) != len) - return PROJECTM_FAILURE; - - return PROJECTM_SUCCESS; -} - - -int Preset::write_per_frame_equations(FILE * fs) -{ - - int len; - - if (fs == NULL) - return PROJECTM_FAILURE; - - len = strlen(per_frame_eqn_string_buffer); - - if (fwrite(per_frame_eqn_string_buffer, 1, len, fs) != len) - return PROJECTM_FAILURE; - - return PROJECTM_SUCCESS; -} - - -int Preset::write_per_pixel_equations(FILE * fs) -{ - - int len; - - if (fs == NULL) - return PROJECTM_FAILURE; - - len = strlen(per_pixel_eqn_string_buffer); - - if (fwrite(per_pixel_eqn_string_buffer, 1, len, fs) != len) - return PROJECTM_FAILURE; - - return PROJECTM_SUCCESS; -} -#endif /** NEEDS_MOVED */ - -void Preset::load_custom_wave_init_conditions() -{ - - for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) - pos->second->load_unspecified_init_conds(); - -} - -void Preset::load_custom_shape_init_conditions() -{ - - // void eval_custom_shape_init_conds(); - - for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) - pos->second->load_custom_shape_init(); -} - - - - -void Preset::evaluateFrame() -{ - - /* Evaluate all equation objects in same order as the renderer */ - - evalInitConditions(); - evalPerFrameEquations(); - evalPerPixelEqns(); - evalInitConditions(); - evalCustomShapeInitConditions(); - evalCustomWavePerFrameEquations(); - evalCustomShapePerFrameEquations(); - -} - -/** Evaluates all per-pixel equations */ -void Preset::evalPerPixelEqns() -{ - - /* Evaluate all per pixel equations using splay traversal */ - for (std::map::iterator pos = per_pixel_eqn_tree.begin(); - pos != per_pixel_eqn_tree.end(); ++pos) - pos->second->evaluate(); - - /* Set mesh i / j values to -1 so engine vars are used by default again */ - this->mesh_i = -1; - this->mesh_j = -1; -} - -/** Finds / Creates (if necessary) initial condition associated with passed parameter */ -InitCond * Preset::get_init_cond( Param *param ) -{ - - InitCond * init_cond; - CValue init_val; - - assert(param); - - std::map::iterator pos = init_cond_tree.find(param->name); - - init_cond = pos == init_cond_tree.end() ? 0 : pos->second; - - if (init_cond == NULL) - { - - if (param->type == P_TYPE_BOOL) - init_val.bool_val = 0; - - else if (param->type == P_TYPE_INT) - init_val.int_val = *(int*)param->engine_val; - - else if (param->type == P_TYPE_DOUBLE) - init_val.float_val = *(float*)param->engine_val; - - /* Create new initial condition */ - if ((init_cond = new InitCond(param, init_val)) == NULL) - return NULL; - - /* Insert the initial condition into this presets tree */ - std::pair::iterator, bool> inserteePair = - init_cond_tree.insert(std::make_pair(init_cond->param->name, init_cond)); - - if (!inserteePair.second) - { - delete init_cond; - return NULL; - } - } - - return init_cond; - -} - -/* load_preset_file: private function that loads a specific preset denoted - by the given pathname */ -int Preset::load_preset_file(const char * pathname) -{ - - FILE * fs; - int retval; - int lineno; - line_mode_t line_mode; - - if (pathname == NULL) - return PROJECTM_FAILURE; - - /* Open the file corresponding to pathname */ - if ((fs = fopen(pathname, "rb")) == 0) - { -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "load_preset_file: loading of file %s failed!\n", pathname); -#endif - return PROJECTM_ERROR; - } - -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "load_preset_file: file stream \"%s\" opened successfully\n", pathname); -#endif - - /* Parse any comments */ - if (Parser::parse_top_comment(fs) < 0) - { -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "load_preset_file: no left bracket found...\n"); -#endif - fclose(fs); - return PROJECTM_FAILURE; - } - - /* Parse the preset name and a left bracket */ - char tmp_name[MAX_TOKEN_SIZE]; - - if (Parser::parse_preset_name(fs, tmp_name) < 0) - { -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "load_preset_file: loading of preset name in file \"%s\" failed\n", pathname); -#endif - fclose(fs); - return PROJECTM_ERROR; - } - name = std::string(tmp_name); - -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "load_preset_file: preset \"%s\" parsed\n", this->name); -#endif - - /* Parse each line until end of file */ - lineno = 0; -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "load_preset_file: beginning line parsing...\n"); -#endif - while ((retval = Parser::parse_line(fs, this)) != EOF) - { - if (retval == PROJECTM_PARSE_ERROR) - { - line_mode = NORMAL_LINE_MODE; -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE( "load_preset_file: parse error in file \"%s\": line %d\n", pathname,lineno); -#endif - - } - lineno++; - } - -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE("load_preset_file: finished line parsing successfully\n"); -#endif - - /* Now the preset has been loaded. - Evaluation calls can be made at appropiate - times in the frame loop */ - - fclose(fs); -#if defined(PRESET_DEBUG) && defined(DEBUG) - DWRITE("load_preset_file: file \"%s\" closed, preset ready\n", pathname); -#endif - return PROJECTM_SUCCESS; -} - - -void Preset::load_init_conditions() -{ - - ParamUtils::LoadInitCondFunctor functor(this); - builtinParams.traverse(functor); - -} - - - - - - -/* Find a parameter given its name, will create one if not found */ -Param * Preset::find(char * name, int flags) -{ - - Param * param = NULL; - - /* Null argument checks */ - assert(name); - - /* First look in the builtin database */ - param = (Param *)this->builtinParams.find_builtin_param(name); - - /* If the search failed, check the user database */ - if (param == NULL) - { - std::map::iterator pos = user_param_tree.find(name); - - if (pos == user_param_tree.end()) - param = 0; - else - param = pos->second; - } - - /* If it doesn't exist in the user (or builtin) database and - create_flag is set, then make it and insert into the database - */ - - if ((param == NULL) && (flags & P_CREATE)) - { - - /* Check if string is valid */ - if (!Param::is_valid_param_string(name)) - { - if (PARAM_DEBUG) printf("find: invalid parameter name:\"%s\"\n", name); - return NULL; - } - /* Now, create the user defined parameter given the passed name */ - if ((param = new Param(name)) == NULL) - { - if (PARAM_DEBUG) printf("find: failed to create a new user parameter!\n"); - return NULL; - } - /* Finally, insert the new parameter into this preset's proper splaytree */ - std::pair::iterator, bool> inserteePair - = user_param_tree.insert(std::make_pair(param->name, param)); - - if (!inserteePair.second) - { - if (PARAM_DEBUG) printf("PARAM \"%s\" already exists in user parameter tree!\n", param->name.c_str()); - delete param; - return NULL; - } - - } - - /* Return the found (or created) parameter. Note that if P_CREATE is not set, this could be null */ - return param; - -} diff --git a/src/projectM-engine-backup/Preset.hpp b/src/projectM-engine-backup/Preset.hpp deleted file mode 100644 index b87e07a20..000000000 --- a/src/projectM-engine-backup/Preset.hpp +++ /dev/null @@ -1,182 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Preset - * - * $Log$ - */ - -#ifndef _PRESET_HPP -#define _PRESET_HPP - -#include "Common.hpp" -#include -#include - -#define PRESET_DEBUG 2 /* 0 for no debugging, 1 for normal, 2 for insane */ - -#include "CustomShape.hpp" -#include "CustomWave.hpp" -#include "Expr.hpp" -#include "PerPixelEqn.hpp" -#include "PerFrameEqn.hpp" -#include "BuiltinParams.hpp" -#include "PresetFrameIO.hpp" -#include -#include "InitCond.hpp" - - - -class CustomWave; -class CustomShape; -class InitCond; - - - - -class Preset { -protected: - - -public: - - /** Load a preset by filename with input and output buffers specified. - * This is the only poper way to allocate a new preset. */ - Preset(const std::string & filename, const PresetInputs & presetInputs, PresetOutputs & presetOutputs); - - ~Preset(); - - /** Evaluates the preset for a frame given the current values of preset inputs / outputs */ - void evaluateFrame(); - - BuiltinParams builtinParams; - - std::string name; - std::string file_path; - int mesh_i,mesh_j; - - void load_init_conditions(); - template - static CustomObject * find_custom_object(int id, bool create_flag, std::map & customObjects); - - int per_pixel_eqn_string_index; - int per_frame_eqn_string_index; - int per_frame_init_eqn_string_index; - - int per_frame_eqn_count, - per_frame_init_eqn_count; - - char per_pixel_eqn_string_buffer[STRING_BUFFER_SIZE]; - char per_frame_eqn_string_buffer[STRING_BUFFER_SIZE]; - char per_frame_init_eqn_string_buffer[STRING_BUFFER_SIZE]; - - /* Data structures that contain equation and initial condition information */ - std::map per_frame_eqn_tree; /* per frame equations */ - std::map per_pixel_eqn_tree; /* per pixel equation tree */ - GenExpr * per_pixel_eqn_array[NUM_OPS]; /* per pixel equation array */ - std::map per_frame_init_eqn_tree; /* per frame initial equations */ - std::map init_cond_tree; /* initial conditions */ - std::map user_param_tree; /* user parameter splay tree */ - - int add_per_pixel_eqn( char *name, GenExpr *gen_expr ); - int isPerPixelEqn( int op ); - - int resetPerPixelEqns(); - int resetPerPixelEqnFlags(); - - InitCond *get_init_cond( Param *param ); - - void load_custom_wave_init_conditions(); - void load_custom_wave_init( CustomWave *customWave ); - void load_custom_shape_init_conditions(); - void load_custom_shape_init( CustomShape *customShape ); - void initialize(const std::string & pathname); - - void reloadPerFrame(char * s); - void reloadPerFrameInit(char *s); - void reloadPerPixel(char *s); - int load_preset_file(const char * pathname); - static Preset *load_preset( const char *pathname ); - void savePreset(char * name); - int write_preset_name( FILE *fs ); - int write_init_conditions( FILE *fs ); - int write_init( InitCond *initCond ); - int write_per_frame_init_equations( FILE *fs ); - int write_per_frame_equations( FILE *fs ); - int write_per_pixel_equations( FILE *fs ); - Param * find(char * name, int flags) ; - int destroy(); - void load_init_cond(char *name, int flags); - - PresetOutputs::cwave_container * customWaves; - PresetOutputs::cshape_container * customShapes; - -private: - - void evalCustomWavePerFrameEquations(); - void evalCustomShapePerFrameEquations(); - void evalInitConditions(); - void evalCustomWaveInitConditions(); - void evalCustomShapeInitConditions(); - void evalPerPixelEqns(); - void evalPerFrameEquations(); - - PresetOutputs & m_presetOutputs; -}; - -template -CustomObject * Preset::find_custom_object(int id, bool create_flag, std::map & customObjects) -{ - - CustomObject * custom_object = NULL; - - - typename std::map::iterator pos = customObjects.find(id); - - if (pos == customObjects.end()) - { - if (create_flag == FALSE) - { - return NULL; - } - - if ((custom_object = new CustomObject(id)) == NULL) - { - return NULL; - } - - std::pair::iterator, bool> inserteePair = - customObjects.insert(std::make_pair(custom_object->id, custom_object)); - - assert(inserteePair.second); - - custom_object = inserteePair.first->second; - - } else - custom_object = pos->second; - - - assert(custom_object); - return custom_object; -} -#endif /** !_PRESET_HPP */ diff --git a/src/projectM-engine-backup/PresetChooser.cpp b/src/projectM-engine-backup/PresetChooser.cpp deleted file mode 100644 index b2397590e..000000000 --- a/src/projectM-engine-backup/PresetChooser.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// -// C++ Implementation: PresetChooser -// -// Description: -// -// -// Author: Carmelo Piccione , (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// - -#include "PresetChooser.hpp" - diff --git a/src/projectM-engine-backup/PresetChooser.hpp b/src/projectM-engine-backup/PresetChooser.hpp deleted file mode 100644 index 505915777..000000000 --- a/src/projectM-engine-backup/PresetChooser.hpp +++ /dev/null @@ -1,225 +0,0 @@ -/** PresetChooser.hpp: - * Provides functions and iterators to select presets. Requires a preset loader upon construction. - */ - -/// @idea Weighted random based on user stats - -#ifndef PRESET_CHOOSER_HPP -#define PRESET_CHOOSER_HPP - -#include "Preset.hpp" - -#include "PresetLoader.hpp" - -#include -#include - - -class PresetChooser; - -/// A simple iterator class to traverse back and forth a preset directory -class PresetIterator { - -public: - PresetIterator() {} - - /// Instantiate a preset iterator at the given starting position - PresetIterator(std::size_t start); - - /// Move iterator forward - void operator++(); - - /// Move iterator backword - void operator--() ; - - /// Not equal comparator - bool operator !=(const PresetIterator & presetPos) const ; - - - /// Equality comparator - bool operator ==(const PresetIterator & presetPos) const ; - - /// Returns an integer value representing the iterator position - /// @bug might become internal - /// \brief Returns the indexing value used by the current iterator. - std::size_t operator*() const; - - /// Allocate a new preset given this iterator's associated preset name - /// \param presetInputs the preset inputs to associate with the preset upon construction - /// \param presetOutputs the preset outputs to associate with the preset upon construction - /// \returns an auto pointer of the newly allocated preset - std::auto_ptr allocate(const PresetInputs & presetInputs, PresetOutputs & presetOutputs); - - /// Set the chooser asocciated with this iterator - void setChooser(const PresetChooser & chooser); - -private: - std::size_t m_currentIndex; - const PresetChooser * m_presetChooser; - -}; - -class PresetChooser { - -public: - typedef PresetIterator iterator; - - /// Initializes a chooser with an established preset loader. - /// \param presetLoader an initialized preset loader to choose presets from - /// \note The preset loader is refreshed via events or otherwise outside this class's scope - PresetChooser(const PresetLoader & presetLoader); - - - /// Choose a preset via the passed in index. Must be between 0 and num valid presets in directory - /// \param index An index lying in the interval [0, this->getNumPresets()] - /// \param presetInputs the preset inputs to associate with the preset upon construction - /// \param presetOutputs the preset outputs to associate with the preset upon construction - std::auto_ptr directoryIndex(std::size_t index, const PresetInputs & presetInputs, - PresetOutputs & presetOutputs) const; - - /// Gets the number of presets last believed to exist in the preset loader's filename collection - /// \returns the number of presets in the collection - std::size_t getNumPresets() const; - - /// A functor, for all preset indices, returns probability 1 / (number of presets in directory) - class UniformRandomFunctor { - - public: - /// Initialize a new functor with a particular collection size - /// \param collectionSize the number of presets one is sampling over - UniformRandomFunctor(std::size_t collectionSize); - - /// Returns uniform (fixed) probability for any index - /// \param index the index position of the preset to load - float operator() (std::size_t index) const; - - private: - std::size_t m_collectionSize; - - }; - - - /// An STL-esque iterator to beginning traversing presets from a directory - /// \returns the position of the first preset in the collection - PresetIterator begin(); - - /// An STL-esque iterator to retrieve an end position from a directory - /// \returns the end position of the collection - PresetIterator end() const; - - /// Perform a weighted sample to select a preset given a weight functor. - /// \param presetInputs the preset inputs to associate with the preset upon construction - /// \param presetOutputs the preset outputs to associate with the preset upon construction - /// \param WeightFunctor a functor that returns a probability for each index (see UniformRandomFunctor) - /// \returns an auto pointer of the newly allocated preset - template - std::auto_ptr weightedRandom(const PresetInputs & presetInputs, PresetOutputs & presetOutputs, WeightFunctor & weightFunctor) const; - - - /// Do a weighted sample given a weight functor and default construction (ie. element size) of the weight functor - /// \param presetInputs the preset inputs to associate with the preset upon construction - /// \param presetOutputs the preset outputs to associate with the preset upon construction - /// \param WeightFunctor a functor that returns a probability for each index (see UniformRandomFunctor) - /// \returns an auto pointer of the newly allocated preset - template - std::auto_ptr weightedRandom(const PresetInputs & presetInputs, PresetOutputs & preseOutputs) const; - -private: - template - std::auto_ptr doWeightedSample(WeightFunctor & weightFunctor, const PresetInputs & presetInputs, PresetOutputs & presetOutputs); - - const PresetLoader * m_presetLoader; -}; - - -inline PresetChooser::PresetChooser(const PresetLoader & presetLoader):m_presetLoader(&presetLoader) {} - -inline std::size_t PresetChooser::getNumPresets() const { - return m_presetLoader->getNumPresets(); -} - -inline void PresetIterator::setChooser(const PresetChooser & chooser) { - m_presetChooser = &chooser; -} - -inline std::size_t PresetIterator::operator*() const { - return m_currentIndex; -} - -inline PresetIterator::PresetIterator(std::size_t start):m_currentIndex(start) {} - -inline void PresetIterator::operator++() { - assert(m_currentIndex < m_presetChooser->getNumPresets()); - m_currentIndex++; -} - -inline void PresetIterator::operator--() { - assert(m_currentIndex > 0); - m_currentIndex--; -} - -inline bool PresetIterator::operator !=(const PresetIterator & presetPos) const { - return (*presetPos != **this); -} - - -inline bool PresetIterator::operator ==(const PresetIterator & presetPos) const { - return (*presetPos == **this); -} - -inline std::auto_ptr PresetIterator::allocate(const PresetInputs & presetInputs, PresetOutputs & presetOutputs) { - return m_presetChooser->directoryIndex(m_currentIndex, presetInputs, presetOutputs); -} - -inline float PresetChooser::UniformRandomFunctor::operator() (std::size_t index) const { - return (1.0 / m_collectionSize); -} - - -inline PresetIterator PresetChooser::begin() { - PresetIterator pos(0); - pos.setChooser(*this); - return pos; -} - -inline PresetIterator PresetChooser::end() const { - PresetIterator pos(m_presetLoader->getNumPresets()); - return pos; -} - -template -std::auto_ptr PresetChooser::weightedRandom(const PresetInputs & presetInputs, PresetOutputs & presetOutputs, WeightFunctor & weightFunctor) const { - doWeightedSample(weightFunctor); -} - -template -inline std::auto_ptr PresetChooser::weightedRandom(const PresetInputs & presetInputs, PresetOutputs & presetOutputs) const { - - WeightFunctor weightFunctor(m_presetLoader->getNumPresets()); - doWeightedSample(weightFunctor, presetInputs, presetOutputs); - -} - -inline std::auto_ptr PresetChooser::directoryIndex(std::size_t index, const PresetInputs & presetInputs, - PresetOutputs & presetOutputs) const { - - return m_presetLoader->loadPreset(index,presetInputs, presetOutputs); -} - -template -inline std::auto_ptr PresetChooser::doWeightedSample(WeightFunctor & weightFunctor, const PresetInputs & presetInputs, PresetOutputs & presetOutputs) { - - // Choose a random bounded mass between 0 and 1 - float cutoff = ((float)(random())) / RAND_MAX; - - // Sum up mass, stopping when cutoff is reached. This is the typical - // weighted sampling algorithm. - float mass = 0; - for (PresetIterator pos = this->begin();pos != this->end() ; ++pos) { - mass += weightFunctor(*pos); - if (mass >= cutoff) - return pos.allocate(presetInputs, presetOutputs); - } -} - -#endif diff --git a/src/projectM-engine-backup/PresetFilters.hpp b/src/projectM-engine-backup/PresetFilters.hpp deleted file mode 100644 index 0a7b98c6c..000000000 --- a/src/projectM-engine-backup/PresetFilters.hpp +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef PRESET_FILTERS_HPP -#define PRESET_FILTERS_HPP -#include "Preset.hpp" - -class PresetFilters { - -/// The merge functor decides how to put the presets together. -/// Assumes getMergedPreset() is implemented. -/// A sample is below -/// @bug this is screwed up, but functor idea still has merit once design is resolved -class LinearMergeFunctor { - -public: - LinearMergeFunctor(PresetOutputs & presetOutputsAB):m_presetOutputsAB(presetOutputsAB) {} - - - void operator() (const PresetInputs & inputsA, const PresetInputs & inputsB, - const PresetOutputs & outputsA, const PresetOutputs & outputsB) { - - // use time variables from inputsA/B to determine how presets should be merged - - } - - PresetOutputs & getMergedOutputs() { - return m_presetAB; - } - - -private: - PresetOutputs & m_presetOutputsAB; - -}; - -template -static void merge(const PresetOutput & outputsA, const Preset & outputsB, MergeFunctor & functor); - -}; -#endif diff --git a/src/projectM-engine-backup/PresetFrameIO.cpp b/src/projectM-engine-backup/PresetFrameIO.cpp deleted file mode 100644 index 76dcb0227..000000000 --- a/src/projectM-engine-backup/PresetFrameIO.cpp +++ /dev/null @@ -1,203 +0,0 @@ -#include "PresetFrameIO.hpp" -#include "wipemalloc.h" -#include -#include -#include -PresetInputs::PresetInputs() -{ -} - -void PresetInputs::Initialize(int gx, int gy) -{ - int x, y; - - this->gx =gx; - this->gy=gy; - std::cerr << "Allocating x_mesh, gx,gy is " << gx << "," << gy << std::endl; - this->x_mesh=(float **)wipemalloc(gx * sizeof(float *)); - assert(x_mesh); - for(x = 0; x < gx; x++) - { - this->x_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->y_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->y_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - - } - this->rad_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->rad_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->theta_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x theta_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - - this->origtheta=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->origtheta[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->origrad=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->origrad[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->origx=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->origx[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->origy=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->origy[x] = (float *)wipemalloc(gy * sizeof(float)); - } - -for (x=0;xorigx[x][y]=x/(float)(gx-1); - this->origy[x][y]=-((y/(float)(gy-1))-1); - this->origrad[x][y]=hypot((this->origx[x][y]-.5)*2,(this->origy[x][y]-.5)*2) * .7071067; - this->origtheta[x][y]=atan2(((this->origy[x][y]-.5)*2),((this->origx[x][y]-.5)*2)); - } - } - - - -} - -PresetOutputs::PresetOutputs() -{ -} - -void PresetOutputs::Initialize(int gx, int gy) -{ - int x; - this->sx_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->sx_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->sy_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->sy_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->dx_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->dx_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->dy_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->dy_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->cx_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->cx_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->cy_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->cy_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->zoom_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->zoom_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->zoomexp_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->zoomexp_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->rot_mesh=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->rot_mesh[x] = (float *)wipemalloc(gy * sizeof(float)); - } - zoom_is_mesh = false; - zoomexp_is_mesh =false; - rot_is_mesh =false; - - sx_is_mesh =false; - sy_is_mesh = false; - dx_is_mesh = false; - dy_is_mesh =false; - cx_is_mesh = false; - cy_is_mesh = false;; - -} - -PresetInputs::~PresetInputs() -{ - for(int x = 0; x < this->gx; x++) - { - - - free(this->origtheta[x]); - free(this->origrad[x]); - free(this->origx[x]); - free(this->origy[x]); - - free(this->x_mesh[x]); - free(this->y_mesh[x]); - free(this->rad_mesh[x]); - free(this->theta_mesh[x]); - - } - - - free(this->origx); - free(this->origy); - free(this->origrad); - free(this->origtheta); - - //std::cerr << "freeing x_mesh" <x_mesh); - free(this->y_mesh); - free(this->rad_mesh); - free(this->theta_mesh); - - this->origx = NULL; - this->origy = NULL; - this->origtheta = NULL; - this->origrad = NULL; - - this->x_mesh = NULL; - this->y_mesh = NULL; - this->rad_mesh = NULL; - this->theta_mesh = NULL; -} - -void PresetInputs::ResetMesh() -{ - int x,y; - - assert(x_mesh); - - assert(y_mesh); - assert(rad_mesh); - assert(theta_mesh); - - for (x=0;xgx;x++) - { - for(y=0;ygy;y++) - { - x_mesh[x][y]=this->origx[x][y]; - y_mesh[x][y]=this->origy[x][y]; - rad_mesh[x][y]=this->origrad[x][y]; - theta_mesh[x][y]=this->origtheta[x][y]; - } - } - - } diff --git a/src/projectM-engine-backup/PresetFrameIO.hpp b/src/projectM-engine-backup/PresetFrameIO.hpp deleted file mode 100644 index dd494f87e..000000000 --- a/src/projectM-engine-backup/PresetFrameIO.hpp +++ /dev/null @@ -1,191 +0,0 @@ -#ifndef PRESET_FRAME_IO_HPP -#define PRESET_FRAME_IO_HPP -#include - -class CustomWave; -class CustomShape; - - -/** Container for all preset writeable engine variables. It's a struct - * so that it's light weight. Access is done directly on - * members for Mr. Sperl's convenience */ -class PresetOutputs { -public: - typedef std::map cwave_container; - typedef std::map cshape_container; - - cwave_container customWaves; - cshape_container customShapes; - - void Initialize(int gx, int gy); - PresetOutputs(); - /* PER FRAME VARIABLES BEGIN */ - float zoom; - float zoomexp; - float rot; - float warp; - - float sx; - float sy; - float dx; - float dy; - float cx; - float cy; - - float decay; - - float wave_r; - float wave_g; - float wave_b; - float wave_o; - float wave_x; - float wave_y; - float wave_mystery; - - float ob_size; - float ob_r; - float ob_g; - float ob_b; - float ob_a; - - float ib_size; - float ib_r; - float ib_g; - float ib_b; - float ib_a; - - float mv_a ; - float mv_r ; - float mv_g ; - float mv_b ; - float mv_l; - float mv_x; - float mv_y; - float mv_dy; - float mv_dx; - - /* PER_FRAME VARIABLES END */ - - float fRating; - float fGammaAdj; - float fVideoEchoZoom; - float fVideoEchoAlpha; - - int nVideoEchoOrientation; - int nWaveMode; - int bAdditiveWaves; - int bWaveDots; - int bWaveThick; - int bModWaveAlphaByVolume; - int bMaximizeWaveColor; - int bTexWrap; - int bDarkenCenter; - int bRedBlueStereo; - int bBrighten; - int bDarken; - int bSolarize; - int bInvert; - int bMotionVectorsOn; - - - float fWaveAlpha ; - float fWaveScale; - float fWaveSmoothing; - float fWaveParam; - float fModWaveAlphaStart; - float fModWaveAlphaEnd; - float fWarpAnimSpeed; - float fWarpScale; - float fShader; - - /* Q VARIABLES START */ - - float q1; - float q2; - float q3; - float q4; - float q5; - float q6; - float q7; - float q8; - - - /* Q VARIABLES END */ - - float **zoom_mesh; - float **zoomexp_mesh; - float **rot_mesh; - - float **sx_mesh; - float **sy_mesh; - float **dx_mesh; - float **dy_mesh; - float **cx_mesh; - float **cy_mesh; - - bool zoom_is_mesh; - bool zoomexp_is_mesh; - bool rot_is_mesh; - - bool sx_is_mesh; - bool sy_is_mesh; - bool dx_is_mesh; - bool dy_is_mesh; - bool cx_is_mesh; - bool cy_is_mesh; - - -}; - -/** Container for all *read only* engine variables. It's a struct - * so that it's light weight. Access is done directly on - * members for Mr. Sperl's convenience */ -class PresetInputs { - -public: - /* PER_PIXEL VARIBLES BEGIN */ - - float x_per_pixel; - float y_per_pixel; - float rad_per_pixel; - float ang_per_pixel; - - /* PER_PIXEL VARIBLES END */ - - int fps; - - - float time; - float bass; - float mid; - float bass_att; - float mid_att; - float treb_att; - int frame; - float progress; - - - /* variables were added in milkdrop 1.04 */ - int gx,gy; - -/// @bug are these in use? - /// @bugfix YES, presets reference meshx and meshy - int meshx; - int meshy; - float **x_mesh; - float **y_mesh; - float **rad_mesh; - float **theta_mesh; - - float **origtheta; //grid containing interpolated mesh reference values - float **origrad; - float **origx; //original mesh - float **origy; - - void ResetMesh(); - ~PresetInputs(); - PresetInputs(); - void Initialize(int gx, int gy); -}; - -#endif diff --git a/src/projectM-engine-backup/PresetLoader.cpp b/src/projectM-engine-backup/PresetLoader.cpp deleted file mode 100644 index a08bad4d9..000000000 --- a/src/projectM-engine-backup/PresetLoader.cpp +++ /dev/null @@ -1,137 +0,0 @@ -// -// C++ Implementation: PresetLoader -// -// Description: -// -// -// Author: Carmelo Piccione , (C) 2007 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include "PresetLoader.hpp" -#include "Preset.hpp" -#include -#include -extern "C" -{ -#include -#include -} -#include -#include "projectM.hpp" - -const std::string PresetLoader::PROJECTM_FILE_EXTENSION(".prjm"); -const std::string PresetLoader::MILKDROP_FILE_EXTENSION(".milk"); - -PresetLoader::PresetLoader(std::string dirname) :m_dirname(dirname), m_dir(0) -{ - // Do one scan - rescan(); -} - -PresetLoader::~PresetLoader() -{ - if (m_dir) - closedir(m_dir); -} - -void PresetLoader::setScanDirectory(std::string dirname) -{ - m_dirname = dirname; -} - - -void PresetLoader::rescan() -{ - std::cerr << "Rescanning..." << std::endl; - - // Clear the directory entry collection - m_entries.clear(); - - std::cerr << "cleared!" << std::endl; - - // If directory already opened, close it first - if (m_dir) - { - std::cerr << "m_dir" << std::endl; - closedir(m_dir); - m_dir = 0; - } - - std::cerr << "opening " << m_dirname << std::endl; - // Allocate a new a stream given the current directory name - if ((m_dir = opendir(m_dirname.c_str())) == NULL) - { - handleDirectoryError(); - abort(); - } - - struct dirent * dir_entry; - - while ((dir_entry = readdir(m_dir)) != NULL) - { - - - - std::ostringstream out; - // Convert char * to friendly string - std::string filename(dir_entry->d_name); - - - // Verify extension is projectm or milkdrop - if ((filename.rfind(PROJECTM_FILE_EXTENSION) != (filename.length() - PROJECTM_FILE_EXTENSION.length())) - && (filename.rfind(MILKDROP_FILE_EXTENSION) != (filename.length() - MILKDROP_FILE_EXTENSION.length()))) - continue; - - // Create full path name - out << m_dirname << PATH_SEPARATOR << filename; - - // std::cerr << "[PresetLoader]" << filename << std::endl; - // Add to our directory entry collection - m_entries.push_back(out.str()); - - // the directory entry struct is freed elsewhere - } - -} - -std::auto_ptr PresetLoader::loadPreset(unsigned int index, const PresetInputs & presetInputs, PresetOutputs & presetOutputs) const -{ - - // Check that index isn't insane - assert(index >= 0); - assert(index < m_entries.size()); - - // Return a new auto pointer to a present - return std::auto_ptr(new Preset(m_entries[index], presetInputs, presetOutputs)); -} - - - -void PresetLoader::handleDirectoryError() -{ - switch (errno) - { - case ENOENT: - std::cerr << "[PresetLoader] ENOENT error. \"man fopen\" for more info." << std::endl; - break; - case ENOMEM: - std::cerr << "[PresetLoader] out of memory! Are you running Windows?" << std::endl; - abort(); - case ENOTDIR: - std::cerr << "[PresetLoader] directory specified is not a preset directory! Cannot continue." << std::endl; - break; - case ENFILE: - std::cerr << "[PresetLoader] Your system has reached its open file limit. Giving up..." << std::endl; - abort(); - case EMFILE: - std::cerr << "[PresetLoader] too many files in use by projectM! Bailing!" << std::endl; - abort(); - case EACCES: - std::cerr << "[PresetLoader] permissions issue reading the specified preset directory." << std::endl; - break; - default: - break; - } -} diff --git a/src/projectM-engine-backup/PresetLoader.hpp b/src/projectM-engine-backup/PresetLoader.hpp deleted file mode 100644 index a23571367..000000000 --- a/src/projectM-engine-backup/PresetLoader.hpp +++ /dev/null @@ -1,51 +0,0 @@ -#ifndef __PRESET_LOADER_HPP -#define __PRESET_LOADER_HPP - -#include // used for path / filename stuff - -#include // for auto pointers -#include -#include -#include - -class Preset; -class PresetInputs; -class PresetOutputs; - -class PresetLoader { - public: - static const std::string PROJECTM_FILE_EXTENSION; - static const std::string MILKDROP_FILE_EXTENSION; - - /** Initializes the preset loader with the target directory specified */ - PresetLoader(std::string dirname); - - /** Destructor will remove all alllocated presets */ - ~PresetLoader(); - - /** Load a preset by specifying a filename of the directory (that is, NOT full path) */ - /** Autopointers: when you take it, I leave it */ - std::auto_ptr loadPreset(unsigned int index, const PresetInputs & presetInputs, - PresetOutputs & presetOutputs) const; - - /** Returns the number of presets in the active directory */ - inline std::size_t getNumPresets() const { - return m_entries.size(); - } - - /** Sets the directory where the loader will search for files */ - void setScanDirectory(std::string pathname); - - /** Rescans the active preset directory */ - void rescan(); - - private: - void handleDirectoryError(); - std::string m_dirname; - DIR * m_dir; - - // vector chosen for speed, but not great for reverse index lookups - std::vector m_entries; -}; - -#endif diff --git a/src/projectM-engine-backup/Renderer.cpp b/src/projectM-engine-backup/Renderer.cpp deleted file mode 100644 index 250892df7..000000000 --- a/src/projectM-engine-backup/Renderer.cpp +++ /dev/null @@ -1,1995 +0,0 @@ -#include "Renderer.hpp" -#include "wipemalloc.h" -#include "math.h" -#include "Common.hpp" -#include "console_interface.h" -#include "CustomShape.hpp" -#include "CustomWave.hpp" - -class Preset; - -Renderer::Renderer(int width, int height, int gx, int gy, RenderTarget *renderTarget, BeatDetect *beatDetect, char* fontURL) -{ - int x; int y; - - this->gx=gx; - this->gy=gy; - - this->totalframes = 1; - this->noSwitch = 0; - this->showfps = 0; - this->showtitle = 0; - this->showpreset = 0; - this->showhelp = 0; - this->showstats = 0; - this->studio = 0; -this->realfps=0; - - this->drawtitle=0; - - this->title = NULL; - - /** Other stuff... */ - this->correction = 1; - this->aspect=1.33333333; - - this->gridx=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->gridx[x] = (float *)wipemalloc(gy * sizeof(float)); - } - this->gridy=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->gridy[x] = (float *)wipemalloc(gy * sizeof(float)); - } - - this->origx2=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->origx2[x] = (float *)wipemalloc(gy * sizeof(float)); - } -this->origy2=(float **)wipemalloc(gx * sizeof(float *)); - for(x = 0; x < gx; x++) - { - this->origy2[x] = (float *)wipemalloc(gy * sizeof(float)); - } - - - //initialize reference grid values - for (x=0;xgridx[x][y]=origx*renderTarget->texsize; - this->gridy[x][y]=origy*renderTarget->texsize; - this->origx2[x][y]=( origx-.5)*2; - this->origy2[x][y]=( origy-.5)*2; - }} - -this->renderTarget = renderTarget; -this->beatDetect = beatDetect; -this->fontURL = fontURL; - -#ifdef USE_FTGL - /** Reset fonts */ - title_font = NULL; - other_font = NULL; - poly_font = NULL; -#endif /** USE_FTGL */ - -} - -void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInputs) -{ - totalframes++; - - DWRITE( "start Pass 1 \n" ); - - //BEGIN PASS 1 - // - //This pass is used to render our texture - //the texture is drawn to a subsection of the framebuffer - //and then we perform our manipulations on it - //in pass 2 we will copy the texture into texture memory - - - renderTarget->lock(); - - - // glPushAttrib( GL_ALL_ATTRIB_BITS ); /* Overkill, but safe */ - - glViewport( 0, 0, renderTarget->texsize, renderTarget->texsize ); - - glEnable( GL_TEXTURE_2D ); - if(this->renderTarget->usePbuffers) - { - glBindTexture( GL_TEXTURE_2D, renderTarget->textureID[1] ); - } - else - { - glBindTexture( GL_TEXTURE_2D, renderTarget->textureID[0] ); - } - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); - - glMatrixMode( GL_PROJECTION ); - glPushMatrix(); - glLoadIdentity(); - glOrtho(0.0, 1, 0.0, 1,10,40); - - glMatrixMode( GL_MODELVIEW ); - glPushMatrix(); - glLoadIdentity(); - - DWRITE( "renderFrame: renderTarget->texsize: %d x %d\n", this->renderTarget->texsize, this->renderTarget->texsize ); - - - PerPixelMath(presetOutputs, presetInputs); - - if(this->renderTarget->usePbuffers) - { - //draw_motion_vectors(); //draw motion vectors - //unlockPBuffer( this->renderTarget); - //lockPBuffer( this->renderTarget, PBUFFER_PASS1 ); - } - PerFrame(presetOutputs); //apply per-frame effects - Interpolation(presetOutputs,presetInputs); //apply per-pixel effects - - draw_title_to_texture(); //draw title to texture - -// if(!this->renderTarget->usePbuffers) - { - draw_motion_vectors(presetOutputs); //draw motion vectors - } - draw_shapes(presetOutputs); - draw_custom_waves(presetOutputs); - draw_waveform(presetOutputs, presetInputs); - if(presetOutputs->bDarkenCenter)darken_center(); - draw_borders(presetOutputs); //draw borders - - /** Restore original view state */ - glMatrixMode( GL_MODELVIEW ); - glPopMatrix(); - - glMatrixMode( GL_PROJECTION ); - glPopMatrix(); - - /** Restore all original attributes */ - // glPopAttrib(); - glFlush(); - - renderTarget->unlock(); - - -#ifdef DEBUG - GLint msd = 0, - psd = 0; - glGetIntegerv( GL_MODELVIEW_STACK_DEPTH, &msd ); - glGetIntegerv( GL_PROJECTION_STACK_DEPTH, &psd ); - DWRITE( "end pass1: modelview matrix depth: %d\tprojection matrix depth: %d\n", - msd, psd ); - DWRITE( "begin pass2\n" ); -#endif - - //BEGIN PASS 2 - // - //end of texture rendering - //now we copy the texture from the framebuffer to - //video texture memory and render fullscreen on a quad surface. - - /** Reset the viewport size */ - DWRITE( "viewport: %d x %d\n", this->vw, this->vh ); - glViewport( 0, 0, this->vw, this->vh ); - glClear( GL_COLOR_BUFFER_BIT ); - - if ( this->renderTarget ) { - glBindTexture( GL_TEXTURE_2D, this->renderTarget->textureID[0] ); - } - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(-0.5, 0.5, -0.5,0.5,10,40); - - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glLineWidth( this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize/512.0); - //if(this->studio%2)render_texture_to_studio(); - //else - render_texture_to_screen(presetOutputs); - - // glClear(GL_COLOR_BUFFER_BIT); - //render_Studio(); - - //preset editing menu - glMatrixMode(GL_MODELVIEW); - glTranslated(-0.5,-0.5,-1); - - // When console refreshes, there is a chance the preset has been changed by the user - refreshConsole(); - draw_title_to_screen(); - if(this->showhelp%2)draw_help(); - if(this->showtitle%2)draw_title(); - if(this->showfps%2)draw_fps(this->realfps); - if(this->showpreset%2)draw_preset(); - if(this->showstats%2)draw_stats(presetInputs); - glTranslatef(0.5 ,0.5,1); - - DWRITE( "end pass2\n" ); -} - - -void Renderer::Interpolation(PresetOutputs *presetOutputs, PresetInputs *presetInputs) -{ - int x,y; - - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glTranslated( 0, 0, -1 ); - - glColor4f(0.0, 0.0, 0.0,presetOutputs->decay); - - glEnable(GL_TEXTURE_2D); - -#ifdef MACOS2 - /** Bind the stashed texture */ - if ( this->renderTarget->pbuffer != NULL ) { - glBindTexture( GL_TEXTURE_2D, this->renderTarget->textureID[0] ); -#ifdef DEBUG - if ( glGetError() ) { - DWRITE( "failed to bind texture\n" ); - } -#endif - } -#endif - - for (x=0;xgx - 1;x++){ - glBegin(GL_TRIANGLE_STRIP); - for(y=0;ygy;y++){ - glTexCoord2f(presetInputs->x_mesh[x][y], presetInputs->y_mesh[x][y]); - glVertex2f(this->gridx[x][y], this->gridy[x][y]); - glTexCoord2f(presetInputs->x_mesh[x+1][y], presetInputs->y_mesh[x+1][y]); - glVertex2f(this->gridx[x+1][y], this->gridy[x+1][y]); - } - glEnd(); - } - -#ifdef MACOS2 - /** Re-bind the pbuffer */ - if ( this->renderTarget->pbuffer != NULL ) { - glBindTexture( GL_TEXTURE_2D, this->renderTarget->textureID[0] ); - } -#endif - - glDisable(GL_TEXTURE_2D); - - glPopMatrix(); -} - - -void Renderer::PerFrame(PresetOutputs *presetOutputs) -{ - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glTranslated(0, 0, -9); - - //Texture wrapping( clamp vs. wrap) - if (presetOutputs->bTexWrap==0){ - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);} - else{ glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);} - - - // glRasterPos2i(0,0); - // glClear(GL_COLOR_BUFFER_BIT); - // glColor4d(0.0, 0.0, 0.0,1.0); - - // glMatrixMode(GL_TEXTURE); - // glLoadIdentity(); - - glRasterPos2i(0,0); - glClear(GL_COLOR_BUFFER_BIT); - glColor4d(0.0, 0.0, 0.0,1.0); - - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); - - /* - glTranslatef(presetOutputs->cx,presetOutputs->cy, 0); - if(this->correction) glScalef(1,this->vw/(float)this->vh,1); - - if(!isPerPixelEqn(ROT_OP)) { - // printf("ROTATING: rot = %f\n", rot); - glRotatef(presetOutputs->rot*90, 0, 0, 1); - } - if(!isPerPixelEqn(SX_OP)) glScalef(1/presetOutputs->sx,1,1); - if(!isPerPixelEqn(SY_OP)) glScalef(1,1/presetOutputs->sy,1); - - if(this->correction)glScalef(1,this->vh/(float)this->vw,1); - glTranslatef((-presetOutputs->cx) ,(-presetOutputs->cy),0); - */ - - if(!presetOutputs->dx_is_mesh) glTranslatef(-presetOutputs->dx,0,0); - if(!presetOutputs->dy_is_mesh) glTranslatef(0 ,-presetOutputs->dy,0); - } - - -Renderer::~Renderer() { - - int x; - - for(x = 0; x < this->gx; x++) - { - - free(this->gridx[x]); - free(this->gridy[x]); - free(this->origx2[x]); - free(this->origy2[x]); - - - } - - free(this->origx2); - free(this->origy2); - free(this->gridx); - free(this->gridy); - - - - this->origx2 = NULL; - this->origy2 = NULL; - this->gridx = NULL; - this->gridy = NULL; - -} - - -void Renderer::PerPixelMath(PresetOutputs *presetOutputs, PresetInputs *presetInputs) { - - int x,y; - float fZoom2,fZoom2Inv; - - - - if(!presetOutputs->cx_is_mesh) - { - for (x=0;xgx;x++){ - - for(y=0;ygy;y++){ - presetOutputs->cx_mesh[x][y]=presetOutputs->cx; - } - - } - } - - if(!presetOutputs->cy_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetOutputs->cy_mesh[x][y]=presetOutputs->cy; - }} - } - - if(!presetOutputs->sx_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetOutputs->sx_mesh[x][y]=presetOutputs->sx; - }} - } - - if(!presetOutputs->sy_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetOutputs->sy_mesh[x][y]=presetOutputs->sy; - }} - } - - if(!presetOutputs->zoom_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetOutputs->zoom_mesh[x][y]=presetOutputs->zoom; - }} - } - - if(!presetOutputs->zoomexp_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetOutputs->zoomexp_mesh[x][y]=presetOutputs->zoomexp; - }} - } - - if(!presetOutputs->rot_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetOutputs->rot_mesh[x][y]=presetOutputs->rot; - } - } - } - - /* - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - x_mesh[x][y]=(x_mesh[x][y]-.5)*2; - } - } - - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - y_mesh[x][y]=(y_mesh[x][y]-.5)*2; - } - } - */ - - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - fZoom2 = powf( presetOutputs->zoom_mesh[x][y], powf( presetOutputs->zoomexp_mesh[x][y], presetInputs->rad_mesh[x][y]*2.0f - 1.0f)); - fZoom2Inv = 1.0f/fZoom2; - presetInputs->x_mesh[x][y]= this->origx2[x][y]*0.5f*fZoom2Inv + 0.5f; - presetInputs->y_mesh[x][y]= this->origy2[x][y]*0.5f*fZoom2Inv + 0.5f; - } - } - - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetInputs->x_mesh[x][y] = ( presetInputs->x_mesh[x][y] - presetOutputs->cx_mesh[x][y])/presetOutputs->sx_mesh[x][y] + presetOutputs->cx_mesh[x][y]; - } - } - - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetInputs->y_mesh[x][y] = ( presetInputs->y_mesh[x][y] - presetOutputs->cy_mesh[x][y])/presetOutputs->sy_mesh[x][y] + presetOutputs->cy_mesh[x][y]; - } - } - - - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - float u2 = presetInputs->x_mesh[x][y] - presetOutputs->cx_mesh[x][y]; - float v2 = presetInputs->y_mesh[x][y] - presetOutputs->cy_mesh[x][y]; - - float cos_rot = cosf(presetOutputs->rot_mesh[x][y]); - float sin_rot = sinf(presetOutputs->rot_mesh[x][y]); - - presetInputs->x_mesh[x][y] = u2*cos_rot - v2*sin_rot + presetOutputs->cx_mesh[x][y]; - presetInputs->y_mesh[x][y] = u2*sin_rot + v2*cos_rot + presetOutputs->cy_mesh[x][y]; - - } - } - - if(presetOutputs->dx_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetInputs->x_mesh[x][y] -= presetOutputs->dx_mesh[x][y]; - } - } - } - - if(presetOutputs->dy_is_mesh) - { - for (x=0;xgx;x++){ - for(y=0;ygy;y++){ - presetInputs->y_mesh[x][y] -= presetOutputs->dy_mesh[x][y]; - } - } - - } - -} - - - -void Renderer::reset(int w, int h) -{ - this->aspect=(float)h / (float)w; - this -> vw = w; - this -> vh = h; - -//FIXME maybe needs called elsewhere - //if (!this->renderTarget->usePbuffers) { - // renderTarge->createPBuffers(w,h,this->renderTarget); - // } - - /* Our shading model--Gouraud (smooth). */ - glShadeModel( GL_SMOOTH); - /* Culling. */ - // glCullFace( GL_BACK ); - // glFrontFace( GL_CCW ); - // glEnable( GL_CULL_FACE ); - /* Set the clear color. */ - glClearColor( 0, 0, 0, 0 ); - /* Setup our viewport. */ - glViewport( 0, 0, w, h ); - /* - * Change to the projection matrix and set - * our viewing volume. - */ - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); - - // gluOrtho2D(0.0, (GLfloat) width, 0.0, (GLfloat) height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - // glFrustum(0.0, height, 0.0,width,10,40); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - glDrawBuffer(GL_BACK); - glReadBuffer(GL_BACK); - glEnable(GL_BLEND); - - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glEnable( GL_LINE_SMOOTH ); - glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); - - glEnable(GL_POINT_SMOOTH); - - // glCopyTexImage2D(GL_TEXTURE_2D,0,GL_RGB,0,0,renderTarget->texsize,renderTarget->texsize,0); - //glCopyTexSubImage2D(GL_TEXTURE_2D,0,0,0,0,0,renderTarget->texsize,renderTarget->texsize); - glLineStipple(2, 0xAAAA); - - /** (Re)create the offscreen for pass 1 */ - - //REME: necesary? - //rescale_per_pixel_matrices(); - - /** Load TTF font **/ - - - -#ifdef USE_FTGL - /**f Load the standard fonts */ - if ( title_font == NULL && other_font == NULL ) { - char path[1024]; - - sprintf( path, "%s%cVera.ttf", this->fontURL, PATH_SEPARATOR ); - title_font = new FTGLPixmapFont(path); - poly_font = new FTGLPolygonFont(path); - sprintf( path, "%s%cVeraMono.ttf", this->fontURL, PATH_SEPARATOR ); - other_font = new FTGLPixmapFont(path); - - } -#endif /** USE_FTGL */ -} - - - - - -void Renderer::draw_custom_waves(PresetOutputs *presetOutputs) { - - int x; - CustomWave *wavecode; - - glMatrixMode( GL_MODELVIEW ); - glPushMatrix(); - glTranslatef( 0, 0, -1 ); - - glPointSize(this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize/512); - - /// @bug SPERL: this is a starting point at least - for (PresetOutputs::cwave_container::const_iterator pos = presetOutputs->customWaves.begin(); - pos != presetOutputs->customWaves.end(); ++pos) - { - - if(wavecode->enabled==1) - { - - if (wavecode->bAdditive==0) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - else glBlendFunc(GL_SRC_ALPHA, GL_ONE); - if (wavecode->bDrawThick==1) glLineWidth(this->renderTarget->texsize < 512 ? 1 : 2*this->renderTarget->texsize/512); - - beatDetect->pcm->getPCM(wavecode->value1,wavecode->samples,0,wavecode->bSpectrum,wavecode->smoothing,0); - beatDetect->pcm->getPCM(wavecode->value2,wavecode->samples,1,wavecode->bSpectrum,wavecode->smoothing,0); - // printf("%f\n",pcmL[0]); - - - float mult=wavecode->scaling*presetOutputs->fWaveScale*(wavecode->bSpectrum ? 0.015f :1.0f); - - for(x=0;xsamples;x++) - {wavecode->value1[x]*=mult;} - - for(x=0;xsamples;x++) - {wavecode->value2[x]*=mult;} - - for(x=0;xsamples;x++) - {wavecode->sample_mesh[x]=((float)x)/((float)(wavecode->samples-1));} - - // printf("mid inner loop\n"); - wavecode->evalPerPointEqns(); - - //put drawing code here - if (wavecode->bUseDots==1) glBegin(GL_POINTS); - else glBegin(GL_LINE_STRIP); - - for(x=0;xsamples;x++) - { - - glColor4f(wavecode->r_mesh[x],wavecode->g_mesh[x],wavecode->b_mesh[x],wavecode->a_mesh[x]); - glVertex3f(wavecode->x_mesh[x],-(wavecode->y_mesh[x]-1),-1); - } - glEnd(); - glPointSize(this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize/512); - glLineWidth(this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize/512); - glDisable(GL_LINE_STIPPLE); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - // glPopMatrix(); - - } - - } - - glPopMatrix(); -} - - -void Renderer::draw_shapes(PresetOutputs *presetOutputs) { - - int i; - - float theta; - float radius; - - CustomShape *shapecode; - - float pi = 3.14159265; - float start,inc,xval,yval; - - float t; - - // more=isMoreCustomWave(); - // printf("not inner loop\n"); - - glMatrixMode( GL_MODELVIEW ); - glPushMatrix(); - glTranslatef( 0, 0, -1 ); - -/// @bug SPERL: this is a starting point at least - for (PresetOutputs::cshape_container::const_iterator pos = presetOutputs->customShapes.begin(); - pos != presetOutputs->customShapes.end(); ++pos) - { - - if(shapecode->enabled==1) - { - // printf("drawing shape %f\n",shapecode->ang); - shapecode->y=-((shapecode->y)-1); - radius=.5; - shapecode->radius=shapecode->radius*(.707*.707*.707*1.04); - //Additive Drawing or Overwrite - if (shapecode->additive==0) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - else glBlendFunc(GL_SRC_ALPHA, GL_ONE); - - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - /* DEPRECATED - if(this->correction) - { - glTranslatef(0.5,0.5, 0); - glScalef(1.0,this->vw/(float)this->vh,1.0); - glTranslatef(-0.5 ,-0.5,0); - } - */ - - xval=shapecode->x; - yval=shapecode->y; - - if (shapecode->textured) - { - glMatrixMode(GL_TEXTURE); - glPushMatrix(); - glLoadIdentity(); - //glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - //glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - - //glTranslatef(.5,.5, 0); - //if (this->correction) glScalef(1,this->vw/(float)this->vh,1); - - //glRotatef((shapecode->tex_ang*360/6.280), 0, 0, 1); - - //glScalef(1/(shapecode->tex_zoom),1/(shapecode->tex_zoom),1); - - // glScalef(1,vh/(float)vw,1); - //glTranslatef((-.5) ,(-.5),0); - // glScalef(1,this->vw/(float)this->vh,1); - glEnable(GL_TEXTURE_2D); - - - glBegin(GL_TRIANGLE_FAN); - glColor4f(0.0,0.0,0.0,shapecode->a); - //glColor4f(shapecode->r,shapecode->g,shapecode->b,shapecode->a); - - glTexCoord2f(.5,.5); - glVertex3f(xval,yval,-1); - //glColor4f(shapecode->r2,shapecode->g2,shapecode->b2,shapecode->a2); - glColor4f(0.0,0.0,0.0,shapecode->a2); - - for ( i=1;isides+2;i++) - { - - // theta+=inc; - // glColor4f(shapecode->r2,shapecode->g2,shapecode->b2,shapecode->a2); - //glTexCoord2f(radius*cos(theta)+.5 ,radius*sin(theta)+.5 ); - //glVertex3f(shapecode->radius*cos(theta)+xval,shapecode->radius*sin(theta)+yval,-1); - t = (i-1)/(float)shapecode->sides; - - glTexCoord2f( 0.5f + 0.5f*cosf(t*3.1415927f*2 + shapecode->tex_ang + 3.1415927f*0.25f)*(this->correction ? this->aspect : 1.0)/shapecode->tex_zoom, 0.5f + 0.5f*sinf(t*3.1415927f*2 + shapecode->tex_ang + 3.1415927f*0.25f)/shapecode->tex_zoom); - glVertex3f(shapecode->radius*cosf(t*3.1415927f*2 + shapecode->ang + 3.1415927f*0.25f)*(this->correction ? this->aspect : 1.0)+xval, shapecode->radius*sinf(t*3.1415927f*2 + shapecode->ang + 3.1415927f*0.25f)+yval,-1); - } - glEnd(); - - - - - glDisable(GL_TEXTURE_2D); - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); - } - else{//Untextured (use color values) - //printf("untextured %f %f %f @:%f,%f %f %f\n",shapecode->a2,shapecode->a,shapecode->border_a, shapecode->x,shapecode->y,shapecode->radius,shapecode->ang); - //draw first n-1 triangular pieces - glBegin(GL_TRIANGLE_FAN); - - glColor4f(shapecode->r,shapecode->g,shapecode->b,shapecode->a); - - // glTexCoord2f(.5,.5); - glVertex3f(xval,yval,-1); - glColor4f(shapecode->r2,shapecode->g2,shapecode->b2,shapecode->a2); - - for ( i=1;isides+2;i++) - { - - //theta+=inc; - // glColor4f(shapecode->r2,shapecode->g2,shapecode->b2,shapecode->a2); - // glTexCoord2f(radius*cos(theta)+.5 ,radius*sin(theta)+.5 ); - //glVertex3f(shapecode->radius*cos(theta)+xval,shapecode->radius*sin(theta)+yval,-1); - - t = (i-1)/(float)shapecode->sides; - glVertex3f(shapecode->radius*cosf(t*3.1415927f*2 + shapecode->ang + 3.1415927f*0.25f)*(this->correction ? this->aspect : 1.0)+xval, shapecode->radius*sinf(t*3.1415927f*2 + shapecode->ang + 3.1415927f*0.25f)+yval,-1); - - } - glEnd(); - - - } - if (presetOutputs->bWaveThick==1) glLineWidth(this->renderTarget->texsize < 512 ? 1 : 2*this->renderTarget->texsize/512); - glBegin(GL_LINE_LOOP); - glColor4f(shapecode->border_r,shapecode->border_g,shapecode->border_b,shapecode->border_a); - for ( i=1;isides+1;i++) - { - - t = (i-1)/(float)shapecode->sides; - glVertex3f(shapecode->radius*cosf(t*3.1415927f*2 + shapecode->ang + 3.1415927f*0.25f)*(this->correction ? this->aspect : 1.0)+xval, shapecode->radius*sinf(t*3.1415927f*2 + shapecode->ang + 3.1415927f*0.25f)+yval,-1); - - //theta+=inc; - //glVertex3f(shapecode->radius*cos(theta)+xval,shapecode->radius*sin(theta)+yval,-1); - } - glEnd(); - if (presetOutputs->bWaveThick==1) glLineWidth(this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize/512); - - glPopMatrix(); - } - } - - glPopMatrix(); -} - - -void Renderer::draw_waveform(PresetOutputs *presetOutputs, PresetInputs *presetInputs) { - - int x; - - float r,theta; - - float offset,scale,dy2_adj; - - float co; - - float wave_x_temp=0; - float wave_y_temp=0; - float dy_adj; - float xx,yy; - - float cos_rot; - float sin_rot; - - DWRITE( "draw_waveform: %d\n", presetOutputs->nWaveMode ); - - glMatrixMode( GL_MODELVIEW ); - glPushMatrix(); - - modulate_opacity_by_volume(presetOutputs); - maximize_colors(presetOutputs); - - if(presetOutputs->bWaveDots==1) glEnable(GL_LINE_STIPPLE); - - offset=presetOutputs->wave_x-.5; - scale=505.0/512.0; - - - - - //Thick wave drawing - if (presetOutputs->bWaveThick==1) glLineWidth( (this->renderTarget->texsize < 512 ) ? 2 : 2*this->renderTarget->texsize/512); - - //Additive wave drawing (vice overwrite) - if (presetOutputs->bAdditiveWaves==0) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - else glBlendFunc(GL_SRC_ALPHA, GL_ONE); - - switch(presetOutputs->nWaveMode) - { - - case 8://monitor - - glTranslatef(0.5,0.5, 0); - glRotated(-presetOutputs->wave_mystery*90,0,0,1); - - glTranslatef(-0.5,-0.825, 0); - glTranslatef( 0, 0, -1 ); - - /* - for (x=0;x<16;x++) - { - glBegin(GL_LINE_STRIP); - glColor4f(1.0-(x/15.0),.5,x/15.0,1.0); - glVertex3f((this->totalframes%256)*2*scale, -this->beat_val[x]*presetOutputs->fWaveScale+renderTarget->texsize*wave_y,-1); - glColor4f(.5,.5,.5,1.0); - glVertex3f((this->totalframes%256)*2*scale, this->renderTarget->texsize*presetOutputs->wave_y,-1); - glColor4f(1.0,1.0,0,1.0); - //glVertex3f((this->totalframes%256)*scale*2, this->beat_val_att[x]*presetOutputs->fWaveScale+this->renderTarget->texsize*presetOutputs->wave_y,-1); - glEnd(); - - glTranslatef(0,this->renderTarget->texsize*(1/36.0), 0); - } - */ - - glTranslatef(0,(1/18.0), 0); - - - glBegin(GL_LINE_STRIP); - glColor4f(1.0,1.0,0.5,1.0); - glVertex2f((this->totalframes%256)*2*scale, beatDetect->treb_att*5*presetOutputs->fWaveScale+presetOutputs->wave_y); - glColor4f(.2,.2,.2,1.0); - glVertex2f((this->totalframes%256)*2*scale, presetOutputs->wave_y); - glColor4f(1.0,1.0,0,1.0); - glVertex2f((this->totalframes%256)*scale*2, beatDetect->treb*-5*presetOutputs->fWaveScale+presetOutputs->wave_y); - glEnd(); - - glTranslatef(0,.075, 0); - glBegin(GL_LINE_STRIP); - glColor4f(0,1.0,0.0,1.0); - glVertex2f((this->totalframes%256)*2*scale, beatDetect->mid_att*5*presetOutputs->fWaveScale+presetOutputs->wave_y); - glColor4f(.2,.2,.2,1.0); - glVertex2f((this->totalframes%256)*2*scale, presetOutputs->wave_y); - glColor4f(.5,1.0,.5,1.0); - glVertex2f((this->totalframes%256)*scale*2, beatDetect->mid*-5*presetOutputs->fWaveScale+presetOutputs->wave_y); - glEnd(); - - - glTranslatef(0,.075, 0); - glBegin(GL_LINE_STRIP); - glColor4f(1.0,0,0,1.0); - glVertex2f((this->totalframes%256)*2*scale, beatDetect->bass_att*5*presetOutputs->fWaveScale+presetOutputs->wave_y); - glColor4f(.2,.2,.2,1.0); - glVertex2f((this->totalframes%256)*2*scale, presetOutputs->wave_y); - glColor4f(1.0,.5,.5,1.0); - glVertex2f((this->totalframes%256)*scale*2, beatDetect->bass*-5*presetOutputs->fWaveScale+presetOutputs->wave_y); - glEnd(); - - break; - - case 0://circular waveforms - // float co; - // glPushMatrix(); - /* - if(this->correction) - { - glTranslatef(this->renderTarget->texsize*.5,this->renderTarget->texsize*.5, 0); - glScalef(1.0,this->vw/(float)this->vh,1.0); - glTranslatef((-this->renderTarget->texsize*.5) ,(-this->renderTarget->texsize*.5),0); - } - */ - - glTranslatef( 0, 0, -1 ); - - presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0); - - glBegin(GL_LINE_STRIP); - - DWRITE( "nsamples: %d\n", beatDetect->pcm->numsamples ); - - for ( x=0;xpcm->numsamples;x++) - { float inv_nverts_minus_one = 1.0f/(float)(beatDetect->pcm->numsamples); - //co= -(fabs(x-((beatDetect->pcm->numsamples*.5)-1))/beatDetect->pcm->numsamples)+1; - // printf("%d %f\n",x,co); - //theta=x*(6.28/beatDetect->pcm->numsamples); - //r= ((1+2*presetOutputs->wave_mystery)*(this->renderTarget->texsize/5.0)+ - // ( co*beatDetect->pcm->pcmdataL[x]+ (1-co)*beatDetect->pcm->pcmdataL[-(x-(beatDetect->pcm->numsamples-1))]) - // *25*presetOutputs->fWaveScale); - r=(0.5 + 0.4f*.12*beatDetect->pcm->pcmdataR[x]*presetOutputs->fWaveScale + presetOutputs->wave_mystery)*.5; - theta=(x)*inv_nverts_minus_one*6.28f + presetInputs->time*0.2f; - /* - if (x < 51) - { - float mix = x/51.0; - mix = 0.5f - 0.5f*cosf(mix * 3.1416f); - float rad_2 = 0.5f + 0.4f*.12*beatDetect->pcm->pcmdataR[x]*presetOutputs->fWaveScale + presetOutputs->wave_mystery; - r = rad_2*(1.0f-mix) + r*(mix); - } - */ - glVertex2f((r*cos(theta)*(this->correction ? this->aspect : 1.0)+presetOutputs->wave_x), (r*sin(theta)+presetOutputs->wave_y)); - - } - - // r= ( (1+2*presetOutputs->wave_mystery)*(this->renderTarget->texsize/5.0)+ - // (0.5*beatDetect->pcm->pcmdataL[0]+ 0.5*beatDetect->pcm->pcmdataL[beatDetect->pcm->numsamples-1]) - // *20*presetOutputs->fWaveScale); - - //glVertex3f(r*cos(0)+(presetOutputs->wave_x*this->renderTarget->texsize),r*sin(0)+(presetOutputs->wave_y*this->renderTarget->texsize),-1); - - glEnd(); - /* - glBegin(GL_LINE_LOOP); - - for ( x=0;x<(512/pcmbreak);x++) - { - theta=(blockstart+x)*((6.28*pcmbreak)/512.0); - r= ((1+2*presetOutputs->wave_mystery)*(this->renderTarget->texsize/5.0)+fdata_buffer[fbuffer][0][blockstart+x]*.0025*presetOutputs->fWaveScale); - - glVertex3f(r*cos(theta)+(presetOutputs->wave_x*this->renderTarget->texsize),r*sin(theta)+(wave_y*this->renderTarget->texsize),-1); - } - glEnd(); - */ - //glPopMatrix(); - - break; - - case 1://circularly moving waveform - // float co; - - glTranslatef(.5,.5, 0); - glScalef(1.0,this->vw/(float)this->vh,1.0); - glTranslatef((-.5) ,(-.5),0); - glTranslatef( 0, 0, -1 ); - - presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0); - - glBegin(GL_LINE_STRIP); - //theta=(frame%512)*(6.28/512.0); - - for ( x=1;x<(512-32);x++) - { - //co= -(abs(x-255)/512.0)+1; - // printf("%d %f\n",x,co); - //theta=((this->frame%256)*(2*6.28/512.0))+beatDetect->pcm->pcmdataL[x]*.2*presetOutputs->fWaveScale; - //r= ((1+2*presetOutputs->wave_mystery)*(this->renderTarget->texsize/5.0)+ - // (beatDetect->pcm->pcmdataL[x]-beatDetect->pcm->pcmdataL[x-1])*80*presetOutputs->fWaveScale); - theta=beatDetect->pcm->pcmdataL[x+32]*0.06*presetOutputs->fWaveScale * 1.57 + presetInputs->time*2.3; - r=(0.53 + 0.43*beatDetect->pcm->pcmdataR[x]*0.12*presetOutputs->fWaveScale+ presetOutputs->wave_mystery)*.5; - - - glVertex2f((r*cos(theta)*(this->correction ? this->aspect : 1.0)+presetOutputs->wave_x),(r*sin(theta)+presetOutputs->wave_y)); - } - - glEnd(); - /* - presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0); - wave_x_temp=(presetOutputs->wave_x*.75)+.125; - wave_x_temp=-(wave_x_temp-1); - - glBegin(GL_LINE_STRIP); - - - - for (x=0; x<512-32; x++) - { - float rad = (.53 + 0.43*beatDetect->pcm->pcmdataR[x]) + presetOutputs->wave_mystery; - float ang = beatDetect->pcm->pcmdataL[x+32] * 1.57f + this->Time*2.3f; - glVertex3f((rad*cosf(ang)*.2*scale*presetOutputs->fWaveScale + wave_x_temp)*this->renderTarget->texsize,(rad*sinf(ang)*presetOutputs->fWaveScale*.2*scale + presetOutputs->wave_y)*this->renderTarget->texsize,-1); - - } - glEnd(); - */ - - break; - - case 2://EXPERIMENTAL - - glTranslatef( 0, 0, -1 ); - presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0); - - - glBegin(GL_LINE_STRIP); - - for (x=0; x<512-32; x++) - { - - glVertex2f((beatDetect->pcm->pcmdataR[x]*presetOutputs->fWaveScale*0.5*(this->correction ? this->aspect : 1.0) + presetOutputs->wave_x),( (beatDetect->pcm->pcmdataL[x+32]*presetOutputs->fWaveScale*0.5 + presetOutputs->wave_y))); - } - glEnd(); - - break; - - case 3://EXPERIMENTAL - - glTranslatef( 0, 0, -9 ); - presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0); - //wave_x_temp=(presetOutputs->wave_x*.75)+.125; - //wave_x_temp=-(wave_x_temp-1); - - - - glBegin(GL_LINE_STRIP); - - for (x=0; x<512-32; x++) - { - - glVertex2f((beatDetect->pcm->pcmdataR[x] * presetOutputs->fWaveScale*0.5 + presetOutputs->wave_x),( (beatDetect->pcm->pcmdataL[x+32]*presetOutputs->fWaveScale*0.5 + presetOutputs->wave_y))); - - } - glEnd(); - - break; - - case 4://single x-axis derivative waveform - { - presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0); - glTranslatef(.5,.5, 0); - glRotated(-presetOutputs->wave_mystery*90,0,0,1); - glTranslatef(-.5,-.5, 0); - glTranslatef( 0, 0, -1 ); - - float w1 = 0.45f + 0.5f*(presetOutputs->wave_mystery*0.5f + 0.5f); - float w2 = 1.0f - w1; - float xx[512],yy[512]; - - glBegin(GL_LINE_STRIP); - for (int i=0; i<512; i++) - { - xx[i] = -1.0f + 2.0f*(i/512.0) + presetOutputs->wave_x; - yy[i] =0.4* beatDetect->pcm->pcmdataL[i]*0.47f*presetOutputs->fWaveScale + presetOutputs->wave_y; - xx[i] += 0.4*beatDetect->pcm->pcmdataR[i]*0.44f*presetOutputs->fWaveScale; - - if (i>1) - { - xx[i] = xx[i]*w2 + w1*(xx[i-1]*2.0f - xx[i-2]); - yy[i] = yy[i]*w2 + w1*(yy[i-1]*2.0f - yy[i-2]); - } - glVertex2f(xx[i],yy[i]); - } - - glEnd(); - - /* - presetOutputs->wave_x=(presetOutputs->wave_x*.75)+.125; - presetOutputs->wave_x=-(presetOutputs->wave_x-1); - glBegin(GL_LINE_STRIP); - - for ( x=1;x<512;x++) - { - dy_adj= beatDetect->pcm->pcmdataL[x]*20*presetOutputs->fWaveScale-beatDetect->pcm->pcmdataL[x-1]*20*presetOutputs->fWaveScale; - glVertex3f((x*(this->renderTarget->texsize/512))+dy_adj, beatDetect->pcm->pcmdataL[x]*20*presetOutputs->fWaveScale+this->renderTarget->texsize*presetOutputs->wave_x,-1); - } - glEnd(); - */ - } - break; - - case 5://EXPERIMENTAL - - glTranslatef( 0, 0, -5 ); - - presetOutputs->wave_y=-1*(presetOutputs->wave_y-1.0); - - cos_rot = cosf(presetInputs->time*0.3f); - sin_rot = sinf(presetInputs->time*0.3f); - - glBegin(GL_LINE_STRIP); - - for (x=0; x<512; x++) - { - float x0 = (beatDetect->pcm->pcmdataR[x]*beatDetect->pcm->pcmdataL[x+32] + beatDetect->pcm->pcmdataL[x+32]*beatDetect->pcm->pcmdataR[x]); - float y0 = (beatDetect->pcm->pcmdataR[x]*beatDetect->pcm->pcmdataR[x] - beatDetect->pcm->pcmdataL[x+32]*beatDetect->pcm->pcmdataL[x+32]); - - glVertex2f(((x0*cos_rot - y0*sin_rot)*presetOutputs->fWaveScale*0.5*(this->correction ? this->aspect : 1.0) + presetOutputs->wave_x),( (x0*sin_rot + y0*cos_rot)*presetOutputs->fWaveScale*0.5 + presetOutputs->wave_y)); - - } - glEnd(); - - - break; - - case 6://single waveform - - - //glMatrixMode(GL_MODELVIEW); - // glLoadIdentity(); - - glTranslatef(.5,.5, 0); - glRotated(-presetOutputs->wave_mystery*90,0,0,1); - glTranslatef(0,0, -1); - - wave_x_temp=-2*0.4142*(fabs(fabs(presetOutputs->wave_mystery)-.5)-.5); - glScalef(1.0+wave_x_temp,1.0,1.0); - glTranslatef(-.5,-.5, 0); - wave_x_temp=-1*(presetOutputs->wave_x-1.0); - - glBegin(GL_LINE_STRIP); - // wave_x_temp=(wave_x*.75)+.125; - // wave_x_temp=-(wave_x_temp-1); - for ( x=0;xpcm->numsamples;x++) - { - - //glVertex3f(x*scale, fdata_buffer[fbuffer][0][blockstart+x]*.0012*fWaveScale+renderTarget->texsize*wave_x_temp,-1); - glVertex2f(x/(float)beatDetect->pcm->numsamples, beatDetect->pcm->pcmdataR[x]*.04*presetOutputs->fWaveScale+wave_x_temp); - - //glVertex3f(x*scale, renderTarget->texsize*wave_y_temp,-1); - } - // printf("%f %f\n",renderTarget->texsize*wave_y_temp,wave_y_temp); - glEnd(); - break; - - case 7://dual waveforms - - glTranslatef(.5,.5, 0); - glRotated(-presetOutputs->wave_mystery*90,0,0,1); - - wave_x_temp=-2*0.4142*(fabs(fabs(presetOutputs->wave_mystery)-.5)-.5); - glScalef(1.0+wave_x_temp,1.0,1.0); - glTranslatef(-.5,-.5, -1); - glTranslatef( 0, 0, -1 ); - - wave_y_temp=-1*(presetOutputs->wave_x-1); - - glBegin(GL_LINE_STRIP); - - for ( x=0;xpcm->numsamples;x++) - { - - glVertex2f(x/(float)beatDetect->pcm->numsamples, beatDetect->pcm->pcmdataL[x]*.04*presetOutputs->fWaveScale+(wave_y_temp+(presetOutputs->wave_y*presetOutputs->wave_y*.5))); - } - glEnd(); - - glBegin(GL_LINE_STRIP); - - - for ( x=0;xpcm->numsamples;x++) - { - - glVertex2f(x/(float)beatDetect->pcm->numsamples, beatDetect->pcm->pcmdataR[x]*.04*presetOutputs->fWaveScale+(wave_y_temp-(presetOutputs->wave_y*presetOutputs->wave_y*.5))); - } - glEnd(); - glPopMatrix(); - break; - - default: - glTranslatef( 0, 0, -1 ); - glBegin(GL_LINE_LOOP); - - for ( x=0;x<512;x++) - { - theta=(x)*(6.28/512.0); - r= (0.2+beatDetect->pcm->pcmdataL[x]*.002); - - glVertex2f(r*cos(theta)+presetOutputs->wave_x,r*sin(theta)+presetOutputs->wave_y); - } - glEnd(); - -glBegin(GL_LINE_STRIP); - - for ( x=0;x<512;x++) - { - glVertex3f(x*scale, beatDetect->pcm->pcmdataL[x]*.04*presetOutputs->fWaveScale+((presetOutputs->wave_x+.1)),-1); - } - glEnd(); - - glBegin(GL_LINE_STRIP); - - for ( x=0;x<512;x++) - { - glVertex3f(x*scale, beatDetect->pcm->pcmdataR[x]*.04*presetOutputs->fWaveScale+((presetOutputs->wave_x-.1)),-1); - - } - glEnd(); - break; - if (presetOutputs->bWaveThick==1) glLineWidth( (this->renderTarget->texsize < 512) ? 1 : 2*this->renderTarget->texsize/512); -} - glLineWidth( this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize/512); - glDisable(GL_LINE_STIPPLE); - - glPopMatrix(); -} - -void Renderer::maximize_colors(PresetOutputs *presetOutputs) { - - float wave_r_switch=0,wave_g_switch=0,wave_b_switch=0; - //wave color brightening - // - //forces max color value to 1.0 and scales - // the rest accordingly - if(presetOutputs->nWaveMode==2 || presetOutputs->nWaveMode==5) - { - switch(this->renderTarget->texsize) - { - case 256: presetOutputs->wave_o *= 0.07f; break; - case 512: presetOutputs->wave_o *= 0.09f; break; - case 1024: presetOutputs->wave_o *= 0.11f; break; - case 2048: presetOutputs->wave_o *= 0.13f; break; - } - } - - else if(presetOutputs->nWaveMode==3) - { - switch(this->renderTarget->texsize) - { - case 256: presetOutputs->wave_o *= 0.075f; break; - case 512: presetOutputs->wave_o *= 0.15f; break; - case 1024: presetOutputs->wave_o *= 0.22f; break; - case 2048: presetOutputs->wave_o *= 0.33f; break; - } - presetOutputs->wave_o*=1.3f; - presetOutputs->wave_o*=powf(beatDetect->treb ,2.0f); - } - - if (presetOutputs->bMaximizeWaveColor==1) - { - if(presetOutputs->wave_r>=presetOutputs->wave_g && presetOutputs->wave_r>=presetOutputs->wave_b) //red brightest - { - wave_b_switch=presetOutputs->wave_b*(1/presetOutputs->wave_r); - wave_g_switch=presetOutputs->wave_g*(1/presetOutputs->wave_r); - wave_r_switch=1.0; - } - else if (presetOutputs->wave_b>=presetOutputs->wave_g && presetOutputs->wave_b>=presetOutputs->wave_r) //blue brightest - { - wave_r_switch=presetOutputs->wave_r*(1/presetOutputs->wave_b); - wave_g_switch=presetOutputs->wave_g*(1/presetOutputs->wave_b); - wave_b_switch=1.0; - - } - - else if (presetOutputs->wave_g>=presetOutputs->wave_b && presetOutputs->wave_g>=presetOutputs->wave_r) //green brightest - { - wave_b_switch=presetOutputs->wave_b*(1/presetOutputs->wave_g); - wave_r_switch=presetOutputs->wave_r*(1/presetOutputs->wave_g); - wave_g_switch=1.0; - } - - - glColor4f(wave_r_switch, wave_g_switch, wave_b_switch, presetOutputs->wave_o); - } - else - { - glColor4f(presetOutputs->wave_r, presetOutputs->wave_g, presetOutputs->wave_b, presetOutputs->wave_o); - } - -} - -void Renderer::darken_center() { - - float unit=0.05f; - - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glTranslatef(0.5,0.5, 0); - - glBegin(GL_TRIANGLE_FAN); - glColor4f(0,0,0,3.0f/32.0f); - glVertex3f(0,0,-1); - glColor4f(0,0,0,-1); - glVertex3f(-unit,0,-1); - glVertex3f(0,-unit,-1); - glVertex3f(unit,0,-1); - glVertex3f(0,unit,-1); - glVertex3f(-unit,0,-1); - glEnd(); - - glPopMatrix(); -} - - -void Renderer::modulate_opacity_by_volume(PresetOutputs *presetOutputs) { - - //modulate volume by opacity - // - //set an upper and lower bound and linearly - //calculate the opacity from 0=lower to 1=upper - //based on current volume - - - if (presetOutputs->bModWaveAlphaByVolume==1) - {if (beatDetect->vol<=presetOutputs->fModWaveAlphaStart) presetOutputs->wave_o=0.0; - else if (beatDetect->vol>=presetOutputs->fModWaveAlphaEnd) presetOutputs->wave_o=presetOutputs->fWaveAlpha; - else presetOutputs->wave_o=presetOutputs->fWaveAlpha*((beatDetect->vol-presetOutputs->fModWaveAlphaStart)/(presetOutputs->fModWaveAlphaEnd-presetOutputs->fModWaveAlphaStart));} - else presetOutputs->wave_o=presetOutputs->fWaveAlpha; -} - -void Renderer::draw_motion_vectors(PresetOutputs *presetOutputs) { - - int x,y; - - float offsetx=presetOutputs->mv_dx, intervalx=1.0/(float)presetOutputs->mv_x; - float offsety=presetOutputs->mv_dy, intervaly=1.0/(float)presetOutputs->mv_y; - - - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glPointSize(presetOutputs->mv_l); - glColor4f(presetOutputs->mv_r, presetOutputs->mv_g, presetOutputs->mv_b, presetOutputs->mv_a); - - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glTranslatef( 0, 0, -1 ); - - glBegin(GL_POINTS); - for (x=0;xmv_x;x++){ - for(y=0;ymv_y;y++){ - float lx, ly, lz; - lx = offsetx+x*intervalx; - ly = offsety+y*intervaly; - lz = -1; - glVertex2f(lx,ly); - } - } - - glEnd(); - - glPopMatrix(); -} - - -void Renderer::draw_borders(PresetOutputs *presetOutputs) { - - //Draw Borders - float of=presetOutputs->ob_size*.5; - float iff=presetOutputs->ib_size*.5; - float texof=1.0-of; - - //no additive drawing for borders - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glColor4d(presetOutputs->ob_r,presetOutputs->ob_g,presetOutputs->ob_b,presetOutputs->ob_a); - - glMatrixMode( GL_MODELVIEW ); - glPushMatrix(); - glTranslatef( 0, 0, -1 ); - - glRectd(0,0,of,1); - glRectd(of,0,texof,of); - glRectd(texof,0,1,1); - glRectd(of,1,texof,texof); - glColor4d(presetOutputs->ib_r,presetOutputs->ib_g,presetOutputs->ib_b,presetOutputs->ib_a); - glRectd(of,of,of+iff,texof); - glRectd(of+iff,of,texof-iff,of+iff); - glRectd(texof-iff,of,texof,texof); - glRectd(of+iff,texof,texof-iff,texof-iff); - - glPopMatrix(); -} - - - -void Renderer::draw_title_to_texture() { - -#ifdef USE_FTGL - if (this->drawtitle>80) - // if(1) - { - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glColor4f(1.0,1.0,1.0,1.0); - glPushMatrix(); - - glTranslatef(0,0.5, -1); - - glScalef(0.0025,-0.0025,30*.0025); - //glTranslatef(0,0, 1.0); - poly_font->FaceSize( 22); - - glRasterPos2f(0.0, 0.0); - - if ( this->title != NULL ) { - poly_font->Render(this->title ); - } else { - poly_font->Render("Unknown" ); - } - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - glPopMatrix(); - this->drawtitle=0; - } -#endif /** USE_FTGL */ -} - -void Renderer::draw_title_to_screen() { - -#ifdef USE_FTGL - if(this->drawtitle>0) - { - float easein = ((80-this->drawtitle)*.0125); - float easein2 = easein * easein; - float easein3 = .0025/((-easein2)+1.0); - - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glColor4f(1.0,1.0,1.0,1.0); - glPushMatrix(); - - - //glTranslatef(this->vw*.5,this->vh*.5 , -1.0); - glTranslatef(0,0.5 , -1.0); - - glScalef(easein3,easein3,30*.0025); - - glRotatef(easein2*360,1,0,0); - - - //glTranslatef(-.5*this->vw,0, 0.0); - - //poly_font->Depth(1.0); - poly_font->FaceSize(22); - - glRasterPos2f(0.0, 0.0); - if ( this->title != NULL ) { - poly_font->Render(this->title ); - } else { - poly_font->Render("Unknown" ); - } - // poly_font->Depth(0.0); - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - glPopMatrix(); - - this->drawtitle++; - - } -#endif /** USE_FTGL */ -} - -void Renderer::draw_title() { -#ifdef USE_FTGL - //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - - glColor4f(1.0,1.0,1.0,1.0); - // glPushMatrix(); - // glTranslatef(this->vw*.001,this->vh*.03, -1); - // glScalef(this->vw*.015,this->vh*.025,0); - - glRasterPos2f(0.01, 0.05); - title_font->FaceSize( (unsigned)(20*(this->vh/512.0))); - - if ( this->title != NULL ) { - title_font->Render(this->title ); - } else { - title_font->Render("Unknown" ); - } - // glPopMatrix(); - //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - -#endif /** USE_FTGL */ -} -void Renderer::draw_preset() { -#ifdef USE_FTGL - //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - - glColor4f(1.0,1.0,1.0,1.0); - // glPushMatrix(); - //glTranslatef(this->vw*.001,this->vh*-.01, -1); - //glScalef(this->vw*.003,this->vh*.004,0); - - - glRasterPos2f(0.01, 0.01); - - title_font->FaceSize((unsigned)(12*(this->vh/512.0))); - if(this->noSwitch) title_font->Render("[LOCKED] " ); - title_font->FaceSize((unsigned)(20*(this->vh/512.0))); - title_font->Render(this->presetName ); - - - - //glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); -#endif /** USE_FTGL */ -} - -void Renderer::draw_help( ) { - -#ifdef USE_FTGL -//glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - DWRITE("pre-help"); - glColor4f(1.0,1.0,1.0,1.0); - glPushMatrix(); - glTranslatef(0,1, 0); - //glScalef(this->vw*.02,this->vh*.02 ,0); - - - title_font->FaceSize((unsigned)( 18*(this->vh/512.0))); - - glRasterPos2f(0.01, -0.05); - title_font->Render("Help"); - - glRasterPos2f(0.01, -0.09); - title_font->Render("----------------------------"); - - glRasterPos2f(0.01, -0.13); - title_font->Render("F1: This help menu"); - - glRasterPos2f(0.01, -0.17); - title_font->Render("F2: Show song title"); - - glRasterPos2f(0.01, -0.21); - title_font->Render("F3: Show preset name"); - - glRasterPos2f(0.01, -0.25); - title_font->Render("F4: Show Rendering Settings"); - - glRasterPos2f(0.01, -0.29); - title_font->Render("F5: Show FPS"); - - glRasterPos2f(0.01, -0.35); - title_font->Render("F: Fullscreen"); - - glRasterPos2f(0.01, -0.39); - title_font->Render("L: Lock/Unlock Preset"); - - glRasterPos2f(0.01, -0.43); - title_font->Render("M: Show Menu"); - - glRasterPos2f(0.01, -0.49); - title_font->Render("R: Random preset"); - glRasterPos2f(0.01, -0.53); - title_font->Render("N: Next preset"); - - glRasterPos2f(0.01, -0.57); - title_font->Render("P: Previous preset"); - - glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - DWRITE("post-help"); -#endif /** USE_FTGL */ -} - -void Renderer::draw_stats(PresetInputs *presetInputs) { - -#ifdef USE_FTGL - char buffer[128]; - float offset= (this->showfps%2 ? -0.05 : 0.0); - // glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - - glColor4f(1.0,1.0,1.0,1.0); - glPushMatrix(); - glTranslatef(0.01,1, 0); - glRasterPos2f(0, -.05+offset); - other_font->Render(this->correction ? " aspect: corrected" : " aspect: stretched"); -sprintf( buffer, " (%f)", this->aspect); - other_font->Render(buffer); - - - - glRasterPos2f(0, -.09+offset); - other_font->FaceSize((unsigned)(18*(this->vh/512.0))); - - sprintf( buffer, " texsize: %d", this->renderTarget->texsize); - other_font->Render(buffer); - - glRasterPos2f(0, -.13+offset); - sprintf( buffer, "viewport: %d x %d", this->vw, this->vh); - other_font->Render(buffer); - /* REME: FIX - glRasterPos2f(0, -.17+offset); - other_font->Render((this->renderer->renderTarget->usePbuffers ? " FBO: on" : " FBO: off")); - */ - glRasterPos2f(0, -.21+offset); - sprintf( buffer, " mesh: %d x %d", presetInputs->gx,presetInputs->gy); - other_font->Render(buffer); - - - glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - - -#endif /** USE_FTGL */ -} -void Renderer::draw_fps( float realfps ) { -#ifdef USE_FTGL - char bufferfps[20]; - sprintf( bufferfps, "%.1f fps", realfps); - // glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - - glColor4f(1.0,1.0,1.0,1.0); - glPushMatrix(); - glTranslatef(0.01,1, 0); - glRasterPos2f(0, -0.05); - title_font->FaceSize((unsigned)(20*(this->vh/512.0))); - title_font->Render(bufferfps); - - glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - -#endif /** USE_FTGL */ -} - - -//Actually draws the texture to the screen -// -//The Video Echo effect is also applied here -void Renderer::render_texture_to_screen(PresetOutputs *presetOutputs) { - - int flipx=1,flipy=1; - //glBindTexture( GL_TEXTURE_2D,this->renderTarget->textureID[0] ); - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); - - glClear( GL_DEPTH_BUFFER_BIT ); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glTranslatef(0, 0, -15); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); - - // glClear(GL_ACCUM_BUFFER_BIT); - glColor4d(0.0, 0.0, 0.0,1.0f); - - DWRITE( "rendering texture to screen\n" ); - - glBegin(GL_QUADS); - glVertex3d( 0, 0, -1 ); - glVertex4d(-0.5,-0.5,-1,1); - glVertex4d(-0.5, 0.5,-1,1); - glVertex4d(0.5, 0.5,-1,1); - glVertex4d(0.5, -0.5,-1,1); - glEnd(); - - - glEnable(GL_TEXTURE_2D); - //glBindTexture( GL_TEXTURE_2D, this->renderTarget->textureID[0] ); -// glBindTexture( GL_TEXTURE_2D, this->renderTarget->textureID ); - - // glAccum(GL_LOAD,0); - // if (bDarken==1) glBlendFunc(GL_SRC_COLOR,GL_ZERO); - - //Draw giant rectangle and texture it with our texture! - glBegin(GL_QUADS); - glTexCoord4d(0, 1,0,1); glVertex4d(-0.5,-0.5,-1,1); - glTexCoord4d(0, 0,0,1); glVertex4d(-0.5, 0.5,-1,1); - glTexCoord4d(1, 0,0,1); glVertex4d(0.5, 0.5,-1,1); - glTexCoord4d(1, 1,0,1); glVertex4d(0.5, -0.5,-1,1); - glEnd(); - - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - // if (bDarken==1) glBlendFunc(GL_SRC_COLOR,GL_ONE_MINUS_SRC_ALPHA); - - // if (bDarken==1) { glAccum(GL_ACCUM,1-fVideoEchoAlpha); glBlendFunc(GL_SRC_COLOR,GL_ZERO); } - - glMatrixMode(GL_TEXTURE); - - //draw video echo - glColor4f(0.0, 0.0, 0.0,presetOutputs->fVideoEchoAlpha); - glTranslatef(.5,.5,0); - glScalef(1.0/presetOutputs->fVideoEchoZoom,1.0/presetOutputs->fVideoEchoZoom,1); - glTranslatef(-.5,-.5,0); - - switch (((int)presetOutputs->nVideoEchoOrientation)) - { - case 0: flipx=1;flipy=1;break; - case 1: flipx=-1;flipy=1;break; - case 2: flipx=1;flipy=-1;break; - case 3: flipx=-1;flipy=-1;break; - default: flipx=1;flipy=1; break; - } - glBegin(GL_QUADS); - glTexCoord4d(0, 1,0,1); glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glTexCoord4d(0, 0,0,1); glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glTexCoord4d(1, 0,0,1); glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glTexCoord4d(1, 1,0,1); glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - - - glDisable(GL_TEXTURE_2D); - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - - if (presetOutputs->bBrighten==1) - { - glColor4f(1.0, 1.0, 1.0,1.0); - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - glBlendFunc(GL_ZERO, GL_DST_COLOR); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - } - - if (presetOutputs->bDarken==1) - { - - glColor4f(1.0, 1.0, 1.0,1.0); - glBlendFunc(GL_ZERO,GL_DST_COLOR); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - - - - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - } - - - if (presetOutputs->bSolarize) - { - - glColor4f(1.0, 1.0, 1.0,1.0); - glBlendFunc(GL_ZERO,GL_ONE_MINUS_DST_COLOR); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - glBlendFunc(GL_DST_COLOR,GL_ONE); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - - - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - } - - if (presetOutputs->bInvert) - { - glColor4f(1.0, 1.0, 1.0,1.0); - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - } -} -/* -void Renderer::render_texture_to_studio() { - - int x,y; - int flipx=1,flipy=1; - - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); - - glClear( GL_DEPTH_BUFFER_BIT ); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glTranslatef(0, 0, -15); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST); - - // glClear(GL_ACCUM_BUFFER_BIT); - glColor4f(0.0, 0.0, 0.0,0.04); - - - glBegin(GL_QUADS); - glVertex4d(-0.5,-0.5,-1,1); - glVertex4d(-0.5, 0.5,-1,1); - glVertex4d(0.5, 0.5,-1,1); - glVertex4d(0.5, -0.5,-1,1); - glEnd(); - - - glColor4f(0.0, 0.0, 0.0,1.0); - - glBegin(GL_QUADS); - glVertex4d(-0.5,0,-1,1); - glVertex4d(-0.5, 0.5,-1,1); - glVertex4d(0.5, 0.5,-1,1); - glVertex4d(0.5, 0,-1,1); - glEnd(); - - glBegin(GL_QUADS); - glVertex4d(0,-0.5,-1,1); - glVertex4d(0, 0.5,-1,1); - glVertex4d(0.5, 0.5,-1,1); - glVertex4d(0.5, -0.5,-1,1); - glEnd(); - - glPushMatrix(); - glTranslatef(.25, .25, 0); - glScalef(.5,.5,1); - - glEnable(GL_TEXTURE_2D); - - - //Draw giant rectangle and texture it with our texture! - glBegin(GL_QUADS); - glTexCoord4d(0, 1,0,1); glVertex4d(-0.5,-0.5,-1,1); - glTexCoord4d(0, 0,0,1); glVertex4d(-0.5, 0.5,-1,1); - glTexCoord4d(1, 0,0,1); glVertex4d(0.5, 0.5,-1,1); - glTexCoord4d(1, 1,0,1); glVertex4d(0.5, -0.5,-1,1); - glEnd(); - - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - - glMatrixMode(GL_TEXTURE); - - //draw video echo - glColor4f(0.0, 0.0, 0.0,presetOutputs->fVideoEchoAlpha); - glTranslated(.5,.5,0); - glScaled(1/presetOutputs->fVideoEchoZoom,1/presetOutputs->fVideoEchoZoom,1); - glTranslated(-.5,-.5,0); - - switch (((int)presetOutputs->nVideoEchoOrientation)) - { - case 0: flipx=1;flipy=1;break; - case 1: flipx=-1;flipy=1;break; - case 2: flipx=1;flipy=-1;break; - case 3: flipx=-1;flipy=-1;break; - default: flipx=1;flipy=1; break; - } - glBegin(GL_QUADS); - glTexCoord4d(0, 1,0,1); glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glTexCoord4d(0, 0,0,1); glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glTexCoord4d(1, 0,0,1); glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glTexCoord4d(1, 1,0,1); glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - - - //glDisable(GL_TEXTURE_2D); - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - // if (bDarken==1) { glAccum(GL_ACCUM,fVideoEchoAlpha); glAccum(GL_RETURN,1);} - - - if (presetOutputs->bInvert) - { - glColor4f(1.0, 1.0, 1.0,1.0); - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glBegin(GL_QUADS); - glVertex4f(-0.5*flipx,-0.5*flipy,-1,1); - glVertex4f(-0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, 0.5*flipy,-1,1); - glVertex4f(0.5*flipx, -0.5*flipy,-1,1); - glEnd(); - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - } - - // glTranslated(.5,.5,0); - // glScaled(1/fVideoEchoZoom,1/fVideoEchoZoom,1); - // glTranslated(-.5,-.5,0); - //glTranslatef(0,.5*vh,0); - - - //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - - glDisable(GL_TEXTURE_2D); - glMatrixMode(GL_MODELVIEW); - glPopMatrix(); - glPushMatrix(); - glTranslatef(.25, -.25, 0); - glScalef(.5,.5,1); - glColor4f(1.0,1.0,1.0,1.0); - - for (x=0;xgx;x++){ - glBegin(GL_LINE_STRIP); - for(y=0;ygy;y++){ - glVertex4f((presetInputs->x_mesh[x][y]-.5), (presetInputs->y_mesh[x][y]-.5),-1,1); - //glVertex4f((origx[x+1][y]-.5) * vw, (origy[x+1][y]-.5) *vh ,-1,1); - } - glEnd(); - } - - for (y=0;ygy;y++){ - glBegin(GL_LINE_STRIP); - for(x=0;xgx;x++){ - glVertex4f((presetInputs->x_mesh[x][y]-.5), (presetInputs->y_mesh[x][y]-.5),-1,1); - //glVertex4f((origx[x+1][y]-.5) * vw, (origy[x+1][y]-.5) *vh ,-1,1); - } - glEnd(); - } - - glEnable( GL_TEXTURE_2D ); - - - // glTranslated(-.5,-.5,0); glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - - // Waveform display -- bottom-left - glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glTranslatef(-.5,0, 0); - - glTranslatef(0,-0.10, 0); - glBegin(GL_LINE_STRIP); - glColor4f(0,1.0,1.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)), beatDetect->treb_att*-7,-1); - glColor4f(1.0,1.0,1.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)),0 ,-1); - glColor4f(.5,1.0,1.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)), beatDetect->treb*7,-1); - glEnd(); - - glTranslatef(0,-0.13, 0); - glBegin(GL_LINE_STRIP); - glColor4f(0,1.0,0.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)), beatDetect->mid_att*-7,-1); - glColor4f(1.0,1.0,1.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)),0 ,-1); - glColor4f(.5,1.0,0.0,0.5); - glVertex3f((((this->totalframes%256)/551.0)), beatDetect->mid*7,-1); - glEnd(); - - - glTranslatef(0,-0.13, 0); - glBegin(GL_LINE_STRIP); - glColor4f(1.0,0.0,0.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)), beatDetect->bass_att*-7,-1); - glColor4f(1.0,1.0,1.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)),0 ,-1); - glColor4f(.7,0.2,0.2,1.0); - glVertex3f((((this->totalframes%256)/551.0)), beatDetect->bass*7,-1); - glEnd(); - - glTranslatef(0,-0.13, 0); - glBegin(GL_LINES); - - glColor4f(1.0,1.0,1.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)),0 ,-1); - glColor4f(1.0,0.6,1.0,1.0); - glVertex3f((((this->totalframes%256)/551.0)), beatDetect->vol*7,-1); - glEnd(); - - glPopMatrix(); - - glDisable(GL_TEXTURE_2D); -} - -*/ - diff --git a/src/projectM-engine-backup/Renderer.hpp b/src/projectM-engine-backup/Renderer.hpp deleted file mode 100644 index 128ba663a..000000000 --- a/src/projectM-engine-backup/Renderer.hpp +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef Renderer_HPP -#define Renderer_HPP - -#include "PBuffer.hpp" -#include "PresetFrameIO.hpp" -#include "BeatDetect.hpp" - -#ifdef USE_FTGL -#include -#include -#include -#endif /** USE_FTGL */ - -class BeatDetect; - -class Renderer -{ - RenderTarget *renderTarget; - BeatDetect *beatDetect; - //per pixel equation variables - float **gridx; //grid containing interpolated mesh - float **gridy; - float **origx2; //original mesh - float **origy2; - int gx; - int gy; - - int vw; - int vh; - - float aspect; - - - - public: - /// @bug hack to get glConsol - -#ifdef USE_FTGL -FTGLPixmapFont *title_font; -FTGLPixmapFont *other_font; -FTGLPolygonFont *poly_font; -#endif /** USE_FTGL */ - - int showfps; - int showtitle; - int showpreset; - int showhelp; - int showstats; - - int studio; - int correction; - - char *presetName; - char *fontURL; - - int noSwitch; - - int totalframes; -float realfps; -char *title; - int drawtitle; - - Renderer( int width, int height, int gx, int gy, RenderTarget *renderTarget, BeatDetect *beatDetect, char *fontURL); - ~Renderer(); - void RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInputs); - void reset(int w, int h); - -private: - - void PerFrame(PresetOutputs *presetOutputs); - void Interpolation(PresetOutputs *presetOutputs, PresetInputs *presetInputs); - void PerPixelMath(PresetOutputs *presetOutputs, PresetInputs *presetInputs); - void rescale_per_pixel_matrices(); - void maximize_colors(PresetOutputs *presetOutputs); - void render_texture_to_screen(PresetOutputs *presetOutputs); - void draw_fps( float realfps ); - void draw_stats(PresetInputs *presetInputs); - void draw_help( ); - void draw_preset(); - void draw_title(); - void draw_title_to_screen(); - void maximize_colors(); - void draw_title_to_texture(); - void draw_motion_vectors(PresetOutputs *presetOutputs); - void draw_borders(PresetOutputs *presetOutputs); - void draw_shapes(PresetOutputs *presetOutputs); - void draw_custom_waves(PresetOutputs *presetOutputs); - void draw_waveform(PresetOutputs *presetOutputs, PresetInputs *presetInputs); - void modulate_opacity_by_volume(PresetOutputs *presetOutputs) ; - void darken_center(); -}; - -#endif diff --git a/src/projectM-engine-backup/SplayNode.hpp b/src/projectM-engine-backup/SplayNode.hpp deleted file mode 100644 index 09fb19ce0..000000000 --- a/src/projectM-engine-backup/SplayNode.hpp +++ /dev/null @@ -1,91 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * Node of a splay tree - * - * $Log$ - */ - -#ifndef _SPLAYNODE_HPP -#define _SPLAYNODE_HPP - -//#include "projectM.hpp" - -#include "compare.h" - -typedef void Object; -template -class SplayNode { -public: - SplayNode *left, *right; - Data *data; - void *key; - void (*free_key)(void*); - SplayNode(); - SplayNode(void *key, Data *data, void (*free_key)(void*)); - ~SplayNode(); - }; - -/** Create a new default splaynode */ -template -SplayNode::SplayNode() { - this->data = NULL; - this->key = NULL; - this->free_key = free_key; - } - -/* Create a new splay node type */ -template -SplayNode::SplayNode(void * key, Data * data, void (*free_key)(void*)) { - - /* Creates the new splay node struct */ - this->data = data; - this->key = key; - this->free_key = free_key; - } - -/* Recursively free all the splaynodes */ -template -SplayNode::~SplayNode() { - - /* Ok if this happens, a recursive base case */ - /* Free left node */ - if ( left != NULL ) { - delete left; - } - - /* Free right node */ - if ( right != NULL ) { - delete right; - } - - /* Free this node's key */ -// printf( "~SplayNode: %X\t%X\n", key, tree->free_key ); - - this->free_key(key); - - /* Note that the data pointers are not freed here. - Should be freed with a splay traversal function */ - } - -#endif /** !_SPLAYNODE_HPP */ diff --git a/src/projectM-engine-backup/StaticArray.hpp b/src/projectM-engine-backup/StaticArray.hpp deleted file mode 100644 index 9593edd68..000000000 --- a/src/projectM-engine-backup/StaticArray.hpp +++ /dev/null @@ -1,212 +0,0 @@ -#ifndef PROJECTM_STATIC_ARRAY_HPP -#define PROJECTM_STATIC_ARRAY_HPP -#include -/** -* A simple array implementation with a few important features: - * (1) static array length, resulting in compile time optimizations - * (2) bounds checking when compiling with assertions - * Note that this data structure is generally useful only for smaller sized arrays. -*/ - -template -class StaticArray { -public: - - typedef T * iterator; - typedef const T * const_iterator; - - StaticArray(); - StaticArray(const std::size_t logical_size); - StaticArray(const std::size_t logical_size, const T & defaultValue); - const T & operator[] (std::size_t index) const; - T & operator[] (std::size_t index); - - iterator begin(); - iterator end(); - - const_iterator begin() const; - const_iterator end() const; - - void clear(); - bool empty() const; - - bool operator==(const StaticArray & rhs) const; - bool operator!=(const StaticArray & rhs) const; - bool operator<(const StaticArray & rhs) const; - bool operator>(const StaticArray & rhs) const; - - /// Do nothing implementation that will be optimized out. Bit of a hack to make it interface with vector. - void reserve(const std::size_t amount) const {} - - void push_back(const T & element); - void pop_back(); - - void erase(iterator first, iterator last); - - std::size_t size() const; - std::size_t capacity() const; - -private: - std::size_t m_logical_size; - T m_array[STATIC_ARRAY_MAX_SIZE+1]; -}; - - -template -StaticArray::StaticArray():m_logical_size(0) {} - -template -StaticArray::StaticArray(const std::size_t logical_size):m_logical_size(logical_size) { - assert(logical_size <= STATIC_ARRAY_MAX_SIZE); -} - -template -StaticArray::StaticArray(const std::size_t logical_size, const T & defaultValue):m_logical_size(logical_size) { - assert(logical_size <= STATIC_ARRAY_MAX_SIZE); - for (iterator pos = begin(); pos != end();++pos) - *pos = defaultValue; -} - -template -inline const T & StaticArray::operator[] (std::size_t index) const { - assert(index <= (m_logical_size-1)); - return m_array[index]; -} - -template -inline T & StaticArray::operator[] (std::size_t index) { - assert(index <= (m_logical_size-1)); - return m_array[index]; -} - -template -inline std::size_t StaticArray::size() const { - return m_logical_size; -} - - -template -inline std::size_t StaticArray::capacity() const { - return STATIC_ARRAY_MAX_SIZE; -} - - -template -inline bool StaticArray::empty() const { - return m_logical_size == 0; -} - -template -inline void StaticArray::clear() { - m_logical_size = 0; -} - -template -inline typename StaticArray::const_iterator StaticArray::begin() const { - return m_array; -} - - -template -inline typename StaticArray::iterator StaticArray::begin() { - return m_array; -} - - -template -inline typename StaticArray::const_iterator StaticArray::end() const { - return m_array+m_logical_size; -} - - -template -inline void StaticArray::push_back(const T & element) { - (*this)[m_logical_size++] = element; -} - - -template -inline void StaticArray::pop_back() { - assert(m_logical_size > 0); - m_logical_size--; -} - - -/// @slow worst case is around N^2 + N. -template -inline void StaticArray::erase(iterator first, iterator last) { - - StaticArray tmpArray; - - for (iterator pos = begin(); pos != end();++pos) { - for (iterator spos = first; spos != last;++spos) { - if (pos != spos) - tmpArray.push_back(*pos); - } - } - (*this) =tmpArray; -} - -template -inline typename StaticArray::iterator StaticArray::end() { - return m_array+m_logical_size; -} - - -/// Lexographic comparison -template -inline bool StaticArray::operator< (const StaticArray & rhs) const { - - const StaticArray & lhs = *this; - - std::size_t len = rhs.size() < lhs.size() ? rhs.size(): lhs.size(); - - for (std::size_t i = 0; i < len;i++) { - if (lhs[i] < rhs[i]) - return true; - else if (!(lhs[i] == rhs[i])) - return false; - } - - // rhs has less elements than lhs - if (len < lhs.size()) - return false; - - // lhs has less elements than rhs - if (len < rhs.size()) - return true; - - // Equal - return false; - -} - - -template -inline bool StaticArray::operator!=(const StaticArray & rhs) const { - return !(*this == rhs); -} - -template -inline bool StaticArray::operator==(const StaticArray & rhs) const { - - const StaticArray & lhs = *this; - - if (rhs.size() != lhs.size()) - return false; - - for (std::size_t i = 0; i < rhs.size() ;i++) { - if (!(rhs[i] == lhs[i])) - return false; - } - return true; - -} - - -template -inline bool StaticArray ::operator> (const StaticArray & rhs) const { - return ((!((*this) == rhs)) && (!((*this) < rhs))); -} - -#endif diff --git a/src/projectM-engine-backup/browser.cpp b/src/projectM-engine-backup/browser.cpp deleted file mode 100755 index e8a76a5bd..000000000 --- a/src/projectM-engine-backup/browser.cpp +++ /dev/null @@ -1,145 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -#include -#include -#include - -#include "Common.hpp" -#include "fatal.h" -#include "projectM.hpp" -#include "glConsole.h" -#include "event.h" - -extern interface_t current_interface; - -gl_console_t * browser_console = NULL; -int active_font2 = 0; -char input_buffer[MAX_PATH_SIZE]; -int buf_pos = 0; - -int loadBrowser() { - - - - if ((browser_console = glConsoleCreate(40, 10, 80, 20, 1, 1, active_font2)) < 0) - return PROJECTM_FAILURE; - - glConsoleSetFGColor(CONSOLE_RED, browser_console); - glConsoleSetBGColor(CONSOLE_BLACK, browser_console); - glConsoleSetFlags(CONSOLE_FLAG_CURSOR_BLINKING | CONSOLE_FLAG_ALWAYS_DRAW_BACKGROUND, browser_console); - glConsoleClearBuffer(browser_console); - - buf_pos = 0; - memset(input_buffer, 0, MAX_PATH_SIZE); - - return PROJECTM_SUCCESS; -} - -int closeBrowser() { - - - active_font2 = 0; - - glConsoleDestroy(browser_console); - browser_console = NULL; - - return PROJECTM_SUCCESS; -} - -void browser_key_handler( projectMEvent event, projectMKeycode keycode, projectMModifier modifier ) { - - char s[2]; - - s[0] = 0; - s[1] = 0; - - - switch( event ) { - case PROJECTM_KEYDOWN: - switch(keycode) { - case PROJECTM_K_UP: - glConsoleMoveCursorUp(browser_console); - break; - case PROJECTM_K_RETURN: -//@@ loadPresetByFile(input_buffer); - closeBrowser(); - current_interface = DEFAULT_INTERFACE; - break; - case PROJECTM_K_RIGHT: - glConsoleMoveCursorForward(browser_console); - break; - case PROJECTM_K_LEFT: - printf("CURSOR BACKWARD\n"); - glConsoleMoveCursorBackward(browser_console); - break; - case PROJECTM_K_DOWN: - glConsoleMoveCursorDown(browser_console); - break; - case PROJECTM_K_PAGEUP: - glConsoleAlignCursorUp(browser_console); - break; - case PROJECTM_K_PAGEDOWN: - glConsoleAlignCursorDown(browser_console); - break; - case PROJECTM_K_INSERT: - glConsoleAlignCursorLeft(browser_console); - break; - case PROJECTM_K_DELETE: - glConsoleAlignCursorRight(browser_console); - break; - case PROJECTM_K_LSHIFT: - break; - case PROJECTM_K_RSHIFT: - break; - case PROJECTM_K_CAPSLOCK: - break; - case PROJECTM_K_ESCAPE: - closeBrowser(); - current_interface = DEFAULT_INTERFACE; - break; - - default: /* All regular characters */ - if (buf_pos == MAX_PATH_SIZE) { - buf_pos = 0; - } - input_buffer[buf_pos] = (char)keycode; - if ((modifier == PROJECTM_KMOD_LSHIFT) || (modifier == PROJECTM_KMOD_RSHIFT) || (modifier == PROJECTM_KMOD_CAPS)) - input_buffer[buf_pos] -= 32; - - *s = input_buffer[buf_pos]; - glConsolePrintString(s, browser_console); - buf_pos++; - break; - } - } - - -} - -void refreshBrowser() { - - // glConsoleClearBuffer(browser_console); - // glConsoleSetCursorPos(1, 1, browser_console); - //glConsolePrintString("Enter a file to load:\n", browser_console); - //glConsolePrintString(input_buffer, browser_console); - glConsoleDraw(browser_console); -} - diff --git a/src/projectM-engine-backup/browser.h b/src/projectM-engine-backup/browser.h deleted file mode 100755 index 958719b6f..000000000 --- a/src/projectM-engine-backup/browser.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * - * - * $Log$ - */ -/** - * $Id: browser.h,v 1.1.1.1 2005/12/23 18:05:03 psperl Exp $ - * - * Browser interface - * - */ - -#ifndef _BROWSER_H -#define _BROWSER_H - -#include "event.h" - -void browser_key_handler( projectMEvent event, projectMKeycode keycode, projectMModifier modifier ); -int loadBrowser(); -int closeBrowser(); -void refreshBrowser(); - -#endif /** !_BROWSER_H */ diff --git a/src/projectM-engine-backup/carbontoprojectM.h b/src/projectM-engine-backup/carbontoprojectM.h deleted file mode 100755 index 68f2567d6..000000000 --- a/src/projectM-engine-backup/carbontoprojectM.h +++ /dev/null @@ -1,104 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: carbontoprojectM.hpp,v 1.2 2004/11/12 15:12:58 cvs Exp $ - * - * Translates CARBON -> projectM variables - * - * $Log$ - */ - -#ifndef _CARBONTOPROJECTM_H -#define _CARBONTOPROJECTM_H - -#include "projectM.hpp" -#ifdef WIN32 -#else -#endif - -projectMEvent carbon2pmEvent( EventRecord *event ) { \ -\ - switch ( event->what ) { \ - case updateEvt: \ - return PROJECTM_VIDEORESIZE; \ - case keyUp: \ - return PROJECTM_KEYUP; \ - case keyDown: \ - return PROJECTM_KEYDOWN; \ - default: - return PROJECTM_KEYUP; \ - } \ - } \ - -projectMKeycode carbon2pmKeycode( EventRecord *event ) { \ - projectMKeycode char_code = (projectMKeycode)(event->message & charCodeMask); \ - switch ( char_code ) { \ - case kFunctionKeyCharCode: { \ - switch ( ( event->message << 16 ) >> 24 ) { \ - case 111: { \ - return PROJECTM_K_F12; \ - } \ - case 103: { \ - return PROJECTM_K_F11; \ - } \ - case 109: { \ - return PROJECTM_K_F10; \ - } \ - case 101: { \ - return PROJECTM_K_F9; \ - } \ - case 100: { \ - return PROJECTM_K_F8; \ - } \ - case 98: { \ - return PROJECTM_K_F7; \ - } \ - case 97: { \ - return PROJECTM_K_F6; \ - } \ - case 96: { \ - return PROJECTM_K_F5; \ - } \ - case 118: { \ - return PROJECTM_K_F4; \ - } \ - case 99: { \ - return PROJECTM_K_F3; \ - } \ - case 120: { \ - return PROJECTM_K_F2; \ - } \ - case 122: { \ - return PROJECTM_K_F1; \ - } \ - } \ - } \ - default: { \ - return char_code; \ - } \ - } \ - } \ - -projectMModifier carbon2pmModifier( EventRecord *event ) { \ - return (projectMModifier)PROJECTM_K_LSHIFT; \ - } \ - -#endif /** _CARBONTOPROJECTM_H */ diff --git a/src/projectM-engine-backup/compare.h b/src/projectM-engine-backup/compare.h deleted file mode 100755 index b5b64b977..000000000 --- a/src/projectM-engine-backup/compare.h +++ /dev/null @@ -1,114 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * $Log$ - */ - -#ifndef _COMPARE_H -#define _COMPARE_H -#include "wipemalloc.h" -#include "Common.hpp" - -/// @bug this will be ripped away when splaytree is more standardly written or its removed in favor of stl-esque data structure -class SplayKeyFunctions { -public: -static int compare_int(const int * num1, const int * num2); -static int compare_string(const char * string1, const char * string2); - -static void free_int(int * num); -static void free_string(char * string); -static void * copy_int(int * num); -static void * copy_string(char * string); -static int compare_string_version(const char * str1, const char * str2); -}; - - -/** tree_types.cpp */ -/* Compares integer value numbers in 32 bit range */ -inline int SplayKeyFunctions::compare_int(const int * num1, const int * num2) { - - if ((*num1) < (*num2)) - return -1; - if ((*num1) > (*num2)) - return 1; - - return 0; -} - -/* Compares strings in lexographical order */ -inline int SplayKeyFunctions::compare_string(const char * str1, const char * str2) { - - // printf("comparing \"%s\" to \"%s\"\n", str1, str2); - //return strcmp(str1, str2); - return strncmp(str1, str2, MAX_TOKEN_SIZE-1); - -} - -/* Compares a string in version order. That is, file1 < file2 < file10 */ -inline int SplayKeyFunctions::compare_string_version(const char * str1, const char * str2) { - - return strcmp( str1, str2 ); -#ifdef PANTS - return strverscmp(str1, str2); -#endif -} - - -inline void SplayKeyFunctions::free_int(int * num) { - free(num); -} - - - - inline void SplayKeyFunctions::free_string(char * string) { - free(string); -} - - - - inline void * SplayKeyFunctions::copy_int(int * num) { - - int * new_num; - - if ((new_num = (int*)wipemalloc(sizeof(int))) == NULL) - return NULL; - - *new_num = *num; - - return (void*)new_num; -} - - -inline void * SplayKeyFunctions::copy_string(char * string) { - - char * new_string; - - if ((new_string = (char*)wipemalloc(MAX_TOKEN_SIZE)) == NULL) - return NULL; - - strncpy(new_string, string, MAX_TOKEN_SIZE-1); - - return (void*)new_string; -} - -#endif /** !_COMPARE_H */ diff --git a/src/projectM-engine-backup/config b/src/projectM-engine-backup/config deleted file mode 100644 index bf066ae2f..000000000 --- a/src/projectM-engine-backup/config +++ /dev/null @@ -1,22 +0,0 @@ -projectM Config file (ONLY CHANGE THE NUMBERS!!!!!!) ------------------------------------------------------- -Texture Size (Must be power of 2) [256,512,1024,2048, etc] -512 -Grid X Dimension (Higher is Better but much slower) 12-60 -32 -Grid Y Dimension (Higher is Better but much slower) 8-45 -24 -Windowed Width (Initial window width) -512 -Windowed Height (Initial window width) -512 -Fullscreen Width (set to your native screen resolution) -1024 -Fullscreen Height (set to your native screen resolution) -768 -FPS (Higher the Better) 30-90 is realisitc -35 -Fullscreen on Startup (1=yes, 0=no) -0 -X Server to Display projectM default is ":0.0" -:0.0 diff --git a/src/projectM-engine-backup/console_interface.cpp b/src/projectM-engine-backup/console_interface.cpp deleted file mode 100755 index 0e9959bd3..000000000 --- a/src/projectM-engine-backup/console_interface.cpp +++ /dev/null @@ -1,230 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include - -#include "projectM.hpp" -#include "Common.hpp" -#include "fatal.h" -//#include "menu.h" -#include "console_interface.h" -#include "Preset.hpp" -#include "browser.h" -#include "editor.h" -#include "event.h" -#include "BeatDetect.hpp" -#include "PresetChooser.hpp" - - -interface_t current_interface = DEFAULT_INTERFACE; - -void refreshConsole() { - - switch (current_interface) { - - case MENU_INTERFACE: -// refreshMenu(); - break; - case SHELL_INTERFACE: - break; - case EDITOR_INTERFACE: - refreshEditor(); - break; - case DEFAULT_INTERFACE: - break; - case BROWSER_INTERFACE: - refreshBrowser(); - break; - default: - break; - } - -} - -void projectM::key_handler( projectMEvent event, - projectMKeycode keycode, projectMModifier modifier ) { - - switch( event ) { - - - case PROJECTM_KEYDOWN: - - //default_key_handler(); - switch (current_interface) - { - - case MENU_INTERFACE: -// menu_key_handler(this, event, keycode); - break; - case SHELL_INTERFACE: - //shell_key_handler(); - break; - case EDITOR_INTERFACE: - editor_key_handler(event,keycode); - break; - case BROWSER_INTERFACE: - browser_key_handler(event,keycode,modifier); - break; - case DEFAULT_INTERFACE: - default_key_handler(event,keycode); - break; - default: - default_key_handler(event,keycode); - break; - - } - break; - } -} - -void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode) { - - switch( event ) { - - case PROJECTM_KEYDOWN: - - switch( keycode ) - { - case PROJECTM_K_UP: - beatDetect->beat_sensitivity += 0.25; - if (beatDetect->beat_sensitivity > 5.0) beatDetect->beat_sensitivity = 5.0; - break; - case PROJECTM_K_DOWN: - beatDetect->beat_sensitivity -= 0.25; - if (beatDetect->beat_sensitivity < 0) beatDetect->beat_sensitivity = 0; - break; - case PROJECTM_K_F1: - renderer->showhelp++; - renderer->showstats=0; - renderer->showfps=0; - break; - case PROJECTM_K_F5: - if(renderer->showhelp%2==0) renderer->showfps++; - break; - case PROJECTM_K_F4: - if(renderer->showhelp%2==0) renderer->showstats++; - break; - case PROJECTM_K_F3: { - renderer->showpreset++; - printf( "F3 pressed: %d\n", renderer->showpreset ); - break; - } - case PROJECTM_K_F2: - renderer->showtitle++; - break; -#ifndef MACOS - case PROJECTM_K_F9: -#else - case PROJECTM_K_F8: -#endif - renderer->studio++; - break; - - case PROJECTM_K_ESCAPE: { -// exit( 1 ); - break; - } - case PROJECTM_K_f: - - break; - case PROJECTM_K_a: - if (renderer->correction) { - renderer->correction = 0; - } else { - renderer->correction = 1; - } - break; - case PROJECTM_K_b: - break; - case PROJECTM_K_n: - // paranoia but could be useful if directory is empty - /// @bug implement == operator - if (!(*m_presetPos != m_presetChooser->end())) - return; - m_presetChooser->getNumPresets(); - ++(*m_presetPos); - /// @bug implement == operator - if (!((*m_presetPos) != m_presetChooser->end())) - --(*m_presetPos); - m_activePreset = m_presetPos->allocate(this->presetInputs, this->presetOutputs); - break; - case PROJECTM_K_r: -// if (PresetSwitcher::switchPreset(RANDOM_NEXT, HARD_CUT) < 0) { - printf("WARNING: Bad preset file, loading idle preset\n"); - abort(); -// } - break; - case PROJECTM_K_p: - if (*m_presetPos != m_presetChooser->begin()) { - --(*m_presetPos); - // ...mroe - } - - -// if ((PresetSwitcher::switchPreset(ALPHA_PREVIOUS, HARD_CUT)) < 0){ - printf("WARNING: Bad preset file, loading idle preset\n"); - abort(); -// } - break; - case PROJECTM_K_l: - if (renderer->noSwitch==0)renderer->noSwitch=1; else renderer->noSwitch=0; - // current_interface = BROWSER_INTERFACE; - // loadBrowser(); - break; - case PROJECTM_K_e: - current_interface = EDITOR_INTERFACE; -// loadEditor(active_preset->per_frame_eqn_string_buffer,(void (*)()) reloadPerFrame, -// 80, 24, 140, 60, 0, 0); - break; - case PROJECTM_K_s: - renderer->studio++; -// current_interface = EDITOR_INTERFACE; -// loadEditor("[FILE NAME HERE]", (void (*)())savePreset, -// 50, 1, 100, 5, 0, .92); - case PROJECTM_K_i: - DWRITE( "PROJECTM_K_i\n" ); - - break; - case PROJECTM_K_z: - break; - case PROJECTM_K_0: -// nWaveMode=0; - break; - case PROJECTM_K_6: -// nWaveMode=6; - break; - case PROJECTM_K_7: -// nWaveMode=7; - break; - case PROJECTM_K_m: - renderer->showhelp=0; - renderer->showstats=0; - renderer->showfps=0; -// current_interface = MENU_INTERFACE; -// showMenu(); - break; - case PROJECTM_K_t: - break; - default: - break; - } - } -} diff --git a/src/projectM-engine-backup/console_interface.h b/src/projectM-engine-backup/console_interface.h deleted file mode 100755 index ca9c5221d..000000000 --- a/src/projectM-engine-backup/console_interface.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: console_interface.h,v 1.1.1.1 2005/12/23 18:05:03 psperl Exp $ - * - * $Log$ - */ - -#ifndef _CONSOLE_INTERFACE_H -#define _CONSOLE_INTERFACE_H - -#include "event.h" - -void default_key_handler(projectM *PM, projectMEvent event, projectMKeycode keycode); -void refreshConsole(); -#if defined(__CPLUSPLUS) && !defined(MACOS) -xtern "C" void key_handler(projectM *PM, projectMEvent event, projectMKeycode keycode, projectMModifier modifier ); -#else -extern void key_handler(projectM *PM, projectMEvent event, projectMKeycode keycode, projectMModifier modifier ); -#endif -#endif /** !_CONSOLE_INTERFACE_H */ diff --git a/src/projectM-engine-backup/dlldefs.h b/src/projectM-engine-backup/dlldefs.h deleted file mode 100755 index b944fe730..000000000 --- a/src/projectM-engine-backup/dlldefs.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * DLL definitions for exporting symbols on various platforms - * - * $Log$ - */ - -#ifndef _DLLDEFS_H -#define _DLLDEFS_H - -#ifndef DLLEXPORT -#ifdef WIN32 -#define DLLEXPORT __declspec(dllexport) -#else /** !WIN32 */ -#define DLLEXPORT -#endif /** WIN32 */ -#endif /** !DLLEXPORT */ - -#endif /** !_DLLDEFS_H */ diff --git a/src/projectM-engine-backup/editor.cpp b/src/projectM-engine-backup/editor.cpp deleted file mode 100755 index fbc97dfce..000000000 --- a/src/projectM-engine-backup/editor.cpp +++ /dev/null @@ -1,870 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/* Editor written on top of glConsole */ -#include -#include -#include - -#include "projectM.hpp" - -#ifdef MACOS -#include -#else -#include -#endif /** MACOS */ -#include "Common.hpp" -#include "fatal.h" -#include "event.h" - -//#include "preset_types.h" -#include "Preset.hpp" - -#include "glConsole.h" - -#include "editor.h" - -#define MAX_BUFFER_SIZE 50000 -#define KEY_REFRESH_RATE 2 -#define KEY_DELAY_TIME 15 - -extern interface_t current_interface; - -typedef enum { - OVERWRITE, - INSERT -} edit_mode_t; - -edit_mode_t edit_mode = OVERWRITE; - -void refresh_from_cursor(char * s); -void save_cursor_pos(); -void restore_cursor_pos(); -void writeChar(char c); -void replace_char(char c); -void insert_char(char c); -void shift_buffer_right(); -void insert_newline(); -void shift_buffer_left(); -void delete_newline(); -void complete_refresh(); - -void moveCursorLeft(); -void moveCursorRight(); - -int moveCursorUp(); -int moveCursorDown(); - -int get_prev_newline_dist(); -int get_next_newline_dist(); -int key_delay_cnt = 0; -int move_to_next_newline(); -int move_to_prev_newline(); -void handle_home(); -void handle_end(); -void handle_pageup(); -void handle_pagedown(); - -gl_console_t * editor_console = NULL; -int current_font = 0; -char editor_buffer[MAX_BUFFER_SIZE]; -int key_refresh_cnt = 0; -int cursor_pos = 0; -int backup_pos = -1; -int cursorx = 0; -int cursory = 0; -int key_held_down = 0; -projectMKeycode last_sdl_key = (projectMKeycode) 0; -projectMEvent last_sdl_event; - -void (*callfunc)(void*, void*) = NULL; - -int loadEditor(char * string, void (*func)(), int screen_width, int screen_height, - int scroll_width, int scroll_height, float start_x, float start_y) { - - if (string == NULL) - return PROJECTM_FAILURE; - - - - if ((editor_console = - glConsoleCreate(screen_width, screen_height, scroll_width, scroll_height, start_x, start_y, current_font)) < 0) - return PROJECTM_FAILURE; - - /* Set colors */ - glConsoleSetFGColor(CONSOLE_GREEN, editor_console); - glConsoleSetBGColor(CONSOLE_BLACK, editor_console); - glConsoleSetCursorColor(CONSOLE_RED, editor_console); - - /* Set flags */ - glConsoleSetFlags(CONSOLE_FLAG_CURSOR_BLINKING|CONSOLE_FLAG_ALWAYS_DRAW_BACKGROUND, editor_console); - - /* Clear the console buffer */ - // glConsoleClearBuffer(editor_console); - - /* Print the characters of the passed string, realign cursor to top left */ - glConsolePrintString(string, editor_console); - glConsoleAlignCursorLeft(editor_console); - glConsoleAlignCursorUp(editor_console); - - /* Copy string into editor buffer */ - strncpy(editor_buffer, string, MAX_BUFFER_SIZE-1); - cursor_pos = 0; - - callfunc = (void (*)(void*, void*))func; - backup_pos = -1; - edit_mode = OVERWRITE; - glConsoleSetCursorStyle(BAR_STYLE, editor_console); - return PROJECTM_SUCCESS; -} - -int closeEditor() { - - - current_font = 0; - key_held_down = 0; - - glConsoleDestroy(editor_console); - editor_console = NULL; - callfunc = NULL; - return PROJECTM_SUCCESS; -} - - -void key_helper( projectMKeycode key, projectMEvent event, projectMModifier modifier) { - char c; - - switch(key) { - case PROJECTM_K_INSERT: - if (edit_mode == OVERWRITE) { - edit_mode = INSERT; - glConsoleSetCursorStyle(UNDERLINE_STYLE, editor_console); - } - else { - edit_mode = OVERWRITE; - glConsoleSetCursorStyle(BAR_STYLE, editor_console); - } - break; - case PROJECTM_K_RETURN: - if (modifier== PROJECTM_KMOD_LCTRL) { -/// @bug editor is busted -// callfunc(editor_buffer, active_preset); - } - else { - writeChar('\n'); - } - break; - case PROJECTM_K_LCTRL: - break; - case PROJECTM_K_RIGHT: - moveCursorRight(); - // glConsoleMoveCursorForward(editor_console); - break; - case PROJECTM_K_LEFT: - moveCursorLeft(); - // glConsoleMoveCursorBackward(editor_console); - break; - case PROJECTM_K_UP: - moveCursorUp(); - break; - case PROJECTM_K_DOWN: - moveCursorDown(); - // glConsoleMoveCursorDown(editor_console); - break; - case PROJECTM_K_PAGEUP: - handle_pageup(); - // glConsoleAlignCursorUp(editor_console); - break; - case PROJECTM_K_PAGEDOWN: - handle_pagedown(); - // glConsoleAlignCursorDown(editor_console); - break; - case PROJECTM_K_HOME: - handle_home(); - // glConsoleAlignCursorLeft(editor_console); - break; - case PROJECTM_K_END: - handle_end(); - // glConsoleAlignCursorRight(editor_console); - break; - case PROJECTM_K_LSHIFT: - break; - case PROJECTM_K_RSHIFT: - break; - case PROJECTM_K_CAPSLOCK: - break; - case PROJECTM_K_BACKSPACE: - writeChar('\b'); - break; - - case PROJECTM_K_ESCAPE: - closeEditor(); - current_interface = DEFAULT_INTERFACE; - break; - - default: - /* All regular characters */ - c = (char)key; - - writeChar(c); - break; - } -} - - -void editor_key_handler( projectMEvent event, projectMKeycode keycode ) { - - switch( event ) { - - case PROJECTM_KEYUP: - // printf("KEY UP\n"); - key_held_down = 0; - return; - - case PROJECTM_KEYDOWN: - // printf("KEY DOWN FIRST\n"); - key_held_down = 1; - last_sdl_key = keycode; - last_sdl_event = event; - key_helper(last_sdl_key, event, (projectMModifier)0); - key_delay_cnt = KEY_DELAY_TIME; - return; - - default: - - break; - } - - - - - - -} - -void refreshEditor() { - - /* Refresh the editor console */ - glConsoleDraw(editor_console); - - /* Update keyboard related events */ - if (key_delay_cnt > 0) - key_delay_cnt--; - else if ((key_held_down) && ((key_refresh_cnt % KEY_REFRESH_RATE) == 0)) { - key_helper(last_sdl_key, last_sdl_event, (projectMModifier)0); - } - - key_refresh_cnt++; - -} - -void moveCursorRight() { - - /* Out of bounds check */ - if (cursor_pos >= (MAX_BUFFER_SIZE-1)) - return; - - if (editor_buffer[cursor_pos+1] == 0) - return; - - /* If we are at a new line character jump down to next line */ - if (editor_buffer[cursor_pos] == '\n') { - glConsoleAlignCursorLeft(editor_console); - glConsoleMoveCursorDown(editor_console); - - } - - /* Otherwise just advance cursor forward */ - else - glConsoleMoveCursorForward(editor_console); - - //printf("editor: %c\n", editor_buffer[cursor_pos]); - /* Move cursor forward in editor buffer */ - cursor_pos++; - -} - -void moveCursorLeft() { - - /* Out of bounds check */ - if (cursor_pos <= 0) - return; - - /* If the previous (left) character is a new line jump up a line and all the way to the end of character string */ - if (editor_buffer[cursor_pos-1] == '\n') { - glConsoleMoveCursorUp(editor_console); - glConsoleCursorToNextChar('\n', editor_console); - } - - /* Otherwise just move cursor back a space */ - else - glConsoleMoveCursorBackward(editor_console); - - /* Move cursor forward in editor buffer */ - cursor_pos--; - -} - - -int moveCursorUp() { - - - int dist1, dist2; - int return_flag = PROJECTM_SUCCESS; - - /* We need this distance to: - 1) move the cursor back to the previous new line - 2) position the cursor at the same column on the previous line - */ - - /* Move cursor to previous newline character */ - if (cursor_pos == 0) - return PROJECTM_FAILURE; - - dist1 = move_to_prev_newline(); - - if (cursor_pos == 0) - return_flag = PROJECTM_FAILURE; - else { - moveCursorLeft(); - /* Again move to previous newline */ - dist2 = move_to_prev_newline(); - } - - /* Move cursor forward appropiately, stopping prematurely if new line is reached */ - while ((dist1 > 1) && (editor_buffer[cursor_pos] !='\n') && (cursor_pos <= (MAX_BUFFER_SIZE-1))) { - cursor_pos++; - glConsoleMoveCursorForward(editor_console); - dist1--; - } - return return_flag; -} - - -int moveCursorDown() { - - int dist1, dist2; - - dist2 = get_prev_newline_dist(); - - //printf("prev new line distance: %d\n", dist2); - /* Move cursor to next line, store the distance - away from the newline. If this distance is - less than (error value) or equal to zero do nothing */ - if ((dist1 = move_to_next_newline()) <= 0) { - return PROJECTM_FAILURE; - } - // printf("distance away from next newline: %d\n", dist1); - while ((cursor_pos != (MAX_BUFFER_SIZE-1)) && (editor_buffer[cursor_pos] != '\n') && (dist2 > 0)) { - cursor_pos++; - glConsoleMoveCursorForward(editor_console); - dist2--; - } - - return PROJECTM_SUCCESS; -; -} - -int get_prev_newline_dist() { - - int cnt = 0; - - if (cursor_pos == 0) - return 0; - - /* If we are already at the newline, then skip the first character - and increment cnt */ - if (editor_buffer[cursor_pos] == '\n') { - /* Top of buffer, return 0 */ - if (cursor_pos == 0) - return 0; - /* Otherwise set count to one */ - cnt++; - } - while (editor_buffer[cursor_pos-cnt] != '\n') { - - /* In this case we are the top of the editor buffer, so stop */ - if ((cursor_pos-cnt) <= 0) - return cnt; - - cnt++; - - } - - //printf("Returning %d\n", cnt-1); - return cnt-1; -} - - -int get_next_newline_dist() { - - int cnt = 0; - - - while (editor_buffer[cursor_pos+cnt] != '\n') { - - /* In this case we have exceeded the cursor buffer, so abort action */ - if ((cursor_pos+cnt) >= (MAX_BUFFER_SIZE-1)) - return 0; - - cnt++; - - } - - return cnt; -} - -/* Moves cursor to next line, returns length away from next one. - If this is the last line, returns 0. - On error returns -1 (PROJECTM_FAILURE) -*/ - -int move_to_next_newline() { - - int cnt = 0; - - - while (editor_buffer[cursor_pos+cnt] != '\n') { - - /* In this case we have exceeded the cursor buffer, so abort action */ - if ((cursor_pos+cnt) >= (MAX_BUFFER_SIZE-1)) - return 0; - - cnt++; - - } - - - /* New line is the last character in buffer, so quit */ - if ((cursor_pos+cnt+1) > (MAX_BUFFER_SIZE-1)) - return 0; - - if (editor_buffer[cursor_pos+cnt+1] == 0) - return 0; - - /* One more time to skip past new line character */ - cnt++; - - /* Now we can move the cursor position accordingly */ - cursor_pos += cnt; - - /* Now move the console cursor to beginning of next line - These functions are smart enough to not exceed the console - without bounds checking */ - glConsoleMoveCursorDown(editor_console); - glConsoleAlignCursorLeft(editor_console); - - /* Finally, return distance cursor was away from the new line */ - return cnt; -} - -/* Moves cursor to previous line, returns length away from previous one. - If this is the first line, returns 0. - On error returns -1 (PROJECTM_FAILURE) - More specifically, the cursor will be exactly at the new line character - of the previous line. - Now its the beginning of the line, not the newline -*/ - -int move_to_prev_newline() { - - int cnt = 0; - - if (editor_buffer[cursor_pos] == '\n') { - if (cursor_pos == 0) - return 0; - else { - cnt++; - glConsoleMoveCursorBackward(editor_console); - } - } - while (((cursor_pos - cnt) > -1) && (editor_buffer[cursor_pos-cnt] != '\n')) { - - - glConsoleMoveCursorBackward(editor_console); - - cnt++; - - } - - //for (i=0;i < cnt; i++) - - - /* New line is the last character in buffer, so quit */ - // if ((cursor_pos-cnt-1) <= 0) - // return 0; - - - /* Now we can move the cursor position accordingly */ - cursor_pos -= cnt-1; - - /* Now move the console cursor to end of previous line - These functions are smart enough to not exceed the console - without bounds checking */ ; - // glConsoleMoveCursorUp(editor_console); - // glConsoleCursorToNextChar('\n', editor_console); - - /* Finally, return distance cursor was away from the new line */ - return cnt; - -} - -void handle_return() { - - -} - - -void handle_backspace() { - - -} - -void handle_home() { - - while ((cursor_pos > 0) && (editor_buffer[cursor_pos-1] != '\n')) { - cursor_pos--; - } - - glConsoleAlignCursorLeft(editor_console); - -} - -void handle_end() { - - while ((cursor_pos < (MAX_BUFFER_SIZE-1)) && (editor_buffer[cursor_pos+1] != 0) && (editor_buffer[cursor_pos] != '\n')) { - cursor_pos++; - glConsoleMoveCursorForward(editor_console); - } - - // glConsoleCursorToNextChar('\n', editor_console); - -} - -void handle_pageup() { - - int dist1; - - dist1 = move_to_prev_newline(); - - while (cursor_pos != 0) - moveCursorLeft(); - - while ((dist1 > 1) && (cursor_pos < (MAX_BUFFER_SIZE-1)) && (editor_buffer[cursor_pos+1] != 0) && (editor_buffer[cursor_pos] != '\n')) { - cursor_pos++; - glConsoleMoveCursorForward(editor_console); - dist1--; - } - -} - - -void handle_pagedown() { - - int dist1; - - dist1 = get_prev_newline_dist(); - - while (cursor_pos < (MAX_BUFFER_SIZE-2) && (editor_buffer[cursor_pos+1] != 0)) - moveCursorRight(); - - move_to_prev_newline(); - moveCursorRight(); - - while ((dist1 > 1) && (cursor_pos < (MAX_BUFFER_SIZE-1)) && (editor_buffer[cursor_pos+1] != 0) && (editor_buffer[cursor_pos] != '\n')) { - cursor_pos++; - glConsoleMoveCursorForward(editor_console); - dist1--; - } - -} - - -/* Writes a character to console and editor according to editor mode */ -void writeChar(char c) { - - switch (edit_mode) { - /* Overwrite mode, replaces cursor character with passed character. - Cursor remains standing */ - case OVERWRITE: - - /* Case on c to catch special characters */ - switch (c) { - - case '\b': /* Backspace */ - // printf("backspace case, overwrite mode:\n"); - /* At beginning of buffer, do nothing */ - if (cursor_pos == 0) - return; - - /* At first character of current line. - Default behavior is to delete the new line, - and squeeze the rest of the editor buffer back one character */ - if (editor_buffer[cursor_pos-1] == '\n') { - delete_newline(); - return; - } - - /* Normal overwrite back space case. - Here the previous character is replaced with a space, - and the cursor moves back one */ - - editor_buffer[--cursor_pos]= ' '; - (editor_console->cursor_ptr-1)->symbol = ' '; - glConsoleMoveCursorBackward(editor_console); - return; - case '\n': /* New line character */ - insert_newline(); - return; - default: /* not a special character, do typical behavior */ - // printf("DEFAULT CASE: char = %c\n", c); - - /* If cursor is sitting on the new line, then we - squeeze the pressed character between the last character - and the new line */ - if (editor_buffer[cursor_pos] == '\n') { - insert_char(c); - return; - } - - /* Otherwise, replace character in editor buffer */ - replace_char(c); - return; - } - - return; - - case INSERT: /* Insert Mode */ - switch (c) { - case '\b': /* Backspace case */ - - - if (editor_buffer[cursor_pos-1] == '\n') { - delete_newline(); - return; - } - - shift_buffer_left(); - cursor_pos--; - glConsoleMoveCursorBackward(editor_console); - refresh_from_cursor(editor_buffer+cursor_pos); - return; - - case '\n': - insert_newline(); - return; - - default: - // printf("insert_char: char = %c\n", c); - insert_char(c); - return; - } - default: /* Shouldn't happen */ - return; - - - - - } - - - - -} - -void delete_newline() { - - - if (cursor_pos == 0) - return; - - /* Move console cursor to previous line's end of character */ - glConsoleMoveCursorUp(editor_console); - glConsoleCursorToNextChar('\n', editor_console); - - shift_buffer_left(); - cursor_pos--; - - /* Lazy unoptimal refresh here */ - complete_refresh(); - return; - - - -} - -/* Refreshes entire console but retains initial cursor position */ -void complete_refresh() { - - int sx, sy; - - glConsoleGetCursorPos(&sx, &sy, editor_console); - - glConsoleSetCursorPos(0, 0, editor_console); - - glConsoleClearBuffer(editor_console); - glConsolePrintString(editor_buffer, editor_console); - glConsoleSetCursorPos(sx, sy, editor_console); - - -} -/* Helper function to insert a newline and adjust the graphical console - accordingly. Behavior is same regardless of edit mode type */ -void insert_newline() { - - - /* End of buffer, deny request */ - if (cursor_pos == (MAX_BUFFER_SIZE-1)) - return; - - shift_buffer_right(); - editor_buffer[cursor_pos] = '\n'; - - /* Lazy unoptimal refresh */ - complete_refresh(); - - cursor_pos++; - glConsoleAlignCursorLeft(editor_console); - glConsoleMoveCursorDown(editor_console); -} - -/* Helper function to insert a character. Updates the console and editor buffer - by inserting character at cursor position with passed argument, and moving - the cursor forward if possible */ -void insert_char(char c) { - - /* End of editor buffer, just replace the character instead */ - if (cursor_pos == (MAX_BUFFER_SIZE-1)) { - editor_buffer[cursor_pos] = c; - editor_console->cursor_ptr->symbol = c; - return; - } - - //printf("EDITOR BUFFER WAS:\n%s\n-----------------------------------\n", editor_buffer+cursor_pos); - - /* Shift contents of editor buffer right */ - shift_buffer_right(); - - - /* Now place the passed character at the desired location */ - editor_buffer[cursor_pos] = c; - - // printf("EDITOR BUFFER IS NOW:\n%s\n-----------------------------------\n", editor_buffer+cursor_pos); - - /* Refresh console from current cursor position */ - refresh_from_cursor(editor_buffer+cursor_pos); - - /* Move cursor forward */ - cursor_pos++; - glConsoleMoveCursorForward(editor_console); - -} - -/* Helper function to replace a character. Updates the console and editor buffer - by replacing character at cursor position with passed argument, and - moving the cursor forward if possible */ -void replace_char(char c) { - - /* End of buffer, replace character but dont go forward */ - if (cursor_pos == (MAX_BUFFER_SIZE-1)) { - editor_buffer[cursor_pos] = c; - editor_console->cursor_ptr->symbol = c; - return; - } - - /* Replace character, move cursor forward one */ - editor_buffer[cursor_pos++] = c; - editor_console->cursor_ptr->symbol = c; - glConsoleMoveCursorForward(editor_console); - -} - - -void save_cursor_pos() { - - backup_pos = cursor_pos; - glConsoleGetCursorPos(&cursorx, &cursory, editor_console); - // printf("cursor_x: %d, cursor_y: %d\n", cursorx, cursory); -} - -void restore_cursor_pos() { - - if (backup_pos == -1) - return; - cursor_pos = backup_pos; - glConsoleSetCursorPos(cursorx, cursory, editor_console); - backup_pos = -1; -} - -/* Primarily for optimization, this function refreshs the editor console from the cursor position onward - rather than the entire screen buffer */ -void refresh_from_cursor(char * s) { - - if (s == NULL) - return; - - save_cursor_pos(); - glConsolePrintString(s, editor_console); - restore_cursor_pos(); -} - - -/* Shifts editor buffer right from current cursor position */ -void shift_buffer_right() { - - int i; - char backup, backup2; - - if (cursor_pos == (MAX_BUFFER_SIZE-1)) - return; - - backup = editor_buffer[cursor_pos]; - - for (i = cursor_pos; i < (MAX_BUFFER_SIZE-1); i++) { - backup2 = editor_buffer[i+1]; - editor_buffer[i+1] = backup; - backup = backup2; - } - -} - -/* Shifts editor buffer left from current position */ -void shift_buffer_left() { - - - int i; - char backup, backup2; - - if (cursor_pos == 0) - return; - - //printf("cursor at: %c\n", editor_buffer[cursor_pos]); - backup = editor_buffer[MAX_BUFFER_SIZE-1]; - - //printf("shift_buffer_left: [before]\n%s\n", editor_buffer); - - for (i = MAX_BUFFER_SIZE-1; i >= cursor_pos; i--) { - backup2 = editor_buffer[i-1]; - editor_buffer[i-1] = backup; - backup = backup2; - } - // printf("shift_buffer_left: [after]\n%s\n", editor_buffer); - -} diff --git a/src/projectM-engine-backup/editor.h b/src/projectM-engine-backup/editor.h deleted file mode 100755 index 697b872df..000000000 --- a/src/projectM-engine-backup/editor.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: editor.h,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * $Log: editor.h,v $ - * Revision 1.1.1.1 2005/12/23 18:05:00 psperl - * Imported - */ - -#ifndef _EDITOR_H -#define _EDITOR_H - -#include "event.h" - -void editor_key_handler( projectMEvent event, projectMKeycode keycode ); -void key_helper( projectMKeycode key, projectMEvent event, projectMModifier modifier); -int loadEditor(char * s, void (*func)(), int screen_width, int screen_height, - int scroll_width, int scroll_height, float start_x, float start_y); -int closeEditor(); -void refreshEditor(); - - - -#endif /** !_EDITOR_H */ diff --git a/src/projectM-engine-backup/event.h b/src/projectM-engine-backup/event.h deleted file mode 100755 index c480926e3..000000000 --- a/src/projectM-engine-backup/event.h +++ /dev/null @@ -1,151 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: event.h,v 1.2 2004/10/08 10:54:27 cvs Exp $ - * - * projectM keycodes. Enables translation from various event schemes such as Win32, SDL - * &c. - * - * $Log: event.h,v $ - */ - -#ifndef _PROJECTM_EVENT_H -#define _PROJECTM_EVENT_H - -typedef enum { - /** Event types */ - PROJECTM_KEYUP, - PROJECTM_KEYDOWN, - PROJECTM_VIDEORESIZE, - PROJECTM_VIDEOQUIT, - } projectMEvent; - -typedef enum { - /** Keycodes */ - PROJECTM_K_RETURN, - PROJECTM_K_RIGHT, - PROJECTM_K_LEFT, - PROJECTM_K_UP, - PROJECTM_K_DOWN, - PROJECTM_K_PAGEUP, - PROJECTM_K_PAGEDOWN, - PROJECTM_K_INSERT, - PROJECTM_K_DELETE, - PROJECTM_K_ESCAPE, - PROJECTM_K_LSHIFT, - PROJECTM_K_RSHIFT, - PROJECTM_K_CAPSLOCK, - PROJECTM_K_LCTRL, - PROJECTM_K_HOME, - PROJECTM_K_END, - PROJECTM_K_BACKSPACE, - - PROJECTM_K_F1, - PROJECTM_K_F2, - PROJECTM_K_F3, - PROJECTM_K_F4, - PROJECTM_K_F5, - PROJECTM_K_F6, - PROJECTM_K_F7, - PROJECTM_K_F8, - PROJECTM_K_F9, - PROJECTM_K_F10, - PROJECTM_K_F11, - PROJECTM_K_F12, - - PROJECTM_K_0 = 48, - PROJECTM_K_1, - PROJECTM_K_2, - PROJECTM_K_3, - PROJECTM_K_4, - PROJECTM_K_5, - PROJECTM_K_6, - PROJECTM_K_7, - PROJECTM_K_8, - PROJECTM_K_9, - - PROJECTM_K_A = 65, - PROJECTM_K_B, - PROJECTM_K_C, - PROJECTM_K_D, - PROJECTM_K_E, - PROJECTM_K_F, - PROJECTM_K_G, - PROJECTM_K_H, - PROJECTM_K_I, - PROJECTM_K_J, - PROJECTM_K_K, - PROJECTM_K_L, - PROJECTM_K_M, - PROJECTM_K_N, - PROJECTM_K_O, - PROJECTM_K_P, - PROJECTM_K_Q, - PROJECTM_K_R, - PROJECTM_K_S, - PROJECTM_K_T, - PROJECTM_K_U, - PROJECTM_K_V, - PROJECTM_K_W, - PROJECTM_K_X, - PROJECTM_K_Y, - PROJECTM_K_Z, - - PROJECTM_K_a = 97, - PROJECTM_K_b, - PROJECTM_K_c, - PROJECTM_K_d, - PROJECTM_K_e, - PROJECTM_K_f, - PROJECTM_K_g, - PROJECTM_K_h, - PROJECTM_K_i, - PROJECTM_K_j, - PROJECTM_K_k, - PROJECTM_K_l, - PROJECTM_K_m, - PROJECTM_K_n, - PROJECTM_K_o, - PROJECTM_K_p, - PROJECTM_K_q, - PROJECTM_K_r, - PROJECTM_K_s, - PROJECTM_K_t, - PROJECTM_K_u, - PROJECTM_K_v, - PROJECTM_K_w, - PROJECTM_K_x, - PROJECTM_K_y, - PROJECTM_K_z, - PROJECTM_K_NONE, - } projectMKeycode; - -typedef enum { - /** Modifiers */ - PROJECTM_KMOD_LSHIFT, - PROJECTM_KMOD_RSHIFT, - PROJECTM_KMOD_CAPS, - PROJECTM_KMOD_LCTRL, - PROJECTM_KMOD_RCTRL, - } projectMModifier; - -#endif /** !_PROJECTM_EVENT_H */ - diff --git a/src/projectM-engine-backup/fatal.h b/src/projectM-engine-backup/fatal.h deleted file mode 100755 index 57a62850e..000000000 --- a/src/projectM-engine-backup/fatal.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: fatal.h,v 1.1.1.1 2005/12/23 18:05:05 psperl Exp $ - * - * Error codes - * - * $Log$ - */ - -#ifndef _FATAL_H -#define _FATAL_H - -/* Fatal Error Definitions */ - -#define PROJECTM_OUTOFMEM_ERROR -7; /* out of memory */ -#define PROJECTM_ERROR -1 /* non specific error */ -#define PROJECTM_SUCCESS 1 -#define PROJECTM_FAILURE -1 -#define PROJECTM_PARSE_ERROR -11 -#define PROJECTM_DIV_BY_ZERO -3 -#define PROJECTM_OK 2 - -#endif /** !_FATAL_H */ - diff --git a/src/projectM-engine-backup/fftsg.cpp b/src/projectM-engine-backup/fftsg.cpp deleted file mode 100755 index d005f77c5..000000000 --- a/src/projectM-engine-backup/fftsg.cpp +++ /dev/null @@ -1,3314 +0,0 @@ -/* -Fast Fourier/Cosine/Sine Transform - dimension :one - data length :power of 2 - decimation :frequency - radix :split-radix - data :inplace - table :use -functions - cdft: Complex Discrete Fourier Transform - rdft: Real Discrete Fourier Transform - ddct: Discrete Cosine Transform - ddst: Discrete Sine Transform - dfct: Cosine Transform of RDFT (Real Symmetric DFT) - dfst: Sine Transform of RDFT (Real Anti-symmetric DFT) -function prototypes - void cdft(int, int, double *, int *, double *); - void rdft(int, int, double *, int *, double *); - void ddct(int, int, double *, int *, double *); - void ddst(int, int, double *, int *, double *); - void dfct(int, double *, double *, int *, double *); - void dfst(int, double *, double *, int *, double *); -macro definitions - USE_CDFT_PTHREADS : default=not defined - CDFT_THREADS_BEGIN_N : must be >= 512, default=8192 - CDFT_4THREADS_BEGIN_N : must be >= 512, default=65536 - USE_CDFT_WINTHREADS : default=not defined - CDFT_THREADS_BEGIN_N : must be >= 512, default=32768 - CDFT_4THREADS_BEGIN_N : must be >= 512, default=524288 - - --------- Complex DFT (Discrete Fourier Transform) -------- - [definition] - - X[k] = sum_j=0^n-1 x[j]*exp(2*pi*i*j*k/n), 0<=k - X[k] = sum_j=0^n-1 x[j]*exp(-2*pi*i*j*k/n), 0<=k - ip[0] = 0; // first time only - cdft(2*n, 1, a, ip, w); - - ip[0] = 0; // first time only - cdft(2*n, -1, a, ip, w); - [parameters] - 2*n :data length (int) - n >= 1, n = power of 2 - a[0...2*n-1] :input/output data (double *) - input data - a[2*j] = Re(x[j]), - a[2*j+1] = Im(x[j]), 0<=j= 2+sqrt(n) - strictly, - length of ip >= - 2+(1<<(int)(log(n+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n/2-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - cdft(2*n, -1, a, ip, w); - is - cdft(2*n, 1, a, ip, w); - for (j = 0; j <= 2 * n - 1; j++) { - a[j] *= 1.0 / n; - } - . - - --------- Real DFT / Inverse of Real DFT -------- - [definition] - RDFT - R[k] = sum_j=0^n-1 a[j]*cos(2*pi*j*k/n), 0<=k<=n/2 - I[k] = sum_j=0^n-1 a[j]*sin(2*pi*j*k/n), 0 IRDFT (excluding scale) - a[k] = (R[0] + R[n/2]*cos(pi*k))/2 + - sum_j=1^n/2-1 R[j]*cos(2*pi*j*k/n) + - sum_j=1^n/2-1 I[j]*sin(2*pi*j*k/n), 0<=k - ip[0] = 0; // first time only - rdft(n, 1, a, ip, w); - - ip[0] = 0; // first time only - rdft(n, -1, a, ip, w); - [parameters] - n :data length (int) - n >= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - - output data - a[2*k] = R[k], 0<=k - input data - a[2*j] = R[j], 0<=j= 2+sqrt(n/2) - strictly, - length of ip >= - 2+(1<<(int)(log(n/2+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n/2-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - rdft(n, 1, a, ip, w); - is - rdft(n, -1, a, ip, w); - for (j = 0; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - --------- DCT (Discrete Cosine Transform) / Inverse of DCT -------- - [definition] - IDCT (excluding scale) - C[k] = sum_j=0^n-1 a[j]*cos(pi*j*(k+1/2)/n), 0<=k DCT - C[k] = sum_j=0^n-1 a[j]*cos(pi*(j+1/2)*k/n), 0<=k - ip[0] = 0; // first time only - ddct(n, 1, a, ip, w); - - ip[0] = 0; // first time only - ddct(n, -1, a, ip, w); - [parameters] - n :data length (int) - n >= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - output data - a[k] = C[k], 0<=k= 2+sqrt(n/2) - strictly, - length of ip >= - 2+(1<<(int)(log(n/2+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/4-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - ddct(n, -1, a, ip, w); - is - a[0] *= 0.5; - ddct(n, 1, a, ip, w); - for (j = 0; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - --------- DST (Discrete Sine Transform) / Inverse of DST -------- - [definition] - IDST (excluding scale) - S[k] = sum_j=1^n A[j]*sin(pi*j*(k+1/2)/n), 0<=k DST - S[k] = sum_j=0^n-1 a[j]*sin(pi*(j+1/2)*k/n), 0 - ip[0] = 0; // first time only - ddst(n, 1, a, ip, w); - - ip[0] = 0; // first time only - ddst(n, -1, a, ip, w); - [parameters] - n :data length (int) - n >= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - - input data - a[j] = A[j], 0 - output data - a[k] = S[k], 0= 2+sqrt(n/2) - strictly, - length of ip >= - 2+(1<<(int)(log(n/2+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/4-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - ddst(n, -1, a, ip, w); - is - a[0] *= 0.5; - ddst(n, 1, a, ip, w); - for (j = 0; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - --------- Cosine Transform of RDFT (Real Symmetric DFT) -------- - [definition] - C[k] = sum_j=0^n a[j]*cos(pi*j*k/n), 0<=k<=n - [usage] - ip[0] = 0; // first time only - dfct(n, a, t, ip, w); - [parameters] - n :data length - 1 (int) - n >= 2, n = power of 2 - a[0...n] :input/output data (double *) - output data - a[k] = C[k], 0<=k<=n - t[0...n/2] :work area (double *) - ip[0...*] :work area for bit reversal (int *) - length of ip >= 2+sqrt(n/4) - strictly, - length of ip >= - 2+(1<<(int)(log(n/4+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/8-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - a[0] *= 0.5; - a[n] *= 0.5; - dfct(n, a, t, ip, w); - is - a[0] *= 0.5; - a[n] *= 0.5; - dfct(n, a, t, ip, w); - for (j = 0; j <= n; j++) { - a[j] *= 2.0 / n; - } - . - - --------- Sine Transform of RDFT (Real Anti-symmetric DFT) -------- - [definition] - S[k] = sum_j=1^n-1 a[j]*sin(pi*j*k/n), 0= 2, n = power of 2 - a[0...n-1] :input/output data (double *) - output data - a[k] = S[k], 0= 2+sqrt(n/4) - strictly, - length of ip >= - 2+(1<<(int)(log(n/4+0.5)/log(2))/2). - ip[0],ip[1] are pointers of the cos/sin table. - w[0...n*5/8-1] :cos/sin table (double *) - w[],ip[] are initialized if ip[0] == 0. - [remark] - Inverse of - dfst(n, a, t, ip, w); - is - dfst(n, a, t, ip, w); - for (j = 1; j <= n - 1; j++) { - a[j] *= 2.0 / n; - } - . - - -Appendix : - The cos/sin table is recalculated when the larger table required. - w[] and ip[] are compatible with all routines. -*/ - - -void cdft(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - int nw; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - if (isgn >= 0) { - cftfsub(n, a, ip, nw, w); - } else { - cftbsub(n, a, ip, nw, w); - } -} - - -void rdft(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void rftbsub(int n, double *a, int nc, double *c); - int nw, nc; - double xi; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > (nc << 2)) { - nc = n >> 2; - makect(nc, ip, w + nw); - } - if (isgn >= 0) { - if (n > 4) { - cftfsub(n, a, ip, nw, w); - rftfsub(n, a, nc, w + nw); - } else if (n == 4) { - cftfsub(n, a, ip, nw, w); - } - xi = a[0] - a[1]; - a[0] += a[1]; - a[1] = xi; - } else { - a[1] = 0.5 * (a[0] - a[1]); - a[0] -= a[1]; - if (n > 4) { - rftbsub(n, a, nc, w + nw); - cftbsub(n, a, ip, nw, w); - } else if (n == 4) { - cftbsub(n, a, ip, nw, w); - } - } -} - - -void ddct(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void rftbsub(int n, double *a, int nc, double *c); - void dctsub(int n, double *a, int nc, double *c); - int j, nw, nc; - double xr; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > nc) { - nc = n; - makect(nc, ip, w + nw); - } - if (isgn < 0) { - xr = a[n - 1]; - for (j = n - 2; j >= 2; j -= 2) { - a[j + 1] = a[j] - a[j - 1]; - a[j] += a[j - 1]; - } - a[1] = a[0] - xr; - a[0] += xr; - if (n > 4) { - rftbsub(n, a, nc, w + nw); - cftbsub(n, a, ip, nw, w); - } else if (n == 4) { - cftbsub(n, a, ip, nw, w); - } - } - dctsub(n, a, nc, w + nw); - if (isgn >= 0) { - if (n > 4) { - cftfsub(n, a, ip, nw, w); - rftfsub(n, a, nc, w + nw); - } else if (n == 4) { - cftfsub(n, a, ip, nw, w); - } - xr = a[0] - a[1]; - a[0] += a[1]; - for (j = 2; j < n; j += 2) { - a[j - 1] = a[j] - a[j + 1]; - a[j] += a[j + 1]; - } - a[n - 1] = xr; - } -} - - -void ddst(int n, int isgn, double *a, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void cftbsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void rftbsub(int n, double *a, int nc, double *c); - void dstsub(int n, double *a, int nc, double *c); - int j, nw, nc; - double xr; - - nw = ip[0]; - if (n > (nw << 2)) { - nw = n >> 2; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > nc) { - nc = n; - makect(nc, ip, w + nw); - } - if (isgn < 0) { - xr = a[n - 1]; - for (j = n - 2; j >= 2; j -= 2) { - a[j + 1] = -a[j] - a[j - 1]; - a[j] -= a[j - 1]; - } - a[1] = a[0] + xr; - a[0] -= xr; - if (n > 4) { - rftbsub(n, a, nc, w + nw); - cftbsub(n, a, ip, nw, w); - } else if (n == 4) { - cftbsub(n, a, ip, nw, w); - } - } - dstsub(n, a, nc, w + nw); - if (isgn >= 0) { - if (n > 4) { - cftfsub(n, a, ip, nw, w); - rftfsub(n, a, nc, w + nw); - } else if (n == 4) { - cftfsub(n, a, ip, nw, w); - } - xr = a[0] - a[1]; - a[0] += a[1]; - for (j = 2; j < n; j += 2) { - a[j - 1] = -a[j] - a[j + 1]; - a[j] -= a[j + 1]; - } - a[n - 1] = -xr; - } -} - - -void dfct(int n, double *a, double *t, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void dctsub(int n, double *a, int nc, double *c); - int j, k, l, m, mh, nw, nc; - double xr, xi, yr, yi; - - nw = ip[0]; - if (n > (nw << 3)) { - nw = n >> 3; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > (nc << 1)) { - nc = n >> 1; - makect(nc, ip, w + nw); - } - m = n >> 1; - yi = a[m]; - xi = a[0] + a[n]; - a[0] -= a[n]; - t[0] = xi - yi; - t[m] = xi + yi; - if (n > 2) { - mh = m >> 1; - for (j = 1; j < mh; j++) { - k = m - j; - xr = a[j] - a[n - j]; - xi = a[j] + a[n - j]; - yr = a[k] - a[n - k]; - yi = a[k] + a[n - k]; - a[j] = xr; - a[k] = yr; - t[j] = xi - yi; - t[k] = xi + yi; - } - t[mh] = a[mh] + a[n - mh]; - a[mh] -= a[n - mh]; - dctsub(m, a, nc, w + nw); - if (m > 4) { - cftfsub(m, a, ip, nw, w); - rftfsub(m, a, nc, w + nw); - } else if (m == 4) { - cftfsub(m, a, ip, nw, w); - } - a[n - 1] = a[0] - a[1]; - a[1] = a[0] + a[1]; - for (j = m - 2; j >= 2; j -= 2) { - a[2 * j + 1] = a[j] + a[j + 1]; - a[2 * j - 1] = a[j] - a[j + 1]; - } - l = 2; - m = mh; - while (m >= 2) { - dctsub(m, t, nc, w + nw); - if (m > 4) { - cftfsub(m, t, ip, nw, w); - rftfsub(m, t, nc, w + nw); - } else if (m == 4) { - cftfsub(m, t, ip, nw, w); - } - a[n - l] = t[0] - t[1]; - a[l] = t[0] + t[1]; - k = 0; - for (j = 2; j < m; j += 2) { - k += l << 2; - a[k - l] = t[j] - t[j + 1]; - a[k + l] = t[j] + t[j + 1]; - } - l <<= 1; - mh = m >> 1; - for (j = 0; j < mh; j++) { - k = m - j; - t[j] = t[m + k] - t[m + j]; - t[k] = t[m + k] + t[m + j]; - } - t[mh] = t[m + mh]; - m = mh; - } - a[l] = t[0]; - a[n] = t[2] - t[1]; - a[0] = t[2] + t[1]; - } else { - a[1] = a[0]; - a[2] = t[0]; - a[0] = t[1]; - } -} - - -void dfst(int n, double *a, double *t, int *ip, double *w) -{ - void makewt(int nw, int *ip, double *w); - void makect(int nc, int *ip, double *c); - void cftfsub(int n, double *a, int *ip, int nw, double *w); - void rftfsub(int n, double *a, int nc, double *c); - void dstsub(int n, double *a, int nc, double *c); - int j, k, l, m, mh, nw, nc; - double xr, xi, yr, yi; - - nw = ip[0]; - if (n > (nw << 3)) { - nw = n >> 3; - makewt(nw, ip, w); - } - nc = ip[1]; - if (n > (nc << 1)) { - nc = n >> 1; - makect(nc, ip, w + nw); - } - if (n > 2) { - m = n >> 1; - mh = m >> 1; - for (j = 1; j < mh; j++) { - k = m - j; - xr = a[j] + a[n - j]; - xi = a[j] - a[n - j]; - yr = a[k] + a[n - k]; - yi = a[k] - a[n - k]; - a[j] = xr; - a[k] = yr; - t[j] = xi + yi; - t[k] = xi - yi; - } - t[0] = a[mh] - a[n - mh]; - a[mh] += a[n - mh]; - a[0] = a[m]; - dstsub(m, a, nc, w + nw); - if (m > 4) { - cftfsub(m, a, ip, nw, w); - rftfsub(m, a, nc, w + nw); - } else if (m == 4) { - cftfsub(m, a, ip, nw, w); - } - a[n - 1] = a[1] - a[0]; - a[1] = a[0] + a[1]; - for (j = m - 2; j >= 2; j -= 2) { - a[2 * j + 1] = a[j] - a[j + 1]; - a[2 * j - 1] = -a[j] - a[j + 1]; - } - l = 2; - m = mh; - while (m >= 2) { - dstsub(m, t, nc, w + nw); - if (m > 4) { - cftfsub(m, t, ip, nw, w); - rftfsub(m, t, nc, w + nw); - } else if (m == 4) { - cftfsub(m, t, ip, nw, w); - } - a[n - l] = t[1] - t[0]; - a[l] = t[0] + t[1]; - k = 0; - for (j = 2; j < m; j += 2) { - k += l << 2; - a[k - l] = -t[j] - t[j + 1]; - a[k + l] = t[j] - t[j + 1]; - } - l <<= 1; - mh = m >> 1; - for (j = 1; j < mh; j++) { - k = m - j; - t[j] = t[m + k] + t[m + j]; - t[k] = t[m + k] - t[m + j]; - } - t[0] = t[m + mh]; - m = mh; - } - a[l] = t[0]; - } - a[0] = 0; -} - - -/* -------- initializing routines -------- */ - - -#include - -void makewt(int nw, int *ip, double *w) -{ - void makeipt(int nw, int *ip); - int j, nwh, nw0, nw1; - double delta, wn4r, wk1r, wk1i, wk3r, wk3i; - - ip[0] = nw; - ip[1] = 1; - if (nw > 2) { - nwh = nw >> 1; - delta = atan(1.0) / nwh; - wn4r = cos(delta * nwh); - w[0] = 1; - w[1] = wn4r; - if (nwh == 4) { - w[2] = cos(delta * 2); - w[3] = sin(delta * 2); - } else if (nwh > 4) { - makeipt(nw, ip); - w[2] = 0.5 / cos(delta * 2); - w[3] = 0.5 / cos(delta * 6); - for (j = 4; j < nwh; j += 4) { - w[j] = cos(delta * j); - w[j + 1] = sin(delta * j); - w[j + 2] = cos(3 * delta * j); - w[j + 3] = -sin(3 * delta * j); - } - } - nw0 = 0; - while (nwh > 2) { - nw1 = nw0 + nwh; - nwh >>= 1; - w[nw1] = 1; - w[nw1 + 1] = wn4r; - if (nwh == 4) { - wk1r = w[nw0 + 4]; - wk1i = w[nw0 + 5]; - w[nw1 + 2] = wk1r; - w[nw1 + 3] = wk1i; - } else if (nwh > 4) { - wk1r = w[nw0 + 4]; - wk3r = w[nw0 + 6]; - w[nw1 + 2] = 0.5 / wk1r; - w[nw1 + 3] = 0.5 / wk3r; - for (j = 4; j < nwh; j += 4) { - wk1r = w[nw0 + 2 * j]; - wk1i = w[nw0 + 2 * j + 1]; - wk3r = w[nw0 + 2 * j + 2]; - wk3i = w[nw0 + 2 * j + 3]; - w[nw1 + j] = wk1r; - w[nw1 + j + 1] = wk1i; - w[nw1 + j + 2] = wk3r; - w[nw1 + j + 3] = wk3i; - } - } - nw0 = nw1; - } - } -} - - -void makeipt(int nw, int *ip) -{ - int j, l, m, m2, p, q; - - ip[2] = 0; - ip[3] = 16; - m = 2; - for (l = nw; l > 32; l >>= 2) { - m2 = m << 1; - q = m2 << 3; - for (j = m; j < m2; j++) { - p = ip[j] << 2; - ip[m + j] = p; - ip[m2 + j] = p + q; - } - m = m2; - } -} - - -void makect(int nc, int *ip, double *c) -{ - int j, nch; - double delta; - - ip[1] = nc; - if (nc > 1) { - nch = nc >> 1; - delta = atan(1.0) / nch; - c[0] = cos(delta * nch); - c[nch] = 0.5 * c[0]; - for (j = 1; j < nch; j++) { - c[j] = 0.5 * cos(delta * j); - c[nc - j] = 0.5 * sin(delta * j); - } - } -} - - -/* -------- child routines -------- */ - - -#ifdef USE_CDFT_PTHREADS -#define USE_CDFT_THREADS -#ifndef CDFT_THREADS_BEGIN_N -#define CDFT_THREADS_BEGIN_N 8192 -#endif -#ifndef CDFT_4THREADS_BEGIN_N -#define CDFT_4THREADS_BEGIN_N 65536 -#endif -#include -#include -#include -#define cdft_thread_t pthread_t -#define cdft_thread_create(thp,func,argp) { \ - if (pthread_create(thp, NULL, func, (void *) argp) != 0) { \ - fprintf(stderr, "cdft thread error\n"); \ - exit(1); \ - } \ -} -#define cdft_thread_wait(th) { \ - if (pthread_join(th, NULL) != 0) { \ - fprintf(stderr, "cdft thread error\n"); \ - exit(1); \ - } \ -} -#endif /* USE_CDFT_PTHREADS */ - - -#ifdef USE_CDFT_WINTHREADS -#define USE_CDFT_THREADS -#ifndef CDFT_THREADS_BEGIN_N -#define CDFT_THREADS_BEGIN_N 32768 -#endif -#ifndef CDFT_4THREADS_BEGIN_N -#define CDFT_4THREADS_BEGIN_N 524288 -#endif -#include -#include -#include -#define cdft_thread_t HANDLE -#define cdft_thread_create(thp,func,argp) { \ - DWORD thid; \ - *(thp) = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, (LPVOID) argp, 0, &thid); \ - if (*(thp) == 0) { \ - fprintf(stderr, "cdft thread error\n"); \ - exit(1); \ - } \ -} -#define cdft_thread_wait(th) { \ - WaitForSingleObject(th, INFINITE); \ - CloseHandle(th); \ -} -#endif /* USE_CDFT_WINTHREADS */ - - -void cftfsub(int n, double *a, int *ip, int nw, double *w) -{ - void bitrv2(int n, int *ip, double *a); - void bitrv216(double *a); - void bitrv208(double *a); - void cftf1st(int n, double *a, double *w); - void cftrec4(int n, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftfx41(int n, double *a, int nw, double *w); - void cftf161(double *a, double *w); - void cftf081(double *a, double *w); - void cftf040(double *a); - void cftx020(double *a); -#ifdef USE_CDFT_THREADS - void cftrec4_th(int n, double *a, int nw, double *w); -#endif /* USE_CDFT_THREADS */ - - if (n > 8) { - if (n > 32) { - cftf1st(n, a, &w[nw - (n >> 2)]); -#ifdef USE_CDFT_THREADS - if (n > CDFT_THREADS_BEGIN_N) { - cftrec4_th(n, a, nw, w); - } else -#endif /* USE_CDFT_THREADS */ - if (n > 512) { - cftrec4(n, a, nw, w); - } else if (n > 128) { - cftleaf(n, 1, a, nw, w); - } else { - cftfx41(n, a, nw, w); - } - bitrv2(n, ip, a); - } else if (n == 32) { - cftf161(a, &w[nw - 8]); - bitrv216(a); - } else { - cftf081(a, w); - bitrv208(a); - } - } else if (n == 8) { - cftf040(a); - } else if (n == 4) { - cftx020(a); - } -} - - -void cftbsub(int n, double *a, int *ip, int nw, double *w) -{ - void bitrv2conj(int n, int *ip, double *a); - void bitrv216neg(double *a); - void bitrv208neg(double *a); - void cftb1st(int n, double *a, double *w); - void cftrec4(int n, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftfx41(int n, double *a, int nw, double *w); - void cftf161(double *a, double *w); - void cftf081(double *a, double *w); - void cftb040(double *a); - void cftx020(double *a); -#ifdef USE_CDFT_THREADS - void cftrec4_th(int n, double *a, int nw, double *w); -#endif /* USE_CDFT_THREADS */ - - if (n > 8) { - if (n > 32) { - cftb1st(n, a, &w[nw - (n >> 2)]); -#ifdef USE_CDFT_THREADS - if (n > CDFT_THREADS_BEGIN_N) { - cftrec4_th(n, a, nw, w); - } else -#endif /* USE_CDFT_THREADS */ - if (n > 512) { - cftrec4(n, a, nw, w); - } else if (n > 128) { - cftleaf(n, 1, a, nw, w); - } else { - cftfx41(n, a, nw, w); - } - bitrv2conj(n, ip, a); - } else if (n == 32) { - cftf161(a, &w[nw - 8]); - bitrv216neg(a); - } else { - cftf081(a, w); - bitrv208neg(a); - } - } else if (n == 8) { - cftb040(a); - } else if (n == 4) { - cftx020(a); - } -} - - -void bitrv2(int n, int *ip, double *a) -{ - int j, j1, k, k1, l, m, nh, nm; - double xr, xi, yr, yi; - - m = 1; - for (l = n >> 2; l > 8; l >>= 2) { - m <<= 1; - } - nh = n >> 1; - nm = 4 * m; - if (l == 8) { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + 2 * ip[m + k]; - k1 = 4 * k + 2 * ip[m + j]; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + 2 * ip[m + k]; - j1 = k1 + 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= 2; - k1 -= nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh + 2; - k1 += nh + 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh - nm; - k1 += 2 * nm - 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - } else { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + ip[m + k]; - k1 = 4 * k + ip[m + j]; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + ip[m + k]; - j1 = k1 + 2; - k1 += nh; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = a[j1 + 1]; - yr = a[k1]; - yi = a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - } -} - - -void bitrv2conj(int n, int *ip, double *a) -{ - int j, j1, k, k1, l, m, nh, nm; - double xr, xi, yr, yi; - - m = 1; - for (l = n >> 2; l > 8; l >>= 2) { - m <<= 1; - } - nh = n >> 1; - nm = 4 * m; - if (l == 8) { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + 2 * ip[m + k]; - k1 = 4 * k + 2 * ip[m + j]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + 2 * ip[m + k]; - j1 = k1 + 2; - k1 += nh; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - j1 += nm; - k1 += 2 * nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= 2; - k1 -= nh; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh + 2; - k1 += nh + 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh - nm; - k1 += 2 * nm - 2; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - } - } else { - for (k = 0; k < m; k++) { - for (j = 0; j < k; j++) { - j1 = 4 * j + ip[m + k]; - k1 = 4 * k + ip[m + j]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nh; - k1 += 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += 2; - k1 += nh; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 += nm; - k1 += nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nh; - k1 -= 2; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - j1 -= nm; - k1 -= nm; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - } - k1 = 4 * k + ip[m + k]; - j1 = k1 + 2; - k1 += nh; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - j1 += nm; - k1 += nm; - a[j1 - 1] = -a[j1 - 1]; - xr = a[j1]; - xi = -a[j1 + 1]; - yr = a[k1]; - yi = -a[k1 + 1]; - a[j1] = yr; - a[j1 + 1] = yi; - a[k1] = xr; - a[k1 + 1] = xi; - a[k1 + 3] = -a[k1 + 3]; - } - } -} - - -void bitrv216(double *a) -{ - double x1r, x1i, x2r, x2i, x3r, x3i, x4r, x4i, - x5r, x5i, x7r, x7i, x8r, x8i, x10r, x10i, - x11r, x11i, x12r, x12i, x13r, x13i, x14r, x14i; - - x1r = a[2]; - x1i = a[3]; - x2r = a[4]; - x2i = a[5]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x5r = a[10]; - x5i = a[11]; - x7r = a[14]; - x7i = a[15]; - x8r = a[16]; - x8i = a[17]; - x10r = a[20]; - x10i = a[21]; - x11r = a[22]; - x11i = a[23]; - x12r = a[24]; - x12i = a[25]; - x13r = a[26]; - x13i = a[27]; - x14r = a[28]; - x14i = a[29]; - a[2] = x8r; - a[3] = x8i; - a[4] = x4r; - a[5] = x4i; - a[6] = x12r; - a[7] = x12i; - a[8] = x2r; - a[9] = x2i; - a[10] = x10r; - a[11] = x10i; - a[14] = x14r; - a[15] = x14i; - a[16] = x1r; - a[17] = x1i; - a[20] = x5r; - a[21] = x5i; - a[22] = x13r; - a[23] = x13i; - a[24] = x3r; - a[25] = x3i; - a[26] = x11r; - a[27] = x11i; - a[28] = x7r; - a[29] = x7i; -} - - -void bitrv216neg(double *a) -{ - double x1r, x1i, x2r, x2i, x3r, x3i, x4r, x4i, - x5r, x5i, x6r, x6i, x7r, x7i, x8r, x8i, - x9r, x9i, x10r, x10i, x11r, x11i, x12r, x12i, - x13r, x13i, x14r, x14i, x15r, x15i; - - x1r = a[2]; - x1i = a[3]; - x2r = a[4]; - x2i = a[5]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x5r = a[10]; - x5i = a[11]; - x6r = a[12]; - x6i = a[13]; - x7r = a[14]; - x7i = a[15]; - x8r = a[16]; - x8i = a[17]; - x9r = a[18]; - x9i = a[19]; - x10r = a[20]; - x10i = a[21]; - x11r = a[22]; - x11i = a[23]; - x12r = a[24]; - x12i = a[25]; - x13r = a[26]; - x13i = a[27]; - x14r = a[28]; - x14i = a[29]; - x15r = a[30]; - x15i = a[31]; - a[2] = x15r; - a[3] = x15i; - a[4] = x7r; - a[5] = x7i; - a[6] = x11r; - a[7] = x11i; - a[8] = x3r; - a[9] = x3i; - a[10] = x13r; - a[11] = x13i; - a[12] = x5r; - a[13] = x5i; - a[14] = x9r; - a[15] = x9i; - a[16] = x1r; - a[17] = x1i; - a[18] = x14r; - a[19] = x14i; - a[20] = x6r; - a[21] = x6i; - a[22] = x10r; - a[23] = x10i; - a[24] = x2r; - a[25] = x2i; - a[26] = x12r; - a[27] = x12i; - a[28] = x4r; - a[29] = x4i; - a[30] = x8r; - a[31] = x8i; -} - - -void bitrv208(double *a) -{ - double x1r, x1i, x3r, x3i, x4r, x4i, x6r, x6i; - - x1r = a[2]; - x1i = a[3]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x6r = a[12]; - x6i = a[13]; - a[2] = x4r; - a[3] = x4i; - a[6] = x6r; - a[7] = x6i; - a[8] = x1r; - a[9] = x1i; - a[12] = x3r; - a[13] = x3i; -} - - -void bitrv208neg(double *a) -{ - double x1r, x1i, x2r, x2i, x3r, x3i, x4r, x4i, - x5r, x5i, x6r, x6i, x7r, x7i; - - x1r = a[2]; - x1i = a[3]; - x2r = a[4]; - x2i = a[5]; - x3r = a[6]; - x3i = a[7]; - x4r = a[8]; - x4i = a[9]; - x5r = a[10]; - x5i = a[11]; - x6r = a[12]; - x6i = a[13]; - x7r = a[14]; - x7i = a[15]; - a[2] = x7r; - a[3] = x7i; - a[4] = x3r; - a[5] = x3i; - a[6] = x5r; - a[7] = x5i; - a[8] = x1r; - a[9] = x1i; - a[10] = x6r; - a[11] = x6i; - a[12] = x2r; - a[13] = x2i; - a[14] = x4r; - a[15] = x4i; -} - - -void cftf1st(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, m, mh; - double wn4r, csc1, csc3, wk1r, wk1i, wk3r, wk3i, - wd1r, wd1i, wd3r, wd3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i; - - mh = n >> 3; - m = 2 * mh; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] + a[j2]; - x0i = a[1] + a[j2 + 1]; - x1r = a[0] - a[j2]; - x1i = a[1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j2] = x1r - x3i; - a[j2 + 1] = x1i + x3r; - a[j3] = x1r + x3i; - a[j3 + 1] = x1i - x3r; - wn4r = w[1]; - csc1 = w[2]; - csc3 = w[3]; - wd1r = 1; - wd1i = 0; - wd3r = 1; - wd3i = 0; - k = 0; - for (j = 2; j < mh - 2; j += 4) { - k += 4; - wk1r = csc1 * (wd1r + w[k]); - wk1i = csc1 * (wd1i + w[k + 1]); - wk3r = csc3 * (wd3r + w[k + 2]); - wk3i = csc3 * (wd3i + w[k + 3]); - wd1r = w[k]; - wd1i = w[k + 1]; - wd3r = w[k + 2]; - wd3i = w[k + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] + a[j2]; - x0i = a[j + 1] + a[j2 + 1]; - x1r = a[j] - a[j2]; - x1i = a[j + 1] - a[j2 + 1]; - y0r = a[j + 2] + a[j2 + 2]; - y0i = a[j + 3] + a[j2 + 3]; - y1r = a[j + 2] - a[j2 + 2]; - y1i = a[j + 3] - a[j2 + 3]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 + 2] + a[j3 + 2]; - y2i = a[j1 + 3] + a[j3 + 3]; - y3r = a[j1 + 2] - a[j3 + 2]; - y3i = a[j1 + 3] - a[j3 + 3]; - a[j] = x0r + x2r; - a[j + 1] = x0i + x2i; - a[j + 2] = y0r + y2r; - a[j + 3] = y0i + y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j1 + 2] = y0r - y2r; - a[j1 + 3] = y0i - y2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1r * x0r - wk1i * x0i; - a[j2 + 1] = wk1r * x0i + wk1i * x0r; - x0r = y1r - y3i; - x0i = y1i + y3r; - a[j2 + 2] = wd1r * x0r - wd1i * x0i; - a[j2 + 3] = wd1r * x0i + wd1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3r * x0r + wk3i * x0i; - a[j3 + 1] = wk3r * x0i - wk3i * x0r; - x0r = y1r + y3i; - x0i = y1i - y3r; - a[j3 + 2] = wd3r * x0r + wd3i * x0i; - a[j3 + 3] = wd3r * x0i - wd3i * x0r; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - y0r = a[j0 - 2] + a[j2 - 2]; - y0i = a[j0 - 1] + a[j2 - 1]; - y1r = a[j0 - 2] - a[j2 - 2]; - y1i = a[j0 - 1] - a[j2 - 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 - 2] + a[j3 - 2]; - y2i = a[j1 - 1] + a[j3 - 1]; - y3r = a[j1 - 2] - a[j3 - 2]; - y3i = a[j1 - 1] - a[j3 - 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j0 - 2] = y0r + y2r; - a[j0 - 1] = y0i + y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j1 - 2] = y0r - y2r; - a[j1 - 1] = y0i - y2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1i * x0r - wk1r * x0i; - a[j2 + 1] = wk1i * x0i + wk1r * x0r; - x0r = y1r - y3i; - x0i = y1i + y3r; - a[j2 - 2] = wd1i * x0r - wd1r * x0i; - a[j2 - 1] = wd1i * x0i + wd1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3i * x0r + wk3r * x0i; - a[j3 + 1] = wk3i * x0i - wk3r * x0r; - x0r = y1r + y3i; - x0i = y1i - y3r; - a[j3 - 2] = wd3i * x0r + wd3r * x0i; - a[j3 - 1] = wd3i * x0i - wd3r * x0r; - } - wk1r = csc1 * (wd1r + wn4r); - wk1i = csc1 * (wd1i + wn4r); - wk3r = csc3 * (wd3r - wn4r); - wk3i = csc3 * (wd3i - wn4r); - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0 - 2] + a[j2 - 2]; - x0i = a[j0 - 1] + a[j2 - 1]; - x1r = a[j0 - 2] - a[j2 - 2]; - x1i = a[j0 - 1] - a[j2 - 1]; - x2r = a[j1 - 2] + a[j3 - 2]; - x2i = a[j1 - 1] + a[j3 - 1]; - x3r = a[j1 - 2] - a[j3 - 2]; - x3i = a[j1 - 1] - a[j3 - 1]; - a[j0 - 2] = x0r + x2r; - a[j0 - 1] = x0i + x2i; - a[j1 - 2] = x0r - x2r; - a[j1 - 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2 - 2] = wk1r * x0r - wk1i * x0i; - a[j2 - 1] = wk1r * x0i + wk1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3 - 2] = wk3r * x0r + wk3i * x0i; - a[j3 - 1] = wk3r * x0i - wk3i * x0r; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wn4r * (x0r - x0i); - a[j2 + 1] = wn4r * (x0i + x0r); - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = -wn4r * (x0r + x0i); - a[j3 + 1] = -wn4r * (x0i - x0r); - x0r = a[j0 + 2] + a[j2 + 2]; - x0i = a[j0 + 3] + a[j2 + 3]; - x1r = a[j0 + 2] - a[j2 + 2]; - x1i = a[j0 + 3] - a[j2 + 3]; - x2r = a[j1 + 2] + a[j3 + 2]; - x2i = a[j1 + 3] + a[j3 + 3]; - x3r = a[j1 + 2] - a[j3 + 2]; - x3i = a[j1 + 3] - a[j3 + 3]; - a[j0 + 2] = x0r + x2r; - a[j0 + 3] = x0i + x2i; - a[j1 + 2] = x0r - x2r; - a[j1 + 3] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2 + 2] = wk1i * x0r - wk1r * x0i; - a[j2 + 3] = wk1i * x0i + wk1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3 + 2] = wk3i * x0r + wk3r * x0i; - a[j3 + 3] = wk3i * x0i - wk3r * x0r; -} - - -void cftb1st(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, m, mh; - double wn4r, csc1, csc3, wk1r, wk1i, wk3r, wk3i, - wd1r, wd1i, wd3r, wd3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i; - - mh = n >> 3; - m = 2 * mh; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] + a[j2]; - x0i = -a[1] - a[j2 + 1]; - x1r = a[0] - a[j2]; - x1i = -a[1] + a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[0] = x0r + x2r; - a[1] = x0i - x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - a[j2] = x1r + x3i; - a[j2 + 1] = x1i + x3r; - a[j3] = x1r - x3i; - a[j3 + 1] = x1i - x3r; - wn4r = w[1]; - csc1 = w[2]; - csc3 = w[3]; - wd1r = 1; - wd1i = 0; - wd3r = 1; - wd3i = 0; - k = 0; - for (j = 2; j < mh - 2; j += 4) { - k += 4; - wk1r = csc1 * (wd1r + w[k]); - wk1i = csc1 * (wd1i + w[k + 1]); - wk3r = csc3 * (wd3r + w[k + 2]); - wk3i = csc3 * (wd3i + w[k + 3]); - wd1r = w[k]; - wd1i = w[k + 1]; - wd3r = w[k + 2]; - wd3i = w[k + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] + a[j2]; - x0i = -a[j + 1] - a[j2 + 1]; - x1r = a[j] - a[j2]; - x1i = -a[j + 1] + a[j2 + 1]; - y0r = a[j + 2] + a[j2 + 2]; - y0i = -a[j + 3] - a[j2 + 3]; - y1r = a[j + 2] - a[j2 + 2]; - y1i = -a[j + 3] + a[j2 + 3]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 + 2] + a[j3 + 2]; - y2i = a[j1 + 3] + a[j3 + 3]; - y3r = a[j1 + 2] - a[j3 + 2]; - y3i = a[j1 + 3] - a[j3 + 3]; - a[j] = x0r + x2r; - a[j + 1] = x0i - x2i; - a[j + 2] = y0r + y2r; - a[j + 3] = y0i - y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - a[j1 + 2] = y0r - y2r; - a[j1 + 3] = y0i + y2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2] = wk1r * x0r - wk1i * x0i; - a[j2 + 1] = wk1r * x0i + wk1i * x0r; - x0r = y1r + y3i; - x0i = y1i + y3r; - a[j2 + 2] = wd1r * x0r - wd1i * x0i; - a[j2 + 3] = wd1r * x0i + wd1i * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3] = wk3r * x0r + wk3i * x0i; - a[j3 + 1] = wk3r * x0i - wk3i * x0r; - x0r = y1r - y3i; - x0i = y1i - y3r; - a[j3 + 2] = wd3r * x0r + wd3i * x0i; - a[j3 + 3] = wd3r * x0i - wd3i * x0r; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = -a[j0 + 1] - a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = -a[j0 + 1] + a[j2 + 1]; - y0r = a[j0 - 2] + a[j2 - 2]; - y0i = -a[j0 - 1] - a[j2 - 1]; - y1r = a[j0 - 2] - a[j2 - 2]; - y1i = -a[j0 - 1] + a[j2 - 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - y2r = a[j1 - 2] + a[j3 - 2]; - y2i = a[j1 - 1] + a[j3 - 1]; - y3r = a[j1 - 2] - a[j3 - 2]; - y3i = a[j1 - 1] - a[j3 - 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i - x2i; - a[j0 - 2] = y0r + y2r; - a[j0 - 1] = y0i - y2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - a[j1 - 2] = y0r - y2r; - a[j1 - 1] = y0i + y2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2] = wk1i * x0r - wk1r * x0i; - a[j2 + 1] = wk1i * x0i + wk1r * x0r; - x0r = y1r + y3i; - x0i = y1i + y3r; - a[j2 - 2] = wd1i * x0r - wd1r * x0i; - a[j2 - 1] = wd1i * x0i + wd1r * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3] = wk3i * x0r + wk3r * x0i; - a[j3 + 1] = wk3i * x0i - wk3r * x0r; - x0r = y1r - y3i; - x0i = y1i - y3r; - a[j3 - 2] = wd3i * x0r + wd3r * x0i; - a[j3 - 1] = wd3i * x0i - wd3r * x0r; - } - wk1r = csc1 * (wd1r + wn4r); - wk1i = csc1 * (wd1i + wn4r); - wk3r = csc3 * (wd3r - wn4r); - wk3i = csc3 * (wd3i - wn4r); - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0 - 2] + a[j2 - 2]; - x0i = -a[j0 - 1] - a[j2 - 1]; - x1r = a[j0 - 2] - a[j2 - 2]; - x1i = -a[j0 - 1] + a[j2 - 1]; - x2r = a[j1 - 2] + a[j3 - 2]; - x2i = a[j1 - 1] + a[j3 - 1]; - x3r = a[j1 - 2] - a[j3 - 2]; - x3i = a[j1 - 1] - a[j3 - 1]; - a[j0 - 2] = x0r + x2r; - a[j0 - 1] = x0i - x2i; - a[j1 - 2] = x0r - x2r; - a[j1 - 1] = x0i + x2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2 - 2] = wk1r * x0r - wk1i * x0i; - a[j2 - 1] = wk1r * x0i + wk1i * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3 - 2] = wk3r * x0r + wk3i * x0i; - a[j3 - 1] = wk3r * x0i - wk3i * x0r; - x0r = a[j0] + a[j2]; - x0i = -a[j0 + 1] - a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = -a[j0 + 1] + a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i - x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i + x2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2] = wn4r * (x0r - x0i); - a[j2 + 1] = wn4r * (x0i + x0r); - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3] = -wn4r * (x0r + x0i); - a[j3 + 1] = -wn4r * (x0i - x0r); - x0r = a[j0 + 2] + a[j2 + 2]; - x0i = -a[j0 + 3] - a[j2 + 3]; - x1r = a[j0 + 2] - a[j2 + 2]; - x1i = -a[j0 + 3] + a[j2 + 3]; - x2r = a[j1 + 2] + a[j3 + 2]; - x2i = a[j1 + 3] + a[j3 + 3]; - x3r = a[j1 + 2] - a[j3 + 2]; - x3i = a[j1 + 3] - a[j3 + 3]; - a[j0 + 2] = x0r + x2r; - a[j0 + 3] = x0i - x2i; - a[j1 + 2] = x0r - x2r; - a[j1 + 3] = x0i + x2i; - x0r = x1r + x3i; - x0i = x1i + x3r; - a[j2 + 2] = wk1i * x0r - wk1r * x0i; - a[j2 + 3] = wk1i * x0i + wk1r * x0r; - x0r = x1r - x3i; - x0i = x1i - x3r; - a[j3 + 2] = wk3i * x0r + wk3r * x0i; - a[j3 + 3] = wk3i * x0i - wk3r * x0r; -} - - -#ifdef USE_CDFT_THREADS -struct cdft_arg_st { - int n0; - int n; - double *a; - int nw; - double *w; -}; -typedef struct cdft_arg_st cdft_arg_t; - - -void cftrec4_th(int n, double *a, int nw, double *w) -{ - void *cftrec1_th(void *p); - void *cftrec2_th(void *p); - int i, idiv4, m, nthread; - cdft_thread_t th[4]; - cdft_arg_t ag[4]; - - nthread = 2; - idiv4 = 0; - m = n >> 1; - if (n > CDFT_4THREADS_BEGIN_N) { - nthread = 4; - idiv4 = 1; - m >>= 1; - } - for (i = 0; i < nthread; i++) { - ag[i].n0 = n; - ag[i].n = m; - ag[i].a = &a[i * m]; - ag[i].nw = nw; - ag[i].w = w; - if (i != idiv4) { - cdft_thread_create(&th[i], cftrec1_th, &ag[i]); - } else { - cdft_thread_create(&th[i], cftrec2_th, &ag[i]); - } - } - for (i = 0; i < nthread; i++) { - cdft_thread_wait(th[i]); - } -} - - -void *cftrec1_th(void *p) -{ - int cfttree(int n, int j, int k, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftmdl1(int n, double *a, double *w); - int isplt, j, k, m, n, n0, nw; - double *a, *w; - - n0 = ((cdft_arg_t *) p)->n0; - n = ((cdft_arg_t *) p)->n; - a = ((cdft_arg_t *) p)->a; - nw = ((cdft_arg_t *) p)->nw; - w = ((cdft_arg_t *) p)->w; - m = n0; - while (m > 512) { - m >>= 2; - cftmdl1(m, &a[n - m], &w[nw - (m >> 1)]); - } - cftleaf(m, 1, &a[n - m], nw, w); - k = 0; - for (j = n - m; j > 0; j -= m) { - k++; - isplt = cfttree(m, j, k, a, nw, w); - cftleaf(m, isplt, &a[j - m], nw, w); - } - return (void *) 0; -} - - -void *cftrec2_th(void *p) -{ - int cfttree(int n, int j, int k, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftmdl2(int n, double *a, double *w); - int isplt, j, k, m, n, n0, nw; - double *a, *w; - - n0 = ((cdft_arg_t *) p)->n0; - n = ((cdft_arg_t *) p)->n; - a = ((cdft_arg_t *) p)->a; - nw = ((cdft_arg_t *) p)->nw; - w = ((cdft_arg_t *) p)->w; - k = 1; - m = n0; - while (m > 512) { - m >>= 2; - k <<= 2; - cftmdl2(m, &a[n - m], &w[nw - m]); - } - cftleaf(m, 0, &a[n - m], nw, w); - k >>= 1; - for (j = n - m; j > 0; j -= m) { - k++; - isplt = cfttree(m, j, k, a, nw, w); - cftleaf(m, isplt, &a[j - m], nw, w); - } - return (void *) 0; -} -#endif /* USE_CDFT_THREADS */ - - -void cftrec4(int n, double *a, int nw, double *w) -{ - int cfttree(int n, int j, int k, double *a, int nw, double *w); - void cftleaf(int n, int isplt, double *a, int nw, double *w); - void cftmdl1(int n, double *a, double *w); - int isplt, j, k, m; - - m = n; - while (m > 512) { - m >>= 2; - cftmdl1(m, &a[n - m], &w[nw - (m >> 1)]); - } - cftleaf(m, 1, &a[n - m], nw, w); - k = 0; - for (j = n - m; j > 0; j -= m) { - k++; - isplt = cfttree(m, j, k, a, nw, w); - cftleaf(m, isplt, &a[j - m], nw, w); - } -} - - -int cfttree(int n, int j, int k, double *a, int nw, double *w) -{ - void cftmdl1(int n, double *a, double *w); - void cftmdl2(int n, double *a, double *w); - int i, isplt, m; - - if ((k & 3) != 0) { - isplt = k & 1; - if (isplt != 0) { - cftmdl1(n, &a[j - n], &w[nw - (n >> 1)]); - } else { - cftmdl2(n, &a[j - n], &w[nw - n]); - } - } else { - m = n; - for (i = k; (i & 3) == 0; i >>= 2) { - m <<= 2; - } - isplt = i & 1; - if (isplt != 0) { - while (m > 128) { - cftmdl1(m, &a[j - m], &w[nw - (m >> 1)]); - m >>= 2; - } - } else { - while (m > 128) { - cftmdl2(m, &a[j - m], &w[nw - m]); - m >>= 2; - } - } - } - return isplt; -} - - -void cftleaf(int n, int isplt, double *a, int nw, double *w) -{ - void cftmdl1(int n, double *a, double *w); - void cftmdl2(int n, double *a, double *w); - void cftf161(double *a, double *w); - void cftf162(double *a, double *w); - void cftf081(double *a, double *w); - void cftf082(double *a, double *w); - - if (n == 512) { - cftmdl1(128, a, &w[nw - 64]); - cftf161(a, &w[nw - 8]); - cftf162(&a[32], &w[nw - 32]); - cftf161(&a[64], &w[nw - 8]); - cftf161(&a[96], &w[nw - 8]); - cftmdl2(128, &a[128], &w[nw - 128]); - cftf161(&a[128], &w[nw - 8]); - cftf162(&a[160], &w[nw - 32]); - cftf161(&a[192], &w[nw - 8]); - cftf162(&a[224], &w[nw - 32]); - cftmdl1(128, &a[256], &w[nw - 64]); - cftf161(&a[256], &w[nw - 8]); - cftf162(&a[288], &w[nw - 32]); - cftf161(&a[320], &w[nw - 8]); - cftf161(&a[352], &w[nw - 8]); - if (isplt != 0) { - cftmdl1(128, &a[384], &w[nw - 64]); - cftf161(&a[480], &w[nw - 8]); - } else { - cftmdl2(128, &a[384], &w[nw - 128]); - cftf162(&a[480], &w[nw - 32]); - } - cftf161(&a[384], &w[nw - 8]); - cftf162(&a[416], &w[nw - 32]); - cftf161(&a[448], &w[nw - 8]); - } else { - cftmdl1(64, a, &w[nw - 32]); - cftf081(a, &w[nw - 8]); - cftf082(&a[16], &w[nw - 8]); - cftf081(&a[32], &w[nw - 8]); - cftf081(&a[48], &w[nw - 8]); - cftmdl2(64, &a[64], &w[nw - 64]); - cftf081(&a[64], &w[nw - 8]); - cftf082(&a[80], &w[nw - 8]); - cftf081(&a[96], &w[nw - 8]); - cftf082(&a[112], &w[nw - 8]); - cftmdl1(64, &a[128], &w[nw - 32]); - cftf081(&a[128], &w[nw - 8]); - cftf082(&a[144], &w[nw - 8]); - cftf081(&a[160], &w[nw - 8]); - cftf081(&a[176], &w[nw - 8]); - if (isplt != 0) { - cftmdl1(64, &a[192], &w[nw - 32]); - cftf081(&a[240], &w[nw - 8]); - } else { - cftmdl2(64, &a[192], &w[nw - 64]); - cftf082(&a[240], &w[nw - 8]); - } - cftf081(&a[192], &w[nw - 8]); - cftf082(&a[208], &w[nw - 8]); - cftf081(&a[224], &w[nw - 8]); - } -} - - -void cftmdl1(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, m, mh; - double wn4r, wk1r, wk1i, wk3r, wk3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i; - - mh = n >> 3; - m = 2 * mh; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] + a[j2]; - x0i = a[1] + a[j2 + 1]; - x1r = a[0] - a[j2]; - x1i = a[1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - a[j2] = x1r - x3i; - a[j2 + 1] = x1i + x3r; - a[j3] = x1r + x3i; - a[j3 + 1] = x1i - x3r; - wn4r = w[1]; - k = 0; - for (j = 2; j < mh; j += 2) { - k += 4; - wk1r = w[k]; - wk1i = w[k + 1]; - wk3r = w[k + 2]; - wk3i = w[k + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] + a[j2]; - x0i = a[j + 1] + a[j2 + 1]; - x1r = a[j] - a[j2]; - x1i = a[j + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j] = x0r + x2r; - a[j + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1r * x0r - wk1i * x0i; - a[j2 + 1] = wk1r * x0i + wk1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3r * x0r + wk3i * x0i; - a[j3 + 1] = wk3r * x0i - wk3i * x0r; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wk1i * x0r - wk1r * x0i; - a[j2 + 1] = wk1i * x0i + wk1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = wk3i * x0r + wk3r * x0i; - a[j3 + 1] = wk3i * x0i - wk3r * x0r; - } - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] + a[j2]; - x0i = a[j0 + 1] + a[j2 + 1]; - x1r = a[j0] - a[j2]; - x1i = a[j0 + 1] - a[j2 + 1]; - x2r = a[j1] + a[j3]; - x2i = a[j1 + 1] + a[j3 + 1]; - x3r = a[j1] - a[j3]; - x3i = a[j1 + 1] - a[j3 + 1]; - a[j0] = x0r + x2r; - a[j0 + 1] = x0i + x2i; - a[j1] = x0r - x2r; - a[j1 + 1] = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - a[j2] = wn4r * (x0r - x0i); - a[j2 + 1] = wn4r * (x0i + x0r); - x0r = x1r + x3i; - x0i = x1i - x3r; - a[j3] = -wn4r * (x0r + x0i); - a[j3 + 1] = -wn4r * (x0i - x0r); -} - - -void cftmdl2(int n, double *a, double *w) -{ - int j, j0, j1, j2, j3, k, kr, m, mh; - double wn4r, wk1r, wk1i, wk3r, wk3i, wd1r, wd1i, wd3r, wd3i; - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, y0r, y0i, y2r, y2i; - - mh = n >> 3; - m = 2 * mh; - wn4r = w[1]; - j1 = m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[0] - a[j2 + 1]; - x0i = a[1] + a[j2]; - x1r = a[0] + a[j2 + 1]; - x1i = a[1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wn4r * (x2r - x2i); - y0i = wn4r * (x2i + x2r); - a[0] = x0r + y0r; - a[1] = x0i + y0i; - a[j1] = x0r - y0r; - a[j1 + 1] = x0i - y0i; - y0r = wn4r * (x3r - x3i); - y0i = wn4r * (x3i + x3r); - a[j2] = x1r - y0i; - a[j2 + 1] = x1i + y0r; - a[j3] = x1r + y0i; - a[j3 + 1] = x1i - y0r; - k = 0; - kr = 2 * m; - for (j = 2; j < mh; j += 2) { - k += 4; - wk1r = w[k]; - wk1i = w[k + 1]; - wk3r = w[k + 2]; - wk3i = w[k + 3]; - kr -= 4; - wd1i = w[kr]; - wd1r = w[kr + 1]; - wd3i = w[kr + 2]; - wd3r = w[kr + 3]; - j1 = j + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j] - a[j2 + 1]; - x0i = a[j + 1] + a[j2]; - x1r = a[j] + a[j2 + 1]; - x1i = a[j + 1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wk1r * x0r - wk1i * x0i; - y0i = wk1r * x0i + wk1i * x0r; - y2r = wd1r * x2r - wd1i * x2i; - y2i = wd1r * x2i + wd1i * x2r; - a[j] = y0r + y2r; - a[j + 1] = y0i + y2i; - a[j1] = y0r - y2r; - a[j1 + 1] = y0i - y2i; - y0r = wk3r * x1r + wk3i * x1i; - y0i = wk3r * x1i - wk3i * x1r; - y2r = wd3r * x3r + wd3i * x3i; - y2i = wd3r * x3i - wd3i * x3r; - a[j2] = y0r + y2r; - a[j2 + 1] = y0i + y2i; - a[j3] = y0r - y2r; - a[j3 + 1] = y0i - y2i; - j0 = m - j; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] - a[j2 + 1]; - x0i = a[j0 + 1] + a[j2]; - x1r = a[j0] + a[j2 + 1]; - x1i = a[j0 + 1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wd1i * x0r - wd1r * x0i; - y0i = wd1i * x0i + wd1r * x0r; - y2r = wk1i * x2r - wk1r * x2i; - y2i = wk1i * x2i + wk1r * x2r; - a[j0] = y0r + y2r; - a[j0 + 1] = y0i + y2i; - a[j1] = y0r - y2r; - a[j1 + 1] = y0i - y2i; - y0r = wd3i * x1r + wd3r * x1i; - y0i = wd3i * x1i - wd3r * x1r; - y2r = wk3i * x3r + wk3r * x3i; - y2i = wk3i * x3i - wk3r * x3r; - a[j2] = y0r + y2r; - a[j2 + 1] = y0i + y2i; - a[j3] = y0r - y2r; - a[j3 + 1] = y0i - y2i; - } - wk1r = w[m]; - wk1i = w[m + 1]; - j0 = mh; - j1 = j0 + m; - j2 = j1 + m; - j3 = j2 + m; - x0r = a[j0] - a[j2 + 1]; - x0i = a[j0 + 1] + a[j2]; - x1r = a[j0] + a[j2 + 1]; - x1i = a[j0 + 1] - a[j2]; - x2r = a[j1] - a[j3 + 1]; - x2i = a[j1 + 1] + a[j3]; - x3r = a[j1] + a[j3 + 1]; - x3i = a[j1 + 1] - a[j3]; - y0r = wk1r * x0r - wk1i * x0i; - y0i = wk1r * x0i + wk1i * x0r; - y2r = wk1i * x2r - wk1r * x2i; - y2i = wk1i * x2i + wk1r * x2r; - a[j0] = y0r + y2r; - a[j0 + 1] = y0i + y2i; - a[j1] = y0r - y2r; - a[j1 + 1] = y0i - y2i; - y0r = wk1i * x1r - wk1r * x1i; - y0i = wk1i * x1i + wk1r * x1r; - y2r = wk1r * x3r - wk1i * x3i; - y2i = wk1r * x3i + wk1i * x3r; - a[j2] = y0r - y2r; - a[j2 + 1] = y0i - y2i; - a[j3] = y0r + y2r; - a[j3 + 1] = y0i + y2i; -} - - -void cftfx41(int n, double *a, int nw, double *w) -{ - void cftf161(double *a, double *w); - void cftf162(double *a, double *w); - void cftf081(double *a, double *w); - void cftf082(double *a, double *w); - - if (n == 128) { - cftf161(a, &w[nw - 8]); - cftf162(&a[32], &w[nw - 32]); - cftf161(&a[64], &w[nw - 8]); - cftf161(&a[96], &w[nw - 8]); - } else { - cftf081(a, &w[nw - 8]); - cftf082(&a[16], &w[nw - 8]); - cftf081(&a[32], &w[nw - 8]); - cftf081(&a[48], &w[nw - 8]); - } -} - - -void cftf161(double *a, double *w) -{ - double wn4r, wk1r, wk1i, - x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i, - y8r, y8i, y9r, y9i, y10r, y10i, y11r, y11i, - y12r, y12i, y13r, y13i, y14r, y14i, y15r, y15i; - - wn4r = w[1]; - wk1r = w[2]; - wk1i = w[3]; - x0r = a[0] + a[16]; - x0i = a[1] + a[17]; - x1r = a[0] - a[16]; - x1i = a[1] - a[17]; - x2r = a[8] + a[24]; - x2i = a[9] + a[25]; - x3r = a[8] - a[24]; - x3i = a[9] - a[25]; - y0r = x0r + x2r; - y0i = x0i + x2i; - y4r = x0r - x2r; - y4i = x0i - x2i; - y8r = x1r - x3i; - y8i = x1i + x3r; - y12r = x1r + x3i; - y12i = x1i - x3r; - x0r = a[2] + a[18]; - x0i = a[3] + a[19]; - x1r = a[2] - a[18]; - x1i = a[3] - a[19]; - x2r = a[10] + a[26]; - x2i = a[11] + a[27]; - x3r = a[10] - a[26]; - x3i = a[11] - a[27]; - y1r = x0r + x2r; - y1i = x0i + x2i; - y5r = x0r - x2r; - y5i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - y9r = wk1r * x0r - wk1i * x0i; - y9i = wk1r * x0i + wk1i * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - y13r = wk1i * x0r - wk1r * x0i; - y13i = wk1i * x0i + wk1r * x0r; - x0r = a[4] + a[20]; - x0i = a[5] + a[21]; - x1r = a[4] - a[20]; - x1i = a[5] - a[21]; - x2r = a[12] + a[28]; - x2i = a[13] + a[29]; - x3r = a[12] - a[28]; - x3i = a[13] - a[29]; - y2r = x0r + x2r; - y2i = x0i + x2i; - y6r = x0r - x2r; - y6i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - y10r = wn4r * (x0r - x0i); - y10i = wn4r * (x0i + x0r); - x0r = x1r + x3i; - x0i = x1i - x3r; - y14r = wn4r * (x0r + x0i); - y14i = wn4r * (x0i - x0r); - x0r = a[6] + a[22]; - x0i = a[7] + a[23]; - x1r = a[6] - a[22]; - x1i = a[7] - a[23]; - x2r = a[14] + a[30]; - x2i = a[15] + a[31]; - x3r = a[14] - a[30]; - x3i = a[15] - a[31]; - y3r = x0r + x2r; - y3i = x0i + x2i; - y7r = x0r - x2r; - y7i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - y11r = wk1i * x0r - wk1r * x0i; - y11i = wk1i * x0i + wk1r * x0r; - x0r = x1r + x3i; - x0i = x1i - x3r; - y15r = wk1r * x0r - wk1i * x0i; - y15i = wk1r * x0i + wk1i * x0r; - x0r = y12r - y14r; - x0i = y12i - y14i; - x1r = y12r + y14r; - x1i = y12i + y14i; - x2r = y13r - y15r; - x2i = y13i - y15i; - x3r = y13r + y15r; - x3i = y13i + y15i; - a[24] = x0r + x2r; - a[25] = x0i + x2i; - a[26] = x0r - x2r; - a[27] = x0i - x2i; - a[28] = x1r - x3i; - a[29] = x1i + x3r; - a[30] = x1r + x3i; - a[31] = x1i - x3r; - x0r = y8r + y10r; - x0i = y8i + y10i; - x1r = y8r - y10r; - x1i = y8i - y10i; - x2r = y9r + y11r; - x2i = y9i + y11i; - x3r = y9r - y11r; - x3i = y9i - y11i; - a[16] = x0r + x2r; - a[17] = x0i + x2i; - a[18] = x0r - x2r; - a[19] = x0i - x2i; - a[20] = x1r - x3i; - a[21] = x1i + x3r; - a[22] = x1r + x3i; - a[23] = x1i - x3r; - x0r = y5r - y7i; - x0i = y5i + y7r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - x0r = y5r + y7i; - x0i = y5i - y7r; - x3r = wn4r * (x0r - x0i); - x3i = wn4r * (x0i + x0r); - x0r = y4r - y6i; - x0i = y4i + y6r; - x1r = y4r + y6i; - x1i = y4i - y6r; - a[8] = x0r + x2r; - a[9] = x0i + x2i; - a[10] = x0r - x2r; - a[11] = x0i - x2i; - a[12] = x1r - x3i; - a[13] = x1i + x3r; - a[14] = x1r + x3i; - a[15] = x1i - x3r; - x0r = y0r + y2r; - x0i = y0i + y2i; - x1r = y0r - y2r; - x1i = y0i - y2i; - x2r = y1r + y3r; - x2i = y1i + y3i; - x3r = y1r - y3r; - x3i = y1i - y3i; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[2] = x0r - x2r; - a[3] = x0i - x2i; - a[4] = x1r - x3i; - a[5] = x1i + x3r; - a[6] = x1r + x3i; - a[7] = x1i - x3r; -} - - -void cftf162(double *a, double *w) -{ - double wn4r, wk1r, wk1i, wk2r, wk2i, wk3r, wk3i, - x0r, x0i, x1r, x1i, x2r, x2i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i, - y8r, y8i, y9r, y9i, y10r, y10i, y11r, y11i, - y12r, y12i, y13r, y13i, y14r, y14i, y15r, y15i; - - wn4r = w[1]; - wk1r = w[4]; - wk1i = w[5]; - wk3r = w[6]; - wk3i = -w[7]; - wk2r = w[8]; - wk2i = w[9]; - x1r = a[0] - a[17]; - x1i = a[1] + a[16]; - x0r = a[8] - a[25]; - x0i = a[9] + a[24]; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - y0r = x1r + x2r; - y0i = x1i + x2i; - y4r = x1r - x2r; - y4i = x1i - x2i; - x1r = a[0] + a[17]; - x1i = a[1] - a[16]; - x0r = a[8] + a[25]; - x0i = a[9] - a[24]; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - y8r = x1r - x2i; - y8i = x1i + x2r; - y12r = x1r + x2i; - y12i = x1i - x2r; - x0r = a[2] - a[19]; - x0i = a[3] + a[18]; - x1r = wk1r * x0r - wk1i * x0i; - x1i = wk1r * x0i + wk1i * x0r; - x0r = a[10] - a[27]; - x0i = a[11] + a[26]; - x2r = wk3i * x0r - wk3r * x0i; - x2i = wk3i * x0i + wk3r * x0r; - y1r = x1r + x2r; - y1i = x1i + x2i; - y5r = x1r - x2r; - y5i = x1i - x2i; - x0r = a[2] + a[19]; - x0i = a[3] - a[18]; - x1r = wk3r * x0r - wk3i * x0i; - x1i = wk3r * x0i + wk3i * x0r; - x0r = a[10] + a[27]; - x0i = a[11] - a[26]; - x2r = wk1r * x0r + wk1i * x0i; - x2i = wk1r * x0i - wk1i * x0r; - y9r = x1r - x2r; - y9i = x1i - x2i; - y13r = x1r + x2r; - y13i = x1i + x2i; - x0r = a[4] - a[21]; - x0i = a[5] + a[20]; - x1r = wk2r * x0r - wk2i * x0i; - x1i = wk2r * x0i + wk2i * x0r; - x0r = a[12] - a[29]; - x0i = a[13] + a[28]; - x2r = wk2i * x0r - wk2r * x0i; - x2i = wk2i * x0i + wk2r * x0r; - y2r = x1r + x2r; - y2i = x1i + x2i; - y6r = x1r - x2r; - y6i = x1i - x2i; - x0r = a[4] + a[21]; - x0i = a[5] - a[20]; - x1r = wk2i * x0r - wk2r * x0i; - x1i = wk2i * x0i + wk2r * x0r; - x0r = a[12] + a[29]; - x0i = a[13] - a[28]; - x2r = wk2r * x0r - wk2i * x0i; - x2i = wk2r * x0i + wk2i * x0r; - y10r = x1r - x2r; - y10i = x1i - x2i; - y14r = x1r + x2r; - y14i = x1i + x2i; - x0r = a[6] - a[23]; - x0i = a[7] + a[22]; - x1r = wk3r * x0r - wk3i * x0i; - x1i = wk3r * x0i + wk3i * x0r; - x0r = a[14] - a[31]; - x0i = a[15] + a[30]; - x2r = wk1i * x0r - wk1r * x0i; - x2i = wk1i * x0i + wk1r * x0r; - y3r = x1r + x2r; - y3i = x1i + x2i; - y7r = x1r - x2r; - y7i = x1i - x2i; - x0r = a[6] + a[23]; - x0i = a[7] - a[22]; - x1r = wk1i * x0r + wk1r * x0i; - x1i = wk1i * x0i - wk1r * x0r; - x0r = a[14] + a[31]; - x0i = a[15] - a[30]; - x2r = wk3i * x0r - wk3r * x0i; - x2i = wk3i * x0i + wk3r * x0r; - y11r = x1r + x2r; - y11i = x1i + x2i; - y15r = x1r - x2r; - y15i = x1i - x2i; - x1r = y0r + y2r; - x1i = y0i + y2i; - x2r = y1r + y3r; - x2i = y1i + y3i; - a[0] = x1r + x2r; - a[1] = x1i + x2i; - a[2] = x1r - x2r; - a[3] = x1i - x2i; - x1r = y0r - y2r; - x1i = y0i - y2i; - x2r = y1r - y3r; - x2i = y1i - y3i; - a[4] = x1r - x2i; - a[5] = x1i + x2r; - a[6] = x1r + x2i; - a[7] = x1i - x2r; - x1r = y4r - y6i; - x1i = y4i + y6r; - x0r = y5r - y7i; - x0i = y5i + y7r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[8] = x1r + x2r; - a[9] = x1i + x2i; - a[10] = x1r - x2r; - a[11] = x1i - x2i; - x1r = y4r + y6i; - x1i = y4i - y6r; - x0r = y5r + y7i; - x0i = y5i - y7r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[12] = x1r - x2i; - a[13] = x1i + x2r; - a[14] = x1r + x2i; - a[15] = x1i - x2r; - x1r = y8r + y10r; - x1i = y8i + y10i; - x2r = y9r - y11r; - x2i = y9i - y11i; - a[16] = x1r + x2r; - a[17] = x1i + x2i; - a[18] = x1r - x2r; - a[19] = x1i - x2i; - x1r = y8r - y10r; - x1i = y8i - y10i; - x2r = y9r + y11r; - x2i = y9i + y11i; - a[20] = x1r - x2i; - a[21] = x1i + x2r; - a[22] = x1r + x2i; - a[23] = x1i - x2r; - x1r = y12r - y14i; - x1i = y12i + y14r; - x0r = y13r + y15i; - x0i = y13i - y15r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[24] = x1r + x2r; - a[25] = x1i + x2i; - a[26] = x1r - x2r; - a[27] = x1i - x2i; - x1r = y12r + y14i; - x1i = y12i - y14r; - x0r = y13r - y15i; - x0i = y13i + y15r; - x2r = wn4r * (x0r - x0i); - x2i = wn4r * (x0i + x0r); - a[28] = x1r - x2i; - a[29] = x1i + x2r; - a[30] = x1r + x2i; - a[31] = x1i - x2r; -} - - -void cftf081(double *a, double *w) -{ - double wn4r, x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i; - - wn4r = w[1]; - x0r = a[0] + a[8]; - x0i = a[1] + a[9]; - x1r = a[0] - a[8]; - x1i = a[1] - a[9]; - x2r = a[4] + a[12]; - x2i = a[5] + a[13]; - x3r = a[4] - a[12]; - x3i = a[5] - a[13]; - y0r = x0r + x2r; - y0i = x0i + x2i; - y2r = x0r - x2r; - y2i = x0i - x2i; - y1r = x1r - x3i; - y1i = x1i + x3r; - y3r = x1r + x3i; - y3i = x1i - x3r; - x0r = a[2] + a[10]; - x0i = a[3] + a[11]; - x1r = a[2] - a[10]; - x1i = a[3] - a[11]; - x2r = a[6] + a[14]; - x2i = a[7] + a[15]; - x3r = a[6] - a[14]; - x3i = a[7] - a[15]; - y4r = x0r + x2r; - y4i = x0i + x2i; - y6r = x0r - x2r; - y6i = x0i - x2i; - x0r = x1r - x3i; - x0i = x1i + x3r; - x2r = x1r + x3i; - x2i = x1i - x3r; - y5r = wn4r * (x0r - x0i); - y5i = wn4r * (x0r + x0i); - y7r = wn4r * (x2r - x2i); - y7i = wn4r * (x2r + x2i); - a[8] = y1r + y5r; - a[9] = y1i + y5i; - a[10] = y1r - y5r; - a[11] = y1i - y5i; - a[12] = y3r - y7i; - a[13] = y3i + y7r; - a[14] = y3r + y7i; - a[15] = y3i - y7r; - a[0] = y0r + y4r; - a[1] = y0i + y4i; - a[2] = y0r - y4r; - a[3] = y0i - y4i; - a[4] = y2r - y6i; - a[5] = y2i + y6r; - a[6] = y2r + y6i; - a[7] = y2i - y6r; -} - - -void cftf082(double *a, double *w) -{ - double wn4r, wk1r, wk1i, x0r, x0i, x1r, x1i, - y0r, y0i, y1r, y1i, y2r, y2i, y3r, y3i, - y4r, y4i, y5r, y5i, y6r, y6i, y7r, y7i; - - wn4r = w[1]; - wk1r = w[2]; - wk1i = w[3]; - y0r = a[0] - a[9]; - y0i = a[1] + a[8]; - y1r = a[0] + a[9]; - y1i = a[1] - a[8]; - x0r = a[4] - a[13]; - x0i = a[5] + a[12]; - y2r = wn4r * (x0r - x0i); - y2i = wn4r * (x0i + x0r); - x0r = a[4] + a[13]; - x0i = a[5] - a[12]; - y3r = wn4r * (x0r - x0i); - y3i = wn4r * (x0i + x0r); - x0r = a[2] - a[11]; - x0i = a[3] + a[10]; - y4r = wk1r * x0r - wk1i * x0i; - y4i = wk1r * x0i + wk1i * x0r; - x0r = a[2] + a[11]; - x0i = a[3] - a[10]; - y5r = wk1i * x0r - wk1r * x0i; - y5i = wk1i * x0i + wk1r * x0r; - x0r = a[6] - a[15]; - x0i = a[7] + a[14]; - y6r = wk1i * x0r - wk1r * x0i; - y6i = wk1i * x0i + wk1r * x0r; - x0r = a[6] + a[15]; - x0i = a[7] - a[14]; - y7r = wk1r * x0r - wk1i * x0i; - y7i = wk1r * x0i + wk1i * x0r; - x0r = y0r + y2r; - x0i = y0i + y2i; - x1r = y4r + y6r; - x1i = y4i + y6i; - a[0] = x0r + x1r; - a[1] = x0i + x1i; - a[2] = x0r - x1r; - a[3] = x0i - x1i; - x0r = y0r - y2r; - x0i = y0i - y2i; - x1r = y4r - y6r; - x1i = y4i - y6i; - a[4] = x0r - x1i; - a[5] = x0i + x1r; - a[6] = x0r + x1i; - a[7] = x0i - x1r; - x0r = y1r - y3i; - x0i = y1i + y3r; - x1r = y5r - y7r; - x1i = y5i - y7i; - a[8] = x0r + x1r; - a[9] = x0i + x1i; - a[10] = x0r - x1r; - a[11] = x0i - x1i; - x0r = y1r + y3i; - x0i = y1i - y3r; - x1r = y5r + y7r; - x1i = y5i + y7i; - a[12] = x0r - x1i; - a[13] = x0i + x1r; - a[14] = x0r + x1i; - a[15] = x0i - x1r; -} - - -void cftf040(double *a) -{ - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i; - - x0r = a[0] + a[4]; - x0i = a[1] + a[5]; - x1r = a[0] - a[4]; - x1i = a[1] - a[5]; - x2r = a[2] + a[6]; - x2i = a[3] + a[7]; - x3r = a[2] - a[6]; - x3i = a[3] - a[7]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[2] = x1r - x3i; - a[3] = x1i + x3r; - a[4] = x0r - x2r; - a[5] = x0i - x2i; - a[6] = x1r + x3i; - a[7] = x1i - x3r; -} - - -void cftb040(double *a) -{ - double x0r, x0i, x1r, x1i, x2r, x2i, x3r, x3i; - - x0r = a[0] + a[4]; - x0i = a[1] + a[5]; - x1r = a[0] - a[4]; - x1i = a[1] - a[5]; - x2r = a[2] + a[6]; - x2i = a[3] + a[7]; - x3r = a[2] - a[6]; - x3i = a[3] - a[7]; - a[0] = x0r + x2r; - a[1] = x0i + x2i; - a[2] = x1r + x3i; - a[3] = x1i - x3r; - a[4] = x0r - x2r; - a[5] = x0i - x2i; - a[6] = x1r - x3i; - a[7] = x1i + x3r; -} - - -void cftx020(double *a) -{ - double x0r, x0i; - - x0r = a[0] - a[2]; - x0i = a[1] - a[3]; - a[0] += a[2]; - a[1] += a[3]; - a[2] = x0r; - a[3] = x0i; -} - - -void rftfsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr, xi, yr, yi; - - m = n >> 1; - ks = 2 * nc / m; - kk = 0; - for (j = 2; j < m; j += 2) { - k = n - j; - kk += ks; - wkr = 0.5 - c[nc - kk]; - wki = c[kk]; - xr = a[j] - a[k]; - xi = a[j + 1] + a[k + 1]; - yr = wkr * xr - wki * xi; - yi = wkr * xi + wki * xr; - a[j] -= yr; - a[j + 1] -= yi; - a[k] += yr; - a[k + 1] -= yi; - } -} - - -void rftbsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr, xi, yr, yi; - - m = n >> 1; - ks = 2 * nc / m; - kk = 0; - for (j = 2; j < m; j += 2) { - k = n - j; - kk += ks; - wkr = 0.5 - c[nc - kk]; - wki = c[kk]; - xr = a[j] - a[k]; - xi = a[j + 1] + a[k + 1]; - yr = wkr * xr + wki * xi; - yi = wkr * xi - wki * xr; - a[j] -= yr; - a[j + 1] -= yi; - a[k] += yr; - a[k + 1] -= yi; - } -} - - -void dctsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr; - - m = n >> 1; - ks = nc / n; - kk = 0; - for (j = 1; j < m; j++) { - k = n - j; - kk += ks; - wkr = c[kk] - c[nc - kk]; - wki = c[kk] + c[nc - kk]; - xr = wki * a[j] - wkr * a[k]; - a[j] = wkr * a[j] + wki * a[k]; - a[k] = xr; - } - a[m] *= c[0]; -} - - -void dstsub(int n, double *a, int nc, double *c) -{ - int j, k, kk, ks, m; - double wkr, wki, xr; - - m = n >> 1; - ks = nc / n; - kk = 0; - for (j = 1; j < m; j++) { - k = n - j; - kk += ks; - wkr = c[kk] - c[nc - kk]; - wki = c[kk] + c[nc - kk]; - xr = wki * a[k] - wkr * a[j]; - a[k] = wkr * a[k] + wki * a[j]; - a[j] = xr; - } - a[m] *= c[0]; -} - diff --git a/src/projectM-engine-backup/fftsg.h b/src/projectM-engine-backup/fftsg.h deleted file mode 100755 index ff9da6e41..000000000 --- a/src/projectM-engine-backup/fftsg.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: fftsg.h,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Wrapper for rdft() and friends - * - * $Log$ - */ - -#ifndef _FFTSG_H -#define _FFTSG_H - -extern void rdft(int n, int isgn, double *a, int *ip, double *w); - -#endif /** !_FFTSG_H */ - diff --git a/src/projectM-engine-backup/fonts b/src/projectM-engine-backup/fonts deleted file mode 120000 index 8b289e24f..000000000 --- a/src/projectM-engine-backup/fonts +++ /dev/null @@ -1 +0,0 @@ -../../fonts \ No newline at end of file diff --git a/src/projectM-engine-backup/glConsole.cpp b/src/projectM-engine-backup/glConsole.cpp deleted file mode 100755 index 580d6b354..000000000 --- a/src/projectM-engine-backup/glConsole.cpp +++ /dev/null @@ -1,1028 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: glConsole.c,v 1.2 2005/12/28 18:51:18 psperl Exp $ - * - * Encapsulation of an OpenGL-based console - * - */ - -#include -#include -#include -#include -#ifdef MACOS -#include -#endif /** MACOS */ -#include - -#include "projectM.hpp" - -#ifdef MACOS -#include -#else -#include -#endif /** MACOS */ -#include "glConsole.h" -#include "Common.hpp" -#include "fatal.h" - -#include "wipemalloc.h" - -#ifdef USE_FTGL -#include -#include -#endif /** USE_FTGL */ - -#define HEIGHT_SPACE 8 /* pixel space between lines */ -#define DEFAULT_CONSOLE_FOREGROUND_COLOR CONSOLE_WHITE -#define DEFAULT_CONSOLE_BACKGROUND_COLOR CONSOLE_BLACK -#define DEFAULT_CURSOR_COLOR CONSOLE_GREEN -#define CURSOR_REFRESH_RATE 10 - -static int gl_console_set_color(color_t color); -int clear_console_screen_buffer(gl_console_t * gl_console); -int clear_console_scroll_buffer(gl_console_t * gl_console); -//float screen_width = 800; -//float screen_height = 600; - -extern projectM *PM; -int refresh_count = 0; - -/* Creates a new console of (width X height) with left corner at - (x, y) */ -gl_console_t * glConsoleCreate(int screen_width, int screen_height, int scroll_width, int scroll_height, - float start_x, float start_y, int Font_Descriptor) { - - console_char_t * buffer; - gl_console_t * gl_console; - - if ((screen_width > MAX_CONSOLE_WIDTH) || (screen_width < 1)) - return NULL; - - if ((screen_height > MAX_CONSOLE_HEIGHT) || (screen_height < 1)) - return NULL; - - if ((gl_console = (gl_console_t*)wipemalloc(sizeof(gl_console_t))) == NULL) - return NULL; - - if ((scroll_height < screen_height)) - return NULL; - - if ((scroll_width < screen_width)) - return NULL; - - if ((buffer = (console_char_t*)wipemalloc(scroll_width*scroll_height*sizeof(console_char_t))) == NULL) - return NULL; - /* Need to know height and width of screen so we can see if the - if x and y are valid, will do later */ - - /* Set struct parameters */ - gl_console->screen_buffer = buffer; - gl_console->font_descriptor = Font_Descriptor; - gl_console->screen_width = screen_width; - gl_console->screen_height = screen_height; - gl_console->scroll_width = scroll_width; - gl_console->scroll_height = scroll_height; - gl_console->start_x = start_x; /* x coordinate of console's upper left corner */ - gl_console->start_y = start_y; /* y coordinate of console's upper left corner */ - gl_console->screen_start_x = gl_console->screen_start_y = 0; - gl_console->screen_x = gl_console->screen_y = 0; /* set cursor positions to zero */ - gl_console->cursor_ptr = buffer; /* start cursor pointer at beginning of buffer */ - gl_console->current_fg = DEFAULT_CONSOLE_FOREGROUND_COLOR; - gl_console->current_bg = DEFAULT_CONSOLE_BACKGROUND_COLOR; - gl_console->scroll_buffer = buffer; - gl_console->cursor_color = DEFAULT_CURSOR_COLOR; - gl_console->cursor_style = BAR_STYLE; - gl_console->flags = 0; - /* Clears the console buffer */ - clear_console_scroll_buffer(gl_console); - - if (GL_CONSOLE_DEBUG) printf("glConsoleCreate: finished initializing\n"); - - /* Finished, return new console */ - return gl_console; -} - -/* Destroy the passed console */ -int glConsoleDestroy(gl_console_t * console) { - - if (console == NULL) - return PROJECTM_FAILURE; - - free(console->scroll_buffer); - free(console); - - console = NULL; - - return PROJECTM_SUCCESS; - -} - - -int glConsoleClearScreen(gl_console_t * console) { - - if (console == NULL) - return PROJECTM_FAILURE; - - clear_console_screen_buffer(console); - - return PROJECTM_SUCCESS; -} - - -int glConsoleClearBuffer(gl_console_t * console) { - - if (console == NULL) - return PROJECTM_FAILURE; - - clear_console_scroll_buffer(console); - glConsoleAlignCursorLeft(console); - glConsoleAlignCursorUp(console); - - return PROJECTM_SUCCESS; -} - -/* Aligns cursor to the next character 'c' */ -int glConsoleCursorToNextChar(char c, gl_console_t * gl_console) { - - console_char_t * endofbuf; - if (gl_console == NULL) - return PROJECTM_FAILURE; - - endofbuf = gl_console->scroll_buffer + (gl_console->scroll_width*gl_console->scroll_height) - 1; - - while ((gl_console->cursor_ptr != endofbuf) && (gl_console->cursor_ptr->symbol != c)) - glConsoleMoveCursorForward(gl_console); - - return PROJECTM_SUCCESS; - -} - -int glConsoleMoveCursorUp(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* The screen buffer is at the top and so is the screen cursor */ - if ((gl_console->screen_start_y == 0) && (gl_console->screen_y == 0)) { - - /* Wrap up flag specified, move cursor to bottom of screen */ - if (gl_console->flags & CONSOLE_FLAG_SCROLL_WRAP_UP) { - glConsoleAlignCursorDown(gl_console); - } - - - /* Do nothing instead */ - - } - /* The screen cursor is at the top but not the screen buffer */ - else if (gl_console->screen_y == 0){ - - /* screen_y stays the same, since it scrolls up one */ - - /* Decrement the cursor_ptr by one line */ - gl_console->cursor_ptr -= gl_console->scroll_width; - - /* Decrement starting 'y' position of the screen buffer */ - gl_console->screen_start_y--; - - /* Decrement the screen buffer by one line */ - gl_console->screen_buffer -= gl_console->scroll_width; - - - } - /* General case, not at top or bottoom */ - else { - gl_console->screen_y--; - gl_console->cursor_ptr -= gl_console->scroll_width; - } - - return PROJECTM_SUCCESS; -} - - -int glConsoleMoveCursorDown(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* The screen buffer is at the bottom and so is the screen cursor, this may not ever - happen */ - if (gl_console->screen_start_y == (gl_console->scroll_height - gl_console->screen_height)) { - if (gl_console->screen_y == (gl_console->screen_height - 1)) { - // printf("BOTTOM AND END\n"); - /* Wrap down to up enabled */ - if (gl_console->flags & CONSOLE_FLAG_SCROLL_WRAP_DOWN) { - glConsoleAlignCursorUp(gl_console); - } - - /* Otherwise, do nothing */ - } - } - - /* The screen cursor is at the bottom but not the end of the scroll buffer */ - else if (gl_console->screen_y == (gl_console->screen_height - 1)) { - - // printf("BOTTOM BUT NOT END\n"); - /* screen_y stays the same, since it scrolls down one */ - - /* Increment the cursor_ptr by one line */ - gl_console->cursor_ptr += gl_console->scroll_width; - - /* Increment starting 'y' position of the screen buffer */ - gl_console->screen_start_y++; - - /* Increment the screen buffer by one line */ - gl_console->screen_buffer += gl_console->scroll_width; - - - } - - /* General case, not at top or bottoom */ - else { - // printf("GENERAL CASE\n"); - gl_console->screen_y++; - gl_console->cursor_ptr += gl_console->scroll_width; - } - - return PROJECTM_SUCCESS; -} - -/* Move the console forward one character, wrap around is the current behavior */ -int glConsoleMoveCursorForward(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - - /* The case where the end of the screen is reached and the end of the scroll buffer */ - if ((gl_console->screen_start_x + gl_console->screen_width) == (gl_console->scroll_width)) { - if ((gl_console->screen_x) == (gl_console->screen_width - 1)) { - - /* Wrap around to next line if this flag is enabled */ - if (gl_console->flags & CONSOLE_FLAG_SCROLL_WRAP_RIGHT) { - /* Down one and to the left */ - glConsoleMoveCursorDown(gl_console); - glConsoleAlignCursorLeft(gl_console); - } - - /* Otherwise do nothing */ - } - } - - /* The case where the end of the screen is reach, but the not end of the scroll buffer */ - else if (gl_console->screen_x == (gl_console->screen_width - 1)) { - - /* screen_x doesn't change because the whole console is shifted left */ - /* screen_y doesn't change because we haven't reached the end of the scroll buffer */ - - gl_console->cursor_ptr++; /* increment cursor pointer */ - gl_console->screen_buffer++; /* move the screen buffer right one */ - gl_console->screen_start_x++; /* incrementing the start of the screen 'x' variable */ - } - - /* The most common case, no scrolling required. In other words, the cursor is at some - arbitrary non end point position */ - else { - gl_console->screen_x++; /* increment x variable */ - gl_console->cursor_ptr++; /* increment cursor pointer */ - } - - return PROJECTM_SUCCESS; -} - - -/* Moves the cursor backward one space */ -int glConsoleMoveCursorBackward(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* The case where the beginning of the screen is reached and the beginning of the scroll buffer */ - if ((gl_console->screen_start_x == 0) && (gl_console->screen_x == 0)) { - if (gl_console->flags & CONSOLE_FLAG_SCROLL_WRAP_LEFT) { - glConsoleMoveCursorUp(gl_console); - glConsoleAlignCursorRight(gl_console); - } - - } - - /* The case where the beginning of the screen is reach, but the not beginning of the scroll buffer */ - else if (gl_console->screen_x == 0) { - gl_console->cursor_ptr--; /* decrement cursor pointer */ - gl_console->screen_buffer--; /* move the screen buffer left one */ - gl_console->screen_start_x--; /* decrement the start of the screen 'x' variable */ - } - - /* The most common case, no scrolling required. In other words, the cursor is at some - arbitrary non end point position */ - else { - gl_console->screen_x--; /* increment x variable */ - gl_console->cursor_ptr--; /* increment cursor pointer */ - } - - /* Finised, return success */ - return PROJECTM_SUCCESS; -} - -/* Sets the cursor position to (x,y) of the passed console */ -int glConsoleSetCursorPos(int x, int y, gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* Bound checks */ - if ((x < 0) || (x > (gl_console->scroll_width-1))) - return PROJECTM_FAILURE; - - if ((y < 0) || (y > (gl_console->scroll_height-1))) - return PROJECTM_FAILURE; - - - /* Set cursor ptr to new screen location. This variable does not depend on if the - screen needs to be scrolled */ - gl_console->cursor_ptr = gl_console->scroll_buffer + (y * gl_console->scroll_width) + x; - - /* Goal 1: Determine what needs to be changed on the X axis */ - - - /* Case (i): x coordinate is less than the starting screen buffer x coordinate. Must - shift the screen buffer left by difference of the two coordinates */ - if (x < gl_console->screen_start_x) { - // printf("X: case (i)\n"); - - /* Align x offset to new x corodinate */ - gl_console->screen_start_x = x; - - /* Set screen_x to zero because we are left edge aligned in the screen buffer */ - gl_console->screen_x = 0; - - } - - /* Case (ii): x coordinate is greater than farthest screen buffer x coordinate. Must - shift the screen buffer right by difference of the two coordinates */ - else if (x > (gl_console->screen_start_x+gl_console->screen_width-1)) { - // printf("X: case (ii)\n"); - - /* Align end of screen buffer X coordinate space to new x coordinate */ - gl_console->screen_start_x = x - (gl_console->screen_width - 1); - - /* Set screen_x to right edge of screen buffer because we are right aligned to the new x coordinate */ - gl_console->screen_x = gl_console->screen_width - 1; - } - - /* CASE (iii): x coordinate must lie within the current screen buffer rectangle. No need to - shift the screen buffer on the X axis */ - else { - // printf("X: case (iii)\n"); - - /* Set the new screen coordinate to the passed in x coordinate minus the starting screen buffer distance */ - gl_console->screen_x = x - gl_console->screen_start_x; - - } - - - /* Goal 2: Determine what needs to be changed on the Y axis */ - - /* Case (i): y coordinate is less than the starting screen buffer y coordinate. Must - shift the screen buffer up by difference of the two coordinates */ - if (y < gl_console->screen_start_y) { - // printf("Y: case (i) y = %d, start_y = %d\n", y, gl_console->screen_start_y); - - /* Align y offset to new y corodinate */ - gl_console->screen_start_y = y; - - /* Set screen_y to zero because we are top aligned in the screen buffer */ - gl_console->screen_y = 0; - - } - - /* Case (ii): y coordinate is greater than loweest screen buffer y coordinate. Must - shift the screen buffer down by difference of the two coordinates */ - else if (y > (gl_console->screen_start_y+gl_console->screen_height-1)) { - // printf("Y: case (ii)\n"); - - /* Align end of screen buffer Y coordinate space to new y coordinate */ - gl_console->screen_start_y = y - (gl_console->screen_height-1); - - /* Set screen_y to bottom edge of screen buffer because we are bottom aligned to the new y coordinate */ - gl_console->screen_y = gl_console->screen_height - 1; - } - - /* CASE (iii): y coordinate must lie within the current screen buffer rectangle. No need to - shift the screen buffer on the Y axis */ - - else { - // printf("Y: case (iii)\n"); - /* Set the new screen coordinate to the passed in y coordinate minus the starting screen buffer distance */ - gl_console->screen_y = y - gl_console->screen_start_y; - - } - - - /* Re-adjust screen buffer ptr based on computed screen starting coordinates */ - gl_console->screen_buffer = gl_console->scroll_buffer + (gl_console->screen_start_y*gl_console->screen_width) - + gl_console->screen_start_x; - - - return PROJECTM_SUCCESS; -} - -/* Sets 'x' and 'y' to the console coordinates of the current cursor position */ -int glConsoleGetCursorPos(int * x, int * y, gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* Null arguments passed, bail */ - if ((x == NULL) || (y == NULL)) - return PROJECTM_FAILURE; - - /* Set coordinates with appropiate offset */ - *x = gl_console->screen_x + gl_console->screen_start_x; - *y = gl_console->screen_y + gl_console->screen_start_y; - - return PROJECTM_SUCCESS; -} - -/* Helper function that changes the current color */ -static int gl_console_set_color(color_t color) { - - switch (color) { - - case CONSOLE_BLACK: - glColor4f(0, 0, 0, 1); - break; - case CONSOLE_RED: - glColor4f(1, 0, 0, 1); - break; - case CONSOLE_GREEN: - glColor4f(0, 1, 0, 1); - break; - case CONSOLE_WHITE: - glColor4f(1, 1, 1, 1); - break; - case CONSOLE_BLUE: - glColor4f(0, 0, 1, 1); - break; - case CONSOLE_TRANS: - glColor4f(0, 0, 0, 0); - break; - default: /* hmm, use white I guess */ - glColor4f(1, 1, 1, 1); - } - - return PROJECTM_SUCCESS; -} - -/* Sets the passed console to a new foreground */ -int glConsoleSetFGColor(color_t color, gl_console_t * gl_console) { - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - gl_console->current_fg = color; - - return PROJECTM_SUCCESS; -} - -/* Sets the passed console to a new background */ -int glConsoleSetBGColor(color_t color, gl_console_t * gl_console) { - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - gl_console->current_bg = color; - - return PROJECTM_SUCCESS; -} - -/* Sets the cursor color */ -int glConsoleSetCursorColor(color_t color, gl_console_t * gl_console) { - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - gl_console->cursor_color = color; - - return PROJECTM_SUCCESS; -} - -/* Prints a string starting from the current cursor position */ -int glConsolePrintString(char * s, gl_console_t * gl_console) { - - int len; - int i; - console_char_t console_char; - char symbol; - - /* Null argument checks */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - if (s == NULL) - return PROJECTM_FAILURE; - - /* Set the console struct to correct fg and bg values. - The character value will change in the for loop */ - console_char.fg_color = gl_console->current_fg; - console_char.bg_color = gl_console->current_bg; - console_char.symbol = 0; - - /* Calculate length of the string */ - len = strlen(s); - - - for (i = 0; i < len; i++) { - - /* Case on the type of character */ - - switch (symbol = *(s+i)) { - - case '\r': - case '\n': - console_char.symbol = symbol; - *gl_console->cursor_ptr = console_char; - glConsoleMoveCursorDown(gl_console); - glConsoleAlignCursorLeft(gl_console); - break; - case '\b': - glConsoleMoveCursorBackward(gl_console); - break; - default: - /* Change the screen_buffer value */ - console_char.symbol = symbol; - *gl_console->cursor_ptr = console_char; - glConsoleMoveCursorForward(gl_console); - - } - } - - return PROJECTM_SUCCESS; -} - - -/* Clears the console screen_buffer, using current fg and bg values */ -int clear_console_screen_buffer(gl_console_t * gl_console) { - - int i, console_size; - console_char_t console_char; - - /* Set console struct to current fg and bg values */ - console_char.fg_color = gl_console->current_fg; - console_char.bg_color = gl_console->current_bg; - console_char.symbol = 0; /* empty symbol */ - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - console_size = gl_console->scroll_width * gl_console->scroll_height; - - for (i = 0; i < console_size; i++) - *(gl_console->screen_buffer + i) = console_char; - - return PROJECTM_SUCCESS; -} - -/* Clears the entire buffer */ -int clear_console_scroll_buffer(gl_console_t * gl_console) { - - int i, console_size; - console_char_t console_char; - - /* Set console struct to current fg and bg values */ - console_char.fg_color = gl_console->current_fg; - console_char.bg_color = gl_console->current_bg; - console_char.symbol = 0; /* empty symbol */ - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - console_size = gl_console->scroll_width * gl_console->scroll_height; - - for (i = 0; i < console_size; i++) - *(gl_console->scroll_buffer + i) = console_char; - - return PROJECTM_SUCCESS; -} - -/* Align the cursor all the way to the right of the passed console */ -int glConsoleAlignCursorRight(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* Set the cursor pointer to the rightmost end of the scroll buffer */ - gl_console->cursor_ptr += gl_console->scroll_width - (gl_console->screen_start_x + gl_console->screen_x) - 1; - - /* Move the screen buffer to the farthest right as possible */ - gl_console->screen_buffer += gl_console->scroll_width - gl_console->screen_start_x - gl_console->screen_width; - - /* Set the screen start 'x' value to length of the scroll buffer minus the length - of the screen buffer with a -1 offset to access the array correctly */ - gl_console->screen_start_x = gl_console->scroll_width - gl_console->screen_width; - - /* Set the screen_x cursor value to the screen width length minus an array adjustment offset */ - gl_console->screen_x = gl_console->screen_width - 1; - - - return PROJECTM_SUCCESS; -} - -/* Align the cursor all the way to the right of the passed console */ -int glConsoleAlignCursorLeft(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* Set the cursor pointer to the left most end of the scroll buffer */ - gl_console->cursor_ptr -= (gl_console->screen_start_x + gl_console->screen_x); - - /* Set the screen buffer all the way to left */ - gl_console->screen_buffer -= gl_console->screen_start_x; - - /* Set the screen start x to the leftmost end of the scroll buffer */ - gl_console->screen_start_x = 0; - - /* Set the screen_x cursor value to the leftmost end of the screne buffer */ - gl_console->screen_x = 0; - - - /* Finished, return success */ - return PROJECTM_SUCCESS; -} - -/* Align the cursor to the top of the screen of the passed console */ -int glConsoleAlignCursorUp(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* Set the cursor pointer to the top of the buffer plus the x offset */ - gl_console->cursor_ptr = gl_console->scroll_buffer + gl_console->screen_start_x + gl_console->screen_x; - - /* Set the screen start y to the top of the scroll buffer */ - gl_console->screen_start_y = 0; - - /* Set the screen_y cursor value to the top of the screen buffer */ - gl_console->screen_y = 0; - - /* Set screen buffer to the top shifted lefted by the screen start value */ - gl_console->screen_buffer = gl_console->scroll_buffer + gl_console->screen_start_x; - - /* Finished, return success */ - return PROJECTM_SUCCESS; -} - - -/* Align the cursor to the top of the screen of the passed console */ -int glConsoleAlignCursorDown(gl_console_t * gl_console) { - - /* Null argument check */ - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* Set the cursor pointer to the bottom of the buffer plus the x offset */ - gl_console->cursor_ptr = gl_console->scroll_buffer + - ((gl_console->scroll_height-1)*gl_console->scroll_width) - + gl_console->screen_start_x + gl_console->screen_x; - - /* Set the screen start y to the bottom of the scroll buffer mi screen_height */ - gl_console->screen_start_y = gl_console->scroll_height - gl_console->screen_height; - - /* Set the screen_y cursor value to the bottom of the screen buffer */ - gl_console->screen_y = gl_console->screen_height - 1; - - /* Set screen buffer to the bottom minus the height of the screen - shifted left by the screen start value */ - - gl_console->screen_buffer = gl_console->scroll_buffer + - ((gl_console->scroll_height - gl_console->screen_height) - *gl_console->scroll_width) + gl_console->screen_start_x; - - /* Finished, return success */ - return PROJECTM_SUCCESS; -} - - - -int glConsoleDraw( gl_console_t * console) { - -#ifdef USE_FTGL - int vw = 512; - int vh=512; - int x,y; - //float minx, miny, maxx, maxy; - char * symbol; - console_char_t * console_char; - float start_x, start_y; - - //REMOVE SOON - //int width=800,height=600; - - - // console->start_x=0; - // console->start_y=1; - - - int width=1; - int height=1; - - - - start_y = -(console->start_y - 1.0); - start_x = console->start_x; - - /* Null argument check */ - if (console == NULL) - return PROJECTM_FAILURE; - - symbol = (char*)wipemalloc(sizeof(char)+1); - *symbol = *(symbol+1) = 0; - - /* First, push the gl matrix to save data */ - glPushMatrix(); - - - /* Start rendering at the console's start position */ - glTranslatef(start_x,start_y,-1); - //glTranslatef(0,0.5,-1); - /* Assign a pointer to the start of the console buffer */ - console_char = console->screen_buffer; - - /* Iterate through entire console buffer, drawing each - character one at a time with appropiate foreground and - background values. May not be the most efficient. */ - - // glScalef(8.0,8.0,0); - - - - float llx; // The bottom left near most ?? in the x axis - float lly; // The bottom left near most ?? in the y axis - float llz; // The bottom left near most ?? in the z axis - float urx; // The top right far most ?? in the x axis - float ury; // The top right far most ?? in the y axis - float urz; // The top right far most ?? in the z axis - float advance; - - - //Figure out size of one console unit - PM->renderer->other_font->FaceSize((unsigned)(16*(vh/512.0))); - - /// @bug commented out to get projectM working - //advance=PM->renderer->other_font->Advance("W"); - PM->renderer->other_font->BBox("qpg_XT[",llx,lly,llx,urx,ury,urz); - - - float invfix=1.0/512; - llx*=invfix;lly*=invfix;llz*=invfix; - urx*=invfix;ury*=invfix;urz*=invfix; - advance=advance/vw; - - glTranslatef(advance*0.5,lly-ury,0); - - for (y = 0; y < console->screen_height; y++) { - - glPushMatrix(); - char buffer[console->screen_width+1]; - memset( buffer, '\0',sizeof(char) * (console->screen_width+1)); - - - - for (x = 0; x < console->screen_width; x++) { - - console_char = console->screen_buffer + (y*console->scroll_width) + x; - *symbol = console_char->symbol; - - - /* Draw the background color */ - if ((console->flags & CONSOLE_FLAG_ALWAYS_DRAW_BACKGROUND) || (*symbol != 0)) { - - /* Draw the background by drawing a rectangle */ - gl_console_set_color(console_char->bg_color); - glRectf(llx, lly ,llx+advance, ury); - - } - - /* We are at the cursor position. See if the cursor is hidden or not and act accordingly */ - if ((console_char == console->cursor_ptr) && (!(console->flags & CONSOLE_FLAG_CURSOR_HIDDEN))) { - - /* Cursor is not hidden and blinking */ - if (console->flags & CONSOLE_FLAG_CURSOR_BLINKING) { - if (refresh_count % CURSOR_REFRESH_RATE) - gl_console_set_color(console->cursor_color); - else - gl_console_set_color(console_char->bg_color); - } - - /* Cursor is not hidden, and not blinking */ - else { - gl_console_set_color(console->cursor_color); - } - - /* Draw the cursor according to the set style */ - if (console->cursor_style == BAR_STYLE) - glRectf(llx, lly, llx+advance, ury); - else if (console->cursor_style == UNDERLINE_STYLE) { - glRectf(llx, lly, llx+advance, ury); - } - } - - /* The cursor is not here or hidden, draw regular background (OLD COMMENT) */ - - /* Instead of the above, do nothing because we always draw the background before - printing the cursor to the screen */ - else { - -// if ((console->flags & CONSOLE_FLAG_ALWAYS_DRAW_BACKGROUND) || (*symbol != 0)) { - - /* Draw the background by drawing a rectangle */ -// gl_console_set_color(console_char->bg_color); -// glRectf(-0.5, 1.0 ,1.0, -1.0); - - //} - } - - /* If the symbol is nonzero draw it */ - if (*symbol != 0 && *symbol != '\n') { - buffer[x]=*symbol; - //gl_console_set_color(console_char->fg_color); - } - /* Now shift to the right by the size of the character space */ - glTranslatef(advance,0,0); - - // console_char++; - } - - - // glColor4f(0.0,1.0,1.0,1.0); - //glTranslatef(((lly-ury)*console->screen_width),0,0); - //glRasterPos2f(50,-50); - - glPopMatrix(); - - console_char = console->screen_buffer + (y*console->scroll_width + 1); - gl_console_set_color(console_char->fg_color); - glRasterPos2f(0,0); - - PM->renderer->other_font->Render(buffer); - - - /* New line, shift down the size of the symbol plus some extra space */ - - - glTranslatef(0,(lly-ury), 0); - } - //glColor4f(1,1,1,1); - - /* Finished, pop the gl matrix and return success */ - glPopMatrix(); - - - free(symbol); - refresh_count++; -#endif /** USE_FTGL */ - - return PROJECTM_SUCCESS; -} - - - -int glConsoleSetFlags(int flags, gl_console_t * gl_console) { - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - gl_console->flags = gl_console->flags | flags; - - return PROJECTM_SUCCESS; -} - -#ifdef NOGOOD -int glConsoleStartShell(gl_console_t * gl_console) { - - int pid1, pid2; - char * s; - char c; - FILE * fs; - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - if ((s = wipemalloc(sizeof(char) + 512)) == NULL) - return PROJECTM_FAILURE; - - memset(s, 0, 512); - -#if !defined(MACOS) && !defined(WIN32) - if ((pid1 = fork()) == 0) { - printf("bash starting\n"); - execve("/bin/bash", NULL, NULL); - printf("bash exiting..\n"); - exit(0); - } - - if ((pid2 = fork()) == 0) { - //fs = fopen("tempfile", "r"); - printf("about to loop on stdout\n"); - while (1) { - //printf("^");//fflush(stdout); - //ungetc(c, stdin); - fread(s, 1, 1, stdout); - *s = 'a'; - //printf("%c", *s);fflush(stdout); - glConsolePrintString(s, gl_console); - } - //fclose(fs); - printf("waiting for pid1 to exit\n"); - waitpid(pid1, NULL, 0); - free(s); - printf("pid1 exited\n"); - return PROJECTM_SUCCESS; - } - - printf("bash should have started\n"); -#endif /** !MACOS */ - return PROJECTM_SUCCESS; -} -#endif -/* Copies the console buffer into a character array */ -int glConsoleCopyBuffer(char * src, int len, gl_console_t * gl_console) { - - int i; - int j = 0; - int size; - char c; - if (src == NULL) - return PROJECTM_FAILURE; - if (len < 0) - return PROJECTM_FAILURE; - if (gl_console == NULL) - return PROJECTM_FAILURE; - - /* Clear the character space */ - memset(src, 0, len); - - size = gl_console->scroll_width*gl_console->scroll_height; - - for (i=0; ((i - j) < len) && (i < size); i++) { - c = (gl_console->scroll_buffer + i)->symbol; - - /* We don't want to accidentally null terminate the string...*/ - if (c != 0) - src[i - j] = c; - else - j++; - - // if (c != 0) - // src[i] = c; - // else - // src[i] = '\n'; - } - - /* Ensure the string actually ends */ - src[len - 1] = 0; - - return PROJECTM_SUCCESS; -} - -/* Sets the cursor draw style */ -int glConsoleSetCursorStyle(int style_num, gl_console_t * gl_console) { - - if (gl_console == NULL) - return PROJECTM_FAILURE; - - gl_console->cursor_style = style_num; - - return PROJECTM_SUCCESS; -} - diff --git a/src/projectM-engine-backup/glConsole.h b/src/projectM-engine-backup/glConsole.h deleted file mode 100755 index ecded4c00..000000000 --- a/src/projectM-engine-backup/glConsole.h +++ /dev/null @@ -1,114 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * - * $Log$ - */ - -#ifndef _GLCONSOLE_H -#define _GLCONSOLE_H - -#define GL_CONSOLE_DEBUG 0 -#define MAX_CONSOLE_HEIGHT 500 -#define MAX_CONSOLE_WIDTH 500 - -#define CONSOLE_FLAG_NONE 0 -#define CONSOLE_FLAG_CURSOR_HIDDEN 1 -#define CONSOLE_FLAG_CURSOR_BLINKING (1 << 1) -#define CONSOLE_FLAG_SCROLL_WRAP_RIGHT (1 << 3) -#define CONSOLE_FLAG_SCROLL_WRAP_LEFT (1 << 4) -#define CONSOLE_FLAG_SCROLL_WRAP_UP (1 << 5) -#define CONSOLE_FLAG_SCROLL_WRAP_DOWN (1 << 6) -#define CONSOLE_FLAG_ALWAYS_DRAW_BACKGROUND (1 << 7) - -#define BAR_STYLE 0 -#define UNDERLINE_STYLE 1 - -typedef enum { - CONSOLE_RED, - CONSOLE_BLACK, - CONSOLE_BLUE, - CONSOLE_WHITE, - CONSOLE_GREEN, - CONSOLE_TRANS -} color_t; - -typedef struct CONSOLE_CHAR_T { - char symbol; - color_t fg_color; - color_t bg_color; -} console_char_t; - - -typedef struct GL_CONSOLE_T { - float start_x; - float start_y; - int screen_width; - int screen_height; - int scroll_width; - int scroll_height; - console_char_t * screen_buffer; /* start of current screen buffer */ - console_char_t * scroll_buffer; /* pointer to very top of buffer */ - int font_descriptor; - int screen_x; - int screen_y; - int screen_start_x; - int screen_start_y; - int cursor_style; - color_t current_fg; - color_t current_bg; - color_t cursor_color; - console_char_t * cursor_ptr; /* pointer to position in console buffer */ - short int flags; -} gl_console_t; - -int glConsoleSetFGColor(color_t color, gl_console_t * gl_console); -int glConsoleSetBGColor(color_t color, gl_console_t * gl_console); -int glConsoleSetCursorColor(color_t color, gl_console_t * gl_console); -int glConsoleSetCursorPos(int x, int y, gl_console_t * gl_console); -int glConsoleGetCursorPos(int * x, int * y, gl_console_t * gl_console); -int glConsoleShowCursor(gl_console_t * console); -int glConsoleHideCursor(gl_console_t * console); -int glConsoleDraw( gl_console_t * console); -int glConsoleClearScreen(gl_console_t * console); -int glConsoleClearBuffer(gl_console_t * console); -int glConsolePrintString(char * s, gl_console_t * console); -int glConsoleSetFlags(int flags, gl_console_t * console); -int glConsoleSetCursorStyle(int style_num, gl_console_t * console); -int glConsoleAlignCursorRight(gl_console_t * gl_console); -int glConsoleAlignCursorLeft(gl_console_t * gl_console); -int glConsoleAlignCursorUp(gl_console_t * gl_console); -int glConsoleAlignCursorDown(gl_console_t * gl_console); - -int glConsoleMoveCursorForward(gl_console_t * gl_console); -int glConsoleMoveCursorBackward(gl_console_t * gl_console); -int glConsoleMoveCursorUp(gl_console_t * gl_console); -int glConsoleMoveCursorDown(gl_console_t * gl_console); -int glConsoleStartShell(gl_console_t * gl_console); -int glConsoleCopyBuffer(char * src, int len, gl_console_t * gl_console); -int glConsoleCursorToNextChar(char c, gl_console_t * gl_console); -gl_console_t * glConsoleCreate(int screen_width, int screen_height, int scroll_width, int scroll_height, - float start_x, float start_y, int font_descriptor); -int glConsoleDestroy(gl_console_t * console); - -#endif /** !_GLCONSOLE_H */ diff --git a/src/projectM-engine-backup/libprojectM.dsp b/src/projectM-engine-backup/libprojectM.dsp deleted file mode 100755 index a7ffbd35f..000000000 --- a/src/projectM-engine-backup/libprojectM.dsp +++ /dev/null @@ -1,348 +0,0 @@ -# Microsoft Developer Studio Project File - Name="libprojectM" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=libprojectM - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "libprojectM.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "libprojectM.mak" CFG="libprojectM - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libprojectM - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "libprojectM - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "libprojectM - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "libprojectM - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "DEBUG" /YX /FD /GZ /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "libprojectM - Win32 Release" -# Name "libprojectM - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\BeatDetect.cpp -# End Source File -# Begin Source File - -SOURCE=.\browser.cpp -# End Source File -# Begin Source File - -SOURCE=.\builtin_funcs.cpp -# End Source File -# Begin Source File - -SOURCE=.\console_interface.cpp -# End Source File -# Begin Source File - -SOURCE=.\CustomShape.cpp -# End Source File -# Begin Source File - -SOURCE=.\CustomWave.cpp -# End Source File -# Begin Source File - -SOURCE=.\editor.cpp -# End Source File -# Begin Source File - -SOURCE=.\Eval.cpp -# End Source File -# Begin Source File - -SOURCE=.\Expr.cpp -# End Source File -# Begin Source File - -SOURCE=.\fftsg.cpp -# End Source File -# Begin Source File - -SOURCE=.\Func.cpp -# End Source File -# Begin Source File - -SOURCE=.\glConsole.cpp -# End Source File -# Begin Source File - -SOURCE=.\InitCond.cpp -# End Source File -# Begin Source File - -SOURCE=.\menu.cpp -# End Source File -# Begin Source File - -SOURCE=.\Param.cpp -# End Source File -# Begin Source File - -SOURCE=.\Parser.cpp -# End Source File -# Begin Source File - -SOURCE=.\pbuffer.cpp -# End Source File -# Begin Source File - -SOURCE=.\PCM.cpp -# End Source File -# Begin Source File - -SOURCE=.\PerFrameEqn.cpp -# End Source File -# Begin Source File - -SOURCE=.\PerPixelEqn.cpp -# End Source File -# Begin Source File - -SOURCE=.\PerPointEqn.cpp -# End Source File -# Begin Source File - -SOURCE=.\Preset.cpp -# End Source File -# Begin Source File - -SOURCE=.\projectM.cpp -# End Source File -# Begin Source File - -SOURCE=.\SplayTree.cpp -# End Source File -# Begin Source File - -SOURCE=.\timer.cpp -# End Source File -# Begin Source File - -SOURCE=".\win32-dirent.cpp" -# End Source File -# Begin Source File - -SOURCE=.\wipemalloc.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\BeatDetect.h -# End Source File -# Begin Source File - -SOURCE=.\browser.h -# End Source File -# Begin Source File - -SOURCE=.\builtin_funcs.h -# End Source File -# Begin Source File - -SOURCE=.\carbontoprojectM.h -# End Source File -# Begin Source File - -SOURCE=.\common.h -# End Source File -# Begin Source File - -SOURCE=.\compare.h -# End Source File -# Begin Source File - -SOURCE=.\console_interface.h -# End Source File -# Begin Source File - -SOURCE=.\CustomShape.h -# End Source File -# Begin Source File - -SOURCE=.\CustomWave.h -# End Source File -# Begin Source File - -SOURCE=.\CValue.h -# End Source File -# Begin Source File - -SOURCE=.\dlldefs.h -# End Source File -# Begin Source File - -SOURCE=.\editor.h -# End Source File -# Begin Source File - -SOURCE=.\Eval.h -# End Source File -# Begin Source File - -SOURCE=.\event.h -# End Source File -# Begin Source File - -SOURCE=.\Expr.h -# End Source File -# Begin Source File - -SOURCE=.\fatal.h -# End Source File -# Begin Source File - -SOURCE=.\fftsg.h -# End Source File -# Begin Source File - -SOURCE=.\Func.h -# End Source File -# Begin Source File - -SOURCE=.\glConsole.h -# End Source File -# Begin Source File - -SOURCE=.\glf.h -# End Source File -# Begin Source File - -SOURCE=.\InitCond.h -# End Source File -# Begin Source File - -SOURCE=.\lvtoprojectM.h -# End Source File -# Begin Source File - -SOURCE=.\menu.h -# End Source File -# Begin Source File - -SOURCE=.\Param.h -# End Source File -# Begin Source File - -SOURCE=.\Parser.h -# End Source File -# Begin Source File - -SOURCE=.\pbuffer.h -# End Source File -# Begin Source File - -SOURCE=.\PCM.h -# End Source File -# Begin Source File - -SOURCE=.\PerFrameEqn.h -# End Source File -# Begin Source File - -SOURCE=.\PerPixelEqn.h -# End Source File -# Begin Source File - -SOURCE=.\PerPointEqn.h -# End Source File -# Begin Source File - -SOURCE=.\Preset.h -# End Source File -# Begin Source File - -SOURCE=.\projectM.h -# End Source File -# Begin Source File - -SOURCE=.\sdltoprojectM.h -# End Source File -# Begin Source File - -SOURCE=.\SplayTree.h -# End Source File -# Begin Source File - -SOURCE=.\timer.h -# End Source File -# Begin Source File - -SOURCE=".\win32-dirent.h" -# End Source File -# Begin Source File - -SOURCE=.\wipemalloc.h -# End Source File -# End Group -# End Target -# End Project diff --git a/src/projectM-engine-backup/libprojectM.ncb b/src/projectM-engine-backup/libprojectM.ncb deleted file mode 100755 index eed9399a58275a1e821e98b149044d1d7b0f200e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254976 zcmeEv2VfOd_Wrr^(t84g9$rFAfI#S>KN3Rk%>oJmLT^&7fLOrZ1$0rdp{}ld(Vq=h z#qMHR+lr#>+Ff0{E6V@-&dglKETD_x-!e0~nfd12a_)I^?>*@?PK}6*3gWEdq<575o z5(p*mYnH&by8=fq2IkwEDji z(|uyUz7E*EG*hI_+{!ss3vrn|sm-Fw1=Fe)&6qoNo{Q(qo3eOz)o#3S(Yyr#IAg}# zg^Q+CP4z;%zT1>{9lvPK{PEaVXlB*qMMH|)Vn3nr3l~ftKYPX`|Ka$hGv-&#shmA~ z-sINPgK7P+&}CJXi~3Y8LiGC+deVYUP_=(S=PsN#yK2IWxr?e6 zOs$+;wSNMfJg<5*`ys^g#V81KMoq7rzn@$LBiQfs52{@9qmtL~`;+?E%Grze>o=^L zG6NOJ{{3)X*!|$QVoBxf{Yz6r?njDMORDDXSIty$9?zHqcP#eh$7RLkU zNiFL?0r5qppT&tl1=0veG3!AkG{sYGiUsGy|_8*9gb0t@_|G?{Cs3ol9$myq{R0-*%{Hwmb|A92e++yCr%wEtdx!1h_&bFclbEw$bD-1E=& zd;_mqJPy7a%7l{kZr`X$xlt`D+AjZtLP|mTqR5r@B@)@z_zpE^l0e#_VYt(5$BeFw`w_5JV& zB@jyB_alLfM6~x_dro`#U|_dBaA04zktP<$Nn4pHi;2~KPmoD6MWz8)z;*PltGw&) zM}lEaLkawPC7}Afr|+{rKRiMSgcA7uNMKkJ+W&ak#{%uYfgBpZtPga2KI z!(9LD|DQ_Cp*$SaAGANwqc_6%pN=1R@pJs3BoLnC1!{l9-0ejE<1{{Z zd_ep66;nTHELVVT6emcfyez9NPL&=qK{i>O4*M52E-?G>*>`_F?)^Ug>X?20e6|IC z!XuQxZ&dKB3dPOL@`&Oc!M!TAP?tNB;`z|${C*ZBp3_$$nJ^K%;JG-EPA6k3ElY5rvn zO7U^L+-n{)&k}2ViRkS(%M_;i{U6D)-dyElM3E}RIJ?0=l0bava;v$^co_6dou9M; z{JQjP*=TMuiieSf8akip28LH$3$v|SiDHefwwzKjoD@XjrexKwSuby8g(518Snps__JU)f}F zl2qW_U~#ha!Fig+DH!c4ms6G?zT~p35|qcLI49cl)3khEr{z5cdImn+>mVeS~pf_`(2z5&5kpy>Pw(`MCV&qR>ZWa)ys9g zj|a22VTr6(Vbb4(k-Wx;X&sey~aWy5h!Do=OLse}1! zIzJUQu7fwr!SCZ>KC6Q^z`>j2VD77f7RQkqaP{Hx;OfCOgsThJ04@_Q7Y=h;(Ox-t zr~NspoWJJZ@9FB#cVk`7I^Az0g6)PMj((d%j`TzSzF$5gtqkv|?rAKr z7~@NmB&Wzpw&By|cJq=+g8%FU2lNbWj~=!3Oc~;gbedV5jn?ZpvjpjxEXG$u&NqKB zbzqFSxRzXJZZS`Rd87Q-mP^b=^9}tgt}CaSbIkzYIK%MuR6lyl(i_NV=Xi(p=y{0a z5;)eMbiNMH`}^^{y1l?>K^pJ(Wj8Pl`k|iBxO~TFzS~#$?~8v=bUzRA$S>)DjUpr+|21U=&M#~D{MC~F zINkD3|Fz{PoUdB{buoMKB+>dn6eZo%*4%A>K`TjOd0XOZ4SXuoKEqVYFXefS&HFIml*esj#{ zTP|9^IK+i=EKaw6AwMl-A<6jvzf*1p!9}9UrArc_&UmboFj=f zzD}55I!j)({yWQ5oEO;iO4Yv0qWnr3zKhy(bBQ(nt`fspX7k%!7UPWC_pgWAFWasE zo@$?_kzT;~da1p0n#D1-M{c+8XKxva^HPh;FdKD*JVdPNm#h8toTc}Xu{d{FdW9T> z^J9zqs=a4ye*39Cmu2(YUk=6D$l?K*A39E2TmJ*qe(YiKAhiz%TmOR<|DVn85Vg0T zBvyG3ReStX`~D5X{MAzFZ~YHfd(pA}N2onH&eBJ!{rt~GXpbrc@*9oWz30h9#K-oj z9C<$lGki}aR{Fu1?R%Cuya%f-0;CjQgg`-{74vzL$G8}Cy->zzp`;KrO;5xx|hAV~Z0@oF;8(ep| z9&kP3dco1oq8$d?PHiyQcWRr_CZjDzTa7jvZ8O+~YU|PdqYXxT54NM)jkNh_uhoL1 zy+(VG_8ILo+H72hSVQe0t}zU@(Y~$3XTI~-A?~dW_1j1K=e^%H{%7It_P2W5NPkSr zPoK72^|sOv!z<(bK6~#&l;!I7pU*qn+hBTrK6(A2j&afX@%UHfX zA(`_e8i63{pwD0daN=fSqw@i}0B0|W0kc=3t{hIhnK**dP+tZUqkfB^Z-e9c&QSDW zB(oewGnP`9{^}`>4I{h39-Awb$d_^ts+h=L1pY7o+;< zr*%29N4lf>(DZsfj;Q`w3T%`fC#TB!aw`10I9?ueUT{2&_!5NU3+wCq;S*Iq)A>f4 zUXqmHoWS(zFui2e$6mDlQ&j)jYH_OSUyYewHvOl`ZO+4vVvR3d_4{3x{|p^JNd~`| zLJj|!&`vrEG0bMg?SQYd@n@;NSQ|?=-27*&e)*EkZ%uhiB4(tEk-u7MKY1AO<;rCk zpWKf4jK*JEjyLOl4F7f1{(9KTtFF{`>N(3@40=7)Z#|6o>Ps`HjnfSLAU@C=sDA8W z&>Knvr-@T&`Qdu1QQ~3H8%en{#woM$M^&HpFzETx)`>ZHT7C*(H`R1rw77|U=%hqE zjP#qSetNNuuerowTF$B$4Is36sM8DQBYEvMzTq-MLb$YM5ek}-@h@i0(wg=mtVv; zR_zfF!~a3jGcq*th2;;UWzH>*hv9#m_E&JeAa$1`5Rb1vQ;+05=MnPiJ3gn=G7JBA zAaB+867c={S3k@Txqbv*>CeCNJ{Zq>q{;b={(c2qo56J%^z#L1ap0#BTnStm+$gvz zxP@@Rc!Iq6&#Pa3KNlb@@BORKn}7BF?d|IO<25{fehCEE|Fb<0k5B@k1b#mf(D{Cw z*?zLc8z(y6S8q2y6Z%n3-Q8Hn`_NzD`(H!4>W^;tp#8x3g7yJ%&>m1a$L|91t341% zKWGoo|Gh{rOZhd>XbzP`ELqAz^Y_Y$Hxno7c*hAAyZe!iCf4+lp+OePS{pt^$Mdcwf0HPmRM;mywOy?ZKi}ur zz6SmH?X84ID1ieg0SE79Cdw1kXv~lrC0gD+%>F%pe4ljM>wftqW`E!CMl6r9EY3Kh zeeh?C8ihLdEZQWhT6wk z-WAhc?&_9z#aY0e-SVzD8@Q8bc~_hR+)do_&iHBomx`A6dBin=yNi~0^)%`b679bZ~%=>=-9{mbH}YM%70`50H2i!p~e7*CjuafJmK51EYlVkdDN z1izSrv5*ruXN=<-9IxPb1jbl;W4xjW^V>FK%p}Hf820CKej4^mM7{YOc;tM6r;zsF z;Z6fj$KYz)OFC**@IQrv#k(b7WxMy6~;JOKp>5-o5 zrAgYW2*Wryj?Zf+(8t2fgrg0zr)PMTf42v1#KaieE2Hfpak7V_ctZQp?SC?84^L5? zsO`T4bc(F9;UjV`PGZ-81fzTB>iz(XgU`bwlt3tfUzP+^|JVL(^e{R--Ss}6eow6P z>jLx{`DlN<`r&c&waG02R(eFfloYcl>eD$MSS($w|9DwqPBl%4G2YMpI;We3W+?s7 zCr*)c^k+Ury2h6wC8n>r+tRb;F7t@FiFEa!BaNLN&WEIHd^ONJKSrJ*7RFao&NLU9 z%ZW9A7;Dd?s(&_-e~l<_&H8UBIZo8sWij?j!F-0( zYA1YHk|F}S(A1sI9CMQFp#4~uZd|>`tff$`nr1b~%?E={ATyLcH2lU$l z=$u@iqV@{R>+EC_lM6U(Kz5$Zu_3@ADcm>V~hQ zoesqs^gQ>89t5i=c_$7#>QWu_SZ2s{>C~Ur}dx8qY$;}SUHvSe1|SKRuLxTV@RS|8RVZl(5+)`uEj8?}dyW_~q)B|5$}n^=F3wrbBf<7lVAhADx~ zk_USu4>pML=WTg&q{eX`6>OPu*f$@-ZaD%rOMBQZm`v&9!EQ0MUtr%XfNfKb^)?GI z*D4EhuJSOiERXAOVDHR^U9$jluf}05O&;fOVcyn!%-_mug8QagXIHPcxfjF_sk{BY z9N%{F`*Qqx{4?a4&u;Xttgrh(&cV8!>97spGrH>aJfE?C-&0-BGRpXW$nil_xBO$v zN9>1jQIfy^C-Dkrg%fRp@_Ud(iT~~V+tL0x)EC4bJ0H8)adCPiJu=+D{}nFIh-A1p z)y1DUpE#`;pXWa7uG2cG&Lfpd^C&=9iTN9?hztQ-Tc zhkblO(gjH+mR?WRCaq11SzKS%C9O-k6X_)?e+}f~q>Gd8v+3o@!n9RsH(P!R(N$E9?)^g+@oc~SCsi-*b5)mT#|H8l4I%9rABi5sGv(B@ z^V4!IeV#m;_V=_^7B80Z<{Wdm#m8Vh#G~ePi;tHlOfzSr#jB*qIocUx@#*qv+DB;} zEk0YGb#^$jEj~}~bGAA|Enb85B6mBBEM5KRYJDi4auffIO*bni2*XsU>k3w1u$9P7OyZ7Vs!}z#*{QmP`ntayB%Tx8|!SwvFOoMgsCWP^?!949L z4*wbD!+25rY^OsviXC6$a@A(jQxh_II{}@J9Fdx~e(K>omp}4{d&=EVVcR*2pYr zNL)aA5?1$|CKnJ-B2LC?o2B9q&m~TQHd`sTqmIl{{!_7t)->e-J)c6Ji`_4w# zlua-W)*NGIO|Z&gF2=g%PmtmT#~9=6+Pc_MH1&>3shAY~R@5*U}yT_b}(%XnXI4XZd>o?{$ucxj)O( z#4$H~d$gE3|KAJG^#Oi=0^{d=1Jw_{b^UX`f$9gSpGfC^q#FY9alg_33t*P-8v|I& ze+!+jjn>%cc>6&`xKn;2GRm3ico=l*7d<2w{*CgNC^MX69S?(^to?`YAbvM|syytx z?rd+#n8{zdtZ}Y)df50gWw~>{b2Z~rdbZr?Jm9pm@z;<)$knpUhOdS7k?Z7X>%Xo% z8~HLa#^QYRrY@KF7{Bt@1Yhs?v&7r@nnC|LQ%e>XW6x0W(f zY0k9qmtb~#j`_mkc9>t@(=4>{b&xycbveq?J4-`nm{Z^8x2q&Nna)=>{vPP(spmXu z!}pdcu-98#dLPVO$#VD6hmwdlGkm|Y$o90@2vd(v# zX6f$!fO!_X`-40V{H}LX&d~PZCi-td|Cy=}oMh=)IzIIWi?en7 zYLLY_I)BlzxQ4`VzGc&|iP6OZO;Y*C#$@3F~ZhXh!Yjp*8S~9 z5@Y|NT>KW?Z*eu`;nM5s`Yoq1?39+UVem0xrxC`+iZC`-#6D@*H*+yAHivWkIF82s z>oCSP4Sm$uB*Uqq&BJ{NXzy^IAMGFRl|b7kRrw$L}yzwix~-<>h=lcfFs zT0Yf(s`eK?W9ezypVtfJo9hEGdr!`}q2>%|rXg`6t>R$lS934{fTpiD~<+C%A`7u&&_T4!=HGg7kR5r|WOw zeG2pN>yp4~lpmDAD7ntSc^RN-Ti;Gz1Q;Z?*FO#19^0=r&aymqx1V)s{ea9ifUnM z66zDrKihw`2RypnAIPJ#|6jicruuhae8Kb2{eskf@aWVx_G|y380#yJ(C5m*9sT`V z47B~Kzul#1q zW@o$OVfe49{R_MI6RL&&miDsNrk5*6o8!%SZv2R^wseSeiFg>{>uCQ#Pn&*S?LY7^ z{MVCikys?&((7ygg@-}MeBwyE$SWQE{N>3M?1$`O#P5Dj;7ykfT%hxPJ&f>8@l@fT_TQ3IP^3!U%nVZ`53 zE|It7YAcUc*#D;7co^Y}b^iF3R(`FeuQ|+k81y#UKeE}TUn1{HlJPL;ZMDCu3+Qfs z+Ub1ma*Nvw_cLvX^j&%f-S6~e%TK9niDblWvACO@i2a#8jQD%%{y>Fz-wae#k=_`g z7%m=0{`yE#Bro!e<-f0tbt)YX!+(G6A6shWGss;(YV$Kxb~v9qBW?O4cph9= z{9eI(#`$+IU0zQDZ|A{ngbUvLVOAoJJ>64&{&U_lZ9jkhwY8Tw|LW(H_L6^}?8(OO zAM~#h9tT7Mb2`EPNBfAM3$1G#`LeS+9uN=A8uAH`j-M3uE%y8N=&8U3XahFkeah@0 zS;XvbQ;hh~Z6-0)7_}I_qeQcTn?oN^{bGrW*`J{L1KJbP+1~s65fQWh?_z}K{Ge>q zqWs>_aTaq&VC+#{3c8T)jyJ?x9H;GhLyO~u?QKi&pFM&8-TlZvV|)XM6Lo#ji#Glw zZI9CFe<*2iaqA2)n0ybWz+m5q=49bm@;;wkiBTlI^f z;4cxscQ$@2u9w=XtZP+>SIke~P>^eWuY6j`a`g5#E!Y1{&)y-x0Gf zhBV5JvSR)(LpegNE|@bfONi{O3_NAP=peM}#t;{o_RnRj9>uK^tVo*(II4+Q91 zo *{{YtgLu7aSs^16by8bADb-V!YtIyAHC{sD!cm>nf`9T5y-=Mrh`G9}!|I=2k z>H@6vH0(z3XUVZRL++H9q@~3<@`@yz!mhsm8t6S7Br6!7hOY(vsY=#c+(6nxA02AL zH<2{cz&JL1ONp8iQ`_QVnIUKE`*|K1b zXPa|0*zWUPXIt;n{5ZBEp6zfS!BwX*{snL+!d)1Me@|hV2G=cz$8T2x)9`+xt&Z|% z?nsM=I3`)d-0#*OA0+1Y7_@w&z3{P?H>^L+LwV!(=-l#F2F&)auUFoP-SPE@5I@() z<{?$iw;R_DYw~X)gJ3@alYDP zen(F?+AKCmi)A9dJmcQm|&!1~?q3R!Vtp6glU$wr`{FcC?s*<-g zJ@Qiud!|yf{!w}i7Tsau)<2~8gM~I()+oQsFI)d%;?_sR19koIQ8xWSh_O_*Sv*+n zw?U9Es$9r_D87a_Tbv`g(^FI&d??cCj=2S;Xv<5{Mt8wjNf*rDW}Cf>^9azU>zE0~ zQKD$q=b=rXhxr84F}8x(oJE{V%{d5|t6-=Ha9#q|>Ke{N;GRR=lZf9&;QmBu`>Z!> zBaeHlH-okX*HZZPps_&&tJ@1b%Y1M5AG-}p93@JfGvz00^6C&N&u@Z;K3U0R(+ ze(?fG4Y+1-d!ql)dYb(Bbv1b*U&MzY-tRl~`@i^o>5t?4!S8`_{9pBh`7WLPcR~Fi zipRQs$fI+7Klptx_7AH5;L&LxEP^4C6LaHZ|KFA1(eE$hetJRug8HQD7ao7?f7JCz zZ@S?*UqS05Pam-J4?H^OAFK<+&-DqaZ+LX}PpW?5@n`2Fcy!tyLH&aB6IS*{eKFsG zyxjfA=MdwK=6DJ1lbtcvN8~R~{*w5Q#Fu*jYy62aCNeMbCHQgaDY784E`mzNqo-s4 zClf8k{wHxq#a&2#l>ev?lux^R0ZO|e_4S>-{r6#++PiCs_5EC~_HMq7f2EYf^^L2v_#`D~w#J1WyMeol?-LuktzXyMPz& zbHID{(Ue$KQ2EUX?|VKc!-DN z%Dowgxo$5QFVkVX&*1m*{rl2Jc1AK#w*`DyZ7biKhJ zdG-DC+c|#vetbVPJ;w1Ieji@x`1|m8;r%jPPlGGKZxJ59O$qeJZ_oZes15iU-8F9e z4h4^x>u>z_oS6E6w%-$6I@@2ry(XRdgSMw=kBQkHuSERWv9hezV)XlW+FmMl^!sZ& zW2o;G^ZOj9inf=E6EPZanrM5eI0d_HohM@br_1R$wY^k&mYk1M+e^jSs3DJY+e^hc z`u#g?FBR9o=+rXN_EK?8tgcz^wwH=)>G%G$y;Phli*Ratskko2yUuXiOT`Vae&-y~ z_EK?FF2JenrQ)X8Zwx2Ot()H#_}bZ7qV1*9TkH1(wY^l_7X20Hinf=EJIHFB+FmLy zmE*DEN83xq-SK^jHKOgM;uvOYoG98}D(-{%lV`f^rQ&}0+T+P?dnx>V24Vg4WwM#_ zRXhx2u^_oZ5aW{Rr8J^9}p^FP4jNYWu1FkAn8HPPF}0d>m$r zt`%)R6)(g3?W0B8PsPjidxzS7Dqf-AtJL;W@$pzazErgR6!LqbT!~ZLPsOX`3Y=`) zpwi-fUj=)2xZ*^`tJOYbyXVqZV?1@bwu3JH6#f38^Ac>Mda#{(z)mV{i}_|Hn4?YG zsWn_1INC;>ukFvz_U$6rUMO$w_rPf*!M2LQwyL0A1zQVc)!oyz8LqUmXt%*uyB7Ve z%V=xCPP-0v)^)|WZw1#Py7FezToS75+1*J38a+6{ziR8 zM%muy2C!|KF{X8+u~0XqBRbUq&Refnp8q5J!xz944*-)HcjjQW7M7j4k9*j>M0yTbRMp#AgzvGhdk zzwd8xlJ>V3TmQ*AKWdAmyXy&$wK!G#@9P1({H1AsdOEP1zclSXA$IBMik(-Xw{?fk z)eCxF59nWWq1(-&j^^uiSt=9e`%iG}Po|7`rDOe90Uk-?eREuyMtFo0_$ef?8t)d% zJL8JtTo%AA&)Q#35)Rt`YTtYQsV@vS2#@klI{VwVAiTT3mILd1jht<9Jih*Zv`p>m z(-UF6-6rcTPQiHJEP2QJPlfi-)O>Dn4tjh4B}1(Ly3jA`n6oXe4-00XtB+hkeWZa~ z|Den~hd8J^T#oA<-u*&^<1+`>Z0|mZ8{%0JTsycjIF>#7t^RyGo-rKbD2P!C;SoyU z*CTlL<(W85=dWpbR{!pP+irO#y`Ii@)AFq08wke}Q~QCRE67hnt$#iue~R<8zKN1P zpY%qkgrfKWCNSm~V9Rl}XX@JU`Kq5djSbpfw7;9#r^5Ca?J&QOBV6;xHGVv~&JW|# zmUGIvrj2mb>x}QKOG*%~1|0qQj(fX?M<{`xS^~lG z{n?n`q2v2H{wTWMAvk_dy7vEj`T((xzhB6L=la+Aeu40+KLqHiKLo<7{t&v;an=GFkN933v=c04Wk}f<#34{{(t^}%3 zelj~tG!c*U&_XMoFImLY@3s65ivhde2Ya98O>qRXcbdE9QL+1d%{8EB4~rqbcx}Ir zAcj7XC<&+}qHcK|R)+XeRG&D}`cK8|qI}H7M}Hyek3@`lv_y|VXV6V;;!KQ&V0@$u z<0QSfFAdu26t2%ldp(D3b;OqaO{gvyFRqEG_A4+&`d z@3p_Q_qF}^aP|FvSbl@^^;lkYexBFfQ(sqoAPpXIu>Meez{Bhx(E0x!w(EPn@U$;f zKk&W>TnlqTgZhEpAIJ;O`FaykU--s#FH>JmGe}0*zC+PgsWa2LL@9y`bJwi2)cRi|HDki@6kE`Nc9Vk zANDV(e&P9Nf5##8?_t{?;rVBMr22+OxBU?w-S$Vcck|Ew2>l+3Cl9WVc$@k~5$O>b z?yPk-4fSyx=0lt(1F$SDtCIA1XfqS#UD8JrCt&?Jy_!6-?d!{%;fZLItBpsb@ z&hd<2{in#q*w5)*($#+|)`uM`hci6(>)`iEdO9&@4gD)ULsFbHr;z@2{a&UdI7!Y3 z8$MgMnTXSh{OR}3a^wZ`l36kecq-$oDPK!la|iuLiEBxL)6SVrJeC+cs5_0E2-Da2 z>&PSWl~gf4oj+Pn9+WMzf&LrQe*>(RxL=;2f2B8+a%Zr!oOG-=;q0>ZW~#ZL{A+so za;mw~9Ao`AmKA2T=}tVD{;@ZWdC^lVL>dbE8chR7og<<^8vcz zeV>c-@R10Q@dA8JM)xnPusBKQ^QGAMl2Q8Gx#dU0r|9~Q^?X0EKBFu2hof+=NBFF! zj6Y4+V;o7GL7cAh_q4pF5NGK8KP_*4h%?cfIMOX|1BkP9J^wa_pG=&M(siipfc&WM zbj2)c)?bq~ebQ@Tbab|8`BeUD3-{N_Wqvx)e;rI!=qGM@CBJob{mExGzIw=CTetkS zVtnrY1ubp-dAi?$Tb@a8gxaD?J|};gUcOAhspVU70an~h7A@cH>AwkTn~9?3Tl3pg zzeld+Tjkdry{Gf!dCN~BYU^Ur@}9`>Mc8fNFwyefn;73O#(B5>eOgLaoaG~Y`Lxpc zlSf!O#&&R?O}hTxt%dt5zG&%f5W1U8v-A>);XL2c+v@t)&n>;3e$Qcx#qD+fp+>~| z`*cA6QBN6a!*|sFraxN$opk@DuPnW@?oXlhm&&h;uGi7}OK~^s=Q6{szZCaC?L5=1 zzoL|fyZ_$<{5`Ngbywv6Ae>sCssG-(pGGm?2hD$(&S%y7P3e8`b;^aJ^_$|pSf95* zw0=|EU)RsM^&8_KsO!_TepC8jU2muLo8qBz1WspVfjG%n50uRHK$r(J7y9%Z_LXt1 zQFA!x*r+=l{Jsv}KX)BcGhAE1VNDR)VD7x7Ylb#s--n&0xW_yioj=2UAGl75b6YXb z6=m3IgtbXKG52*?C*Y27T$_Y7MyN|1RJ-mPCagum=%c&egTMDfJ7BIm>Hx>}N*wdU z+M{PWi}OxT+;@fR0@od`8(a@Ku8G3Do~krkud3dY#X;(SE(p@MW1UFFs#E{0837AkG428hdLi7$51( zvmf87;DyhBNSlFbJUo6!5?DSK?f)*SNZ6quZC+Z&Xz0VLFX21e>6_An`-2dxeUMCj z$)&4(5WgGieBwZO)&B!n_5VP4)hCK~hgW?+;6K=Z$n;g;4}@2JKj6O$bRK^{5&BpC zKS0<0h67mFKLz4beI|h8D31Wv{>WXs`F#LoIY@uH8h#IDFDGlafBin4#^>rsjSt~U zD$?Ec4!H-j{U(mcHz|?SEr+swaDd}<|A$s%e0sdR8u=u0_d&oKUxKVoJ2Pzv{JZ*W zqWmW{Ic*&2%5M@r;@T|zbL1yWzqgVsk0ySecs{YFmxAvF&WRjOtnsDF9};d$xSr{$ z|1^Am@0G|y;Met^AtxqYka!kx4f2cm8HrO96YxH{{Y6;>13T zPx;A_&mt$py+Hq(UJaR^ctYYDo4=Z35_1#3u>9AO=M#1%yw3R4f3Dn-@La+nmY>>k za$K8)M{M}I(jmQj`W2+B|9aBSIozpW{&c*#zAQ^SDXkyV=VVdnSJ$ULo;t_MzoEpZ zH%LF!#+N6R&UWWT@}u&K%B|^tPT$1viW^Id^mgg3EWIhp(=lnsGQ6hWTvn!TOf}?3 z3)%@V#Ye`nlU#+9mZwA2-r)BNi;)J~KYsg>Z6oh}=eO6v>x=Lo#CyAEpCa2?(*5{&^|8MXF0a>s zPtpc}e_mF!u}F!1i~B8z1{4r%c28JoJw-JndOx%xwfVitEHsUts<6 zHnhL9aB@FymmX1joEXIy{v)uyj+Eu&(UO(Nfa9=R$~BTkoJAb3`(1oCi7g#5zJG3t z&4q{gI8pAydC_DaV}D`O#T+)p$H~&$^fpHjPiFWOe4n?>w6b)pKQz6}8e+_^+=l)P z?ti+|#+NQVOb_#l#TnAwbT`-9@R^WRh3RACM=ybinG-BMTgpwjsY^VY@#jcSeE;`W z8($6SYPy<-iKmcWQ@WXMrmoFzEoo>Pnqw@^l>$>>3W-%-wXxni&vYZ6%kXuik!fVU zo$Ax;$^x^%xcW~Fzehc}++1#+p!`(6_0eDWplmzb_ul}!x4tB|pB0eaR?ftFeAUmC-cFXAv^_0+o*mvo4A7Xr=RL(Kym^*BF=pui?`GL)USL`P6Z<)>CqcP=; zz8^Eq{KwL}%f~pE+26AV`fI0~M)v*eiT>gCreBpW-(E7r3^6T;4daW+U^CdH)Bh2~ zy``OLXU-=(_hk^)M_weV&vv8yhRAK`zfQFD zp>hh&2N`}U`5%VwU-UJ*SUxoTaCuq&E*n_hDoGz9O-vJ``tU@?H&QM(7n_kbzEQd# zQCs`_jK=rA?~o7d`#VN%#rc}WW91f{O;Mj_>HBz)Txc#dAKLH-%cD4VS$v2*hO@OT ze}~E!IP)zYhxMGFOI`9ajr@++{h#_&`uRBw`zxoJj>ON9emK4-l4_b+`UGg3DW*1Y zXVNEPH|Jy%PdtgZ5?}vFGF>eHlTcq@Dryf*qC6(c_2zn`_JEd$DRQ;B+PL-r=~Z&G zx!Jh(0P$2=XVw|l9w44B_nLc+YY!05l3UHKM(qKW&m3)EyHH+BNk2l?n@fz^2b$hO zxyoE+)ILzWST>jqM(qQvhuenUyqnBTM(qQoA1im8dyH!zkbaWfZtgH@A1M6{xzpTb z)ILyrwp?SbF=`(uJ_p|`InngBzt6eye>j)g_vbu$2Ip#Gtsl=P8el){8N^!t)=Iv~H)@Y)`s?HbbAnlC)4NFihI65f?_z|@HkVoa z2dQaln)fYUFLg~_^NPinU^Q?Za}IGK)4x<|m>T9r;v(Y9@ICulW~KGN0bje%G51=0 zx#XH$^CWQ!{a+!qO>HyPmj5fIv*~P3w)iS3HKnGdEk9T5eqc}7{A`pLagMX{y+-cB z`8nVBgBky|l3)_dTf|x)Tqp4+-n?kb!yhHi#FwOcVP){|WE& zCDNGbua89-OHtcq}Rp#6L z+%9+HJi+2W%RM-IT6t{J{l-3qe&^~7cj*3QuM%thbf@nBHO%t=fB1zilZCdvzYF_) zz9nb!{Yhqi?v}=;u~GXK`z>!nT8qtM+T?4$o&0X_rtrw(qGa2`X0AJu{neC)&`|y^0g!53FpSQ7J z(Nyz}#qY>GGtXRO<^QfckMj;djb<@W>Zes{L)Wc{M`;lHrI zL47mU{=OgLdjV0CW99piyo$5L;(yC)IGfn`KbB26U$^)ZjHYjq+7^F`uO0kZ9<<>< zlMistvGvF2@(s@M7Jnf-ab9Nemz;QIp0e`)3N^}&GRV^ZgYo~bWtqia%eOesvUsQL z!kJ8dwEp=*l%~l>_THt($bPaFJ9Gnl6-kb7vOiP>> z*!)GzyZFLaiv7LfOeM}MNmqHtoA>Y=<&m!MV}hB4a{=1p--#>-}4yzG4JbAA=vL_B{U`<*`o>+w;zhvBxsJtEGA$Hlqq z5IF9=hkX%YZ91?Q9q2&r7}!0ya!l+ExXEyn;NF6J6OPvC-{C6ZR=`~dcLm&)a2zZ9 z8(cp)j>)|OR|Pi}?h?55aF@bufV&Lta=7E+R>G}@dlv3FxC`Jo)^``&VQ??Oy$r|k zJdClSeR5E~9qhT`pssZAE;?ur9JB!rMk*bQH@f4195LB;oep;z+zW6g z!ErpX8C-L?7vWBZYYKNA+~IKVz`Y0ee{dX290oTS4&(dKiyhQd4r&{Bzr+Gu8^bk( z<5*-qTs=7MwaD?sx^Pjr`fz!0}rk+$zq3+r*iCJKm>1!_OwTJ3#*cVLrtDgW@dyEAZ3sKLGv*!GCM`FM;!A(f-ZrooF+Ku8A_r$l#dmwB~oJr;4%q+uvhE<3U?{(|8 z@ZS~R3+Mv>_hN7U`w(_Bp7#=GVK;GR_lCc|2-{tp;eBvlfxRWC0RIK+E*B!*`{5=a z&ZUU+D5O&aKTn7=<4MGIB;q;(JaiD}$YtUju>@(%hiuxz9Syett|Q!HxI^KNg*y)J z7`R2+M^g|J?Tg{}zc|*)EBhVy$NAq7^RNE6s2>;mg-PQc5B`;Xp1k+{@cIDiE+1F# z6D6*Xx?@kzt3P8LemcP`@BbI)fS*2%-G1Y%+PJ(iJmY7YKCk|j&zMI#{~51)N;5dV zO+S8od+XCCy@OScmt5eW6F)s2Gbi>Qt{Sf_U?2F%1n!#sG)5i>V72XX$eDF#?)qj6KZ$}5- z?_mGFAI851!~1#h({7AB(J@Xw^RGUAPgg&EKM($ue*Jr1**5R%8R>N4@xvvc{rjb8 z&~WgZa<@Z%?5`*0eAkzNO$9Mq!Dey~vC`u(8|YN|%;E&J%4h2L!2gM7{2ut@xURxA zZaQNNk5B@k1b%4}(D^x9zVY1$oI2me!<@gV^KHEPpcCvBfBcX6;QURUFY}IDU+{Y~ zIzPq>-yJgmbo_3bOXvLk;ix?P`i0-yt_WbxcTJgr{!tB2>t~6?W&#go_yqK~SDLlN zN>7m(X7pBB|Ebtt{c!ncmQT-+N1S(@lV<~WX80^vW!q#k>LNFMj@;`!=)7UW*Ou+* z5gftrn%}zU4{U7iB+g*?JZXmh`})Mk5MwU{c}SkO{1wRi<{MLH<8LlaoxV<6`kzYw zMe>q)+fpphtq#2 znS%b)7j1f_7=L=+TuT3Oq<57C&QZ=O#8t%IWTrFUS;qLI#62)O`UJVm=066jX@gV% zyY+oJ+U}E_&*9&w{QJsk=S*h?;xly^et?|gtZ`Nl_az=AS2}-kR@(4G#j2s|4HN5Ap>z2JiPOlOV9Gr!Nm@Wi|l|Cr;9IT-K9?}=s_ zR&=o_?(OdX!}wjJ(9sM`?7(eHFqK(Ap-^s`LIoBU)dB^wj@-gbp^+TITk0U)r>1&8FzL1Z( z%N+mz0Q_a|Bu+zZ(oUkJD^Az>KW=@&__9%AI(hX4`N`4xOX~~t7v@9P;d+E&3}3l4K#=y4e&TAwIxr{7D|`b2SOj1UeLtxpt}>UsyQPZW1S zug5Ua`b2Se)DT@o>l4MjP+NBwtxpv9Mvc);v_4T>uKO=*eWJLJaK4AuCyM*(e0!}= z6c5n(_|BoJ&>WNCQt<7+c(_E|C&ML(b7)QU7o?#NAssFoeQO!$@5ls={Va{((D$-1 zD$Y^p^Qx*1%zhd6&(wlrpAY+Za^TP>b0PX@cCt^V0UY~f*nd+4F3awt?3a7i2Xw*u zhL~jz-BHp3?)&PW$?)UXD-7q?LH@IS)kDW2?9W*bF+K9=Uv2$^XMR2OW9pDFY$$4fP==}D1)W_WKbp`cvuJ_NK3w;gkJMI5Mj5nYWkVbeG9-#z63HyP?@|6SWCyFNzBC}7!7e0sKOkKn;9>5Mq4WE({)qGxoM%86;Cy@H zRGe#wp)U}pam_uHhaAs;I@ab^1aJn{3AaLe*)wABZ}4^P+EPjk`#lc&2KOTxYUvS- zKh%>li{rpeU3r`OiN>FZ*=x_rB^D>c{v0O-Bc}buE9uMe>`~mGh3oBbq!GUY7apMm4zvWk^*>P*OO*dQ(sDk^-@F*G zTOJ*B;Pc%Mk5B@k1b%xG(DAy4wC`Q}|74VZ)CIttP1jQ9603a>ho03Y+CH6yXB?9_ z3fJ%mB@jyB*DC?t@8cP_{M-G!yz%^ejK668p!I>fzn6~Zd;JC6-%j=WE8Oth@4s6F z<6jz|!3^GW5uPt+Q-hDtCmrX6PE zbikUAPMCF5ikU9l+p#-l#Ps}ai#N<&D1l$J1j6$Fi~e~+=0XV^Pzg}iuYW*O2qOeDgn0tNvH(aug5X_|KW&>3I@Xuz>zhxUtck0*q;NdR?r`qi5`h`uFCnJj}?-& zf`RlOB8cKXP7(V$=ol;V&8*Y$*lV8V$JeM}=g3&_bOwB9tM@ehU;STP{=Q;zeJ7Pg z<0Pp-qFG7W;~A?S$q&TWe-(qgs-k}cPh8Il7XSYpz7)a1{C6+!LuOvavkMaVJqaFN z_5XkU`vLO$uQ2|Dd`XI18Ow@0KAIHQo0qJWu~;-KF2IZLl~Vw~Lc*SSnYZG#wsl26E<1k59RC}T@YOHvFV2#%#nr+O=J;hb+ z*~bs_{Tem;N$~VbswWh(Qy4`1Zmc1HBu^k#dU@6ucp0Y&HgJsZ{h0T|DAKBA)?RxD_`-|-+9I(4s zlKg2t`I=BzfUKOgP$a5}HNc1Ny;sV?y&g55)XR(CpI5Oxr4oj7r@2icVutp&wG>% zsGeT;OM2mVj2^QZJT=2l=Dy|FFpNjK&tEY>wcqc*i-QLF;r~{Q9CO2UFJ0aAK`iJf z8lPJ&V7*6J9(#{$2cCXO^@LmBj~P7?e64NBFO2a(;pCC#%WE$$RWqONdjE0%ua*&G zP+56L%f&2@MJdmNuRo*mYKZr%F8aOQ<9pJLdftAL%jMv!C_g7A`6t#alS>wnuZ0Ug z0Z-hA!__39ApZOZgpgzv>(gC*q7t>S%_B?0wxsQ#!pysG+PrQ=tHtc^a zm-?VJ>wE6XSogm|{5%hCZBa2};FxtNWd8e=;5R)#4+GzuiqBVD@KqbtsoQUo!f^U) zPy9{{D-LLP^ku{2urGppG+pYx_a!Cx_KEVvT?*V%`5l&Aa6qdu@U`wBFNH~$m+SjA z8azD*=a#-e!Pou~O&s)wMaF5Fpunp(;9xz|_ z^Ei9@xRaOO_tE)o@R^Ug{U%euQ^!*5-2hIqF+;&S{GVGPitT|p^tbzT=4rEL-Q_2+ zR`q-AbOW9W(d|`R3DoDeQ&7l$OrJu)7G4li}zi3a3X@z6`MF z%h0F#*O-5^Ki7UYU-!iG&%Jx~$*u9ZdFkQtRSyi^48BTH`M1XGR{aTgM<2xpJrD5F zNBMeeFQ2DM@HcDH?e2|S%&?sr`CP1^sG^%<~H%54pB|-3cg92ljt`+- z1W(!MRpAapiC!=30cK&3(XY5{f{I|^t_p3pTY{(caGC0x@@f{8*Te%OFK17@ZRNw$ z$GP?DW8mq^fqdJ!Bh&w%I>KXe>qpS%XJ6v#IroC6l)=7UNO{#jLGXOa=0yMQzxu&; z6aKfmz5D=ig>Ez#&T-{6e2~a$^kb%?w=iMP_16jwv7e&+crSeHDKo75X3lo`DuS%| zo$mJPu^8`GvS0Z_Y;Ny4Nh_58oqv1abl*%+QQ6aR_pA5({R5Zatnk{$4NwUA{q@LA{bir{XIpsU(bRu2P3%YdGPho*m3JO6{nuL#x0L`f+v0_Y$*7`&dPAyRbP)f zyWg&;`(z*gCxW)OHpo85P1MG*yIt9Q%oj^P?0C#E_Z7#<+1f8BG7GG5zv7R<55G5n z!3C)k-D5dMjC;!QzJ9wE2ow0Z3EktPukX9@_HSPO@MHABqZeNP^IyEr*9!2&eSO`Y zRF=o@#N@{E^Zno6;th^JqCTAtZE!YpX-#_s8&3U2p$Ywb+=xu-aopE8Q1XYL>b_r> zgD385*bMbVK1Mwxc0ky%uh?E=(9t1SYrbK!+v`tp7x*1x`-tzA zvu0Gf_5By%iRp;I~J~x3YdGPsK2cEdD z(ai|zuN86Bz}#bnfAe!(U71|u%^UhTQVi1wCGfvUpd8i71T^&RQA{4hmBXa$+dBe< zXIVRu_n>5s$09-Qvr_?lB>Z)PzmagCqRZO=Ux_&C;d*gXk%!@?G!fZ~>+5iD;eJ!R z$Tqn5P)OS&{vEhZr`-$9z6l)XI<17?58&>E|NC&g8P^x!O5p~=jfa~LcO+a>(2L>z zgZu8dj)$89cRd`(p3H-<;n{lhPIK5Mp5<9F$Uc+Q3U2k67$p1^%&Z~VRp8<&N50y1iV`>P@A zE0NAy2>(nn-kVftop}BN;(s4u*#CAI;y($py{xUuj}0&tky5!a!>TX4S#^49mLCTf=^3yzv;nw1Pzf+FQmH&`Juiv8fhGl_aO!4g7e+(1z%|h z*A3~^gWCa~KL?$AZLMvB@Cf%l;xNd=Ch*EVx46$1zcs?|i_rGS2CWw2seyc)gtTVC zWx#QNa_&h!2Yj9bNBik3#PJ#Kn>0or71DceH1dveHyAh%vYCSX3`acFRk)wY$#^&F z55ao}zP5mmui77f@`QqVuZ}0lD z`Nj7g`^}qePA@&J-$gC|nm*_B316i@vizpcYkbvy=LhHS-1y)PMNhou9BCeHeB0n_ zdp&yT^4`ZyTYlv?qu#jj=AA>{UjNFpp5L}B{rI)#+HXAb(>Fgz&fGTrjX7^TeC*C= z=iKtzv_=m+wrbtCr?37n|L9)JBgef`H1+($-=EO#mJ@c(I{J>Q&e~kNP5TpGe|r9a ziHjQF_wj4(cTBi#*R?zEdi|TvGrxHA#-~o}@$y?EwtoA;;uk)7efjjo->ysCwd&hj zpZ)lx*Dl`p>5hNgmG;SNQ~y=!<_~XpTufFte9uLq`nTIi(1-Xn^?+2U!Q-G3Dp~ks zyL&{v>mDv3LBQB0EgHp$avb*ncLqdP;4{8R3)97%6)1iyqUajNjb~XqF?)v_|A=A6 z9yan$GBG?s@=>zk9Wh+VojszeeR5xR_{1o7slF5R|IyrH=Z_=Y=Oy^TH>A7w$>c!s?@$);F^z&Ev>Fo)myAR|tpwd~pU=}F2iD!ZZ-PGc9bUSPkuK{7KJSBHhTqrZ{nJSIc8?## zD4%XH{AwO?D19#-ahkq&H~Skz4)6W{*S%*yC8nHDGbY* z64d*6Z}59v=<%Nd{`u`|KJN^f@Vl+Ne+ubd?(tKC`-{AIY9k&~%k|S0@ly|@|60g9 z+baGRQT!I|J$?$o&&ysObCJgikN*_#pN`6&VROJg^$^|{;P;|_$NQRyli!Ku{Z{b6 zZI4iznx7$hoDL-%RB9 zKOPSQ5kJ4J!8lWqF57F~_Xq#f5qZzg;3Q6T?~CETwZ~5nP#i4er=NC^?PK0=R0qG& zWRIU3;D_Hfrk^_zmfs=geGlZ9-vHr#64Ip}#CyC+Qgfnv-v<7Zp|A0I3Ha&ZrP~wf zZujz)ihSMd$ub|x$m%tZH|}J>Z;SAG3eu&1%==`7&7bJrPe)kl z)_mRo=??bN?S*vnz5Mn>eyLB;PnJaG5HDY?kgw%l-s>ap{4NUp#3QW-JwB6=R%-+9&V|qOyxvwJ%|wr<0z6u)h*qVkHqUrkqo{4I8I-QK zO=zyHu--Lsv*&FNydCs(pMwA#+| zm0pM}TB|9%5&ZQ86xQ|1LoWOic=(a0Rc5N~T2?S)p!G4YlX2j&@75*#>FT8!&3y$^ z1P}Ln{uhA%W{>ly;QYLosLYCXXQ%HEh zEvIKRua`YP3Eetop-R8-o<*59&)W=mTTQxPKJ&(vna911i;(eyo`)6ipzoUt|7K+T zJKv5b(9^%t+eQIzD$yECFmvJOfkQ6*cKE!?(?a9cZ%r_x7;|r=tmrBGb{P3xD?A2T{#%pi^mH@b^E?VndgruYijeX{ z1Qagh|L+dD@a^EQ@p`C74|*rHV2Xj)euKi*@bkRqe8{iC82X%!O#*+ zsZSq?4QM^A^s(@)y%dEf!twSes!Nc!7{&Mio z^0JIZg2kSP1@NHfyBvIlIW6nLm&3yf4?ha{7XT29p3~9Zk-}4;b+_lO0NytEvX@cT zz5^VXk?3l@$D=nEJ?;6Q2>*LL{HuV!*4N8eRw`F|xlTob2^h9$mGZxOjtlE8+S-|TVT0M0{R#-+%p{Vc)Hf@hs`sco7AwVBLzmwpQTG=RCXpjf85g@LAv%yl&){9ZQtm^71Zx9z1`|7Y1*F^%oO<91?g2Ki!;CVJiixs?db`A2|B#a>tQ4*w|ISyM4x*p%ap*3V7&N} zr}a0K{gb!nO6dn%CbB$51zX;BVRnFj{v9k2Nhlc|D^|9_y9P+ z?s=|*XZwzRV8$Tt_dMM<0Hbf2RteAdYcmaAS4*K)Hp$_cNH0EiwF{4iH=SpQ)&z9& zZZG2~Qm*kl*T8eX=kvya(=$^%Kkd-^m8W|XVeN4X&t!C^a|?wh64SQ=6&_8S)wzbk z<4IrS@!U$;OFf^n;8WjT9SO{}*?E~4vJU>+!0bn;V$vs80$V={!o|G1S*?&(9&s?(jMpk4_%+vdlpiojnO2jAntSH4pe_J#Q88 zw$RgJM6_o`f?ojqtzO1zWIXI?eT%X>a}vx3IP;I_`Cm=zEr&SKmI)@O-owrfd63fQ!l%yt6rMrZ!W}L=58iYJr1VoM`%N!z1021}^YajRbPgk!rIgiKiNdRZ z*EyWR)8Ng1|CaD9>g7G&u0~;3I%gD2HD#~zyv+q?{~DKmD*WqRC4woY9;bTVmcpCP z-IP9sI(pFa^99Q4oI>f_;ZtWr3NHh{JsTms5#HY9X}uqK`G5$ffHx=p&X=7@S)C0k zeFpA8Hhunlh~_K2^$$>`@S zFIO#c>HJafGk~ew=fWG|M`vA1uLI8yJP%(4zs@|BJ`O$T>`39|z^q&B!un?C2iCZ7 zE&BY3=k4c|z23_;7rAs!qp~}ot8?58;X4?Ep7pdY0$%594*zU>wyf|dXxZ-(6P^bi zo%1UF6zJ-_R^b|8KC{M!mjHFCmv;u7F7`5>f{btQ@QZ=hH?o-$nEM|1mU+nY{7ZPa zz{@)td3DAn`~}po&U3|c_3K#|d%3FN$G&Ty^bEUVnR*950o&6zx5tsbU~X+jXY9f= z0=gp)y6|{tJ>lv86JebV3uYSn(HXSDi-3Ozc!~&5W{+rtmt{V(=)74lwZL5Erp$v=mS%MRDwrAA z(j3qKJK$MomP$Vho}crwOd$OR&%-2mxY+Z&9G-QqD|mJu?XxuskAVmI4k)Z|nY^$j z3ePildby?|*Fzqr44BoPhi+&+=KHjAdRCp|3y*r!w|O3zftku?m%bBt`8WusLU=rU z2KXQOI<2Bk<%=Mgxxl=_^M5-0>)crB`r7SI&%=G-l#hVYr=p)9`m!S_JJZwM2FwFq zmPyF+Vb9wbc#|K2%1(x(ZJwVZD9GPJ>GG48kA=d5l0SyR`Wo*FkAFA#Z})sIgirYz z2xbcP@~Ee~5W0Wxc*cO|QctT8TCHA|e+Q4wogJ;Y=8K-sQSjO6)2E=7yS%*Pkhg4} zgRcUo&f8VC2D)GOa#bP02Rv`H;cc7e`FvfH|t7r>`I z2PdqN_7`5RDaf^Rt%I3~olo}sjE0}5JpU8nU*A|3p2^g&&aV~T1fQ?=bQ$5yn>;`N z0zXqc5AwTz*z;ct|8Ms2lYwvbvb-61o&5{vN^r^-L4Cz$?E`x}I!Uebyp0tXn;m>P zEx3563ok*IOsxw~kj}v)oa2#8-`G~T9RB5xB^J_f+Zy|jBT32=)v>xy{CxKJGM8Y{9obuCAc#d@IZD1xgFvIg)3C|Bw zU&X*YeCzVeVlUThXJOkct@c2i7{~3?J33&OX2xcMh^082O zBmBs}Na0i9bF0_qc(|V9WjPO7!so)n?VitK_{@3y^T98FDFeJ&K<1)qgyy7VgO9`<~WgwL`|T>8(T zCI1=0*Ma|go}cNY%XdWSTftN5@r(hFe0$Vh9)9n`W|Nn<4teEsBlu%jZNe+rTM*5rxkK{^M~!FxAZQW&eY+ul78Th39A1I`|prO}G z_)PG>!}B&y*1FE6*MoJVr*$o~3QqY}DSah)7JFJ#NnhxBI}_gIYbBV?$R+Hv7x|d}nvV7Fjnu;Et@v@X7i~PV;b`qGM^L$Q$&r7_Fli}erzD}1= z1Is-B6XE~$p03{J{#MU3UJK^8o;PNb=ChveZ0L^Yjc8SxRxj^V{dPuY2C+!rOhGhi`&s#1aQnij49t75oTflux33r|9>2R*G#z&zn)oP~_?mlXVHX#L9be=hvX z4^rv+9?tn*hhxy;tGphjp@+F%#u8+l<@qmxfB7S->>_xOkF3IF;J>Nbh4l{oL*DjA zvSPd4^M4AwJ?iT;qKlPsf5n#%Ui|~vxf9H9d0YCRvyL5KRt#6-jZh*oMJ?qaV)EZh2V3eN;^ zezMx()Vm?%XQ}iv;O9k;zZIO;7n<~u(0!-pb2?CudAj?6xy{R4iM)$F-4f`^k5M>h zLhF#1OW#h_Go(r%g|6iLtMFv-U*YvLA1Oy)>eBxf{9Rryed+YEYL{LK&+_S1*(u#l8jD==Ar{Ut;FO=H!aLz@v&Xp} zoTqx;?gGyP9{*VIAMkpffu7|ztg`x+g#6AG9*u70Gp_JR@c*Vd3QsUEc-}4q=dE53 zi_pVOp3hoJ$TwJJ7r@VHo`-h=f57wB0B@i3_)Eb5xR+}xa+R-l=QY>9wl*U_ap4&S zo(7NS9`Jn4mmNjfE{}5wQ1^Hq7Q@5HS+49@^e>-s;ZaL{rI&pxvQNml^!?zR2wlMx z!1V@CcNui$kFE6C%x#|VbSt6ztmnBBp7(j)?go$iT?JnXo=UmoV zZ{P4T79nFniGwKzfBh^ME}<^u!>_W1=x39ceLH+U?sc^gT^;rOUq|};JP$?i@E@L5 z9kk?&EIiY}Kh5)21aCL`ve#4glfJH}QP=Y27JMH}1JQKn5PoB3m@b(AK|1$V*@^bBghozpkGI+bw^L8WY@);N167(Ry zd4e%d{sh486oNL02MJm2tqPJ+)bc|O;| z=Q__%3H-bp{1h?AzI=M-D$ny?c)QQ@`E|k#9S-Lt>_I-~!ao)Kqbpr_COmBN`W%Hm zAM|CvLD?rg-DS{y%JVY;e(v{jtwt{S&%3uZEOZ}EKY z0{`#5PHND}49`y${OH|Yf-i$p`NAu_9{hSnK;dF^{;22kHt_t9=WQ~)J@0uQ1J8P% zK=9+Cd#|Va5#Vb*tzu~1KFh(3hEF}aAb7kI%@ZE~B4T=mL+SI;;d(FQJY>`}9!jsE zF63XY@HA+B$kX~LWhY+f(x)J!o-q;3bnu_$c_@H~k>g!DJKgp<1HqIai=Ne0cocM> z@%;QVIQ0yX(o3QB;aM(R0so)$bUy~nR*%0L{IgDXFjK*)XDw9rba<%tbnBp?X9Sdf z3OFC}cFMIyWWdEL@GWgLmH-afgw`Y3(r@;R`*oMa63(sDf8QbV!z5~w7Jr5=D@MBNw zA4z`_n-Tn~SJr0E^RjG0mRES*%Hi!p-rg#yy1AJr?B%VFpJ%}N zqL*bHvV6_sT=mGDjGk8#PR*d#dLC8*e<6wE*)f^GFGHx1pHd3=74a+PcM4^u@te+X z2ES4u%dxj|Qb#coS1=zNflZgP(k`TQ8ME9;gT=Ye%O zZNhzJs|;Ml^d=?z%D`C(&LURW<=`y^Zvp;+MVuj(fM4>D0RKqvSAf49Y^Bf`0gaKQ zjIxyGP&f0iN43DypsP1Aj-xCK2ise+J|M4{lnf!YyfXgu4v<3It4$^>@1@zm%m-!x z=`}zsfrm2)pJR1d3Lh2lQ4anxaF>9)6h12WtK_fTu4?Czvm7d8!84T{Yzg@P{EF@gXT{{cKHhv~|^<2wIE90jfTj^y!v6axOpnN6e<`AC;t>uJQ!ShN|m&0EH zu+o;~D~3)PWhCD;LbEBmgq#)p&fupvIGsa!9eNWljeXv@EL#Z^x#yOJON zS?H=5yK(QZUrh<|FWsyJR^bYM^Y}>y26n7WDFdG-AlZj z!F@3>b?8O>>M3{Ckyag=aa0nXLmqpclrOY)u!8$y@Kx}u1lK(Dsyx+;_&ozy*~3c0 zQ%Ro*Oa(BSq0S+F9x?G*N1pT}8RqemeM}=?{MP`#1pH@^&$$=+%%Fo3=$2D%9OXv9 zXEFFoz#n~=ZUp#8gKG@9imgnQj0qay=CjUWF2zs1M}}H1u(osxagA=X!FMWUmXIe~ zSPai~gh#>aO47%|t7aH8fvcdjbgHLG^mYe5(XpJIQ_-&UswYmgy03!9G{Up_EdlNf z$}Fb5Mkd+UX{2j*HI?+4l&Ct_^DMC*nUQBb`HAHu8DAIb+nS))4(mB)i&zj zS^Ay_EWRM%th6}PSL*47Y1EARG0|8EZ`0`41iuh?y)9Sys^`C6f7QTWHSm9f2Fm|$ zVDhg#{#65i)xiHF8u;^X{`?!QlfHK)|2o>6dV0Gr%Qg3Judc1WpuKCw^6Cw_rh&sl z=IqXOAWIL+&^bfSOcOP8e z-PzgQb#VKh4Y?z$R~=l}-gWS(Xe{Y!Zu;NC(%jqszm21_wK?105uxet>^T^zqITJm zy1IjXz0C&${lIxot~1-w(cQeH&72j5&M{~8_4l@S9bVFAgDn(^g6-W3p{>7+d|fWv zzaiI8MSy&E#K@Ai*(S*eg7x)H6liQ3Xl>2)n%0i)Y=8CK11pwaa$r^6C4=GGyZZXG zUHu{8V4$}4zW(msg(>v*;wvKt_$11 zPqwRPAg=l5wrnpIzkTh6jl0(F-Q2im%f$_s7|fw%ox^WXxYf3&*VycEn!_DYu(7|o z#`NY8qOUC~)!fnDmy06V=Kl60xyIJ+u6|tl9p1*vbH^LovRy45*k7cy2Ju*JIgQh{ z=8iXax8$mU*F8?(-rdsP+MesJ?(_lEJkZ-qc`CR+*V~%Kdg4%H|L|IoXO1Q`ygC?Y z@91yuYHS_oYVNZ&L9^~}Q={!9`DkyprzdV+HQC<7jUBWRLk)E;k8^WZ(BZ`~ARvg4tHjc#o>Ego4fmBurS=zozTl2>xp4P z4x6aKIHNC+xhdBXP;YOIfwD~rwcfCFS94o8Mss-#iCoL-;#gn%;XpAVDRMe#k})K; z9*0k&8i!f;&Dq{247xkA-LTtTnk3HVnJ)n@@9FfG99wV{w^qM9*WBIPQeESWKQ3eQ z;u0$;Pe=CnUWO1G3uhU#k)Fv#_wh!$p~hAfYRp~H)z}YkW1m8Vw#U;>6?-smN7Ah1c6i$`|bVhj2Urd`MQfa6Sl^drjV%s zNqxNr$Hr!>JmTUNhb6V~%I@yYL9mV4uEXiXW9jJebhJ0y(ms&K z_aGF#=`wi)SiXd^Wz*5#<>~n0ym(VyJewD1=x)Kvd(&8aYCb0pHjg0>o5xrGvNT5K zb15`^ZV!&4zCA`JJGW6Z}Ee< z9}SZ(-NGhO`q;sI#71VBiSli#9iMG-Fj!ffp`OIcu0)M}sqrA@HX6i~5R5`YPYP0O z#`<^aia4}Wg=lae-UKV*I&ajnObsG0sB?BFD9 zV;~px?2ZYW6m{+{sW02v(~%ooIz23hu+az^rlsU++QT%nzjq)SksV;uzP{Xs?*4S? zrVYK>qkA9#2CgLnTDGHZ%L0iNrqN7$NH0aivO1y@~u3GnMpmdt8mTC|1nJGOyl!R%%1)`9Tr``bz3u(E^-Ac|NXf<{ zDC{n2Ut4=?w7J^Yk!$T|l3sU(8iwZ;oLxv>B#o=H}VEBTysZt&D@0x-1>E~yDf~c(Hq6PVt$`ZJIFze@9T;7tUVvG z?gb}#s8Y!uZBnaQcu+UTbp2L7OJdV;wb1Sl^sx`X^z&$YOMhFK(3Z2B!Pct*>F!_) zI0R9G2XUt}9KcYW$NVXRiyet> z7Jba9Hp156YJ+|X<)rLhio(*f$E}HY?J+gg@k3-@ZQabthqWGX<%he~*g#+5)(soc zz1;+BN^Q)uh7b%BK5b~VceS=3YwYgn^NG=1HAx>9kCtki#Svo{Vpb$(i%9J3VM!6u zRSri2Y#M|qE$v5A@lG}>QwiO@sVLj!sW?q974OO&&f3k8kO)U*ZimDr=FmiAydZLE z-97zDQoL%i)>`AX``p2WgI2Znt1og(D%wSVwYqDU>!$osu1}-?7+@upDw4EfHJQeq z{@$qB#2nO!f+MYV(lyY@cz8I{p@vc|d>kKp3Axo?qW-8#O_FK*l&AFDGjx`-YH{R#E4ztw- z%HBvYdPfpsRvfTP97^6KErcA*Vw@6!!IY}T3bV_Gy*yzg1R7T3u*27|+pqS!H7fgh zXC>xVTi#rJEZTUEp>h%^){?IYzh4~78dY_DeZB&HBXyg+aYZF!drYD1VWy=XX2uLS zLNNz1zbX5QQ|)XqmLg#{ZQU_=o^8ZLQ&yQ^v0Nqw5(?ljg%ZR>d}7pI6Lgl@1YJzs zk{K*e2Tve(X#-o_PAO zFa;m?GYLLs)^S(l)l^+m6IpC@_q@e=w7rISGx~=Ks^^p+g^OClHoIi(3>A@<N)uq+fyDrUJchnbp&SIOVhNHe{Sk>aa3Whg)x3>289kwm{te*Zh zjzKuV!nXy_9j17F3OBd*x7Mw!GcDZ%Z0T3mWL?UtWpT<;pMt|cdw=hd<#nqV+-%yi z)0g=>@5F4y7@Jo%`l(fy9kRNPn%>s_roMqD7j2G_Hmg9>GEFF3n5OGMp6MzZ5X~Id zL@CM*ir2LFcowL=%anDjZh4*Vt;becPShSOrOWL9%S}sjzlg&`tL_4|G=01?dpWxv zO2!+i)s|`R>tW%FJqvc5Jy=Za-MO`4hd;g$^h@`>c}k4CT~{(CmThChVlwf1 zvJ3sb<9$mtVAyWwEVd2$`dx3--`>fN1l`icy_>cz)xUIXSNpNfY|lp4PD+oluI<1N zCD=1ayFn$fq{JS)!#1t&?qDw8tpE5W*n0vI;B=b;&2$XCv3r$YLHeaz%*pn6^Ma*p zoT_b7VsT-dAT;V|85YC9(MC?Ctp{DT&ZqlQc}}`r&cm+ynC)whClD@sZ}$%EAZZUI z#=F5e8?d_1V_%EeeD>E1Xr1#v#7!gen4y8h_|{vKwe(dFjo@$Yr3*xpG0ZMpC;RtU z2g)QdQH|Z#iGc$}hdPr!d=15*>uIH)JHOiRZMK|r#K~lr5nIW_M4$PpuWV>d_tP>T} zMv!j@X*sFPArX1tbe@cX&6c<=q;tJc#|9%5^%JPz1X^?Yahdrgo88`|wc9*eWLZbd z*25>rXc{6zJE+cB)AD#aY!Boia~)S-TX%1NX!P-fE<|G@bMXe0j$#SNJDa*Y>=>H| z$_RGY^OawyDb5&$GZ{#{w`Y5`$~s$M2O6t9#hu1!JmV*P98V)ah@W z?6%`mUI%erLOb$zN{bk!Ml=Kd-RdmL@SBGx64A*QHSWAZs;+dMz^q(K5;%LJU_}_7 ziF6!Ed7hrdLjyRmsT|71S>Y;}i(1CH+0DE{{mzy{w*UUI#GqU{^qvrsBw=MO!L~7c230Fx{oT|Q_bQNF8o$7Tb3R2%UH}t z>6W-34UIbjX~QcpL6IFe3=CA{MVjEUhdfH#9JR+TO5ZUwmWqewUpuV2N+yD-(1hM*hd(>(1O22vH zdLC?VMvtLsaNKYb&_I7F`}RlUmR!S*y}K`p#PM3R87`csu~ZHlSFSx+F5^j+h4BWI z!tNtpTeiCoS%~)Z)%MfrDU%)E2(wGpVkbv7#L(QQ6B!->aeDHT4WFsD=hEeBp#G`1 z->-VzK3IGJ(_u|xK+o(nHsR3RV&go=l8UQ?u&xLmzke{ocZ^Y@+ie+Ok13sDw}UJ@ zbP{^lK^?mbxt(Bl9^n|agPY&27z1RpgUm z%ktQgrXYC}+lc1mewW&EKU{M`INLGIMnHul_hHS<8l3wu)XA|OQXdc3G5G7bLb*9` z*y5*H{oR+d&7(2827g?)0aU{YZ8YnOaQIDR9m=qA9Us$F*Yx6SC{^ZBibUJEWm`ja zO)EYcc5Nn0v8L>zR#8bO7T|D9xEdd&PFzj#m_|m~ zfrL5%3q%}BM*Db5sLlwDUmvj&bbXrZqH63dMXyIXi)$rjW1t5E<(VbB(HAYVoVNTb z*K@CBRYcU`iciea$(pz52{;D!xPTYdX-pNGE|O{wfrb;;M+>1TcePNUM!_3?zJt?n`&M$XF4hH#&+D^+ME3XEPlc*S}CdT$mg}kT9|u~Dvc{& zzk@ZWij1@ol~qsa?b0_-Z4tkm4$BU3*i$U7D#-cO#UUns5y5DCEoD_vVp=ZGm&M}R ziQjpMa191!;)f*gnBS}@myzm#dy#`I)ZR5r3^fbVVS4Yo96R6gcRHy2xj=pk1y8`ckNIkDw0RL8zTjB#Z8N<(G%a)|xAk&Ivfkqv18?*&8}DFI6h!5ydSV z*w!9Uk3aXoa{S1Lvz5GS{dQ+_&e6ioaY*7$j(sMI`?AwFFr~BSDV#3ZMNdsnGf&zo z)y3Tt9Xy#EmhyR|3G%=t2TofCUlv4DGy*Py^(yQKau05;GeRq&7^1tna&BQo@hd!h z@-T*gXcl^c)6#HgnP^&6c7+u3w~FPh?{e(u@9C!4RL>&TEI!;Zxx0~L*vh3tj>;3@ z0blFmh`*0T$(~;%qK(`05toIphy?P0M_nSqMDWTCio0rvm`_U=$G(p}>!Y%<)C0;gDep^39H<}pxIe&^kz^w_w+L5=jy+jzl z%aDdj=6@mJU^!B#Us`E{G!qSG_7V8B#v;jvt0qo(-BLwc=q=Shj6suHNMs*+Tl*aWovvx`00NGwdG{7}Oc(#a` zOl?>ARD1B@CzF1{sLeZVX{26CQC}aNzik18ft;5j*j6oI|L%(5apPq1;z>pN@U6Gc zA4)Qv%yBZcYY2wi?DhowSk4F2&wFYsLaXx}7xpvRR+e6FE5H-(<#jySmdG|^eiD3p z?At&hgiakjws2z#k>#nKw>D`R#0FoCDyFcJH5Y@qC+sl=jdj4C?azePpTSy+QL{uk; z3o=Hi+ese+1d@7Ze9GR)Wa5U+)avizZzTef;|pXOJsKCvgTmT0RXTDJxuk-7Xu z5ML305l*W|zg!(eCdM%sz>O;!;jC@CXG85%p^@Z63glKRvEl?XNTL(M#O(M5{0RZ= zidYWHL-S(&KZed4@{!j;Vx>&ozbqlbXPH$0>0SyDB?o)eDe~c}f2a)CgQs%T8k473 zw+!7b6Cm5kodC+#c+l*l7ZxS+E<=m@cZpnY zPj`nM0D|n6Y%j+Pjm=DLg2z|ETA5zW8`~fE`BzaumAYC znk}Fl+Zo+F#$g9*;d!g z%RlWFX;Rt~2o#&-c?G3t2ZXJDT+@)3pL0P@O7n~v`*OD4H{ctTWY~)8aR#B8MUcge zpNenv`(xIDFCVRK5-FB+f|y{(jctHdm*XklEN2798=HW-$UPec3XagW%4JLx-FD@H8fHIY5m-pK|v^A8>o2#w8hqtQh! zNHU7wn`)`3BZye$HIM4s;NEUi|ajCPw&EL}Pji%9Wo+2FddFKP}zhG>HH zgD(x>w&xNu-XNVix4Dks<&9WuUAx9)AL`hiZRXX~(ZgrF`~hF7b7Gd_01E==x!hnM z$qmw-HSF8HZBW_{Ep`&lRncj%wrt-P4e$v}SN9(4Jr^XgF>5DMp{}W}D+VR@ck_1N zL8dM$>w#_@qWEMD-kgLlFlT(o0mKc zVj!HAB%lt=Px_N&yVbgv`35T=-sF>H*t8_-?9`pLq>ds|e99ZsbcM~{SgsjO5^>p(}xp#C!08%~(vp^#|*I7!4}v?ZJ}NSCxbU^IK= zux4jLO1@F3$>*o>CRz@^wQ3Ct(tifA!@cb-$MWLGgSd`LcyfiKhJ$;_n4ni>HMR#3HsP``p|7Vkh)NwH3yQl9{Djf2ZoD!=Ah+gA00wuAw7z^S zskeU5b;l?P3Y!~NRZDlg_~4!FJV6>T-O{~{we z*=15dQJgpefL^>*l6)Rg3N!n{s_6^sB~|q;VNP>cra8<>RV?0830Yp{!n>7{xNUsB z`3Yfbw-DigZxceCHenFb&f|UPF--1mYP3g<33XCJ+C)RjL_@knLkn*ogpHIC8_^IO z(GVNa5SvUnlu7ZB_s%0}@FOWwoB_s*)8C!C8{0aI+nh z6vnA6G-X8_83;lMj=&rHG!e$YnXLs`!rZ7Y1SI%6aq~>4Sd{4`zz;LI3<=voGr)5! zS%?Iw?oG*dM<+<7*BTO5STCg= zDr0R&Pg`gbU2&0}z3r?L@>iB!7cf!eiH@+FXo_Bur@T-jO-isY+Dk~=H20dlAQ6m$ zwcM;bzCV8^-L&1$UInz?KIs}1-kUpi0WZQ2b1m!eY}i91&4r_H z(>ex*Hr7gmk%TFGSZepm%Ojw^rRxZfNx`p0lk5q!hP@8-7tYwHQ%xqv2Cn$FT-SgV6_D)`!m>R;M(%UnLCw7n0>*p($ z1<0;g9!6G#k(FWOv@mjd7&#-1tO_C;WpEwm6_yF_e&oqdX86fZ>hrI^Ov?88w_heH zErVcM2EjBBf@vNEGYDi5gc^RHD0WtppO{{Y+AT`Agi4!~PO0)ITj4V{;TC>!gtL9G zeTN37!V^TnavqnkVJ(VypIrK3u{|5?v+kq^UnL+hc+$(|xhKcSX|y5#*qF=1Q0@0O z4B3S3qhrHjCw4lv+lq0F2TtsRQg#C>Yd?I!LsZdGtvlFddTd{s;9@m)cY#+?p+fg` z;|_X0?|Z9LqQuq5A07^RTUvYbxz=ekLbWj0~OuEOCs z;$!G!!zQ5 zxzuw=)x6(gPxNsCuZd84@8_PUelG;u3(akArzsytqpf2qGePE_dayiNb-Eh1PA?}Y z%>#CWaw6%%9Oq%zXi-~@In;^FR)eVu8H6`&lW~Q4wY$9@BD|}`x^oju)taSkg$@}@ zQXAdJQeuVd<-8^`Jooy@Jd%y7L$__nyF^sugIKn++Cix->)d>IP>z31r8kQ~+0On$ zGFB(?R^$l^xThGM#(6*|+ZQxnE%uV88_H}^$2v)wYK{5?8Jx9sUjYGe^{{<1Sy@qI zckA$a$QS|7n#AEG#J-o@`Qse+iCmMljWn^O_;ph8+bB~-s48)uZ+~&ARAY;}2?ss| z4G-=5p>!AII8}~+?UQB0#qG((q;r zO>tfZiebLbC*>hx-}RE~?d`H(OgqbcIL(d^+JoJ&Wp{Or0-X8a`k{kXUXG&xQ&1+- zeR|A}Ag}bYZ;rQLY0?N1WoI=H=M4oo?AncbSBD*KJirmedx`hv^qMQtvJGC^WSoWp z{p#!8%S2t6#|*k%h^30&{AeNUa=u$nL`RH!8m@1#*NkUm>* zZzWBjoGC|8PO!zHR11*_FG|q!vq~CXWv1$<%@^i0!yUm4%N~Mn*{Fh(s8RRE;fC9o zQMzi>H!VHBGA#7Lai!4DF|#etI2a|oH}|Kaaz4R|MaHuH6Xu_oaD>8h8Cbzfd?h4hErZ~8MTVOwG}8OvoMxVH;S7Tf zxAg<|U;K?R#rWA)KF~ZwV`YC}=+qv}IqnvGWm;Dhz3|crYNKIG@3Y>6ef{mc3OFuH zm!bhFKOTFCoj51g`%-zfZ=v@K5vTZyDJ1S`Jh_V$ZQsm^fXSPkeVA9Mcwi04%8uW_?4t2ontcHc{Vu5YLA#LNBJD$L0_`w6_HEnd zm7mwYI>~vBy{cXfD6ALT18=N$qq==(pDHm@92K;s%Vv7_p`KK%tEIj^%vC)0GZGc+ zN;^0ue%Z}SWZ}%CY*o$;D9lgG*YGpJZBkm1b4i}-T6>SynBT)nIZCj z+hxo*D0^UnF|S1r&-44%G-GZ)WXxO9(>M2$Ki-%fl>J;Wyb#|8?7zY1@{PuP{Y+!} zPBA8@-%exJ692(MV}8o-XoWG8h>t^WuY=cX4;wQLJp0kh9)?Mfey1xR~+p(E{8iQ_-yY7gCIh8v8BDmIhT$f*L%=K%bPu)JS z-2ec%Lzwp?BqMV;a3J3i1Q!Bf17kjVU1VAT+{j6S~v&1MKGe z)A`1GvoV)}<4JV!3~4)|@u+VD`>>zr`m>iWibwak)L|zw=(;LLxR`p|Xw2v9soRyv z0KVw@-fC>68e4+5yO$aBUhK|b_m5*Uuj#>N;A3t8AC-&lx0M+42K4#LMaH}zI?;6l z^;wA=y7mkh^ZGXASx>!QflPt?H;pvrDR^tA9)Ap;hbU8q?aV?C>wwku0%?!6xUl}e z(d+ARc)N~ry7qZJKTZ4ib|L&Uxb$qs-NXOyS!&F?Nxus_(lz09W7=p(AH@DH-C@j& z;Cu}J2WUqt;O|Yeug{>jd#L+=!EWA3`bf&$orUivY#N(9^ z9J+z0=z2%3F;@V4F1ib^FJ>d0xC-pQ3Uf&F_Q$}N3;A_}z z%#GAzbUlhZx*os4nC;l|HQ?Pj&zLR5zeC&8^;^;}h5uiyH)bZfewO;!3y%MyO|&0% zFya5#p6g8ITsPeja6Z#LYiP-t~&q`7*qMWXG!_U`(w&GIVf8HZ! zuIWxvWyeFuBfH51;? zUXA^3VvIoc3%ZQyf~KxwXxv*(d#7!lhFsTev&rVQ^Z|wRlW*n6gw{-_9t+@Q2QaVM zPn+G!xP{FX?Ztkv#rv?0+v!tZcf^%nj?L)G6)-Mf6YIdQ>ybmo+<<&TT~D>3!z+i% zp-ubrx1--rtW99Pf&6!_N#arHGkIx?XsiEr(3q#O=kTh-_Wy@EnTbxq>jCQPRCxXp z_j~xgy4IMl>~s*nRG-WBEV|QGgnrLCfNs%QblpT5U5`*lx;}rAyDu5*?lX_Md-VUj zIrRDb?!{*Ce;9QA{rSd}U~kd&dvvbr0qW*^p7*a)2jO)WGUs1kK;B2O)yLuatNgB} zp3117_O=9a3vzxd;Ng=O81uJP*uiND%ootX*gD#Tm(S*OCiw~-hUbqTPttCseT3Ip zJDB&aHs&MP(nZ+aMqnG(U}L0RM*K}R#vI4q-p6kNZR`qoe}M3QZ1J8z*DqdT%y0Pp zk#>6;I4;IUbR9=G_j@_c-;NB$v@OyLCNL&lh}@L9_f%v4vz&HH{e8W|m#XPy7Me$0gY9bKqXVIJ3pK*H59VX861kn|p%1&$iRY z!C&?q?2WYiYXx@v?(>q=N%XB77f}wqKLxH+;N?`xpV{PK{srAM(6;ig@50ZUr{+4YXCt{sNg#yA=HVzCc=TGrW0PV;E~zd)tf3uik}yx6&6i zxRh_uK2JZ3ei2%KgY5UC?};;+!+|Hd{%KqkO76eM&UCfG!z&NjpgFRKeg)basViL% z?=$8@Sz~t7PBsw!A@vwtzw`8?_~bS8Q~T*#FJr!lt%p|~_8VQ($3!7_e~bG4HO!?K zBASGCEIRu4E!Ypb zo^=TR(CJOs&mZO*^GU%%`=8G>hS#px>rr%4j~-fPGiI+spFw~1c$l}_%@(QZEl+#}$) z1R3(Lk6>Hxy_mTt{YVe>bPa8-8=P~{{W}Vgh5n>|33@>GR&1)T$e3S)=SA$|0s4&Z zLpQqi(hhz>zfdPRu%W+ajQKLU`6c@O$U4TJjtDY+|2cN{Ioj!ouFt~9N06f*y1zxw zo$!*YVvPgOTMwZNioY(cg=sH?knGu|CTwo#0Q=>PkKqiZVp zzXQin%D$=vd7IEL?O_9T`4Dy1zlJ#$Fwym2=rX!)9*9D$Rcn*5LU&PLZ&|^5CTmRT zA=;yteF6H_wHf<}E}8eG^P?F3IyQFqX_Te>1L%`OG?SxWjjs2rK;Bgh9bG%Hzw@A- z!?qtnmfxO@{cd)7H=V=&hP|qpNSByGQ>=l|-ST@3qvEu2;bGDtuzxAT1wr$YC3BW;B*yXL%Lol zV2(rH2=4pQ%TtRP|LAAW#NHmq#(#qyZ=ekib$u^OyTQ(m@q46>df&*{j4k|%bX{A< zxcjHEyH9&PZNS!BfqT_fa8Gpk&(mIZLTeH>{e-WBSE9$mgm3O)&9%hA>HoR#^9O9> z3m2m&_`1B3Hi?a74l-_0_g@KM--jL^Kz~0z1Dzn>fBHI0u%T~sq^lM@x{5D%cl}>~ zeiDvC&mpI-P4p2Pkn3AyceB+7=4%1j`Ob-&G{*e+iM1= zDP`t_B>gJvTUQ%(f5nxIu@||x{@-z#3x6(XH}9=s&4?YZ1O9;#%#qQ>E3o@2WPIun z_04a;a8f_IuJHI?^tPw8>u7tg3HTl1VU>4|?^h;)b2Dw^0KcCj^G!1t_t1TAJ#%-` zK3Pql<858#bUieM`drFdg|IB~F3ExURUdMexjyA~sDQxCe z?iuXqzsGVXd>niEJ-Av2kd64Hql~5e?)Gw2R~u84K@XI9WFh15GWffIIq_u18~Tlp z&x1$u?f-vA^p<_X;aZPG0;b@+NF*vr9Vao2hhO>;48d7 zaKy!$!Ep`tv=$u|p!aFm?W_4sN8SVQc1r_mE!xNj*1#*Whu7B|U99s^n3{xFd7j>+ zy3M;zgSSU7W!~9JJDUv;)I)UrVtW)y?hn$o4iqKv{LqEq)Ae`A_2?qTZg~FlNc0TP zV^=dT=tBnI-u^)TO6o7X{`qVdyNkN}1U68Nj#sHp4u??8@he=sc&EF68{O_l$F=D0 zPH%?`x@j-i_BQHq`h4!_;Ue0_2yp+7^pW%zx*9ysO?i5CxwKhyqw7sUJNPlMuLs{_ z$oH#J^jX+m!3O5pdzgP_*(3J#`ULiqe=VY3zg|w?NZo#!_7PrhYsSv%*egWt9~Uxi zH-x#^^MoXR=MERH+k}3QX)C?rk;Ffy&PmXgi*Td6GU0vALW5{_2 zyj^%+0y)attWu8GFg~xN&!*lM)I*2+A^13oEPJ5$CwTl8?cz52o>lO)WI}=`4Bd{* z_M+?;mV*oZH!pQb-@q=$QKyGXjp+z%%9k+5sfQyT?~i&j3M z|1r~r^}lQqdkoa!?eH937g2xDpvz|LO4sK`kw1<7vc=3f`01)aU-vP_RW#90BKM`} zeDp}>NZ>i(aXs$kxey&Z$y}o>uuq32`G40c^1=D3Md%hC@1suNMZfYJ?D~Z@oVk$K z3?GNa(sv+Z20h$%0lZ-suUklePMdq+5OY`Rc`dR&KaM?PY&*Pqkv+QJ1AKJNSkK&K zUldF3H_*=4T*lt#M#lV(Bs~mOV-q>*>to*bUJ3l@OC7`o<+Ly4{#=WTFPIvZOv2ZK zW6>GdIQ860yL|}Re%|2nCxY)db^Kava}_%NAKKZ~r@Op$;QrAX_6B`>ajEJ54+b_K zv`n6=L$#TX97yf8Xu#d| z|Lx%WH03V#I=a4{c7jcJ*0X1E7SnNTGlR^Jp`Sg-(9G|ajmW=&F`ZuxycS)+z6yBW zKbpDgmCTFb`P^M1`x3gCvWdMN z^!W+u>Wk2Q0-fHQV-L>DExx}D{^>oP2 zv8CPcH){!fz?sY&xqosC^ER)i+ezC<_zT`%R)YTx$oWZlIb6$Hp8T_je;$1;T*vr= zt^aB&b-WY1FQo0G|0n5l8ycWTf6+w$b0c+AjvOB+?^WojavyVR?Bi}h!uxs1@MiMwL*{_!@UQX==#b;=IYqDuG6re*C6+@D_vaw?}yHhkvsp| zU5vf2XHRkpeHu3M{Ud3JM@c*T3~Z$epAGtlH;!@n{|$V2eROOR`zC#kuBYa(2HT1r z(YvnNK!(NSHBt8&WPN{t>(|~!1b_7w{dZR%ILeDyi-Dt|JxX==IrRB!X{X_}nRf6D z^}ghIlKSGMw0ZQT>soa5Bl?B=sf$K*P>fvvfK8r9eU3y=pGFU_$L{`-`X9T9eL3RO z;o&}T6oGTzG|n_hZ|bM*VpFNU+qUW`U2jsZLhzl|BJ3V^!M#K%&*|*nLwAXfUnc?@ctAXt%jd3(g$6G?*9?^ zo9PdA-2skT3`$OB&^UxY%aWhvpR{@)J$US3$f@G9mJ1sV7&FsJdSeW9veL%hfw$h<3~Gq0+ViWi$>=5LLB8mI!|CFZcX z+@7sf%~rhBWKGVVIab;F8ew?LgweiW)j{Q#nO-ws$7hGH+^orL%*aosYKihkn)hZN z&isZs#uy`hD$VKqY2Vk;8^tkZqxDmB@hY<=vo)hVovLP)AH&*jQbuQbE`O{UlNpzh zzk-X8H%}Lg%4ja`;uFk|3Vu?cb8*MdBvVpwR)PGnT>fNJn>jn9GdaiK6f-qbllflE z-&A}c&aiv#Rr5uEn)$jZDv)ofD?h`0#eB{B&Q*0QzuMew9yRhytEyFemf4ZHAfq#0 z2Y;$Lr{IbLt!b({lt0(pR`8($twF1{D?Z=cRPdGp`Fc3`h2~!izEYq)=c?t(Ut~U7 z@aY20U0r^yd92_E1)BT0_)^nXaASddPm8R+>dXrMRz7VTfkS4H9I zr+wJyr!x(mJqtc6qj_nRuey^T@c za#Fi&NnPE+zTW18e784BJeWJebCx`dytJ#iX=$fkW|&(#tS1^9_(Yd|t-{HbJPC@e zJmA`KGOW69m*~06m(8pH?8(b7xRKWzoSb@W$&*me;SQc<>+9~wogCSu_({=jJ(-G$ zp20a0$9DX`RqcoU4gT!-@8fDecKr8owNE?#`?%Vt9shk??aPk;KCbp@$A2H6W9C@D zma#rQpFY=)_r}p*U=~;(-za}BE!2+pem=0!EVTQ~(Re%EOt<@+^X@j!1nK*YoqZrW0v#x z!kTD2C^G+A`jb-auUC}`f2rA5*j*^!hboJ&-1HXSSxA@V$B#-gzi@Y<_CH;ImAR|% z(Ly~d;^>Vr_55j{!o|nh@kHk~Ey8LRhHB(*KAM-oc+*kC?BJBsc{2KF>!c38# zEpYKA=JBGj#X944@nxpCXi1U$Zyo-X%!@W=K>JA931S;<8uIv;iUS@Un^t9F0Y#dGF^ zC0{7feyEFIZXPaaER|2Yi+7v#BW@V+qgb9kbD-q<5#|21YYf6*L5Uya~2KN6hgQG$tZ>Wm-?hxj5~ zQ90$whcJZI9=Y~vg;!@AAzslDtb72JpUMN*iQ zeMn(ADGqvaoxBCT`y}TQd9R(Y(;xRaz@@cOznl)b=i3IVI}{ee?2B5v2G89QFuS|GQAnVmbH{^FI~kBiCFV#Y@ctmH%8R|1y_9 z!c^6?V+bGh~NNb~N(Ckpkv zh$}zJyt?$QrSkQ0@zJKP^l+)pbX>g3ysG4FC3*(Z#mAV*rAtcX8}H&{&F>0tD3Tw% zi;pwyr8ku7SsfQ2Z!)EmO67a+;uFlbOH8T!>Ro)I`9#S#OZ1$Ui%&AIEvhS#AHIuE zF|#TcR*t-e_+8THDdx+S->!UD3_s1R$TVi;=jrwXrkf8|JX$eJ`m^ve%=;=oTB+wB z9ln|7wWPgVX~rJnV4<>#A8l`|{l zckkj0X@9R6DgV@}R`IvUysF~93i$`R{95yL`5(*g6FxhCU1EM!xoDJpeyer~eyO=; z2w!NK5oUe52X7U=qifK_eNnokEy%%dvu@Tc~w|H;ng!l zn(st$`ETp|T+fX~cm$_(`Q|H6K5p{ukPl2gOjK6S1?p@(%GVy1<|&b^@>dCedZt{@ zd`D^Wtrt&{D=L$JSHApw)kj1_^CG3`u6;4hos_5NAft4ZSDxb0ep+-7%PpaO z)iM4oXVtfonfB?-##gZdt7px17M6I9IoGT)YiU*M%?8t8HZoLiHe1YjW~^B#f3(ZAX^#OCxT*A)lA@d6J|NiyT^SXHV;3Oti9Y<2{DSg@d zLcA+#;N+%+w&Y20Y+o30awJ{RlcUKyK2Dmb%AN$(=$p_dHRFy7p9EdLuzQlCQt)Kx zB_D}BNxA`olcT>Y`~vLDZUlN+RD|Fp>H80zowWSXOTtb{|Gboim$96bndyZtlsyTl zqdx8A=*Fc_f^z=LnO}B&M=x_a$sOjT_(?FIyz=v9v;EigKQEw9%PI9B$i7^LgD>mtc~ zAAah&%MEe~_Z^g9!~IS0dmi@#AZ6xi-U1(sxt|LhJA>wW=uhN+IzO^ZE7QJ}+^=Nc z<5cb+2W}bnx3C{_Huuj!cO&=d#Mu=zwZO07{!SQY1#kY$k1X>>=&$8|KX~SFzlcP3 z?#!=<&*gp>Gn}V1^m0bsI%A^D2I1nF8RLg_<_#&F8*| z`#kQ`0Xl=blrfpxmyoxbyL1alGn@Ey?w10`Oxu>Fs3pFM+Y#`x-C(9bw}$&__(BA8 zE%G*SUjvhyx&QV0|EUJHBKMnUEKiQQrl0~#xnt}#mprn zkWc&??lQH&&jSB2cfmc* z{b|yl=Kek8ex5tYX2b;Ul%K3S*8=YM5n9Fl2JV}=uM&OkZxDU%f;*;kLN_X%`yJdR z*L~dY1K)$(r$Ogo?sF*jIQJ)sKh0gwM?KH|AomdyuPL~na+A3~2%ZJpcX40E{R7-L zbAOur3%QRV-sbPexK|Uuk^2JfcW{3}^tt~8IuCNM0{_F@H*^{-2a}g zXPo(f`Jnj+b2Z!6*O+U~b>@0Hy&KG{@#T0e9v81OuQxZDH<&k?H{pG8i}@S#X7d(v ztGUg*)!c6G;6(Cm=I!Pk<}ObA-f8YO_n3RlyUe@Id+>&8GR^GDa zE;SwaMRgfIIAgBBBdX8z;}vzp9L2lpxVh3?#qQ~NhOmirp_3V!rZQ|zqYItE@K()! z?resKIdtXo=t>tb1lG`9FJ_4Q|LXeRp7(zU(YdbAT%WP${XyKG_rI9r+w*0A#Kp_aH3hFN z(6cNqKGM9t;LQbkSA&a>GK(^`89g89;-k$<{Oja<@8VTvX=YhQ&-c6dcrzliFr(-1 zTzrE0c)@oH^bWW&T^Z_YB6hjhzU!o_PxUj&Y|re@==~{G3l*QjMCj@Qy_2EH$~P4& zt~Gj2w!of;PcwTn*JZT-rM*3!>uL{7&sq(257VOkHKl!)a{2peN(=KuLvih^=@~bw z1c({zgzbsq@H^A2&+NDo!0ZD%KBJaP7NCS(H6 z-ozv!tU&BIPGWFuV>@9MlCZ)kd$$zArj)YFhOl>NfkJ2*0m`1Gh0>Nb|L;%IeSBjA z1^3^#`MhuR_*y#B(b18vuB5Ab&QbJ1B%4wi_O#rc&2JL?dAL8jatAmYMYfI7^B9l* z;Ov3=^ug@k?c;RvJUoOwyhTR#Z#+DdvFJdjpJbi<#~4Pdbw>J8p5L*i)E;9441eQT zfKPY26`tQ+S)fghVangl47L-j>?ZpByPLLlPz;klp9Sm`r_b%v$0NJ4)JnhG)0@CT zZ<@3J=+h^f+wCh>c05{M>(-w1m%+{kN6QM6A{z_YVh_`Pg7rNt9uEYo|Ha?m1gn3^ z=1;cG2S3Bzzbi)rUpoP~84LR<&MrW<5!`|u(y7jNWRA(Fyp}A)cXc{m9zUC%)0sv( zGdb5PJ;%wn$PSm!-&Tf{o!*Vl-;NiT(N2Fk+o=5Zu7AlkU``+9@8Isg>;!uJjt(9V z?91!q+Fv>r+1Dz6XLfAoIK2~}-j#jZ`A+}K=kLag%PbDjK#^jJN;er^Vnoi|^fq3i@7=xmC4cr-i2`#Bpm9zWmh5lctT*KfS*uhKcm zt`ff!*;U@l*%I^RP2z=Ml(Vnm+i$Xa9%MH__rDWuzm!=s8r;rA!@6)aGf}6uCMs`Y zq7{5=BJNMb0x9BEE`o!I*S3hcGcrxN_#(;cUBs(J#AqMUb`j%G zM4LyZ6Ic86w*~3n$KN%iZ>VntvJI>63bJ1!yP?u8iE*lUUNn9@%HlJQ)A%DD%C)=^ zYFtrz@`~j;B+H=u$}3#Sq{K8-uD)l)-zfC0qi&jb(%YT%)@9pbTj}vP5Pc7+o1UZ{ zkAWGyt%?`%CElg;8T;Gf>AUj5-M{VJ_y6m-p}1>U@k+;!cf!=0z{i;+My@e!vTb*>-ut=8Y=JNzSH=ifyx%oW7pX`w( z^Gm0`G2iRNAEy>N9eZAofvtl(|rDgmi-^(;bdc@lCa0h$*44}iE{*<1t zHyP!x;wRm%oXLV4m;rWxJ?{YjyuZn_axXvG`0)6R%t$-Z$_8J~eBo!A-R< zW0TJtlWe_uxQW@-?rLS`wMb!LB{pnv_jh=~jBUo#|{l+p&Uo5q^8q#dfi$@_jmIi{K9C5ajV?YuMv= zG?li}dU=O@?nfuH-mbT@PwdloG7s{T4y}hfo0s@KO8?1WK6#Th{0aOT6#|!tepmBH zezMo(@w=I2cA0IXbjNSXe9rGOrB?~RyIF3RTPIJ!{P8Al0>|;@H#Uvm!~BJxY)oqW zeUrC@U+`w;*O;WoM+Co zXId|xA^ah%27hF|e1_nmY~medy?ln?Vdls7$JWVb6bl}1jSpObly?ln!N1C(Ir||L_f=98QKF50b48fz#8TJe-`vbl`#+VKK zq|4~xvF1~L(!KTYIBc|*SlQ0ZDO3CGYChv9`*ps(b~8&^?{rJ|*WJxfJJiZ{ZBDiD z^UX{<(@Iy-(;IJQ*cn!~q&+;r46#G3Y$|(rqS?dlVP#V{r&9SRnc&v#sn)dwSE%6g$PrmX+^stoH15D_gQT1;U?UrrN1i zdgwXDf@hj(cAAwf0iS;s@4-KDb|tf`)qZ=JTkWmZ$+NioU0@!!k6Y>gd;C3lvp(6` zmhdoVR@q5bI<+32XEvFaoee+_&o{X?*IvFa{d=P5?`1Bs7g_1+`}!~7?feX9pUdO# zZGOd1cEmlrkGYATY>np>iT{1gjr?TeJG+VK?T5b2xmNa1J-z+SWBg* z=gqa}0p<&S-P6zCf#%QrWdGFTFJjl=RA-aT(~q zfdp5%`B*lV{CKm<{M24-oqUkXe;Bq-udr74D<%9R%%%2H>*Rwf1s`c1vJY7&AGA#H zQP^d>!8-Y%34&Lfhwa1G%LfTQ!Q5l-wN5^0rQp+f-@L+2@*2@P8zQ|n7 z`>&S|68sZ$tUcDs{%KA>wdYUG9sHy#?c4uiq@{oDbgpyeD*a~;o|nEKmzZX@nJrGk zmzw6bxt0AGpMSmSWII{eMb83~Wj{*8SDW^>y?rGOUt`+YcJ|CPd@b_oIrfG${BzUVwzg~2FpDUg zZSPCNzc6iV8!Ox6o}cS^Uu$cZYW#5X?=Q{Hc4vD+di=S;>|%GZvX$e=mBmY?yiYLEfg|R#3@^bo$zvs*XyTHmeh);js>}~h9Z>8ZE%szG>EBhKg{kLXcyRVg9d=I~9 z_Ott0+3E84`z2F`yq#>hty?m#-kyEH=|E^iuLk#g5NL~+6%3h zw-d~WV$Zj-Md0bbWj^31+XWu}gDJ8_R`y~2eDF5=!e=|1k-q=G!w&Iz&PK7vf0sSu zbDfO?55LEVb-uH^;^Ft%RX)er8_Joa_V|EZJ~JQl)7cz36{7b?Q*4XvW~ICJ_vhvlezLXb>Ho5Q73Qo(;Q_w!qp=JzZ1%FlGRU2>Kv{ja8@ z?PwRI@AuzKSKHO z+{#a9Gx+)$`=R;JtkC!|Rpndzck_3%Fg?CR_HX8I=F&8rVgJczRN21s<6EY^o-YG4 z)9DTDU#Y{z#~ z@soWh4>#reNMHL%`hGOC2lJENV4vRH_TwiTcOGtG-!tzydypP(X&3R6ZFCQ3+xN}; zrfZsBjxFRTJJ|mHF~=Us94okyd!KA&R|7{+4m45ebtanla}#}bfQd#OY@!7hvd?lY z*J8rIXTRl1-aa>SJ1e-*IOn!@p=5; za!n^Z6MqobV8RFCmvRjw{2u<>Tz??^KK=(>?-0He{}QgB5xyAzr(BgLT33Nz&b5MY z8U8x1lekXfI*02l>UO$`iq1As#kth)JQGbi(?rY8pzg1jXx_=ROAiwr)XPM9y-l?E zRqoFz;Py1ps$T*Znke@Za6U89!uz1b{#Zo;bY??m9(3kH`+V>&0FV8&lJ4N;ny89> zu!Gnm%S(~Qe%Mm>)0VX-j(xGbZp5)SHif;nyaUO%fIRzfZ}#QB?G0aZh~ITYEkIDNf zdG96fOVI5LpMBuz2FkmMJU5%D;8x-uFwx{2!M_Fk-ND}t{PDz3g5E^RJe54hk!L7* z#*$|YxDS!%Vf;tPlTV&;8v65E6U|y}qD8C7 zTg|@a&ZPZ_v|~s+l(Y?`Ep+=px%miqWMW?|@>g;X@rQ)t{IRdI7<46RNH$#Q?@p=p zweP36B%Z<#F-FF5!l`@doTa*P+k!=-ZkaKUKg5sVXHpOUohX(?zjCnWG3H<8$2`Zr z;#6Ngwrl53=q$TPyxfR<~}+Hi+w4w>`E6e;1u3e%$7D zec8d*B|5r)@jcX;Y|1ZQl2^e*Z|5(LlRSR1oNa|wW*o0_V%hyG=|eG{q%YjM{UffY z&LoM$Ng4k*PwXf2$90N%=t13diH_o8KThA4AD0=|CH93IhvjQ-mkmhazs>V4yR5Qd zDf<~8&$75Ek=c4|nc0U_J`X2RYR;^xg-8e_jmEY!D>BaP8x}qJ^kIPKP zCCjAQcDNla@Ly{Ior~2n*Q6T4L02T69Q?MC$QVz1?ei{J-~Zk7Sw4aE#PfNp;08P& zz5Vma{&7RTe@Wk0XA|jr52~7s2Hl;F+MGym77uO8OjSDjvkiHEWj|!^qj`QK@zazy z3*HT0XvF%xp^18DnW$?9>&{Hpf(^d)xz_ot4Y>5Y>3LiZz4-ZzpT!tfdJ;dGN8y-G zGXB4IqjnU$qXqs0E#TzwYBYcP`CGPYTTS$E+P+Sh&oy5s_31VLFBQIG6t|(t1GSht6pAaOBnpmy>Q? zdP7rWe&_5xTPF|Kl=Z?QclM3VQ~qXrp&jFFqv@Sb&%VwTjo%&W!m|0LIGsNReO3xt zNZ3p?I#bcZP5B}?DTbln!kn7%aE5HjdVX@uhG=sXVDh)&i{R9lf8e&PSB5(~=(eBu zYsdcc8mn`(eE#-kM8@ch0E6Gb$rtH-2w#3jCl3{1@^|9=(EN-B>GYkb|E?y$q<6-S z^so$_ec|bMHA|4c3^4RlPQK|KpAMYsAObwFg?+l?8@=KWE>da~kf?uF+_B7LLasz%I|b?%ZGx4@CZL zqP;3zzd=sENw)rd`{nU{^#JQ&M}IIoVEL9H=N2++4(K#R<9^vFebiSVFXOwv~qebSUX?QI10zb6@hW>6&K2SEweSOEH z|6AZ}mizpZOjbtMjOWt*Wr|r46-5CizqE&^yE8a^{+WCso)N>`k3Gy=(U+0Va`5!_ zG{;Am#4!2iJNY@CKjZW7?d0VGO#c1M<s{A*v{5+`pKVDL*&9-5V*^Hh9$F6DVGa_2_-{L9R0 zB*AsomxoKu8+Kl#v&}sIL9V|&n(lv+^*+#@XW`S!9LysX@K-okXI}X9atGf_{@9+P z_7-&Rujcpf6V`d2#Q{GKYb;Uz@4AGm^w|G`Ith;bIInoqRTqxqlfK?Dbv9&j+>+gT z<(1r<&TvSE3xRd^yUs>UhDB57pU3|3@OC!W)m+JNoJZ&MZ7Zzyi{lkm*>U}1U*}6I zKK2#XC0V#QEIalJ*L^QHJKTSy1(Ndo4Kf>KI(dF$cwSlm0=xCWbG5MBA8_-lPfzX# z2;Z#-!gwOs&Hst~Kh=Ig0(R>G*86dJZat7lPukZJJtseyNO$Xn1iu9g9<36vlMi(B zzvoxyD`qxPdDe~hVST}P>FxKq`F^F+89(YYR;B>Z``^S^8F1$E~Cea(f@Es>k=U3>0t z#`ANqc7YTof8J#h~ z&;OGJmq2k*V*X!>mev|S|GWOO+`MF``}u#4@Jn5PtDXP-dO+t{WzJCg!ESwEn4dCt z6I|wCH~+5?yu!hn=l-|N|9Xe{-#qtgEuiNoZU3`U_cLMt(>?zQ`=1U@*#G=W_;YxL z8}IFZy8H?IpAP;G`=5?p!v1Gp(fa}RKOOyq{ZB_PVgJ*mC+vSZIAQ;Dw)Vpl_CG5H ze~10g8l@-ff4cG#_CFncZ~yaInx!S_R%a&q^d<}qBfNe6Nco%c zc6zk8ukZM2MvMN)ou4gv%W>$kX#Cc>W*%tFz~Sv(mdVVjk?y=FQ$)aEkf* zAmi-&yY%jixTVI~_aCP89!S70b!Tm5X9(`;=0|7WKTG`dMqi@Zyr}xQ_V45L$-KRP z;rDgxEobk)vEY8ZK`u7V-oLAFf9gBNohdJUs&VZ8=JT7lXH0LPn|}_`{j5>?Ah*Av zv*om(JP!Rly)WyWH_6kFqx5{{vt>$m{bPvJk2^={j=!O9e$v^nKL0T6bj@;SkNNcB zZvNDnvNAk9Ng*s_96A34uW@g`iSm419yMMv%0D=I!8QbqxhNN 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 WjEDW=^D=5xfB#ppYS2B@1NaZ^puJ20 diff --git a/src/projectM-engine-backup/libprojectM.plg b/src/projectM-engine-backup/libprojectM.plg deleted file mode 100755 index a3e36679c..000000000 --- a/src/projectM-engine-backup/libprojectM.plg +++ /dev/null @@ -1,78 +0,0 @@ - - -
-
Build Log

-

---------------------Configuration: libprojectM - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\DOCUME~1\descarte\LOCALS~1\Temp\RSP2E1.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "DEBUG" /Fp"Debug/libprojectM.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\tmp\projectM-1.00\src\libprojectM\browser.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\builtin_funcs.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\console_interface.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\CustomShape.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\CustomWave.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\editor.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\Eval.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\Expr.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\Func.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\glConsole.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\InitCond.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\menu.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\Param.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\Parser.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\PerFrameEqn.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\PerPixelEqn.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\PerPointEqn.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\Preset.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\projectM.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\SplayTree.cpp"
-"C:\tmp\projectM-1.00\src\libprojectM\win32-dirent.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\descarte\LOCALS~1\Temp\RSP2E1.tmp" 
-Creating temporary file "C:\DOCUME~1\descarte\LOCALS~1\Temp\RSP2E2.tmp" with contents
-[
-/nologo /out:"Debug\libprojectM.lib" 
-".\Debug\BeatDetect.obj"
-".\Debug\browser.obj"
-".\Debug\builtin_funcs.obj"
-".\Debug\console_interface.obj"
-".\Debug\CustomShape.obj"
-".\Debug\CustomWave.obj"
-".\Debug\editor.obj"
-".\Debug\Eval.obj"
-".\Debug\Expr.obj"
-".\Debug\fftsg.obj"
-".\Debug\Func.obj"
-".\Debug\glConsole.obj"
-".\Debug\InitCond.obj"
-".\Debug\menu.obj"
-".\Debug\Param.obj"
-".\Debug\Parser.obj"
-".\Debug\pbuffer.obj"
-".\Debug\PCM.obj"
-".\Debug\PerFrameEqn.obj"
-".\Debug\PerPixelEqn.obj"
-".\Debug\PerPointEqn.obj"
-".\Debug\Preset.obj"
-".\Debug\projectM.obj"
-".\Debug\SplayTree.obj"
-".\Debug\timer.obj"
-".\Debug\win32-dirent.obj"
-".\Debug\wipemalloc.obj"
-]
-Creating command line "link.exe -lib @C:\DOCUME~1\descarte\LOCALS~1\Temp\RSP2E2.tmp"
-
Output Window

-Compiling...
-browser.cpp
-builtin_funcs.cpp
-console_interface.cpp
-CustomShape.cpp
-CustomWave.cpp
-cl.exe terminated at user request.
-
-
- - diff --git a/src/projectM-engine-backup/libprojectM/Debug/libprojectM.pch b/src/projectM-engine-backup/libprojectM/Debug/libprojectM.pch deleted file mode 100755 index e8c8d9c278102680b2664a6c218a0596efa0bfa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186940 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 CD2JB- diff --git a/src/projectM-engine-backup/libprojectM/Debug/vc60.idb b/src/projectM-engine-backup/libprojectM/Debug/vc60.idb deleted file mode 100755 index 0f48fc1bb8f202cbb8ca2e8cc6a194549f1debc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246784 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
-
Build Log

-

---------------------Configuration: libprojectM - Win32 Debug--------------------
-

-
Command Lines

-
-
-
-
Results

-libprojectM.lib - 0 error(s), 0 warning(s)
-
- - diff --git a/src/projectM-engine-backup/lvtoprojectM.h b/src/projectM-engine-backup/lvtoprojectM.h deleted file mode 100755 index 4215b8abe..000000000 --- a/src/projectM-engine-backup/lvtoprojectM.h +++ /dev/null @@ -1,156 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: sdltoprojectM.hpp,v 1.1 2004/10/08 00:35:28 cvs Exp $ - * - * Translates SDL -> projectM variables - * - * $Log: sdltoprojectM.hpp,v $ - * Revision 1.1 2004/10/08 00:35:28 cvs - * Moved and imported - * - * Revision 1.1.1.1 2004/10/04 12:56:00 cvs - * Imported - * - */ - -#include - -projectMEvent lv2pmEvent( VisEventType event ) { - - switch ( event ) { - case VISUAL_EVENT_RESIZE: - return PROJECTM_VIDEORESIZE; - case VISUAL_EVENT_KEYUP: - return PROJECTM_KEYUP; - case VISUAL_EVENT_KEYDOWN: - return PROJECTM_KEYDOWN; - default: - return PROJECTM_KEYUP; - } - } -projectMKeycode lv2pmKeycode( VisKey keysym ) -{ - switch ( keysym ) - { - case VKEY_F1: - return PROJECTM_K_F1; - case VKEY_F2: - return PROJECTM_K_F2; - case VKEY_F3: - return PROJECTM_K_F3; - case VKEY_F4: - return PROJECTM_K_F4; - case VKEY_F5: - return PROJECTM_K_F5; - case VKEY_F6: - return PROJECTM_K_F6; - case VKEY_F7: - return PROJECTM_K_F7; - case VKEY_F8: - return PROJECTM_K_F8; - case VKEY_F9: - return PROJECTM_K_F9; - case VKEY_F10: - return PROJECTM_K_F10; - case VKEY_F11: - return PROJECTM_K_F11; - case VKEY_F12: - return PROJECTM_K_F12; - case VKEY_ESCAPE: - return PROJECTM_K_ESCAPE; - case VKEY_a: - return PROJECTM_K_a; - case VKEY_b: - return PROJECTM_K_b; - case VKEY_c: - return PROJECTM_K_c; - case VKEY_d: - return PROJECTM_K_d; - case VKEY_e: - return PROJECTM_K_e; - case VKEY_f: - return PROJECTM_K_f; - case VKEY_g: - return PROJECTM_K_g; - case VKEY_h: - return PROJECTM_K_h; - case VKEY_i: - return PROJECTM_K_i; - case VKEY_j: - return PROJECTM_K_j; - case VKEY_k: - return PROJECTM_K_k; - case VKEY_l: - return PROJECTM_K_l; - case VKEY_m: - return PROJECTM_K_m; - case VKEY_n: - return PROJECTM_K_n; - case VKEY_o: - return PROJECTM_K_o; - case VKEY_p: - return PROJECTM_K_p; - case VKEY_q: - return PROJECTM_K_q; - case VKEY_r: - return PROJECTM_K_r; - case VKEY_s: - return PROJECTM_K_s; - case VKEY_t: - return PROJECTM_K_t; - case VKEY_u: - return PROJECTM_K_u; - case VKEY_v: - return PROJECTM_K_v; - case VKEY_w: - return PROJECTM_K_w; - case VKEY_x: - return PROJECTM_K_x; - case VKEY_y: - return PROJECTM_K_y; - case VKEY_z: - return PROJECTM_K_z; - case VKEY_UP: - return PROJECTM_K_UP; - case VKEY_RETURN: - return PROJECTM_K_RETURN; - case VKEY_RIGHT: - return PROJECTM_K_RIGHT; - case VKEY_LEFT: - return PROJECTM_K_LEFT; - case VKEY_DOWN: - return PROJECTM_K_DOWN; - case VKEY_PAGEUP: - return PROJECTM_K_PAGEUP; - case VKEY_PAGEDOWN: - return PROJECTM_K_PAGEDOWN; - - - default: - return PROJECTM_K_NONE; - break; - } - } - -projectMModifier lv2pmModifier( int mod ) { - return mod && VKMOD_LSHIFT; - } diff --git a/src/projectM-engine-backup/menu.cpp b/src/projectM-engine-backup/menu.cpp deleted file mode 100755 index 26c3f7930..000000000 --- a/src/projectM-engine-backup/menu.cpp +++ /dev/null @@ -1,1033 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ - -#include -#include -#include - -#include "projectM.hpp" - -#ifdef MACOS -#include -#else -#include -#endif /** MACOS */ -#include "Common.hpp" -#include "fatal.h" -#include "Param.hpp" -#include - -#include "InitCond.hpp" - -#include "glConsole.h" - -#include "Preset.hpp" -#include "editor.h" -#include "menu.h" -#include "wipemalloc.h" - -#define HIGHLIGHT_COLOR 1 -#define DEFAULT_COLOR 0 -#define LOCKED_COLOR 2 -#if 0 -extern Preset *activePreset; -extern interface_t current_interface; - -menu_t * load_waveform_menu(); -menu_t * load_augmentations_menu(); -menu_t * load_postprocessing_menu(); -menu_t * load_motion_menu(); -int load_main_menu(); - -int edit_per_frame_init(); -int edit_per_frame_eqn(); -int edit_per_pixel_eqn(); -int run_bash_shell(); - - -int print_menu_item(menu_item_t * menu_item); -int switch_bool_param(Param * param); -int adj_float_param(Param * param, adj_t adj); -int adj_int_param(Param * param, adj_t adj); -int pursue_menu_link(menu_link_t * menu_link); - -int append_menu_item(menu_t * menu, menu_item_t * new_menu_item); - -menu_t * new_menu(menu_t * top_menu); -menu_item_t * new_menu_item(int menu_entry_type, menu_entry_t * menu_entry); -menu_entry_t * new_menu_link(char * print_string, menu_t * menu_ptr); - - -menu_entry_t * new_param_adj(char * print_string, Param * param); - -menu_entry_t * new_function_mode(char * print_string, int (*func_ptr)()); - -int free_menu_entry(menu_entry_t * menu_entry); -int free_menu_item(menu_item_t * menu_item); -int free_menu(menu_t * menu); - -int menu_lprint(char * string, int col); -int init_main_menu(); -int destroy_main_menu(); - -int width, height; - -float xmin,ymin,xmax,ymax; - - -CValue saved_init_val; /* backups the value of an initial condition */ - -menu_t * main_menu = NULL; /* Global menu structure */ - -menu_t * active_menu = NULL; /* the currently loaded menu */ - -gl_console_t * menu_console = NULL; - - -display_state menu_display_state = HIDE; - -int initMenu() { - if (MENU_DEBUG) { - printf("initMenu: loading menu:"); - fflush(stdout); - } - - load_main_menu(); - if (MENU_DEBUG) printf(" [done]\n"); - active_menu = main_menu; - return PROJECTM_SUCCESS; -} - -int showMenu() { - - if ((menu_console = glConsoleCreate(80,24, 81, 25, width*.05, height * .90,0)) == NULL) - return PROJECTM_FAILURE; - - glConsoleSetFlags(CONSOLE_FLAG_CURSOR_HIDDEN|CONSOLE_FLAG_SCROLL_WRAP_DOWN|CONSOLE_FLAG_SCROLL_WRAP_RIGHT, menu_console); - - active_menu = main_menu; - main_menu->start_item = main_menu->selected_item; - menu_display_state = SHOW; - return PROJECTM_SUCCESS; -} - -int hideMenu() { - menu_display_state = HIDE; - active_menu = main_menu; - active_menu->selected_item = active_menu->start_item; - - if (active_menu->locked_item != NULL) { - // if (active_menu->locked_item->menu_entry_type == PARAM_ADJ_TYPE) - // active_menu->locked_item->menu_entry->param_adj.param->init_val = saved_init_val; - active_menu->locked_item = NULL; - } - - glConsoleDestroy(menu_console); - menu_console = NULL; - - return PROJECTM_SUCCESS; -} - -int load_main_menu() { - - menu_t * waveform_menu; - menu_t * augmentations_menu; - menu_t * motion_menu; - menu_t * postprocessing_menu; - - if ((main_menu = new_menu(NULL)) == NULL) - return PROJECTM_OUTOFMEM_ERROR; - - if (MENU_DEBUG) { printf(" [waveform:"); fflush(stdout); } - waveform_menu = load_waveform_menu(); - - if (waveform_menu == NULL) { - free_menu(main_menu); - if (MENU_DEBUG) { printf(" failure]\n"); fflush(stdout); } - return PROJECTM_FAILURE; - } - - if (MENU_DEBUG) { printf(" success]"); fflush(stdout); } - - if (MENU_DEBUG) { printf(" [augmentations:"); fflush(stdout); } - augmentations_menu = load_augmentations_menu(); - - if (augmentations_menu == NULL) { - free_menu(main_menu); - free_menu(waveform_menu); - if (MENU_DEBUG) { printf(" failure]\n"); fflush(stdout); } - return PROJECTM_FAILURE; - } - - if (MENU_DEBUG) { printf(" success]"); fflush(stdout); } - - if (MENU_DEBUG) { printf(" [postprocessing:"); fflush(stdout); } - postprocessing_menu = load_postprocessing_menu(); - - if (postprocessing_menu == NULL) { - free_menu(main_menu); - free_menu(waveform_menu); - free_menu(augmentations_menu); - if (MENU_DEBUG) { printf(" failure]\n"); fflush(stdout); } - return PROJECTM_FAILURE; - } - - if (MENU_DEBUG) { printf(" success]"); fflush(stdout); } - - if (MENU_DEBUG) { printf(" [motion:"); fflush(stdout); } - motion_menu = load_motion_menu(); - - if (motion_menu == NULL) { - free_menu(main_menu); - free_menu(waveform_menu); - free_menu(augmentations_menu); - free_menu(postprocessing_menu); - if (MENU_DEBUG) { printf(" failure]\n"); fflush(stdout); } - return PROJECTM_FAILURE; - } - - if (MENU_DEBUG) { printf(" success]"); fflush(stdout); } - - append_menu_item(main_menu, new_menu_item(MENU_LINK_TYPE, new_menu_link("--waveform", waveform_menu))); - append_menu_item(main_menu, new_menu_item(MENU_LINK_TYPE, new_menu_link("--augmentations", augmentations_menu))); - append_menu_item(main_menu, new_menu_item(MENU_LINK_TYPE, new_menu_link("--motion", motion_menu))); - append_menu_item(main_menu, new_menu_item(MENU_LINK_TYPE, new_menu_link("--post processing, global effects", postprocessing_menu))); - - append_menu_item(main_menu, new_menu_item(FUNCTION_MODE_TYPE, new_function_mode("edit per_frame equations", edit_per_frame_eqn))); - append_menu_item(main_menu, new_menu_item(FUNCTION_MODE_TYPE, new_function_mode("edit per_pixel equations", edit_per_pixel_eqn))); - append_menu_item(main_menu, new_menu_item(FUNCTION_MODE_TYPE, new_function_mode("edit preset initialization code", edit_per_frame_init))); - //append_menu_item(main_menu, new_menu_item(FUNCTION_MODE_TYPE, new_function_mode("bash shell", run_bash_shell))); - - main_menu->selected_item = main_menu->start_item; - - return PROJECTM_SUCCESS; -} - - -menu_t * load_waveform_menu() { - menu_t * waveform_menu; - - if ((waveform_menu = new_menu(main_menu)) == NULL) - return NULL; - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("wave type", ParamUtils::find("nWaveMode", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("size", ParamUtils::find("fWaveScale", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("smoothing", ParamUtils::find("fWaveSmoothing", activePreset, P_CREATE)))); - - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("mystery parameter", ParamUtils::find("wave_mystery", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("opacity", ParamUtils::find("fWaveAlpha", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("position (x)", ParamUtils::find("wave_x", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("position (y)", ParamUtils::find("wave_y", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("color (red)", ParamUtils::find("wave_r", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("color (green)", ParamUtils::find("wave_g", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("color (blue)", ParamUtils::find("wave_b", activePreset, P_CREATE)))); - - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("use dots", ParamUtils::find("bWaveDots", activePreset, P_CREATE)))); - - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("draw thick", ParamUtils::find("bWaveThick", activePreset, P_CREATE)))); - - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("modulate opacity by volume", ParamUtils::find("bModWaveAlphaByVolume", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("mod. lower threshold", ParamUtils::find("fModWaveAlphaStart", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("mod. uppper threshold", ParamUtils::find("fModWaveAlphaEnd", activePreset, P_CREATE)))); - - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("additive drawing", ParamUtils::find("bAdditiveWaves", activePreset, P_CREATE)))); - append_menu_item(waveform_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("color brightening", ParamUtils::find("bMaximizeWaveColor", activePreset, P_CREATE)))); - waveform_menu->selected_item = waveform_menu->start_item; - - return waveform_menu; -} - - -menu_t * load_augmentations_menu() { - menu_t * augmentations_menu; - - if ((augmentations_menu = new_menu(main_menu)) == NULL) - return NULL; - - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("outer border thickness", ParamUtils::find("ob_size", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" color (red)", ParamUtils::find("ob_r", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" color (green)", ParamUtils::find("ob_g", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" color (blue)", ParamUtils::find("ob_b", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" opacity", ParamUtils::find("ob_a", activePreset, P_CREATE)))); - - - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("inner border thickness", ParamUtils::find("ib_size", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" color (red)", ParamUtils::find("ib_r", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" color (green)", ParamUtils::find("ib_g", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" color (blue)", ParamUtils::find("ib_b", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj(" opacity", ParamUtils::find("ib_a", activePreset, P_CREATE)))); - - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("motion vector opacity", ParamUtils::find("mv_a", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("num. mot. vector (X)", ParamUtils::find("mv_x", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("num. mot. vector (Y)", ParamUtils::find("mv_y", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("offset (X)", ParamUtils::find("mv_dx", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("offset (Y)", ParamUtils::find("mv_dy", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("trail length", ParamUtils::find("mv_l", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("color (red)", ParamUtils::find("mv_r", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("color (green)", ParamUtils::find("mv_g", activePreset, P_CREATE)))); - append_menu_item(augmentations_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("color (blue)", ParamUtils::find("mv_b", activePreset, P_CREATE)))); - - - augmentations_menu->selected_item = augmentations_menu->start_item; - - return augmentations_menu; -} - -/* Loads the motion menu, a sub menu of the main menu */ -menu_t * load_motion_menu() { - menu_t * motion_menu; - - if ((motion_menu = new_menu(main_menu)) == NULL) - return NULL; - - - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("zoom amount", ParamUtils::find("zoom", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("zoom exponent", ParamUtils::find("zoomexp", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("rotation amount", ParamUtils::find("rot", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("rot., center of (X)", ParamUtils::find("cx", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("rot., center of (Y)", ParamUtils::find("cy", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("translation (X)", ParamUtils::find("dx", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("translation (Y)", ParamUtils::find("dy", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("scaling (X)", ParamUtils::find("sx", activePreset, P_CREATE)))); - append_menu_item(motion_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("scaling (Y)", ParamUtils::find("sy", activePreset, P_CREATE)))); - - motion_menu->selected_item = motion_menu->start_item; - - return motion_menu; -} - -/* Loads the post processing menu, a sub menu of the main, menu */ -menu_t * load_postprocessing_menu() { - menu_t * postprocessing_menu; - if ((postprocessing_menu = new_menu(main_menu)) == NULL) - return NULL; - - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("sustain level", ParamUtils::find("fDecay", activePreset, P_CREATE)))); - - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("darken center", ParamUtils::find("bDarkenCenter", activePreset, P_CREATE)))); - - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("gamma adjustment", ParamUtils::find("fDecay", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("video echo: alpha", ParamUtils::find("fVideoEchoAlpha", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("video echo: scale", ParamUtils::find("fVideoEchoZoom", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("video echo: orientation", ParamUtils::find("nVideoEchoOrientation", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("texture wrapping", ParamUtils::find("bTexWrap", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("darken filter", ParamUtils::find("bDarken", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("brighten filter", ParamUtils::find("bBrighten", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("solarize filter", ParamUtils::find("bSolarize", activePreset, P_CREATE)))); - append_menu_item(postprocessing_menu, new_menu_item(PARAM_ADJ_TYPE, new_param_adj("invert filter", ParamUtils::find("bInvert", activePreset, P_CREATE)))); - - - postprocessing_menu->selected_item = postprocessing_menu->start_item; - - return postprocessing_menu; -} - -int refreshMenu() { - - menu_item_t * menu_item; - - if (menu_display_state == HIDE) { - return PROJECTM_SUCCESS; - } - - if (menu_display_state == SPECIAL) { - glConsoleDraw(menu_console); - glConsoleClearBuffer(menu_console); - return PROJECTM_SUCCESS; - } - - menu_item = active_menu->start_item; - - glConsoleClearBuffer(menu_console); - - while (menu_item) { - print_menu_item(menu_item); - menu_item = menu_item->down; - } - - glConsoleDraw(menu_console); - return PROJECTM_SUCCESS; -} - -int destroyMenu() { - - if (main_menu != NULL) - free_menu(main_menu); - - main_menu = NULL; - return PROJECTM_SUCCESS; -} - -/* Prints a line to the opengl screen, second entry is the color, work in progress */ -int menu_lprint(char * string, int col) { - - if (active_menu == NULL) - return PROJECTM_FAILURE; - - if (string == NULL) - return PROJECTM_FAILURE; - - if (col == HIGHLIGHT_COLOR) { - glConsoleSetBGColor(CONSOLE_WHITE, menu_console); - glConsoleSetFGColor(CONSOLE_BLUE, menu_console); - } - else if (col == LOCKED_COLOR) { - glConsoleSetBGColor(CONSOLE_WHITE, menu_console); - glConsoleSetFGColor(CONSOLE_RED, menu_console); - } - else { - glConsoleSetBGColor(CONSOLE_BLACK, menu_console); - glConsoleSetFGColor(CONSOLE_WHITE, menu_console); - } - - glConsolePrintString(string, menu_console); - glConsolePrintString("\n", menu_console); - return PROJECTM_SUCCESS; -} - - - -int print_menu_item(menu_item_t * menu_item) { - - param_adj_t param_adj; - char string[MAX_TOKEN_SIZE]; - int col; - InitCond * init_cond; - - if (menu_item == NULL) - return PROJECTM_FAILURE; - if (active_menu == NULL) - return PROJECTM_FAILURE; - - if (active_menu->locked_item == menu_item) - col = LOCKED_COLOR; - else if (active_menu->selected_item == menu_item) - col = HIGHLIGHT_COLOR; - else - col = DEFAULT_COLOR; - switch (menu_item->menu_entry_type) { - - case PARAM_ADJ_TYPE: - param_adj = menu_item->menu_entry->param_adj; - - switch(param_adj.param->type) { - - case P_TYPE_BOOL: - - if ((init_cond = projectM::activePreset->get_init_cond(param_adj.param)) == NULL) - sprintf(string, "%s ?", param_adj.print_string); - else if (init_cond->init_val.bool_val) - sprintf(string, "%s [ON]", param_adj.print_string); - else - sprintf(string, "%s [OFF]", param_adj.print_string); - break; - case P_TYPE_INT: - if ((init_cond = projectM::activePreset->get_init_cond(param_adj.param)) == NULL) - sprintf(string, "%s ?", param_adj.print_string); - else - sprintf(string, "%s %d", param_adj.print_string, init_cond->init_val.int_val); - break; - case P_TYPE_DOUBLE: - if ((init_cond = projectM::activePreset->get_init_cond(param_adj.param)) == NULL) - sprintf(string, "%s ?", param_adj.print_string); - else - sprintf(string, "%s %f", param_adj.print_string, init_cond->init_val.float_val); - break; - - default: /* unknown paramater type */ - return PROJECTM_FAILURE; - } - return menu_lprint(string, col); - case FUNCTION_MODE_TYPE: - return menu_lprint(menu_item->menu_entry->function_mode.print_string, col); - case MENU_LINK_TYPE: - return menu_lprint(menu_item->menu_entry->menu_link.print_string, col); - default: - if (MENU_DEBUG) printf("print_menu_item: invalid menu entry type, val = %d\n", - menu_item->menu_entry_type); - return PROJECTM_FAILURE; - } - - return PROJECTM_SUCCESS; -} - -/* switchMenuState: changes to another menu item according to the passed direction */ -int switchMenuState(dir_t dir) { - - menu_item_t * new_menu_item; - param_adj_t param_adj; - InitCond * init_cond; - - if (active_menu == NULL) - return PROJECTM_FAILURE; - - /* Case on the direction of the key press */ - switch (dir) { - - case PAGEUP: - if(active_menu->locked_item != NULL) { - if (active_menu->locked_item->menu_entry_type == PARAM_ADJ_TYPE) - return adj_float_param(active_menu->locked_item->menu_entry->param_adj.param, BIG_INC); - } - - /* Force to top of menu */ - active_menu->selected_item = active_menu->start_item; - return PROJECTM_SUCCESS; - case PAGEDOWN: - if(active_menu->locked_item != NULL) { - if (active_menu->locked_item->menu_entry_type == PARAM_ADJ_TYPE) - return adj_float_param(active_menu->locked_item->menu_entry->param_adj.param, BIG_DEC); - } - - /* Force to bottom of menu */ - while((new_menu_item = active_menu->selected_item->down) != NULL) - active_menu->selected_item = new_menu_item; - return PROJECTM_SUCCESS; - - case UP: - if(active_menu->locked_item != NULL) { - if (active_menu->locked_item->menu_entry_type == PARAM_ADJ_TYPE) - return adj_float_param(active_menu->locked_item->menu_entry->param_adj.param, SMALL_INC); - } - - /* Is this the first item of the menu ? */ - if ((new_menu_item = active_menu->selected_item->up) == NULL) - return PROJECTM_SUCCESS; - active_menu->selected_item = new_menu_item; - return PROJECTM_SUCCESS; - case DOWN: - if(active_menu->locked_item != NULL) { - if (active_menu->locked_item->menu_entry_type == PARAM_ADJ_TYPE) - return adj_float_param(active_menu->locked_item->menu_entry->param_adj.param, SMALL_DEC); - } - - /* Is this the last item of the menu ? */ - if ((new_menu_item = active_menu->selected_item->down) == NULL) - return PROJECTM_SUCCESS; - active_menu->selected_item = new_menu_item; - return PROJECTM_SUCCESS; - case LEFT: - /* Left key unlocks the highlighted item */ - if (active_menu->locked_item != NULL) { - /* The left arrow cancels the initial condition adjustment */ - if (active_menu->locked_item->menu_entry_type == PARAM_ADJ_TYPE) { - //active_menu->locked_item->menu_entry->param_adj.param->init_val = saved_init_val; - } - active_menu->locked_item = NULL; - return PROJECTM_SUCCESS; - } - /* Otherwise go up a menu if it isn't the top menu */ - if (active_menu->top_menu == NULL) - return PROJECTM_SUCCESS; - active_menu = active_menu->top_menu; - return PROJECTM_SUCCESS; - case RIGHT: - switch (active_menu->selected_item->menu_entry_type) { - case MENU_LINK_TYPE: - return pursue_menu_link(&active_menu->selected_item->menu_entry->menu_link); - case PARAM_ADJ_TYPE: - param_adj = active_menu->selected_item->menu_entry->param_adj; - - - - if (active_menu->locked_item == NULL) { - - if ((init_cond = projectM::activePreset->get_init_cond(param_adj.param)) == NULL) - return PROJECTM_FAILURE; - - - /* Save previous initial condition value */ - //saved_init_val = init_cond->init_val; - - /* If a bool parameter, just switch its value and quit */ - if (param_adj.param->type == P_TYPE_BOOL) { - init_cond->init_val.bool_val = !init_cond->init_val.bool_val; - return PROJECTM_SUCCESS; - } - - /* Otherwise, lock this parameter so the user can adjust it */ - active_menu->locked_item = active_menu->selected_item; - - } - - /* Unlock the item, but keep the changed initial value intact */ - else { - active_menu->locked_item = NULL; - } - - break; - case FUNCTION_MODE_TYPE: - return active_menu->selected_item->menu_entry->function_mode.func_ptr(); - default: - return PROJECTM_FAILURE; - } - default: - return PROJECTM_FAILURE; -} - -return PROJECTM_SUCCESS; -} - -/* Creates a new menu */ -menu_t * new_menu(menu_t * top_menu) { - - menu_t * menu; - - if ((menu = (menu_t*)wipemalloc(sizeof(menu_t))) == NULL) - return NULL; - - menu->top_menu = top_menu; - menu->start_item = menu->selected_item = NULL; - menu->locked_item = NULL; - return menu; -} - -/* Frees a menu */ -int free_menu(menu_t * menu) { - menu_item_t * menu_item, * backup; - - if (menu == NULL) - return PROJECTM_SUCCESS; - - menu_item = menu->start_item; - - /* Now we free every entry in this menu */ - while (menu_item) { - backup = menu_item->down; - - /* If a menu link, free the sub menu it points to */ - if (menu_item->menu_entry_type == MENU_LINK_TYPE) { - free_menu(menu_item->menu_entry->menu_link.sub_menu); - } - - /* Now free the menu item */ - free_menu_item(menu_item); - - /* Set menu item to the next item in the list */ - menu_item = backup; - } - - /* Finally, we free the menu struct itself */ - free(menu); - menu = NULL; - - /* Finished, return success */ - return PROJECTM_SUCCESS; -} - -/* Creates a new menu link type */ -menu_entry_t * new_menu_link(char * print_string, menu_t * menu_ptr) { - - menu_entry_t * menu_entry; - menu_link_t menu_link; - - /* Argument Checks */ - if (print_string == NULL) - return NULL; - if (menu_ptr == NULL) - return NULL; - - - /* Allocate memory for the menu entry */ - if ((menu_entry = (menu_entry_t*)wipemalloc(sizeof(menu_entry_t))) == NULL) - return NULL; - - - /* Copy the string parameter */ - memset(menu_link.print_string, 0, MAX_TOKEN_SIZE); - strncpy(menu_link.print_string, print_string, MAX_TOKEN_SIZE); - - menu_link.sub_menu = menu_ptr; - - menu_entry->menu_link = menu_link; - - return menu_entry; -} - - -/* Creates a new parameter adjustment entry */ -menu_entry_t * new_param_adj(char * print_string, Param * param) { - - menu_entry_t * menu_entry; - param_adj_t param_adj; - - /* Argument Checks */ - if (print_string == NULL) - return NULL; - - if (param == NULL) { - if (MENU_DEBUG) printf("new_param_adj: passed a null parameter!\n"); - return NULL; - } - - /* Allocate memory for the menu entry */ - if ((menu_entry = (menu_entry_t*)wipemalloc(sizeof(menu_entry_t))) == NULL) - return NULL; - - /* Copy the string parameter */ - memset(param_adj.print_string, 0, MAX_TOKEN_SIZE); - strncpy(param_adj.print_string, print_string, MAX_TOKEN_SIZE); - - param_adj.param = param; - menu_entry->param_adj = param_adj; - - return menu_entry; -} - -/* Appends a menu item */ -int append_menu_item(menu_t * menu, menu_item_t * new_menu_item) { - - menu_item_t * menu_item; - - /* Argument checks */ - if (menu == NULL) - return PROJECTM_FAILURE; - - if (new_menu_item == NULL) - return PROJECTM_FAILURE; - - - /* Menu is empty, insert here */ - if (menu->start_item == NULL) { - menu->start_item = new_menu_item; - new_menu_item->up = NULL; - return PROJECTM_SUCCESS; - } - - menu_item = menu->start_item; - - /* Traverse down the menu */ - while (menu_item->down) { - menu_item = menu_item->down; - } - - /* Insert the item at the end */ - menu_item->down = new_menu_item; - new_menu_item->up = menu_item; - - return PROJECTM_SUCCESS; - -} - -/* Creates a new menu item, up and down entries are null by default */ -menu_item_t * new_menu_item(int menu_entry_type, menu_entry_t * menu_entry) { - - menu_item_t * menu_item; - - /* Argument check */ - if (menu_entry == NULL) - return NULL; - - /* Out of memory check */ - if ((menu_item = (menu_item_t*)wipemalloc(sizeof(menu_item_t))) == NULL) { - return NULL; - } - - menu_item->menu_entry_type = menu_entry_type; - menu_item->menu_entry = menu_entry; - menu_item->up = NULL; - menu_item->down = NULL; - - return menu_item; -} - -/* Frees a menu item */ -int free_menu_item(menu_item_t * menu_item) { - - if (menu_item == NULL) - return PROJECTM_OK; - - free(menu_item->menu_entry); - free(menu_item); - - menu_item = NULL; - - return PROJECTM_SUCCESS; -} - - -/* Creates a new editor mode */ -menu_entry_t * new_function_mode(char * print_string, int (*func_ptr)()) { - - menu_entry_t * menu_entry; - function_mode_t function_mode; - - /* Argument Checks */ - if (print_string == NULL) - return NULL; - - /* Allocate memory for the menu entry */ - if ((menu_entry = (menu_entry_t*)wipemalloc(sizeof(menu_entry_t))) == NULL) - return NULL; - - - /* Copy the string parameter */ - memset(function_mode.print_string, 0, MAX_TOKEN_SIZE); - strncpy(function_mode.print_string, print_string, MAX_TOKEN_SIZE); - - function_mode.func_ptr = func_ptr; - menu_entry->function_mode = function_mode; - - return menu_entry; -} - - -/* Pursues a link in a menu */ -int pursue_menu_link(menu_link_t * menu_link) { - - if (menu_link == NULL) - return PROJECTM_FAILURE; - - active_menu = menu_link->sub_menu; - - return PROJECTM_SUCCESS; -} - - -int edit_per_pixel_eqn() { - hideMenu(); - current_interface = EDITOR_INTERFACE; -// loadEditor(activePreset->per_pixel_eqn_string_buffer,(void (*)()) reloadPerPixel, 80, 24, 140, 60, 0, 0); - return PROJECTM_SUCCESS; -} - -int edit_per_frame_eqn() { - hideMenu(); - current_interface = EDITOR_INTERFACE; -// loadEditor(activePreset->per_frame_eqn_string_buffer, (void (*)())reloadPerFrame,80,24,140,60,0,0); - return PROJECTM_SUCCESS; -} - -int edit_per_frame_init() { - hideMenu(); - current_interface = EDITOR_INTERFACE; -// loadEditor(activePreset->per_frame_init_eqn_string_buffer,(void (*)()) reloadPerFrameInit,80,24,140,60,0,0); - return PROJECTM_SUCCESS; -} - - -int run_bash_shell() { - - printf("setting menu state to special\n"); - menu_display_state = SPECIAL; - // glConsoleStartShell(menu_console); - - //menu_display_state = SHOW; - - return PROJECTM_SUCCESS; -} - - - -/* Adjust a float parameter */ -int adj_float_param(Param * param, adj_t adj) { - - float inc_val; - InitCond * init_cond = NULL; - - if (param == NULL) - return PROJECTM_FAILURE; - - if (param->type == P_TYPE_INT) - return (adj_int_param(param, adj)); - - if ((init_cond = (InitCond*)projectM::activePreset->init_cond_tree->splay_find(param->name)) == NULL) - return PROJECTM_FAILURE; - - switch (adj) { - - case VERY_SMALL_INC: - inc_val = .001; - break; - case SMALL_INC: - inc_val = .01; - break; - case BIG_INC: - inc_val = .1; - break; - case VERY_BIG_INC: - inc_val = 1.0; - break; - case VERY_SMALL_DEC: - inc_val = -.001; - break; - case SMALL_DEC: - inc_val = -.01; - break; - case BIG_DEC: - inc_val = -0.1; - break; - case VERY_BIG_DEC: - inc_val = -1.0; - break; - - default: - return PROJECTM_FAILURE; - } - - /* Beyond upper bounds, normalize to maximum value */ - if ((init_cond->init_val.float_val + inc_val) > param->upper_bound.float_val) - init_cond->init_val.float_val = param->upper_bound.float_val; - - else if ((init_cond->init_val.float_val + inc_val) < param->lower_bound.float_val) - init_cond->init_val.float_val = param->lower_bound.float_val; - - else - init_cond->init_val.float_val += inc_val; - - return PROJECTM_SUCCESS; -} - -/* Adjust an integer parameter */ -int adj_int_param(Param * param, adj_t adj) { - - int inc_val; - InitCond * init_cond = NULL; - - if (param == NULL) - return PROJECTM_FAILURE; - - if ((init_cond = (InitCond*)activePreset->init_cond_tree->splay_find(param->name)) == NULL) - return PROJECTM_FAILURE; - - switch (adj) { - - - case VERY_SMALL_INC: - inc_val = 1; - break; - case SMALL_INC: - inc_val = 1; - break; - case BIG_INC: - inc_val = 1; - break; - case VERY_BIG_INC: - inc_val = 5; - break; - - case VERY_SMALL_DEC: - inc_val = -1; - break; - case SMALL_DEC: - inc_val = -1; - break; - case BIG_DEC: - inc_val = -1; - break; - case VERY_BIG_DEC: - inc_val = -5; - break; - - default: - return PROJECTM_FAILURE; - } - - /* Beyond upper bounds, normalize to maximum value */ - if ((init_cond->init_val.int_val + inc_val) > param->upper_bound.int_val) - init_cond->init_val.int_val = param->upper_bound.int_val; - - /* Below lower bounds, normalize to lowest value */ - else if ((init_cond->init_val.int_val + inc_val) < param->lower_bound.int_val) - init_cond->init_val.int_val = param->lower_bound.int_val; - - else - init_cond->init_val.int_val += inc_val; - - return PROJECTM_SUCCESS; -} - -void menu_key_handler( projectMEvent event, projectMKeycode key ) { - - switch( event ) { - case PROJECTM_KEYDOWN: - switch(key) - { - case PROJECTM_K_f: - - if (projectM::currentEngine->fullscreen==1) - {projectM::currentEngine->renderer->reset(projectM::currentEngine->wvw,projectM::currentEngine->wvh); -projectM::currentEngine->fullscreen=0;} - else{projectM::currentEngine->renderer->reset(projectM::currentEngine->fvw,projectM::currentEngine->fvh); -projectM::currentEngine->fullscreen=1; -} - -// init_display(projectM::currentEngine->vw,projectM::currentEngine->vh,projectM::currentEngine->fullscreen); - - - break; - case PROJECTM_K_n: - //projectM::currentEngine->switchPreset(ALPHA_NEXT, HARD_CUT); - break; - case PROJECTM_K_r: - //projectM::currentEngine->switchPreset(RANDOM_NEXT, HARD_CUT); - break; - case PROJECTM_K_p: - //projectM::currentEngine->switchPreset(ALPHA_PREVIOUS, HARD_CUT); - break; - case PROJECTM_K_a: - break; - case PROJECTM_K_z: - break; - case PROJECTM_K_0: - //nWaveMode=0; - break; - case PROJECTM_K_6: - //nWaveMode=6; - break; - case PROJECTM_K_7: - //nWaveMode=7; - break; - case PROJECTM_K_UP: - switchMenuState(UP); - break; - case PROJECTM_K_RETURN: - case PROJECTM_K_RIGHT: - switchMenuState(RIGHT); - break; - case PROJECTM_K_LEFT: - switchMenuState(LEFT); - break; - case PROJECTM_K_DOWN: - switchMenuState(DOWN); - break; - case PROJECTM_K_PAGEUP: - switchMenuState(PAGEUP); - break; - case PROJECTM_K_PAGEDOWN: - switchMenuState(PAGEDOWN); - break; - case PROJECTM_K_ESCAPE: - case PROJECTM_K_m: - hideMenu(); - current_interface = DEFAULT_INTERFACE; - break; - case PROJECTM_K_t: - break; - default: - break; - } - } - - - - -} -#endif diff --git a/src/projectM-engine-backup/menu.h b/src/projectM-engine-backup/menu.h deleted file mode 100755 index 22f020e69..000000000 --- a/src/projectM-engine-backup/menu.h +++ /dev/null @@ -1,118 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id$ - * - * - * - * $Log$ - */ - -#ifndef _MENU_H -#define _MENU_H - -#include "event.h" -#include "Common.hpp" -#include "Param.hpp" - -#define MENU_DEBUG 0 - -#define PARAM_ADJ_TYPE 0 -#define MENU_LINK_TYPE 1 -#define FUNCTION_MODE_TYPE 2 - -typedef struct MENU_LINK_T { - char print_string[MAX_TOKEN_SIZE]; - struct MENU_T * sub_menu; -} menu_link_t; - -typedef struct PARAM_ADJ_T { - char print_string[MAX_TOKEN_SIZE]; - Param * param; -} param_adj_t; - -typedef struct FUNCTION_MODE_T { - char print_string[MAX_TOKEN_SIZE]; - int (*func_ptr)(); -} function_mode_t; - -typedef union MENU_ENTRY_T { - menu_link_t menu_link; - param_adj_t param_adj; - function_mode_t function_mode; -} menu_entry_t; - - -typedef struct MENU_ITEM_T { - int menu_entry_type; - menu_entry_t * menu_entry; - struct MENU_ITEM_T * up; - struct MENU_ITEM_T * down; -} menu_item_t; - - -typedef struct MENU_T { - menu_item_t * selected_item; - menu_item_t * start_item; - menu_item_t * locked_item; - struct MENU_T * top_menu; -} menu_t; - -/* Direction types */ -typedef enum { - UP, - DOWN, - LEFT, - RIGHT, - PAGEUP, - PAGEDOWN -} dir_t; - -/* Adjustment types */ -typedef enum { - BIG_INC, - BIG_DEC, - SMALL_INC, - SMALL_DEC, - VERY_BIG_INC, - VERY_BIG_DEC, - VERY_SMALL_INC, - VERY_SMALL_DEC -} adj_t; - -typedef enum { - SHOW, - HIDE, - SPECIAL -} display_state; - - - -int switchMenuState(dir_t dir); - -int initMenu(); -int refreshMenu(); -int clearMenu(); -int showMenu(); -int hideMenu(); -void menu_key_handler( projectM *PM, projectMEvent event, projectMKeycode key ); - -#endif /** !_MENU_H */ diff --git a/src/projectM-engine-backup/presets b/src/projectM-engine-backup/presets deleted file mode 120000 index 840871fb9..000000000 --- a/src/projectM-engine-backup/presets +++ /dev/null @@ -1 +0,0 @@ -../../presets \ No newline at end of file diff --git a/src/projectM-engine-backup/projectM.cpp b/src/projectM-engine-backup/projectM.cpp deleted file mode 100755 index 22a177274..000000000 --- a/src/projectM-engine-backup/projectM.cpp +++ /dev/null @@ -1,704 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -#include "wipemalloc.h" -#include "BuiltinFuncs.hpp" -#include "fatal.h" -#include "Common.hpp" -#include "compare.h" -#ifdef WIN32 -#include "win32-dirent.h" -#endif - -#include "timer.h" -#include -#ifdef LINUX -#include "time.h" -#endif - -//#include -#include "projectM.hpp" -#include "BeatDetect.hpp" -#include "Eval.hpp" -#include "Param.hpp" -#include "Parser.hpp" -#include "Preset.hpp" -#include "PerPixelEqn.hpp" -//#include "menu.h" -#include "PCM.hpp" //Sound data handler (buffering, FFT, etc.) -#include "CustomWave.hpp" -#include "CustomShape.hpp" -#include -#include "Renderer.hpp" -#include "PresetChooser.hpp" - -#ifdef LINUX -const std::string projectM::PROJECTM_PRESET_PATH("/usr/share/projectM/presets/"); -#endif - -#ifdef MACOS -const std::string projectM::PROJECTM_PRESET_PATH("/usr/share/projectM/presets/"); -#endif - - -#ifdef WIN32 -const std::string projectM::PROJECTM_PRESET_PATH("C:\\Program Files\\ProjectM\\presets"); -#endif - -/** Stash current engine */ -projectM *projectM::currentEngine = NULL; - -/** Static variable initialization involving the render. */ -/// @bug These probably shouldn't be static! -RenderTarget * projectM::renderTarget = NULL; -Renderer * projectM::renderer = NULL; - - -DLLEXPORT projectM::projectM() { - beatDetect = NULL; -} - - -DLLEXPORT void projectM::renderFrame() { - -#ifdef DEBUG - char fname[1024]; - FILE *f = NULL; - int index = 0; - int x, y; -#endif - -// printf("Start of loop at %d\n",timestart); - - mspf=(int)(1000.0/(float)presetInputs.fps); //milliseconds per frame - - -#ifndef WIN32 - presetInputs.time = getTicks( &startTime ) * 0.001; -#else - presetInputs.time = getTicks( startTime ) * 0.001; -#endif /** !WIN32 */ - - presetInputs.frame++; //number of frames for current preset - presetInputs.progress= presetInputs.frame/(float)avgtime; - DWRITE( "frame: %d\ttime: %f\tprogress: %f\tavgtime: %d\tang: %f\trot: %f\n", - this->presetInputs.frame, presetInputs.time, this->presetInputs.progress, this->avgtime, this->presetInputs.ang_per_pixel, - this->presetOutputs.rot ); - if (presetInputs.progress>1.0) presetInputs.progress=1.0; - -// printf("start:%d at:%d min:%d stop:%d on:%d %d\n",startframe, frame frame-startframe,avgtime, noSwitch,progress); - presetInputs.ResetMesh(); - - assert(m_activePreset.get()); - m_activePreset->evaluateFrame(); - - -// printf("%f %d\n",Time,frame); - - - beatDetect->detectFromSamples(); - DWRITE( "=== vol: %f\tbass: %f\tmid: %f\ttreb: %f ===\n", - beatDetect->vol,beatDetect->bass,beatDetect->mid,beatDetect->treb); - DWRITE( "=== bass_att: %f ===\n", - beatDetect->bass_att ); - - if (renderer->noSwitch==0) { - nohard--; - if ((beatDetect->bass-beatDetect->bass_old>beatDetect->beat_sensitivity || - avgtime ) && nohard<0) { -// printf("%f %d %d\n", beatDetect->bass-beatDetect->bass_old,this->frame,this->avgtime); -// switchPreset(RANDOM_NEXT, HARD_CUT); - nohard=presetInputs.fps*5; - } - } - - count++; - - renderer->RenderFrame(&presetOutputs, &presetInputs); - -#ifndef WIN32 - /** Frame-rate limiter */ - /** Compute once per preset */ - if (this->count%100==0) { - this->renderer->realfps=100.0/((getTicks(&this->startTime)-this->fpsstart)/1000); - this->fpsstart=getTicks(&this->startTime); - } - - int timediff = getTicks(&this->startTime)-this->timestart; - - if ( timediff < this->mspf) { - // printf("%s:",this->mspf-timediff); - int sleepTime = (unsigned int)( this->mspf-timediff ) * 1000; - DWRITE( "usleep: %d\n", sleepTime ); - if ( sleepTime > 0 && sleepTime < 100000 ) { - if ( usleep( sleepTime ) != 0 ) {} - } - } - this->timestart=getTicks(&this->startTime); -#endif /** !WIN32 */ - - DWRITE( "exiting renderFrame()\n" ); -} - -DLLEXPORT void projectM::projectM_reset() { - - DWRITE( "projectM_reset(): in\n" ); - - /// @bug it's very possible this is a hack - m_activePreset = std::auto_ptr(0); - - this->presetURL = NULL; - this->fontURL = NULL; - - /** Default variable settings */ - this->hasInit = 0; - - this->pcmframes = 1; - this->freqframes = 0; - - - - this->fvw = 800; - this->fvh = 600; - this->wvw = 512; - this->wvh = 512; - this->fullscreen = 0; - - /** Frames per preset */ - this->avgtime = 500; - - - - /** More other stuff */ - this->mspf = 0; - this->timed = 0; - this->timestart = 0; - this->nohard = 0; - this->count = 0; - - this->fpsstart = 0; - - projectM_resetengine(); -} - -DLLEXPORT void projectM::projectM_init(int gx, int gy, int fps, int texsize, int width, int height) { - - - - /** Initialise engine variables */ - - - projectM_initengine(); - presetInputs.Initialize(gx, gy); - presetOutputs.Initialize(gx, gy); - - DWRITE("projectM plugin: Initializing\n"); - - /** Initialise start time */ -#ifndef WIN32 - gettimeofday(&this->startTime, NULL); -#else - startTime = GetTickCount(); -#endif /** !WIN32 */ - - /** Nullify frame stash */ - fbuffer = NULL; - - /** Initialise per-pixel matrix calculations */ - - - presetInputs.fps = fps; - - /** We need to initialise this before the builtin param db otherwise bass/mid etc won't bind correctly */ - beatDetect = new BeatDetect(); - - /* Preset loading function */ - initPresetTools(); - - /* Load default preset directory */ -#ifdef MACOS2 - /** Probe the bundle for info */ - CFBundleRef bundle = CFBundleGetMainBundle(); - char msg[1024]; - sprintf( msg, "bundle: %X\n", bundle ); - DWRITE( msg ); - if ( bundle != NULL ) { - CFPlugInRef pluginRef = CFBundleGetPlugIn( bundle ); - if ( pluginRef != NULL ) { - DWRITE( "located plugin ref\n" ); - } else { - DWRITE( "failed to find plugin ref\n" ); - } - - CFURLRef bundleURL = CFBundleCopyBundleURL( bundle ); - if ( bundleURL == NULL ) { - DWRITE( "bundleURL failed\n" ); - } else { - DWRITE( "bundleURL OK\n" ); - } - char *bundleName = - (char *)CFStringGetCStringPtr( CFURLGetString( bundleURL ), kCFStringEncodingMacRoman ); - DWRITE( "bundleURL: %s\n", bundleName ); - - presetURL = CFBundleCopyResourceURL( bundle, purl, NULL, NULL ); - if ( presetURL != NULL ) { - this->presetURL = (char *)CFStringGetCStringPtr( CFURLCopyPath( presetURL ), kCFStringEncodingMacRoman); - sprintf( msg, "Preset: %s\n", presetURL ); - DWRITE( msg ); - printf( msg ); - - /** Stash the short preset name */ - - } else { - DWRITE( "Failed to probe 'presets' bundle ref\n" ); - this->presetURL = NULL; - } - - fontURL = CFBundleCopyResourceURL( bundle, furl, NULL, NULL ); - if ( fontURL != NULL ) { - fontURL = (char *)CFStringGetCStringPtr( CFURLCopyPath( fontURL ), kCFStringEncodingMacRoman); - sprintf( msg, "Font: %s\n", fontURL ); - DWRITE( msg ); - printf( msg ); - } else { - DWRITE( "Failed to probe 'fonts' bundle ref\n" ); - fontURL = NULL; - } - } - - /** Sanity check */ - if ( bundle == NULL || presetURL == NULL || fontURL == NULL ) { - sprintf( msg, "defaulting presets\n" ); - DWRITE( msg ); - this->fontURL = (char *)wipemalloc( sizeof( char ) * 512 ); -// strcpy( this->fontURL, "../../fonts/" ); - strcpy( fontURL, "/Users/descarte/tmp/projectM/fonts" ); - this->fontURL[34] = '\0'; -// loadPresetDir( "../../presets/" ); -// loadPresetDir( "/Users/descarte/tmp/projectM-1.00/presets_projectM" ); - } else { - printf( "PresetDir: %s\n", this->presetURL ); - loadPresetDir( presetURL ); - } -#else - if ( presetURL == NULL || fontURL == NULL ) { - char msg[1024]; - sprintf( msg, "defaulting presets\n" ); - DWRITE( msg ); - fontURL = (char *)wipemalloc( sizeof( char ) * 512 ); -#ifdef WIN32 - strcpy( this->fontURL, "c:\\tmp\\projectM\\fonts" ); - fontURL[24] = '\0'; -#else - strcpy( this->fontURL, "/Users/descarte/tmp/projectM/fonts" ); - fontURL[34] = '\0'; -#endif - DWRITE( "loading font URL directly: %s\n", this->fontURL ); -#ifdef WIN32 - // loadPresetDir( "c:\\tmp\\projectM\\presets_projectM" ); -#else - // loadPresetDir( "/Users/descarte/tmp/projectM-1.00/presets_projectM" ); -#endif - } else { - printf( "PresetDir: %s\n", this->presetURL ); - //loadPresetDir( presetURL ); - } - -#endif - - - mspf=(int)(1000.0/(float)presetInputs.fps); - - -// initMenu(); -//DWRITE( "post initMenu()\n" ); - - printf("mesh: %d %d\n", gx,gy ); - -#ifdef PANTS - printf( "maxsamples: %d\n", this->maxsamples ); - initPCM(this->maxsamples); - DWRITE( "post PCM init\n" ); -#endif - - this->avgtime=this->presetInputs.fps*20; - - this->hasInit = 1; - - this->renderTarget = new RenderTarget(texsize, width, height); - this->presetInputs.gx = gx; - this->presetInputs.gy = gy; - - this->renderer = new Renderer(width, height, gx, gy, renderTarget, beatDetect, fontURL); - - printf( "exiting projectM_init()\n" ); -} - - - - -//calculate matrices for per_pixel - - - - -DLLEXPORT void projectM::projectM_initengine() { - - /* PER FRAME CONSTANTS BEGIN */ - this->presetOutputs.zoom=1.0; - this->presetOutputs.zoomexp= 1.0; - this->presetOutputs.rot= 0.0; - this->presetOutputs.warp= 0.0; - - this->presetOutputs.sx= 1.0; - this->presetOutputs.sy= 1.0; - this->presetOutputs.dx= 0.0; - this->presetOutputs.dy= 0.0; - this->presetOutputs.cx= 0.5; - this->presetOutputs.cy= 0.5; - - this->presetOutputs.decay=.98; - - this->presetOutputs.wave_r= 1.0; - this->presetOutputs.wave_g= 0.2; - this->presetOutputs.wave_b= 0.0; - this->presetOutputs.wave_x= 0.5; - this->presetOutputs.wave_y= 0.5; - this->presetOutputs.wave_mystery= 0.0; - - this->presetOutputs.ob_size= 0.0; - this->presetOutputs.ob_r= 0.0; - this->presetOutputs.ob_g= 0.0; - this->presetOutputs.ob_b= 0.0; - this->presetOutputs.ob_a= 0.0; - - this->presetOutputs.ib_size = 0.0; - this->presetOutputs.ib_r = 0.0; - this->presetOutputs.ib_g = 0.0; - this->presetOutputs.ib_b = 0.0; - this->presetOutputs.ib_a = 0.0; - - this->presetOutputs.mv_a = 0.0; - this->presetOutputs.mv_r = 0.0; - this->presetOutputs.mv_g = 0.0; - this->presetOutputs.mv_b = 0.0; - this->presetOutputs.mv_l = 1.0; - this->presetOutputs.mv_x = 16.0; - this->presetOutputs.mv_y = 12.0; - this->presetOutputs.mv_dy = 0.02; - this->presetOutputs.mv_dx = 0.02; - -//this->presetInputs.meshx = 0; -//this->presetInputs.meshy = 0; - - - this->presetInputs.progress = 0; - this->presetInputs.frame = 0; - - this->avgtime = 600; -//bass_thresh = 0; - - /* PER_FRAME CONSTANTS END */ - this->presetOutputs.fRating = 0; - this->presetOutputs.fGammaAdj = 1.0; - this->presetOutputs.fVideoEchoZoom = 1.0; - this->presetOutputs.fVideoEchoAlpha = 0; - this->presetOutputs.nVideoEchoOrientation = 0; - - this->presetOutputs.nWaveMode = 7; - this->presetOutputs.bAdditiveWaves = 0; - this->presetOutputs.bWaveDots = 0; - this->presetOutputs.bWaveThick = 0; - this->presetOutputs.bModWaveAlphaByVolume = 0; - this->presetOutputs.bMaximizeWaveColor = 0; - this->presetOutputs.bTexWrap = 0; - this->presetOutputs.bDarkenCenter = 0; - this->presetOutputs.bRedBlueStereo = 0; - this->presetOutputs.bBrighten = 0; - this->presetOutputs.bDarken = 0; - this->presetOutputs.bSolarize = 0; - this->presetOutputs.bInvert = 0; - this->presetOutputs.bMotionVectorsOn = 1; - - this->presetOutputs.fWaveAlpha =1.0; - this->presetOutputs.fWaveScale = 1.0; - this->presetOutputs.fWaveSmoothing = 0; - this->presetOutputs.fWaveParam = 0; - this->presetOutputs.fModWaveAlphaStart = 0; - this->presetOutputs.fModWaveAlphaEnd = 0; - this->presetOutputs.fWarpAnimSpeed = 0; - this->presetOutputs.fWarpScale = 0; - this->presetOutputs.fShader = 0; - - - /* PER_PIXEL CONSTANTS BEGIN */ - this->presetInputs.x_per_pixel = 0; - this->presetInputs.y_per_pixel = 0; - this->presetInputs.rad_per_pixel = 0; - this->presetInputs.ang_per_pixel = 0; - - /* PER_PIXEL CONSTANT END */ - - - /* Q AND T VARIABLES START */ - - this->presetOutputs.q1 = 0; - this->presetOutputs.q2 = 0; - this->presetOutputs.q3 = 0; - this->presetOutputs.q4 = 0; - this->presetOutputs.q5 = 0; - this->presetOutputs.q6 = 0; - this->presetOutputs.q7 = 0; - this->presetOutputs.q8 = 0; - - - /* Q AND T VARIABLES END */ - -//per pixel meshes -/* - // this->presetOutputs.zoom_mesh = NULL; - // this->presetOutputs.zoomexp_mesh = NULL; - //this->presetOutputs.rot_mesh = NULL; - - - // this->presetOutputs.sx_mesh = NULL; - // this->presetOutputs.sy_mesh = NULL; - // this->presetOutputs.dx_mesh = NULL; - // this->presetOutputs.dy_mesh = NULL; - // this->presetOutputs.cx_mesh = NULL; - // this->presetOutputs.cy_mesh = NULL; - - // this->presetInputs.x_mesh = NULL; - / this->presetInputs.y_mesh = NULL; - // this->presetInputs.rad_mesh = NULL; - // this->presetInputs.theta_mesh = NULL; -*/ - -//custom wave per point meshes -} - -/* Reinitializes the engine variables to a default (conservative and sane) value */ -DLLEXPORT void projectM::projectM_resetengine() { - - this->presetOutputs.zoom=1.0; - this->presetOutputs.zoomexp= 1.0; - this->presetOutputs.rot= 0.0; - this->presetOutputs.warp= 0.0; - - this->presetOutputs.sx= 1.0; - this->presetOutputs.sy= 1.0; - this->presetOutputs.dx= 0.0; - this->presetOutputs.dy= 0.0; - this->presetOutputs.cx= 0.5; - this->presetOutputs.cy= 0.5; - - this->presetOutputs.decay=.98; - - this->presetOutputs.wave_r= 1.0; - this->presetOutputs.wave_g= 0.2; - this->presetOutputs.wave_b= 0.0; - this->presetOutputs.wave_x= 0.5; - this->presetOutputs.wave_y= 0.5; - this->presetOutputs.wave_mystery= 0.0; - - this->presetOutputs.ob_size= 0.0; - this->presetOutputs.ob_r= 0.0; - this->presetOutputs.ob_g= 0.0; - this->presetOutputs.ob_b= 0.0; - this->presetOutputs.ob_a= 0.0; - - this->presetOutputs.ib_size = 0.0; - this->presetOutputs.ib_r = 0.0; - this->presetOutputs.ib_g = 0.0; - this->presetOutputs.ib_b = 0.0; - this->presetOutputs.ib_a = 0.0; - - this->presetOutputs.mv_a = 0.0; - this->presetOutputs.mv_r = 0.0; - this->presetOutputs.mv_g = 0.0; - this->presetOutputs.mv_b = 0.0; - this->presetOutputs.mv_l = 1.0; - this->presetOutputs.mv_x = 16.0; - this->presetOutputs.mv_y = 12.0; - this->presetOutputs.mv_dy = 0.02; - this->presetOutputs.mv_dx = 0.02; - - - if ( beatDetect != NULL ) { - beatDetect->reset(); - } - this->presetInputs.progress = 0; - this->presetInputs.frame = 0; - -// bass_thresh = 0; - - /* PER_FRAME CONSTANTS END */ - this->presetOutputs.fRating = 0; - this->presetOutputs.fGammaAdj = 1.0; - this->presetOutputs.fVideoEchoZoom = 1.0; - this->presetOutputs.fVideoEchoAlpha = 0; - this->presetOutputs.nVideoEchoOrientation = 0; - - this->presetOutputs.nWaveMode = 7; - this->presetOutputs.bAdditiveWaves = 0; - this->presetOutputs.bWaveDots = 0; - this->presetOutputs.bWaveThick = 0; - this->presetOutputs.bModWaveAlphaByVolume = 0; - this->presetOutputs.bMaximizeWaveColor = 0; - this->presetOutputs.bTexWrap = 0; - this->presetOutputs.bDarkenCenter = 0; - this->presetOutputs.bRedBlueStereo = 0; - this->presetOutputs.bBrighten = 0; - this->presetOutputs.bDarken = 0; - this->presetOutputs.bSolarize = 0; - this->presetOutputs.bInvert = 0; - this->presetOutputs.bMotionVectorsOn = 1; - - this->presetOutputs.fWaveAlpha =1.0; - this->presetOutputs.fWaveScale = 1.0; - this->presetOutputs.fWaveSmoothing = 0; - this->presetOutputs.fWaveParam = 0; - this->presetOutputs.fModWaveAlphaStart = 0; - this->presetOutputs.fModWaveAlphaEnd = 0; - this->presetOutputs.fWarpAnimSpeed = 0; - this->presetOutputs.fWarpScale = 0; - this->presetOutputs.fShader = 0; - - - /* PER_PIXEL CONSTANTS BEGIN */ - this->presetInputs.x_per_pixel = 0; - this->presetInputs.y_per_pixel = 0; - this->presetInputs.rad_per_pixel = 0; - this->presetInputs.ang_per_pixel = 0; - - /* PER_PIXEL CONSTANT END */ - - - /* Q VARIABLES START */ - - this->presetOutputs.q1 = 0; - this->presetOutputs.q2 = 0; - this->presetOutputs.q3 = 0; - this->presetOutputs.q4 = 0; - this->presetOutputs.q5 = 0; - this->presetOutputs.q6 = 0; - this->presetOutputs.q7 = 0; - this->presetOutputs.q8 = 0; - - - /* Q VARIABLES END */ - - /** Stash the current engine */ - currentEngine = this; -} - -/** Resets OpenGL state */ -DLLEXPORT void projectM::projectM_resetGL( int w, int h ) { - - - int mindim, origtexsize; - - DWRITE( "projectM_resetGL(): in: %d x %d\n", w, h ); - - /** Stash the new dimensions */ - - - - renderer->reset(w,h); -} - -/** Sets the title to display */ -DLLEXPORT void projectM::projectM_setTitle( char *title ) { - /* - if (strcmp(this->title, title)!=0) - {printf("new title\n"); - this->drawtitle=1; - - if ( this->title != NULL ) { - free( this->title ); - this->title = NULL; - } - - this->title = (char *)wipemalloc( sizeof( char ) * ( strlen( title ) + 1 ) ); - strcpy( this->title, title ); - - } - */ -} - - -int projectM::initPresetTools() { - - /* Initializes the builtin function database */ - BuiltinFuncs::init_builtin_func_db(); - - /* Initializes all infix operators */ - Eval::init_infix_ops(); - - /* Set the seed to the current time in seconds */ -#ifdef WIN32 - srand(time(NULL)); -#endif - - if ((m_presetLoader = new PresetLoader(PROJECTM_PRESET_PATH)) == 0) { - m_presetLoader = 0; - std::cerr << "[projectM] error allocating preset loader" << std::endl; - return PROJECTM_FAILURE; - } - - if ((m_presetChooser = new PresetChooser(*m_presetLoader)) == 0) { - delete(m_presetLoader); - m_presetChooser = 0; - std::cerr << "[projectM] error allocating preset chooser" << std::endl; - return PROJECTM_FAILURE; - } - -// Start the iterator - m_presetPos = new PresetIterator(); - *m_presetPos = m_presetChooser->begin(); - if (*m_presetPos == m_presetChooser->end()) { - std::cerr << "[projectM] error: no valid files found in preset directory \"" << PROJECTM_PRESET_PATH << "\"" << std::endl; - } - - std::cerr << "[projectM] Allocating first preset..." << std::endl; - m_activePreset = m_presetPos->allocate(presetInputs, presetOutputs); - - std::cerr << "[projectM] First preset allocated. Name is \"" << m_activePreset->name << "\"" << std::endl; - projectM_resetengine(); - - /* Done */ -#ifdef PRESET_DEBUG - printf("initPresetLoader: finished\n"); -#endif - return PROJECTM_SUCCESS; -} - -void projectM::destroyPresetTools() { - - if (m_presetChooser) - delete(m_presetChooser); - - if (m_presetLoader) - delete(m_presetLoader); - - Eval::destroy_infix_ops(); - BuiltinFuncs::destroy_builtin_func_db(); - -} diff --git a/src/projectM-engine-backup/projectM.dsp b/src/projectM-engine-backup/projectM.dsp deleted file mode 100755 index 06efa3d37..000000000 --- a/src/projectM-engine-backup/projectM.dsp +++ /dev/null @@ -1,381 +0,0 @@ -# Microsoft Developer Studio Project File - Name="projectM" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=projectM - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "projectM.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "projectM.mak" CFG="projectM - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "projectM - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "projectM - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "projectM - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ELSEIF "$(CFG)" == "projectM - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "DEBUG" /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo - -!ENDIF - -# Begin Target - -# Name "projectM - Win32 Release" -# Name "projectM - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\beat_detect.c -# End Source File -# Begin Source File - -SOURCE=.\browser.c -# End Source File -# Begin Source File - -SOURCE=.\builtin_funcs.c -# End Source File -# Begin Source File - -SOURCE=.\console_interface.c -# End Source File -# Begin Source File - -SOURCE=.\custom_shape.c -# End Source File -# Begin Source File - -SOURCE=.\custom_wave.c -# End Source File -# Begin Source File - -SOURCE=.\editor.c -# End Source File -# Begin Source File - -SOURCE=.\eval.c -# End Source File -# Begin Source File - -SOURCE=.\fftsg.c -# End Source File -# Begin Source File - -SOURCE=.\func.c -# End Source File -# Begin Source File - -SOURCE=.\glConsole.c -# End Source File -# Begin Source File - -SOURCE=.\glf.c -# End Source File -# Begin Source File - -SOURCE=.\init_cond.c -# End Source File -# Begin Source File - -SOURCE=.\menu.c -# End Source File -# Begin Source File - -SOURCE=.\param.c -# End Source File -# Begin Source File - -SOURCE=.\parser.c -# End Source File -# Begin Source File - -SOURCE=.\PCM.c -# End Source File -# Begin Source File - -SOURCE=.\per_frame_eqn.c -# End Source File -# Begin Source File - -SOURCE=.\per_pixel_eqn.c -# End Source File -# Begin Source File - -SOURCE=.\preset.c -# End Source File -# Begin Source File - -SOURCE=.\projectm.c -# End Source File -# Begin Source File - -SOURCE=.\pbuffer.c -# End Source File -# Begin Source File - -SOURCE=.\splaytree.c -# End Source File -# Begin Source File - -SOURCE=.\timer.c -# End Source File -# Begin Source File - -SOURCE=.\tree_types.c -# End Source File -# Begin Source File - -SOURCE=".\win32-dirent.c" -# End Source File -# Begin Source File - -SOURCE=.\wipemalloc.c -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\beat_detect.h -# End Source File -# Begin Source File - -SOURCE=.\browser.h -# End Source File -# Begin Source File - -SOURCE=.\builtin_funcs.h -# End Source File -# Begin Source File - -SOURCE=.\common.h -# End Source File -# Begin Source File - -SOURCE=.\compare.h -# End Source File -# Begin Source File - -SOURCE=.\config.h -# End Source File -# Begin Source File - -SOURCE=.\console_interface.h -# End Source File -# Begin Source File - -SOURCE=.\custom_shape.h -# End Source File -# Begin Source File - -SOURCE=.\custom_shape_types.h -# End Source File -# Begin Source File - -SOURCE=.\custom_wave.h -# End Source File -# Begin Source File - -SOURCE=.\custom_wave_types.h -# End Source File -# Begin Source File - -SOURCE=.\editor.h -# End Source File -# Begin Source File - -SOURCE=.\eval.h -# End Source File -# Begin Source File - -SOURCE=.\event.h -# End Source File -# Begin Source File - -SOURCE=.\expr_types.h -# End Source File -# Begin Source File - -SOURCE=.\fatal.h -# End Source File -# Begin Source File - -SOURCE=.\fftsg.h -# End Source File -# Begin Source File - -SOURCE=.\func.h -# End Source File -# Begin Source File - -SOURCE=.\func_types.h -# End Source File -# Begin Source File - -SOURCE=.\glConsole.h -# End Source File -# Begin Source File - -SOURCE=.\glf.h -# End Source File -# Begin Source File - -SOURCE=.\idle_preset.h -# End Source File -# Begin Source File - -SOURCE=.\init_cond.h -# End Source File -# Begin Source File - -SOURCE=.\init_cond_types.h -# End Source File -# Begin Source File - -SOURCE=.\interface_types.h -# End Source File -# Begin Source File - -SOURCE=.\menu.h -# End Source File -# Begin Source File - -SOURCE=.\param.h -# End Source File -# Begin Source File - -SOURCE=.\param_types.h -# End Source File -# Begin Source File - -SOURCE=.\parser.h -# End Source File -# Begin Source File - -SOURCE=.\PCM.h -# End Source File -# Begin Source File - -SOURCE=.\per_frame_eqn.h -# End Source File -# Begin Source File - -SOURCE=.\per_frame_eqn_types.h -# End Source File -# Begin Source File - -SOURCE=.\per_pixel_eqn.h -# End Source File -# Begin Source File - -SOURCE=.\per_pixel_eqn_types.h -# End Source File -# Begin Source File - -SOURCE=.\per_point_types.h -# End Source File -# Begin Source File - -SOURCE=.\preset.h -# End Source File -# Begin Source File - -SOURCE=.\preset_types.h -# End Source File -# Begin Source File - -SOURCE=.\projectM.h -# End Source File -# Begin Source File - -SOURCE=.\pbuffer.h -# End Source File -# Begin Source File - -SOURCE=.\splaytree.h -# End Source File -# Begin Source File - -SOURCE=.\splaytree_types.h -# End Source File -# Begin Source File - -SOURCE=.\timer.h -# End Source File -# Begin Source File - -SOURCE=.\tree_types.h -# End Source File -# Begin Source File - -SOURCE=".\win32-dirent.h" -# End Source File -# Begin Source File - -SOURCE=.\wipemalloc.h -# End Source File -# End Group -# End Target -# End Project diff --git a/src/projectM-engine-backup/projectM.hpp b/src/projectM-engine-backup/projectM.hpp deleted file mode 100755 index 843674dfc..000000000 --- a/src/projectM-engine-backup/projectM.hpp +++ /dev/null @@ -1,242 +0,0 @@ -/* - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: projectM.hpp,v 1.1.1.1 2005/12/23 18:05:11 psperl Exp $ - * - * Encapsulation of ProjectM engine - * - * $Log$ - */ - -#ifndef _PROJECTM_H -#define _PROJECTM_H - -#include "PBuffer.hpp" - -#ifdef WIN32 -#include "win32-dirent.h" -#else -#include -#endif /** WIN32 */ -#include -#include -#include -#include -#ifndef WIN32 -#include -#endif -#include - -#ifdef MACOS -#include -#include -#include -#else -#ifdef WIN32 -#include -#endif /** WIN32 */ -#include -#include -#endif /** MACOS */ -#ifdef WIN322 -#define inline -#endif /** WIN32 */ -#ifndef WIN32 -#include -#else -#endif /** !WIN32 */ - -#include "dlldefs.h" -#include "event.h" -#include "fatal.h" -#include "PresetFrameIO.hpp" -#include "Renderer.hpp" -//#include "PresetChooser.hpp" - -#include - -class BeatDetect; -class Func; -class Renderer; -class Preset; -class PresetIterator; -class PresetChooser; -class PresetLoader; - -#include -#ifdef WIN32 -#pragma warning (disable:4244) -#pragma warning (disable:4305) -#endif /** WIN32 */ - -#ifdef MACOS2 -#define inline -#endif - -/** KEEP THIS UP TO DATE! */ -#define PROJECTM_VERSION "1.02.00" -#define PROJECTM_TITLE "projectM 1.02.00" - -/** Per-platform path separators */ -#define WIN32_PATH_SEPARATOR '\\' -#define UNIX_PATH_SEPARATOR '/' -#ifdef WIN32 -#define PATH_SEPARATOR WIN32_PATH_SEPARATOR -#else -#define PATH_SEPARATOR UNIX_PATH_SEPARATOR -#endif /** WIN32 */ - -/** Thread state */ -typedef enum { GO, STOP } PMThreadState; - -/** Interface types */ -typedef enum { - MENU_INTERFACE, - SHELL_INTERFACE, - EDITOR_INTERFACE, - DEFAULT_INTERFACE, - BROWSER_INTERFACE - } interface_t; - - -class projectM { -public: - static const std::string PROJECTM_PRESET_PATH; - - static projectM *currentEngine; - static Renderer *renderer; - static RenderTarget *renderTarget; - - char *presetURL; - - char *fontURL; - - int hasInit; - - int pcmframes; - int freqframes; - - - GLubyte *fbuffer; - -#ifndef WIN32 - /* The first ticks value of the application */ - struct timeval startTime; -#else - long startTime; -#endif /** !WIN32 */ - - /** Render target texture ID */ - - char disp[80]; - - float wave_o; - - //int texsize=1024; //size of texture to do actual graphics - int fvw; //fullscreen dimensions - int fvh; - int wvw; //windowed dimensions - int wvh; - - int fullscreen; - - int avgtime; //# frames per preset - - /** Timing information */ - int mspf; - int timed; - int timestart; - int nohard; - int count; - float fpsstart; - - /** Various toggles */ - /* PER_FRAME CONSTANTS END */ - - /** Beat detection engine */ - BeatDetect *beatDetect; - - /** All readonly variables - * which are passed as inputs - * to presets. See struct definitition above */ - PresetInputs presetInputs; - - /** The presets modify these values. For now this is declared on stack - * but might be better on heap for sake of smooth preset switching */ - PresetOutputs presetOutputs; - - /** Functions */ - DLLEXPORT projectM(); - - DLLEXPORT void projectM_init(int gx, int gy, int fps, int texsize, int width, int height); - DLLEXPORT void projectM_reset(); - DLLEXPORT void projectM_resetGL( int width, int height ); - DLLEXPORT void projectM_setTitle( char *title ); - DLLEXPORT void renderFrame(); - - DLLEXPORT void projectM_initengine(); - DLLEXPORT void projectM_resetengine(); - void draw_help(); - void draw_fps(float fps); - void draw_preset(); - void draw_title(); - void draw_stats(); - - void do_per_pixel_math(); - void do_per_frame(); - - void render_interpolation(); - void render_texture_to_screen(); - void render_texture_to_studio(); - - void get_title(); - - void reset_per_pixel_matrices(); - void init_per_pixel_matrices(); - void rescale_per_pixel_matrices(); - void free_per_pixel_matrices(); - - void key_handler( projectMEvent event, - projectMKeycode keycode, projectMModifier modifier ); - void default_key_handler( projectMEvent event, projectMKeycode keycode ); - - /// Initializes preset loading / management libraries - int initPresetTools(); - - /// Deinitialize all preset related tools. Usually done before projectM cleanup - void destroyPresetTools(); - - private: - - // The current position of the directory iterator - PresetIterator * m_presetPos; - - // Required by the preset chooser. Manages a loaded preset directory - PresetLoader * m_presetLoader; - - // Provides accessor functions to choose presets - PresetChooser * m_presetChooser; - - // Currently loaded preset- will be fancier when smooth preset switching - std::auto_ptr m_activePreset; - }; - -#endif /** !_PROJECTM_H */ diff --git a/src/projectM-engine-backup/sdltoprojectM.h b/src/projectM-engine-backup/sdltoprojectM.h deleted file mode 100755 index d2a974db0..000000000 --- a/src/projectM-engine-backup/sdltoprojectM.h +++ /dev/null @@ -1,165 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: sdltoprojectM.hpp,v 1.1 2004/10/08 00:35:28 cvs Exp $ - * - * Translates SDL -> projectM variables - * - * $Log: sdltoprojectM.hpp,v $ - * Revision 1.1 2004/10/08 00:35:28 cvs - * Moved and imported - * - * Revision 1.1.1.1 2004/10/04 12:56:00 cvs - * Imported - * - */ - -#ifndef _SDLTOPROJECTM_H -#define _SDLTOPROJECTM_H - -#include "event.h" - - //#include "projectM/projectM.hpp" -#ifdef WIN32 -#include -#else -#include -#endif - -inline projectMEvent sdl2pmEvent( SDL_Event event ) { \ - - switch ( event.type ) { \ - case SDL_VIDEORESIZE: - return PROJECTM_VIDEORESIZE; \ - case SDL_KEYUP: \ - return PROJECTM_KEYUP; \ - case SDL_KEYDOWN: \ - return PROJECTM_KEYDOWN; \ - default: - return PROJECTM_KEYUP; \ - } \ - } \ - -inline projectMKeycode sdl2pmKeycode( SDLKey keysym ) { \ - switch ( keysym ) { \ - case SDLK_F1: \ - return PROJECTM_K_F1; \ - case SDLK_F2: \ - return PROJECTM_K_F2; \ - case SDLK_F3: \ - return PROJECTM_K_F3; \ - case SDLK_F4: \ - return PROJECTM_K_F4; \ - case SDLK_F5: \ - return PROJECTM_K_F5; \ - case SDLK_F6: \ - return PROJECTM_K_F6; \ - case SDLK_F7: \ - return PROJECTM_K_F7; \ - case SDLK_F8: \ - return PROJECTM_K_F8; \ - case SDLK_F9: \ - return PROJECTM_K_F9; \ - case SDLK_F10: \ - return PROJECTM_K_F10; \ - case SDLK_F11: \ - return PROJECTM_K_F11; \ - case SDLK_F12: \ - return PROJECTM_K_F12; \ - case SDLK_ESCAPE: \ - return PROJECTM_K_ESCAPE; - case SDLK_a: - return PROJECTM_K_a; - case SDLK_b: - return PROJECTM_K_b; - case SDLK_c: - return PROJECTM_K_c; - case SDLK_d: - return PROJECTM_K_d; - case SDLK_e: - return PROJECTM_K_e; - case SDLK_f: - return PROJECTM_K_f; - case SDLK_g: - return PROJECTM_K_g; - case SDLK_h: - return PROJECTM_K_h; - case SDLK_i: - return PROJECTM_K_i; - case SDLK_j: - return PROJECTM_K_j; - case SDLK_k: - return PROJECTM_K_k; - case SDLK_l: - return PROJECTM_K_l; - case SDLK_m: - return PROJECTM_K_m; - case SDLK_n: - return PROJECTM_K_n; - case SDLK_o: - return PROJECTM_K_o; - case SDLK_p: - return PROJECTM_K_p; - case SDLK_q: - return PROJECTM_K_q; - case SDLK_r: - return PROJECTM_K_r; - case SDLK_s: - return PROJECTM_K_s; - case SDLK_t: - return PROJECTM_K_t; - case SDLK_u: - return PROJECTM_K_u; - case SDLK_v: - return PROJECTM_K_v; - case SDLK_w: - return PROJECTM_K_w; - case SDLK_x: - return PROJECTM_K_x; - case SDLK_y: - return PROJECTM_K_y; - case SDLK_z: - return PROJECTM_K_z; - case SDLK_UP: - return PROJECTM_K_UP; - case SDLK_RETURN: - return PROJECTM_K_RETURN; - case SDLK_RIGHT: - return PROJECTM_K_RIGHT; - case SDLK_LEFT: - return PROJECTM_K_LEFT; - case SDLK_DOWN: - return PROJECTM_K_DOWN; - case SDLK_PAGEUP: - return PROJECTM_K_PAGEUP; - case SDLK_PAGEDOWN: - return PROJECTM_K_PAGEDOWN; - - default: \ - return PROJECTM_K_NONE; \ - } \ - } \ - -inline projectMModifier sdl2pmModifier( SDLMod mod ) { \ - return PROJECTM_KMOD_LSHIFT; \ - } \ - -#endif /** _SDLTOPROJECTM_H */ diff --git a/src/projectM-engine-backup/timer.cpp b/src/projectM-engine-backup/timer.cpp deleted file mode 100755 index e9e1dafc7..000000000 --- a/src/projectM-engine-backup/timer.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: timer.c,v 1.1.1.1 2005/12/23 18:05:05 psperl Exp $ - * - * Platform-independent timer - */ - -#include "timer.h" -#include - -#ifndef WIN32 -/** Get number of ticks since the given timestamp */ -unsigned int getTicks( struct timeval *start ) { - struct timeval now; - unsigned int ticks; - - gettimeofday(&now, NULL); - ticks=(now.tv_sec-start->tv_sec)*1000+(now.tv_usec-start->tv_usec)/1000; - return(ticks); - } -#else -unsigned int getTicks( long start ) { - return GetTickCount() - start; - } -#endif /** !WIN32 */ diff --git a/src/projectM-engine-backup/timer.h b/src/projectM-engine-backup/timer.h deleted file mode 100755 index 2c797593f..000000000 --- a/src/projectM-engine-backup/timer.h +++ /dev/null @@ -1,49 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: timer.h,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Platform-independent timer - * - * $Log: timer.h,v $ - * Revision 1.1.1.1 2005/12/23 18:05:00 psperl - * Imported - * - * Revision 1.2 2004/10/05 09:19:40 cvs - * Fixed header include defines - * - * Revision 1.1.1.1 2004/10/04 12:56:00 cvs - * Imported - * - */ - -#ifndef _TIMER_H -#define _TIMER_H - -#ifndef WIN32 -#include -unsigned int getTicks( struct timeval *start ); -#else -#include -unsigned int getTicks( long start ); -#endif /** !WIN32 */ - -#endif /** _TIMER_H */ diff --git a/src/projectM-engine-backup/win32-dirent.cpp b/src/projectM-engine-backup/win32-dirent.cpp deleted file mode 100755 index a5397603e..000000000 --- a/src/projectM-engine-backup/win32-dirent.cpp +++ /dev/null @@ -1,231 +0,0 @@ -/* - - Implementation of POSIX directory browsing functions and types for Win32. - - Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com) - History: Created March 1997. Updated June 2003. - Rights: See end of file. - -*/ - -#include "win32-dirent.h" -#include -#include /* _findfirst and _findnext set errno iff they return -1 */ -#include -#include - -#ifdef __cplusplus -extern "C" -{ -#endif - -struct DIR -{ - long handle; /* -1 for failed rewind */ - struct _finddata_t info; - struct dirent result; /* d_name null iff first time */ - char *name; /* null-terminated char string */ -}; - -DIR *opendir(const char *name) -{ - DIR *dir = 0; - - if(name && name[0]) - { - size_t base_length = strlen(name); - const char *all = /* search pattern must end with suitable wildcard */ - strchr("/\\", name[base_length - 1]) ? "*" : "/*"; - - if((dir = (DIR *) malloc(sizeof *dir)) != 0 && - (dir->name = (char *) malloc(base_length + strlen(all) + 1)) != 0) - { - strcat(strcpy(dir->name, name), all); - - if((dir->handle = (long) _findfirst(dir->name, &dir->info)) != -1) - { - dir->result.d_name = 0; - } - else /* rollback */ - { - free(dir->name); - free(dir); - dir = 0; - } - } - else /* rollback */ - { - free(dir); - dir = 0; - errno = ENOMEM; - } - } - else - { - errno = EINVAL; - } - - return dir; -} - -int closedir(DIR *dir) -{ - int result = -1; - - if(dir) - { - if(dir->handle != -1) - { - result = _findclose(dir->handle); - } - - free(dir->name); - free(dir); - } - - if(result == -1) /* map all errors to EBADF */ - { - errno = EBADF; - } - - return result; -} - -struct dirent *readdir(DIR *dir) -{ - struct dirent *result = 0; - - if(dir && dir->handle != -1) - { - if(!dir->result.d_name || _findnext(dir->handle, &dir->info) != -1) - { - result = &dir->result; - result->d_name = dir->info.name; - } - } - else - { - errno = EBADF; - } - - return result; -} - -void rewinddir(DIR *dir) -{ - if(dir && dir->handle != -1) - { - _findclose(dir->handle); - dir->handle = (long) _findfirst(dir->name, &dir->info); - dir->result.d_name = 0; - } - else - { - errno = EBADF; - } -} - -// helper for scandir below -static void scandir_free_dir_entries(struct dirent*** namelist, int entries) { - int i; - if (!*namelist) return; - for (i = 0; i < entries; ++i) { - free((*namelist)[i]); - } - free(*namelist); - *namelist = 0; -} - -// returns the number of directory entries select or -1 if an error occurs -int scandir( - const char* dir, - struct dirent*** namelist, - int(*filter)(const struct dirent*), - int(*compar)(const void*, const void*) -) { - int entries = 0; - int max_entries = 512; // assume 2*512 = 1024 entries (used for allocation) - DIR* d; - - *namelist = 0; - - // open directory - d = opendir(dir); - if (!d) return -1; - - // iterate - while (1) { - struct dirent* ent = readdir(d); - if (!ent) break; - - // add if no filter or filter returns non-zero - if (filter && (0 == filter(ent))) continue; - - // resize our buffer if there is not enough room - if (!*namelist || entries >= max_entries) { - struct dirent** new_entries; - - max_entries *= 2; - new_entries = (struct dirent **)realloc(*namelist, max_entries); - if (!new_entries) { - scandir_free_dir_entries(namelist, entries); - closedir(d); - errno = ENOMEM; - return -1; - } - - *namelist = new_entries; - } - - // allocate new entry - (*namelist)[entries] = (struct dirent *)malloc(sizeof(struct dirent) + strlen(ent->d_name) + 1); - if (!(*namelist)[entries]) { - scandir_free_dir_entries(namelist, entries); - closedir(d); - errno = ENOMEM; - return -1; - } - - // copy entry info - *(*namelist)[entries] = *ent; - - // and then we tack the string onto the end - { - char* dest = (char*)((*namelist)[entries]) + sizeof(struct dirent); - strcpy(dest, ent->d_name); - (*namelist)[entries]->d_name = dest; - } - - ++entries; - } - - // sort - if (*namelist && compar) qsort(*namelist, entries, sizeof((*namelist)[0]), compar); - - return entries; -} - -int alphasort(const void* lhs, const void* rhs) { - const struct dirent* lhs_ent = *(struct dirent**)lhs; - const struct dirent* rhs_ent = *(struct dirent**)rhs; - return _strcmpi(lhs_ent->d_name, rhs_ent->d_name); -} - -#ifdef __cplusplus -} -#endif - -/* - - Copyright Kevlin Henney, 1997, 2003. All rights reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose is hereby granted without fee, provided - that this copyright and permissions notice appear in all copies and - derivatives. - - This software is supplied "as is" without express or implied warranty. - - But that said, if there are any problems please get in touch. - -*/ diff --git a/src/projectM-engine-backup/win32-dirent.h b/src/projectM-engine-backup/win32-dirent.h deleted file mode 100755 index 7893d0bc4..000000000 --- a/src/projectM-engine-backup/win32-dirent.h +++ /dev/null @@ -1,59 +0,0 @@ - -#ifndef DIRENT_INCLUDED -#define DIRENT_INCLUDED - -/* - - Declaration of POSIX directory browsing functions and types for Win32. - - Author: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com) - History: Created March 1997. Updated June 2003. - Rights: See end of file. - -*/ - -#ifdef __cplusplus -extern "C" -{ -#endif - -typedef struct DIR DIR; - -static int errno; - -struct dirent -{ - char *d_name; -}; - -DIR *opendir(const char *); -int closedir(DIR *); -struct dirent *readdir(DIR *); -void rewinddir(DIR *); -int scandir( - const char* dir, - struct dirent*** namelist, - int(*filter)(const struct dirent*), - int(*compar)(const void*, const void*) ); -int alphasort(const void* lhs, const void* rhs); - -/* - - Copyright Kevlin Henney, 1997, 2003. All rights reserved. - - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose is hereby granted without fee, provided - that this copyright and permissions notice appear in all copies and - derivatives. - - This software is supplied "as is" without express or implied warranty. - - But that said, if there are any problems please get in touch. - -*/ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/projectM-engine-backup/wipemalloc.cpp b/src/projectM-engine-backup/wipemalloc.cpp deleted file mode 100755 index 14bcf7816..000000000 --- a/src/projectM-engine-backup/wipemalloc.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: wipemalloc.c,v 1.1.1.1 2005/12/23 18:05:05 psperl Exp $ - * - * Clean memory allocator - */ - -#include "wipemalloc.h" - - void *wipemalloc( size_t count ) { - void *mem = malloc( count ); - if ( mem != NULL ) { - memset( mem, 0, count ); - } else { - printf( "wipemalloc() failed to allocate %d bytes\n", (int)count ); - } - return mem; - } - -/** Safe memory deallocator */ - void wipefree( void *ptr ) { - if ( ptr != NULL ) { - free( ptr ); - } - } diff --git a/src/projectM-engine-backup/wipemalloc.h b/src/projectM-engine-backup/wipemalloc.h deleted file mode 100755 index 6ff625d36..000000000 --- a/src/projectM-engine-backup/wipemalloc.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: wipemalloc.h,v 1.1.1.1 2005/12/23 18:05:03 psperl Exp $ - * - * Contains an inline function which can replace malloc() that also - * call memset( ..., 0, sizeof( ... ) ) on the allocated block for - * safe initialization - * - * $Log$ - */ - -#ifndef _WIPEMALLOC_H -#define _WIPEMALLOC_H - -#ifndef MACOS -#ifndef HAVE_AIX /** AIX has malloc() defined in a strange place... */ -#ifdef WIN32 -#include -#endif -#include -#include -#else -#include -#endif /** !HAVE_AIX */ -#else -#include -#include -#endif /** !MACOS */ -#include - -#ifdef PANTS -#if defined(WIN32) && !defined(inline) -#define inline -#endif -#endif - -/** Safe memory allocator */ - void *wipemalloc( size_t count ); - void wipefree( void *ptr ); - -#endif /** !_WIPEMALLOC_H */ diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp index 8b497a50a..a04dc17b1 100755 --- a/src/projectM-engine/CustomWave.cpp +++ b/src/projectM-engine/CustomWave.cpp @@ -62,7 +62,8 @@ CustomWave::CustomWave(int _id): scaling(1.0), per_frame_eqn_string_index(0), per_frame_init_eqn_string_index(0), - per_point_eqn_string_index(0) + per_point_eqn_string_index(0), + param_tree(new std::map()) { Param * param; diff --git a/src/projectM-engine/Parser.cpp b/src/projectM-engine/Parser.cpp index ed1a663b9..5732c1933 100755 --- a/src/projectM-engine/Parser.cpp +++ b/src/projectM-engine/Parser.cpp @@ -502,7 +502,7 @@ int Parser::parse_line(FILE * fs, Preset * preset) { CustomWave * custom_wave; /* Retrieve custom shape associated with this id */ - if ((custom_wave = preset->find_custom_wave(last_custom_wave_id, TRUE)) == NULL) + if ((custom_wave = Preset::find_custom_object(last_custom_wave_id, true, *preset->customWaves)) == NULL) return PROJECTM_FAILURE; return parse_wave_per_frame_eqn(fs, custom_wave, preset); @@ -517,7 +517,7 @@ int Parser::parse_line(FILE * fs, Preset * preset) { CustomShape * custom_shape; /* Retrieve custom shape associated with this id */ - if ((custom_shape = preset->find_custom_shape(last_custom_shape_id, TRUE)) == NULL) + if ((custom_shape = Preset::find_custom_object(last_custom_shape_id, true, *preset->customShapes)) == NULL) return PROJECTM_FAILURE; return parse_shape_per_frame_eqn(fs, custom_shape, preset); @@ -527,7 +527,7 @@ int Parser::parse_line(FILE * fs, Preset * preset) { CustomShape * custom_shape; /* Retrieve custom shape associated with this id */ - if ((custom_shape = preset->find_custom_shape(last_custom_shape_id, TRUE)) == NULL) + if ((custom_shape = preset->find_custom_object(last_custom_shape_id, true, *preset->customShapes)) == NULL) return PROJECTM_FAILURE; return parse_shape_per_frame_init_eqn(fs, custom_shape, preset); @@ -1397,7 +1397,7 @@ int Parser::parse_wavecode(char * token, FILE * fs, Preset * preset) { /* Retrieve custom wave information from preset. The 3rd argument if true creates a custom wave if one does not exist */ - if ((custom_wave = preset->find_custom_wave(id, TRUE)) == NULL) { + if ((custom_wave = Preset::find_custom_object(id, true, *preset->customWaves)) == NULL) { //if (PARSE_DEBUG) printf("parse_wavecode: failed to load (or create) custom wave (id = %d)!\n", id); return PROJECTM_FAILURE; } @@ -1475,7 +1475,7 @@ int Parser::parse_shapecode(char * token, FILE * fs, Preset * preset) { /* Retrieve custom shape information from preset. The 3rd argument if true creates a custom shape if one does not exist */ - if ((custom_shape = preset->find_custom_shape(id, TRUE)) == NULL) { + if ((custom_shape = Preset::find_custom_object(id, true, *preset->customShapes)) == NULL) { //if (PARSE_DEBUG) printf("parse_shapecode: failed to load (or create) custom shape (id = %d)!\n", id); return PROJECTM_FAILURE; } @@ -1730,7 +1730,7 @@ int Parser::parse_wave_helper(FILE * fs, Preset * preset, int id, char * eqn_ty InitCond * init_cond; /* Retrieve custom wave associated with this id */ - if ((custom_wave = preset->find_custom_wave(id, TRUE)) == NULL) { + if ((custom_wave = Preset::find_custom_object(id, true, *preset->customWaves)) == NULL) { if (PARSE_DEBUG) printf("parse_wave_helper: custom wave id %d not found!\n", id); return PROJECTM_FAILURE; } @@ -1890,7 +1890,7 @@ int Parser::parse_shape(char * token, FILE * fs, Preset * preset) { } /* Retrieve custom shape associated with this id */ - if ((custom_shape = preset->find_custom_shape(id, TRUE)) == NULL) + if ((custom_shape = Preset::find_custom_object(id,true,*preset->customShapes)) == NULL) return PROJECTM_FAILURE; diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp index 80bd77c7d..f9734294b 100755 --- a/src/projectM-engine/Preset.cpp +++ b/src/projectM-engine/Preset.cpp @@ -70,10 +70,10 @@ Preset::~Preset() /// @note no need to clear the actual container itself for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) - delete(*pos); + delete(pos->second); for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) - delete(*pos); + delete(pos->second); #if defined(PRESET_DEBUG) && defined(DEBUG) @@ -168,7 +168,7 @@ void Preset::evalCustomShapeInitConditions() { for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) - (*pos)->eval_custom_shape_init_conds(); + pos->second->eval_custom_shape_init_conds(); } @@ -176,7 +176,7 @@ void Preset::evalCustomWaveInitConditions() { for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) - (*pos)->eval_custom_wave_init_conds(); + pos->second->eval_custom_wave_init_conds(); } @@ -187,11 +187,11 @@ void Preset::evalCustomWavePerFrameEquations() for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) { - std::map & init_cond_tree = (*pos)->init_cond_tree; + std::map & init_cond_tree = pos->second->init_cond_tree; for (std::map::iterator _pos = init_cond_tree.begin(); _pos != init_cond_tree.end(); ++_pos) _pos->second->evaluate(); - std::map & per_frame_eqn_tree = (*pos)->per_frame_eqn_tree; + std::map & per_frame_eqn_tree = pos->second->per_frame_eqn_tree; for (std::map::iterator _pos = per_frame_eqn_tree.begin(); _pos != per_frame_eqn_tree.end(); ++_pos) _pos->second->evaluate(); } @@ -204,11 +204,11 @@ void Preset::evalCustomShapePerFrameEquations() for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) { - std::map & init_cond_tree = (*pos)->init_cond_tree; + std::map & init_cond_tree = pos->second->init_cond_tree; for (std::map::iterator _pos = init_cond_tree.begin(); _pos != init_cond_tree.end(); ++_pos) _pos->second->evaluate(); - std::map & per_frame_eqn_tree = (*pos)->per_frame_eqn_tree; + std::map & per_frame_eqn_tree = pos->second->per_frame_eqn_tree; for (std::map::iterator _pos = per_frame_eqn_tree.begin(); _pos != per_frame_eqn_tree.end(); ++_pos) _pos->second->evaluate(); } @@ -459,7 +459,7 @@ void Preset::load_custom_wave_init_conditions() { for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) - (*pos)->load_unspecified_init_conds(); + pos->second->load_unspecified_init_conds(); } @@ -469,7 +469,7 @@ void Preset::load_custom_shape_init_conditions() // void eval_custom_shape_init_conds(); for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) - (*pos)->load_custom_shape_init(); + pos->second->load_custom_shape_init(); } @@ -499,7 +499,7 @@ void Preset::evalPerPixelEqns() pos != per_pixel_eqn_tree.end(); ++pos) pos->second->evaluate(); - + } /** Finds / Creates (if necessary) initial condition associated with passed parameter */ @@ -643,65 +643,8 @@ void Preset::load_init_conditions() -CustomWave * Preset::find_custom_wave(int id, bool create_flag) -{ - CustomWave * custom_wave = NULL; - - assert(customWaves); - - if ((custom_wave = (*customWaves)[id]) == NULL) - { - - if (CUSTOM_WAVE_DEBUG) { printf("find_custom_wave: creating custom wave (id = %d)...", id);fflush(stdout);} - - if (create_flag == FALSE) - { - if (CUSTOM_WAVE_DEBUG) printf("you specified not to (create flag = false), returning null\n"); - return NULL; - } - - if ((custom_wave = new CustomWave(id)) == NULL) - { - if (CUSTOM_WAVE_DEBUG) printf("failed...out of memory?\n"); - return NULL; - } - - customWaves->push_back(custom_wave); - } - - return custom_wave; - -} -CustomShape * Preset::find_custom_shape(int id, bool create_flag) -{ - - CustomShape * custom_shape = NULL; - assert(customShapes); - if ((custom_shape = (*customShapes)[id]) == NULL) - { - - if (CUSTOM_SHAPE_DEBUG) { printf("find_custom_shape: creating custom shape (id = %d)...", id);fflush(stdout);} - - if (create_flag == FALSE) - { - if (CUSTOM_SHAPE_DEBUG) printf("you specified not to (create flag = false), returning null\n"); - return NULL; - } - - if ((custom_shape = new CustomShape(id)) == NULL) - { - if (CUSTOM_SHAPE_DEBUG) printf("failed...out of memory?\n"); - return NULL; - } - - customShapes->push_back(custom_shape); - - } - - return custom_shape; -} /* Find a parameter given its name, will create one if not found */ Param * Preset::find(char * name, int flags) diff --git a/src/projectM-engine/Preset.hpp b/src/projectM-engine/Preset.hpp index 95b7745ce..d968e4ebf 100644 --- a/src/projectM-engine/Preset.hpp +++ b/src/projectM-engine/Preset.hpp @@ -31,6 +31,8 @@ #include "Common.hpp" #include +#include + #define PRESET_DEBUG 2 /* 0 for no debugging, 1 for normal, 2 for insane */ #include "CustomShape.hpp" @@ -42,14 +44,14 @@ #include "PresetFrameIO.hpp" #include #include "InitCond.hpp" -#include + class CustomWave; class CustomShape; class InitCond; -//#include + class Preset { @@ -72,9 +74,10 @@ public: std::string name; std::string file_path; + void load_init_conditions(); - CustomShape * find_custom_shape(int id, bool create_flag); - CustomWave * find_custom_wave(int id, bool create_flag); + template + static CustomObject * find_custom_object(int id, bool create_flag, std::map & customObjects); int per_pixel_eqn_string_index; int per_frame_eqn_string_index; @@ -90,12 +93,14 @@ public: /* Data structures that contain equation and initial condition information */ std::map per_frame_eqn_tree; /* per frame equations */ std::map per_pixel_eqn_tree; /* per pixel equation tree */ + GenExpr * per_pixel_eqn_array[NUM_OPS]; /* per pixel equation array */ std::map per_frame_init_eqn_tree; /* per frame initial equations */ std::map init_cond_tree; /* initial conditions */ std::map user_param_tree; /* user parameter splay tree */ int add_per_pixel_eqn( char *name, GenExpr *gen_expr ); - + + int resetPerPixelEqns(); int resetPerPixelEqnFlags(); @@ -123,6 +128,9 @@ public: int destroy(); void load_init_cond(char *name, int flags); + PresetOutputs::cwave_container * customWaves; + PresetOutputs::cshape_container * customShapes; + private: void evalCustomWavePerFrameEquations(); @@ -133,9 +141,42 @@ private: void evalPerPixelEqns(); void evalPerFrameEquations(); - PresetOutputs::cwave_container * customWaves; - PresetOutputs::cshape_container * customShapes; PresetOutputs & m_presetOutputs; }; +template +CustomObject * Preset::find_custom_object(int id, bool create_flag, std::map & customObjects) +{ + + CustomObject * custom_object = NULL; + + + typename std::map::iterator pos = customObjects.find(id); + + if (pos == customObjects.end()) + { + if (create_flag == FALSE) + { + return NULL; + } + + if ((custom_object = new CustomObject(id)) == NULL) + { + return NULL; + } + + std::pair::iterator, bool> inserteePair = + customObjects.insert(std::make_pair(custom_object->id, custom_object)); + + assert(inserteePair.second); + + custom_object = inserteePair.first->second; + + } else + custom_object = pos->second; + + + assert(custom_object); + return custom_object; +} #endif /** !_PRESET_HPP */ diff --git a/src/projectM-engine/PresetFrameIO.hpp b/src/projectM-engine/PresetFrameIO.hpp index 7ca6cfa0f..49a5f401e 100644 --- a/src/projectM-engine/PresetFrameIO.hpp +++ b/src/projectM-engine/PresetFrameIO.hpp @@ -1,6 +1,6 @@ #ifndef PRESET_FRAME_IO_HPP #define PRESET_FRAME_IO_HPP -#include +#include class CustomWave; class CustomShape; @@ -11,8 +11,8 @@ class CustomShape; * members for Mr. Sperl's convenience */ class PresetOutputs { public: - typedef std::vector cwave_container; - typedef std::vector cshape_container; + typedef std::map cwave_container; + typedef std::map cshape_container; cwave_container customWaves; cshape_container customShapes; @@ -168,7 +168,6 @@ public: /* variables were added in milkdrop 1.04 */ int gx,gy; - float **x_mesh; float **y_mesh; float **rad_mesh;

p=FKP^aGuPKn9yTK$3*hZIK_I=; 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�ObE`siPnYF=@(kJ`VcbM} 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 diff --git a/src/projectM-engine-backup/libprojectM/Debug/vc60.pdb b/src/projectM-engine-backup/libprojectM/Debug/vc60.pdb deleted file mode 100755 index 6e47e71d2a792b32ce06b1b0004834062982ce64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110592 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 - -