diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/BuildLog.htm b/src/WinLibs/freetype-2.3.5/objs/debug/BuildLog.htm deleted file mode 100644 index d35b096b5..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/BuildLog.htm and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/autofit.obj b/src/WinLibs/freetype-2.3.5/objs/debug/autofit.obj deleted file mode 100644 index 92d62b3ed..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/autofit.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/bdf.obj b/src/WinLibs/freetype-2.3.5/objs/debug/bdf.obj deleted file mode 100644 index e426a1d01..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/bdf.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/cff.obj b/src/WinLibs/freetype-2.3.5/objs/debug/cff.obj deleted file mode 100644 index c605ca012..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/cff.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftbase.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftbase.obj deleted file mode 100644 index f194f7881..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftbase.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftbbox.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftbbox.obj deleted file mode 100644 index 67f159c95..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftbbox.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftbitmap.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftbitmap.obj deleted file mode 100644 index 986929017..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftbitmap.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftcache.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftcache.obj deleted file mode 100644 index 77cc59cd1..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftcache.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftdebug.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftdebug.obj deleted file mode 100644 index 7f893512f..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftdebug.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftgasp.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftgasp.obj deleted file mode 100644 index beb05780f..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftgasp.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftglyph.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftglyph.obj deleted file mode 100644 index 36d2b01c4..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftglyph.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftgzip.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftgzip.obj deleted file mode 100644 index 229889ef2..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftgzip.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftinit.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftinit.obj deleted file mode 100644 index 39113d8bf..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftinit.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftlzw.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftlzw.obj deleted file mode 100644 index 58cbcf55b..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftlzw.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftmm.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftmm.obj deleted file mode 100644 index 31b4dfd73..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftmm.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftpfr.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftpfr.obj deleted file mode 100644 index e7f148d31..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftpfr.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftstroke.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftstroke.obj deleted file mode 100644 index f652ed5d2..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftstroke.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftsynth.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftsynth.obj deleted file mode 100644 index 8fe89f5dd..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftsynth.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftsystem.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftsystem.obj deleted file mode 100644 index 9ff96afa5..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftsystem.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/fttype1.obj b/src/WinLibs/freetype-2.3.5/objs/debug/fttype1.obj deleted file mode 100644 index 3f451f711..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/fttype1.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/ftwinfnt.obj b/src/WinLibs/freetype-2.3.5/objs/debug/ftwinfnt.obj deleted file mode 100644 index 5558239d7..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/ftwinfnt.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/pcf.obj b/src/WinLibs/freetype-2.3.5/objs/debug/pcf.obj deleted file mode 100644 index 760bdca0b..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/pcf.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/pfr.obj b/src/WinLibs/freetype-2.3.5/objs/debug/pfr.obj deleted file mode 100644 index 00ad8b325..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/pfr.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/psaux.obj b/src/WinLibs/freetype-2.3.5/objs/debug/psaux.obj deleted file mode 100644 index 24ee5f6ee..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/psaux.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/pshinter.obj b/src/WinLibs/freetype-2.3.5/objs/debug/pshinter.obj deleted file mode 100644 index b965dbee9..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/pshinter.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/psmodule.obj b/src/WinLibs/freetype-2.3.5/objs/debug/psmodule.obj deleted file mode 100644 index c7fdb77b2..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/psmodule.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/raster.obj b/src/WinLibs/freetype-2.3.5/objs/debug/raster.obj deleted file mode 100644 index 076a0b0fe..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/raster.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/sfnt.obj b/src/WinLibs/freetype-2.3.5/objs/debug/sfnt.obj deleted file mode 100644 index 1660d709a..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/sfnt.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/smooth.obj b/src/WinLibs/freetype-2.3.5/objs/debug/smooth.obj deleted file mode 100644 index b96165b21..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/smooth.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/truetype.obj b/src/WinLibs/freetype-2.3.5/objs/debug/truetype.obj deleted file mode 100644 index 5a1fec7e3..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/truetype.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/type1.obj b/src/WinLibs/freetype-2.3.5/objs/debug/type1.obj deleted file mode 100644 index 10853bf42..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/type1.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/type1cid.obj b/src/WinLibs/freetype-2.3.5/objs/debug/type1cid.obj deleted file mode 100644 index 355628339..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/type1cid.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/type42.obj b/src/WinLibs/freetype-2.3.5/objs/debug/type42.obj deleted file mode 100644 index 687743597..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/type42.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/vc80.idb b/src/WinLibs/freetype-2.3.5/objs/debug/vc80.idb deleted file mode 100644 index d0f84fd7e..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/vc80.idb and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/vc80.pdb b/src/WinLibs/freetype-2.3.5/objs/debug/vc80.pdb deleted file mode 100644 index d7c3b38a6..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/vc80.pdb and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/debug/winfnt.obj b/src/WinLibs/freetype-2.3.5/objs/debug/winfnt.obj deleted file mode 100644 index f941e1071..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/debug/winfnt.obj and /dev/null differ diff --git a/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm b/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm deleted file mode 100644 index 60933eb38..000000000 Binary files a/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/debug/BuildLog.htm b/src/WinLibs/glew/build/vc6/static/debug/BuildLog.htm deleted file mode 100644 index 4ed7fde58..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/debug/BuildLog.htm and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/debug/glew.obj b/src/WinLibs/glew/build/vc6/static/debug/glew.obj deleted file mode 100644 index 922320ab8..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/debug/glew.obj and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/debug/glew.res b/src/WinLibs/glew/build/vc6/static/debug/glew.res deleted file mode 100644 index 766d80222..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/debug/glew.res and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/debug/vc80.idb b/src/WinLibs/glew/build/vc6/static/debug/vc80.idb deleted file mode 100644 index 398517943..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/debug/vc80.idb and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/debug/vc80.pdb b/src/WinLibs/glew/build/vc6/static/debug/vc80.pdb deleted file mode 100644 index d45686f3d..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/debug/vc80.pdb and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/release/BuildLog.htm b/src/WinLibs/glew/build/vc6/static/release/BuildLog.htm deleted file mode 100644 index 9a08729b6..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/release/BuildLog.htm and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/release/glew.obj b/src/WinLibs/glew/build/vc6/static/release/glew.obj deleted file mode 100644 index 55b684f11..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/release/glew.obj and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/release/glew.res b/src/WinLibs/glew/build/vc6/static/release/glew.res deleted file mode 100644 index 558322e01..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/release/glew.res and /dev/null differ diff --git a/src/WinLibs/glew/build/vc6/static/release/vc80.idb b/src/WinLibs/glew/build/vc6/static/release/vc80.idb deleted file mode 100644 index dc772e6d0..000000000 Binary files a/src/WinLibs/glew/build/vc6/static/release/vc80.idb and /dev/null differ diff --git a/src/projectM-engine/KeyHandler.cpp b/src/projectM-engine/KeyHandler.cpp index 4bf448660..5b94fd899 100755 --- a/src/projectM-engine/KeyHandler.cpp +++ b/src/projectM-engine/KeyHandler.cpp @@ -114,6 +114,10 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode beatDetect->beat_sensitivity -= 0.25; if (beatDetect->beat_sensitivity < 0) beatDetect->beat_sensitivity = 0; break; + case PROJECTM_K_h: + renderer->showhelp++; + renderer->showstats=0; + renderer->showfps=0; case PROJECTM_K_F1: renderer->showhelp++; renderer->showstats=0; diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp index efcb2e045..f1507a088 100644 --- a/src/projectM-engine/Renderer.cpp +++ b/src/projectM-engine/Renderer.cpp @@ -11,7 +11,7 @@ class Preset; -Renderer::Renderer(int width, int height, int gx, int gy, int texsize, BeatDetect *beatDetect, std::string presetURL, std::string _titlefontURL, std::string _menufontURL): title_fontURL(_titlefontURL), menu_fontURL(_menufontURL), m_presetName("None"), vw(width), vh(height), gx(gx), gy(gy) +Renderer::Renderer(int width, int height, int gx, int gy, int texsize, BeatDetect *beatDetect, std::string _presetURL, std::string _titlefontURL, std::string _menufontURL): title_fontURL(_titlefontURL), menu_fontURL(_menufontURL), presetURL(_presetURL), m_presetName("None"), vw(width), vh(height), gx(gx), gy(gy), texsize(texsize) { int x; int y; @@ -102,6 +102,17 @@ Renderer::Renderer(int width, int height, int gx, int gy, int texsize, BeatDetec } +void Renderer::ResetTextures() + { + textureManager->Clear(); + + delete(renderTarget); + renderTarget = new RenderTarget(texsize,vw,vh); + reset(vw,vh); + + textureManager->Preload(); + } + void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInputs) { totalframes++; diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp index eff979b58..508f07f95 100644 --- a/src/projectM-engine/Renderer.hpp +++ b/src/projectM-engine/Renderer.hpp @@ -50,10 +50,12 @@ public: float realfps; std::string title; int drawtitle; + int texsize; Renderer( int width, int height, int gx, int gy, int texsize, BeatDetect *beatDetect, std::string presetURL, std::string title_fontURL, std::string menu_fontURL); ~Renderer(); void RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInputs); + void ResetTextures(); void reset(int w, int h); GLuint initRenderToTexture(); void PerPixelMath(PresetOutputs *presetOutputs, PresetInputs *presetInputs); @@ -100,6 +102,7 @@ private: std::string title_fontURL; std::string menu_fontURL; + std::string presetURL; void draw_waveform(PresetOutputs * presetOutputs); void Interpolation(PresetOutputs *presetOutputs, PresetInputs *presetInputs); diff --git a/src/projectM-engine/TextureManager.cpp b/src/projectM-engine/TextureManager.cpp index 9b689f4e3..371f4d6a9 100644 --- a/src/projectM-engine/TextureManager.cpp +++ b/src/projectM-engine/TextureManager.cpp @@ -7,7 +7,17 @@ TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetURL) { - GLuint tex = SOIL_load_OGL_texture_from_memory( + Preload(); +} + +TextureManager::~TextureManager() +{ + Clear(); +} + +void TextureManager::Preload() +{ + GLuint tex = SOIL_load_OGL_texture_from_memory( M_data, M_bytes, SOIL_LOAD_AUTO, @@ -44,9 +54,9 @@ TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetU textures["headphones.tga"]=tex; } -TextureManager::~TextureManager() -{ - std::map::const_iterator iter; +void TextureManager::Clear() +{ + std::map::const_iterator iter; for(iter = textures.begin(); iter != textures.end(); iter++) { @@ -55,6 +65,7 @@ TextureManager::~TextureManager() textures.clear(); } + void TextureManager::unloadTextures(const PresetOutputs::cshape_container &shapes) { /* diff --git a/src/projectM-engine/TextureManager.hpp b/src/projectM-engine/TextureManager.hpp index 212012751..a6fcac8a2 100644 --- a/src/projectM-engine/TextureManager.hpp +++ b/src/projectM-engine/TextureManager.hpp @@ -21,6 +21,8 @@ public: ~TextureManager(); TextureManager(std::string _presetURL); void unloadTextures(const PresetOutputs::cshape_container &shapes); + void Clear(); + void Preload(); GLuint getTexture(std::string imageUrl); unsigned int getTextureMemorySize(); }; diff --git a/src/projectM-engine/carbontoprojectM.h b/src/projectM-engine/carbontoprojectM.h index 68f2567d6..98ab3ae55 100755 --- a/src/projectM-engine/carbontoprojectM.h +++ b/src/projectM-engine/carbontoprojectM.h @@ -29,7 +29,8 @@ #ifndef _CARBONTOPROJECTM_H #define _CARBONTOPROJECTM_H -#include "projectM.hpp" +#include "event.h" + #ifdef WIN32 #else #endif diff --git a/src/projectM-engine/projectM.cpp b/src/projectM-engine/projectM.cpp index 00249e465..9d135ec1e 100755 --- a/src/projectM-engine/projectM.cpp +++ b/src/projectM-engine/projectM.cpp @@ -93,6 +93,11 @@ DLLEXPORT unsigned projectM::initRenderToTexture() return renderer->initRenderToTexture(); } +DLLEXPORT void projectM::projectM_resetTextures() +{ + renderer->ResetTextures(); +} + DLLEXPORT projectM::projectM(std::string config_file) : beatDetect ( 0 ), renderer(0), smoothFrame(0) { diff --git a/src/projectM-engine/projectM.hpp b/src/projectM-engine/projectM.hpp index af604225e..2eb7940c4 100755 --- a/src/projectM-engine/projectM.hpp +++ b/src/projectM-engine/projectM.hpp @@ -116,6 +116,7 @@ public: DLLEXPORT projectM(int gx, int gy, int fps, int texsize, int width, int height,std::string preset_url,std::string title_fonturl, std::string title_menuurl); DLLEXPORT void projectM_resetGL( int width, int height ); + DLLEXPORT void projectM_resetTextures(); DLLEXPORT void projectM_setTitle( std::string title ); DLLEXPORT void renderFrame(); DLLEXPORT unsigned initRenderToTexture(); diff --git a/src/projectM-wmp/projectM-wmp.suo b/src/projectM-wmp/projectM-wmp.suo index caecfc262..620f108c4 100644 Binary files a/src/projectM-wmp/projectM-wmp.suo and b/src/projectM-wmp/projectM-wmp.suo differ diff --git a/src/projectM-wmp/projectM-wmp/projectM-wmp.vcproj b/src/projectM-wmp/projectM-wmp/projectM-wmp.vcproj index 95ebc1e7e..3b4df6c66 100644 --- a/src/projectM-wmp/projectM-wmp/projectM-wmp.vcproj +++ b/src/projectM-wmp/projectM-wmp/projectM-wmp.vcproj @@ -106,7 +106,7 @@ OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" - UseOfATL="1" + UseOfATL="0" CharacterSet="2" WholeProgramOptimization="1" > @@ -127,13 +127,14 @@ /> - - - - - - - - - - diff --git a/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c b/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c index d60d337f9..570d4a720 100644 --- a/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c +++ b/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c @@ -6,7 +6,7 @@ /* File created by MIDL compiler version 7.00.0499 */ -/* at Wed Oct 03 15:17:19 2007 +/* at Tue Oct 09 16:15:59 2007 */ /* Compiler settings for .\projectM-wmp.idl: Oicf, W1, Zp8, env=Win32 (32b run)