From 38ca4626cee91c25c98f75666f556c8dde140e36 Mon Sep 17 00:00:00 2001 From: mancoast Date: Sun, 3 Nov 2019 16:05:36 -0500 Subject: [PATCH] confirm build w/o fonts --- ...eTune.WindowsUniversal.Application.vcxproj | 4 +- ...ndowsUniversal.Application.vcxproj.filters | 28 +++++++++++ ...ctM.WindowsUniversal.SharedLibrary.vcxproj | 12 ++--- src/libprojectM/Renderer/Renderer.cpp | 48 ++----------------- 4 files changed, 41 insertions(+), 51 deletions(-) diff --git a/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj b/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj index 290137fe5..46d4a5784 100644 --- a/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj +++ b/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj @@ -103,7 +103,7 @@ $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 - WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_X64_CPU;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_DEBUG;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) + EYETUNE_WINRT;WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_X64_CPU;_DEBUG;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_DEBUG;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) NotUsing NotUsing NotUsing @@ -116,7 +116,7 @@ $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) 4453;28204 - EYETUNE_WINRT;WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS + EYETUNE_WINRT;EYETUNE_WINRT;WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS NotUsing NotUsing NotUsing diff --git a/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj.filters b/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj.filters index dd9dd333b..b8c55f717 100644 --- a/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj.filters +++ b/src/EyeTune/EyeTune.WindowsUniversal.Application/EyeTune.WindowsUniversal.Application.vcxproj.filters @@ -137,6 +137,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/EyeTune/projectM.WindowsUniversal.SharedLibrary/projectM.WindowsUniversal.SharedLibrary.vcxproj b/src/EyeTune/projectM.WindowsUniversal.SharedLibrary/projectM.WindowsUniversal.SharedLibrary.vcxproj index 4b1ce0240..3dae2ecce 100644 --- a/src/EyeTune/projectM.WindowsUniversal.SharedLibrary/projectM.WindowsUniversal.SharedLibrary.vcxproj +++ b/src/EyeTune/projectM.WindowsUniversal.SharedLibrary/projectM.WindowsUniversal.SharedLibrary.vcxproj @@ -125,7 +125,7 @@ false true $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) - WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_X64_CPU;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS + EYETUNE_WINRT;WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_X64_CPU;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS Console @@ -139,7 +139,7 @@ false true $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) - EYETUNE_WINRT;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) + EYETUNE_WINRT;EYETUNE_WINRT;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) Console @@ -158,7 +158,7 @@ false true $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) - WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_X64_CPU;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS + EYETUNE_WINRT;WIN32;SOIL_GLES2;USE_GLES;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;NOMINMAX;ANGLE_STANDALONE_BUILD;GL_GLEXT_PROTOTYPES;EGL_EGLEXT_PROTOTYPES;ANGLE_X64_CPU;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS Console @@ -172,7 +172,7 @@ false true $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) - EYETUNE_WINRT;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) + EYETUNE_WINRT;EYETUNE_WINRT;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) Console @@ -187,7 +187,7 @@ false true $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) - _DEBUG;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) + EYETUNE_WINRT;_DEBUG;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) Console @@ -201,7 +201,7 @@ false true $(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories) - EYETUNE_WINRT;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) + EYETUNE_WINRT;EYETUNE_WINRT;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;projectM_FONT_MENU="\"$(MSBuildThisFileDirectory)../fonts/VeraMono.ttf\"";projectM_FONT_TITLE="\"$(MSBuildThisFileDirectory)../fonts/Vera.ttf\"";WIN32;USE_GLES;SOIL_GLES2;DISABLE_NATIVE_PRESETS;%(PreprocessorDefinitions) Console diff --git a/src/libprojectM/Renderer/Renderer.cpp b/src/libprojectM/Renderer/Renderer.cpp index e6025b3bf..d13400466 100644 --- a/src/libprojectM/Renderer/Renderer.cpp +++ b/src/libprojectM/Renderer/Renderer.cpp @@ -17,6 +17,8 @@ Pipeline* Renderer::currentPipe; class Preset; +#ifdef USE_FTGL + void Renderer::drawTextonM(const char* string, GLfloat x, GLfloat y, GLfloat scale, int horizontalAlignment = GLT_LEFT, int verticalAlignment = GLT_TOP) @@ -61,6 +63,8 @@ void Renderer::drawTextonM(GLTtext* text, const char* string, GLfloat x, GLfloat } +#endif /** USE_FTGL */ + Renderer::Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetect, std::string _presetURL, std::string _titlefontURL, std::string _menufontURL, const std::string& datadir) : mesh(gx, gy), m_presetName("None"), m_datadir(datadir), vw(width), vh(height), @@ -272,17 +276,9 @@ void Renderer::Pass2(const Pipeline &pipeline, const PipelineContext &pipelineCo CompositeOutput(pipeline, pipelineContext); } -/* TODO: - * // FTGLES exists: - * https://github.com/cdave1/ftgles/ */ -#ifndef EMSCRIPTEN - glMatrixMode(GL_MODELVIEW); -#endif - glLoadIdentity(); - glTranslatef(-0.5, -0.5, 0); - // When console refreshes, there is a chance the preset has been changed by the user refreshConsole(); + // TODO: draw_title_to_screen(false); if (this->showhelp % 2) draw_help(); @@ -295,40 +291,6 @@ void Renderer::Pass2(const Pipeline &pipeline, const PipelineContext &pipelineCo draw_preset(); if (this->showstats % 2) draw_stats(); - /* - - - - title_font->FaceSize(50); - - glRasterPos2f(0.01, -0.05); - title_font->Render("Help"); - - title_font->Render ("Hello World!");*/ - - - // - // draw_title_to_screen(false); - // if (this->showhelp % 2) - // draw_help(); - //// TODO: - // // if (this->showtitle % 2) - // draw_title(); - //// TODO: - // if (this->showfps % 2) - // draw_fps(); - // // draw_fps(this->realfps); - // if (this->showpreset % 2) - // draw_preset(); - // if (this->showstats % 2) - // draw_stats(); - // glTranslatef(0.5, 0.5, 0); - - // if (textureRenderToTexture) { - // glBindTexture(GL_TEXTURE_2D, textureRenderToTexture); - // glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, texsizeX, texsizeY); - // glBindTexture(GL_TEXTURE_2D, 0); - // } } void Renderer::RenderFrame(const Pipeline &pipeline,