mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-03-01 04:55:03 +00:00
confirm build w/o fonts
This commit is contained in:
@ -103,7 +103,7 @@
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
|
||||
<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)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
@ -116,7 +116,7 @@
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
|
||||
<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_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>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</PreprocessorDefinitions>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
|
||||
@ -137,6 +137,34 @@
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\..\presets\presets_eyetune\*.*" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Filter Include="Assets">
|
||||
|
||||
@ -125,7 +125,7 @@
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>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</PreprocessorDefinitions>
|
||||
<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;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@ -139,7 +139,7 @@
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
|
||||
<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)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@ -158,7 +158,7 @@
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>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</PreprocessorDefinitions>
|
||||
<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;ANGLE_ENABLE_DEBUG_ANNOTATIONS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;DISABLE_NATIVE_PRESETS</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@ -172,7 +172,7 @@
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
|
||||
<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)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@ -187,7 +187,7 @@
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<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)</PreprocessorDefinitions>
|
||||
<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)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@ -201,7 +201,7 @@
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(SolutionDir);$(ProjectDir);$(IntermediateOutputPath);$(SolutionDir)..\msvc;$(SolutionDir)\libprojectM;$(SolutionDir)\libprojectM\Renderer;$(SolutionDir)\libprojectM\Renderer\SOIL2;$(SolutionDir)\libprojectM\Renderer\hlslparser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>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)</PreprocessorDefinitions>
|
||||
<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)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
||||
@ -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,
|
||||
|
||||
Reference in New Issue
Block a user