diff --git a/src/libprojectM/libprojectM.a b/src/libprojectM/libprojectM.a index a57b1f7d4..4465f7a9b 100644 Binary files a/src/libprojectM/libprojectM.a and b/src/libprojectM/libprojectM.a differ diff --git a/src/projectM-emscripten/CMakeLists.txt b/src/projectM-emscripten/CMakeLists.txt index f7c4f9b39..4765e2ebe 100644 --- a/src/projectM-emscripten/CMakeLists.txt +++ b/src/projectM-emscripten/CMakeLists.txt @@ -1,11 +1,13 @@ -PROJECT(projectM-emscripten) +INCLUDE(../cmake/CPack-projectM.cmake) + +PROJECT(projectEM) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) endif(COMMAND cmake_policy) -ADD_EXECUTABLE(projectM-emscripten projectM_SDL_emscripten.cpp) +ADD_EXECUTABLE(projectEM projectM_SDL_emscripten.cpp) -TARGET_LINK_LIBRARIES(projectM-emscripten projectM) +TARGET_LINK_LIBRARIES(projectEM projectM) INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR}) @@ -19,7 +21,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) #FIND_PACKAGE(SDL2 REQUIRED) #INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS}) -#TARGET_LINK_LIBRARIES(projectM-emscripten ${SDL2_LIBRARIES}) +#TARGET_LINK_LIBRARIES(projectEM ${SDL2_LIBRARIES}) -SET_TARGET_PROPERTIES(projectM-emscripten PROPERTIES LINK_FLAGS "-o projectM.html --emrun") -#SET_TARGET_PROPERTIES(projectM-emscripten PROPERTIES LINK_FLAGS "--emrun") +SET_TARGET_PROPERTIES(projectEM PROPERTIES LINK_FLAGS "-o build/projectEM.html --emrun") +#SET_TARGET_PROPERTIES(projectEM PROPERTIES LINK_FLAGS "--emrun") diff --git a/src/projectM-emscripten/build/config.inp b/src/projectM-emscripten/build/config.inp new file mode 100644 index 000000000..60ab122ef --- /dev/null +++ b/src/projectM-emscripten/build/config.inp @@ -0,0 +1,22 @@ +# config.inp +# Configuration File for projectM + +Texture Size = 2048 # Size of internal rendering texture +Mesh X = 2 # Width of PerPixel Equation mesh +Mesh Y = 2 # Height of PerPixel Equation mesh +FPS = 60 # Frames Per Second +Fullscreen = false +Window Width = 512 # startup window width +Window Height = 512 # startup window height + +Smooth Transition Duration = 5 # in seconds +Preset Duration = 10 # in seconds +Easter Egg Parameter = 1 + +Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent +Aspect Correction = true # Custom Shape Aspect Correction + +Preset Path = presets + +Title Font = fonts/Vera.ttf +Menu Font = fonts/VeraMono.ttf diff --git a/src/projectM-emscripten/build/fonts/CMakeLists.txt b/src/projectM-emscripten/build/fonts/CMakeLists.txt new file mode 100644 index 000000000..9c199ab33 --- /dev/null +++ b/src/projectM-emscripten/build/fonts/CMakeLists.txt @@ -0,0 +1,11 @@ +PROJECT(fonts) +cmake_minimum_required(VERSION 2.4.0) +cmake_policy(SET CMP0005 OLD) + +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) + + +Include(../src/cmake/CPack-projectM.cmake) + diff --git a/src/projectM-emscripten/build/fonts/Vera.ttf b/src/projectM-emscripten/build/fonts/Vera.ttf new file mode 100755 index 000000000..58cd6b5e6 Binary files /dev/null and b/src/projectM-emscripten/build/fonts/Vera.ttf differ diff --git a/src/projectM-emscripten/build/fonts/VeraMono.ttf b/src/projectM-emscripten/build/fonts/VeraMono.ttf new file mode 100755 index 000000000..139f0b431 Binary files /dev/null and b/src/projectM-emscripten/build/fonts/VeraMono.ttf differ diff --git a/src/projectM-emscripten/emscripten_sdltoprojectM.h b/src/projectM-emscripten/emscripten_sdltoprojectM.h deleted file mode 100755 index 12283639e..000000000 --- a/src/projectM-emscripten/emscripten_sdltoprojectM.h +++ /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: 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 _EM_SDLTOPROJECTM_H -#define _EM_SDLTOPROJECTM_H - -#include "event.h" - -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; \ - } \ - } \ - -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; \ - } \ - } \ - -projectMModifier sdl2pmModifier( SDLMod mod ) { \ - return PROJECTM_KMOD_LSHIFT; \ - } \ - -#endif /** _SDLTOPROJECTM_H */ diff --git a/src/projectM-emscripten/projectM_SDL_emscripten.cpp b/src/projectM-emscripten/projectM_SDL_emscripten.cpp index f10bfb8c6..b26b1c1eb 100755 --- a/src/projectM-emscripten/projectM_SDL_emscripten.cpp +++ b/src/projectM-emscripten/projectM_SDL_emscripten.cpp @@ -16,6 +16,8 @@ #include #endif +const char *PROJECTEM_CONFIG_PATH = "build/config.inp"; + projectM *globalPM = NULL; bool done = false; @@ -121,7 +123,7 @@ int main( int argc, char *argv[] ) { } #endif - globalPM = new projectM("/usr/local/share/projectM/config.inp"); + globalPM = new projectM(PROJECTEM_CONFIG_PATH); // globalPM->renderTarget->texsize = 1024;