From 1ba91d5a0e1df7419a561f6dcf16a0839509a5e7 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Wed, 27 Aug 2008 13:28:57 +0000 Subject: Reordering of the directories[1]: moving Game/Code to src git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1302 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/lib/projectM/cwrapper/Makefile.in | 30 --- .../lib/projectM/cwrapper/projectM-cwrapper.cpp | 104 ----------- .../Code/lib/projectM/cwrapper/projectM-cwrapper.h | 67 ------- .../lib/projectM/cwrapper/projectM-cwrapper.sln | 20 -- .../lib/projectM/cwrapper/projectM-cwrapper.vcproj | 208 --------------------- 5 files changed, 429 deletions(-) delete mode 100644 Game/Code/lib/projectM/cwrapper/Makefile.in delete mode 100644 Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp delete mode 100644 Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h delete mode 100644 Game/Code/lib/projectM/cwrapper/projectM-cwrapper.sln delete mode 100644 Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj (limited to 'Game/Code/lib/projectM/cwrapper') diff --git a/Game/Code/lib/projectM/cwrapper/Makefile.in b/Game/Code/lib/projectM/cwrapper/Makefile.in deleted file mode 100644 index d2be8613..00000000 --- a/Game/Code/lib/projectM/cwrapper/Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ -OBJECTS = projectM-cwrapper.o -LIBRARY = libprojectM-cwrapper.a - -CXX = @CXX@ -CXXFLAGS += @CXXFLAGS@ -INCLUDES = -I@libprojectM_INCLUDEDIR@/libprojectM -DEFINES = -DPROJECTM_VERSION_INT=@libprojectM_VERSION_INT@ -RANLIB = @RANLIB@ - -.PHONY: all clean distclean strip - -all : $(LIBRARY) - -$(LIBRARY): $(OBJECTS) - ar ruv $(LIBRARY) $(OBJECTS) - $(RANLIB) $(LIBRARY) - -%.o : %.cpp - $(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $(<) -o $@ - -clean : - rm -f $(LIBRARY) - rm -f $(OBJECTS) - -distclean: clean - rm -rf Makefile - -strip : - strip $(LIBRARY) - $(RANLIB) $(LIBRARY) diff --git a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp deleted file mode 100644 index ebf43554..00000000 --- a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.cpp +++ /dev/null @@ -1,104 +0,0 @@ -#include "projectM-cwrapper.h" - -#define PM_CLASS(pm) ((projectM*)pm) - -#if (PROJECTM_VERSION_INT > 1000000) -#define PM_PCM(pm) (PM_CLASS(pm)->pcm()) -#else -#define PM_PCM(pm) (PM_CLASS(pm)->pcm) -#endif - -projectM_ptr projectM_create1(char* config_file) -{ - return projectM_ptr(new projectM(config_file)); -} - -#if (PROJECTM_VERSION_INT < 1000000) -projectM_ptr projectM_create2(int gx, int gy, int fps, int texsize, - int width, int height, char* preset_url, - char* title_fonturl, char* title_menuurl) -{ - return projectM_ptr(new projectM(gx, gy, fps, texsize, width, height, - preset_url, title_fonturl, title_menuurl));} -#endif - -void projectM_resetGL(projectM_ptr pm, int width, int height) -{ - PM_CLASS(pm)->projectM_resetGL(width, height); -} - -void projectM_setTitle(projectM_ptr pm, char* title) -{ - PM_CLASS(pm)->projectM_setTitle(title); -} - -void projectM_renderFrame(projectM_ptr pm) -{ - PM_CLASS(pm)->renderFrame(); -} - -unsigned projectM_initRenderToTexture(projectM_ptr pm) -{ - return PM_CLASS(pm)->initRenderToTexture(); -} - -void projectM_key_handler(projectM_ptr pm, projectMEvent event, - projectMKeycode keycode, projectMModifier modifier) -{ - PM_CLASS(pm)->key_handler(event, keycode, modifier); -} - -void projectM_free(projectM_ptr pm) -{ - delete PM_CLASS(pm); -} - -void PCM_addPCMfloat(projectM_ptr pm, float *PCMdata, int samples) -{ - PM_PCM(pm)->addPCMfloat(PCMdata, samples); -} - -void PCM_addPCM16(projectM_ptr pm, short pcm_data[2][512]) -{ - PM_PCM(pm)->addPCM16(pcm_data); -} - -void PCM_addPCM16Data(projectM_ptr pm, const short* pcm_data, short samples) -{ - PM_PCM(pm)->addPCM16Data(pcm_data, samples); -} - -void PCM_addPCM8(projectM_ptr pm, unsigned char pcm_data[2][1024]) -{ - PM_PCM(pm)->addPCM8(pcm_data); -} - -void PCM_addPCM8_512(projectM_ptr pm, const unsigned char pcm_data[2][512]) -{ - PM_PCM(pm)->addPCM8_512(pcm_data); -} - -#define COPY_FIELD(c_ptr, s, fld) (c_ptr->fld = s.fld) - -#if (PROJECTM_VERSION_INT > 1000000) -void projectM_settings(projectM_ptr pm, Settings* settings) -{ - const projectM::Settings& pmSettings = PM_CLASS(pm)->settings(); - - COPY_FIELD(settings, pmSettings, meshX); - COPY_FIELD(settings, pmSettings, meshY); - COPY_FIELD(settings, pmSettings, fps); - COPY_FIELD(settings, pmSettings, textureSize); - COPY_FIELD(settings, pmSettings, windowWidth); - COPY_FIELD(settings, pmSettings, windowHeight); - settings->presetURL = pmSettings.presetURL.c_str(); - settings->titleFontURL = pmSettings.titleFontURL.c_str(); - settings->menuFontURL = pmSettings.menuFontURL.c_str(); - COPY_FIELD(settings, pmSettings, smoothPresetDuration); - COPY_FIELD(settings, pmSettings, presetDuration); - COPY_FIELD(settings, pmSettings, beatSensitivity); - COPY_FIELD(settings, pmSettings, aspectCorrection); - COPY_FIELD(settings, pmSettings, easterEgg); - COPY_FIELD(settings, pmSettings, shuffleEnabled); -} -#endif diff --git a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h deleted file mode 100644 index 43f36ef4..00000000 --- a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.h +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef __PROJECTM_CWRAPPER_H__ -#define __PROJECTM_CWRAPPER_H__ - -#include "projectM.hpp" - -// PROJECTM_VERSION define is not very helpful, lets create our own -#define PROJECTM_VERSION_1_00_00 1000000 // 1.00.00 = 1.0 or 1.01 (same version number for 1.0 and 1.01) -#define PROJECTM_VERSION_1_10_00 1010000 // 1.10.00 = 1.1 (bigger than 1.2 due to strange versioning) -#define PROJECTM_VERSION_1_02_00 1002000 // 1.02.00 = 1.2 - -// version of projectM to wrap (see PROJECTM_VERSION) -#ifndef PROJECTM_VERSION_INT -#define PROJECTM_VERSION_INT PROJECTM_VERSION_1_02_00 -#endif - -extern "C" { - - #if (PROJECTM_VERSION_INT > 1000000) - struct Settings { - int meshX; - int meshY; - int fps; - int textureSize; - int windowWidth; - int windowHeight; - const char* presetURL; - const char* titleFontURL; - const char* menuFontURL; - int smoothPresetDuration; - int presetDuration; - float beatSensitivity; - char aspectCorrection; - float easterEgg; - char shuffleEnabled; - }; - #endif - - typedef void* projectM_ptr; - - DLLEXPORT projectM_ptr projectM_create1(char* config_file); - #if (PROJECTM_VERSION_INT < 1000000) - DLLEXPORT projectM_ptr projectM_create2(int gx, int gy, int fps, int texsize, - int width, int height, char* preset_url, - char* title_fonturl, char* title_menuurl); - #endif - - DLLEXPORT void projectM_resetGL(projectM_ptr pm, int width, int height); - DLLEXPORT void projectM_setTitle(projectM_ptr pm, char* title); - DLLEXPORT void projectM_renderFrame(projectM_ptr pm); - DLLEXPORT unsigned projectM_initRenderToTexture(projectM_ptr pm); - DLLEXPORT void projectM_key_handler(projectM_ptr pm, projectMEvent event, - projectMKeycode keycode, projectMModifier modifier); - - DLLEXPORT void projectM_free(projectM_ptr pm); - - DLLEXPORT void PCM_addPCMfloat(projectM_ptr pm, float *PCMdata, int samples); - DLLEXPORT void PCM_addPCM16(projectM_ptr pm, short [2][512]); - DLLEXPORT void PCM_addPCM16Data(projectM_ptr pm, const short* pcm_data, short samples); - DLLEXPORT void PCM_addPCM8(projectM_ptr pm, unsigned char [2][1024]); - DLLEXPORT void PCM_addPCM8_512(projectM_ptr pm, const unsigned char [2][512]); - - #if (PROJECTM_VERSION_INT > 1000000) - DLLEXPORT void projectM_settings(projectM_ptr pm, Settings* settings); - #endif -} - -#endif diff --git a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.sln b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.sln deleted file mode 100644 index e05f79a3..00000000 --- a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "projectM-cwrapper", "projectM-cwrapper.vcproj", "{8E653284-12F3-4A90-9D0D-4195557051F7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8E653284-12F3-4A90-9D0D-4195557051F7}.Debug|Win32.ActiveCfg = Debug|Win32 - {8E653284-12F3-4A90-9D0D-4195557051F7}.Debug|Win32.Build.0 = Debug|Win32 - {8E653284-12F3-4A90-9D0D-4195557051F7}.Release|Win32.ActiveCfg = Release|Win32 - {8E653284-12F3-4A90-9D0D-4195557051F7}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj b/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj deleted file mode 100644 index c0902099..00000000 --- a/Game/Code/lib/projectM/cwrapper/projectM-cwrapper.vcproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3