diff --git a/src/projectM-engine/CMakeLists.txt b/src/projectM-engine/CMakeLists.txt index 3ef1e9595..72e0a0d29 100644 --- a/src/projectM-engine/CMakeLists.txt +++ b/src/projectM-engine/CMakeLists.txt @@ -4,7 +4,7 @@ ADD_LIBRARY(projectM SHARED projectM.cpp projectM.hpp PBuffer.cpp PBuffer.hpp In Param.cpp CustomWave.cpp CustomShape.hpp CustomShape.cpp Param.hpp CustomWave.hpp BeatDetect.hpp 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 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) +BuiltinFuncs.cpp compare.h editor.h event.h fatal.h fftsg.h glConsole.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 PresetMerge.cpp PresetMerge.hpp) OPTION(USE_FTGL "Use FTGL for on-screen fonts" ON) diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp index 40c9d5ab4..cfdf0a2f8 100644 --- a/src/projectM-engine/Renderer.cpp +++ b/src/projectM-engine/Renderer.cpp @@ -56,7 +56,6 @@ this->origy2=(float **)wipemalloc(gx * sizeof(float *)); this->origy2[x] = (float *)wipemalloc(gy * sizeof(float)); } - printf("[%d, %d, tex:%d]",gx,gy, renderTarget->texsize); //initialize reference grid values for (x=0;xorigy2=(float **)wipemalloc(gx * sizeof(float *)); float origx=x/(float)(gx-1); float origy=-((y/(float)(gy-1))-1); - this->gridx[x][y]=origx ; - this->gridy[x][y]=origy ; + this->gridx[x][y]=origx; + this->gridy[x][y]=origy; this->origx2[x][y]=( origx-.5)*2; this->origy2[x][y]=( origy-.5)*2; - printf("(%f,%f:%f,%f)",origx,origy,this->gridx[x][y],this->gridy[x][y]); + }} this->renderTarget = renderTarget;