spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove multitexture render path

pull/110/head
Hleb Valoshka 2018-09-25 23:00:00 +03:00
parent 0d7a20ea77
commit 829a17d4ac
6 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/celengine/cmdparser.cpp
View File

@ -770,8 +770,6 @@ Command* CommandParser::parseCommand()
if (compareIgnoringCase(path, "basic") == 0)
glcpath = GLContext::GLPath_Basic;
else if (compareIgnoringCase(path, "multitexture") == 0)
glcpath = GLContext::GLPath_Multitexture;
else if (compareIgnoringCase(path, "glsl") == 0)
glcpath = GLContext::GLPath_GLSL;

7
src/celengine/glcontext.cpp
View File

@ -85,7 +85,6 @@ bool GLContext::setRenderPath(GLRenderPath path)
switch (path)
{
case GLPath_Basic:
case GLPath_Multitexture:
vertexPath = VPath_Basic;
break;
case GLPath_GLSL:
@ -108,10 +107,6 @@ bool GLContext::renderPathSupported(GLRenderPath path) const
case GLPath_Basic:
return true;
case GLPath_Multitexture:
return (maxSimultaneousTextures > 1 &&
(GLEW_EXT_texture_env_combine || GLEW_ARB_texture_env_combine));
case GLPath_GLSL:
return GLEW_ARB_shader_objects &&
GLEW_ARB_shading_language_100 &&
@ -148,7 +143,7 @@ bool GLContext::extensionSupported(const string& ext) const
bool GLContext::bumpMappingSupported() const
{
return renderPath > GLPath_Multitexture;
return renderPath != GLPath_Basic;
}

3
src/celengine/glcontext.h
View File

@ -24,7 +24,6 @@ class GLContext
enum GLRenderPath
{
GLPath_Basic = 0,
GLPath_Multitexture = 1,
GLPath_GLSL = 8,
};
@ -44,7 +43,7 @@ class GLContext
bool extensionSupported(const std::string&) const;
int getMaxTextures() const { return maxSimultaneousTextures; };
bool hasMultitexture() const { return renderPath >= GLPath_Multitexture; };
bool hasMultitexture() const { return renderPath != GLPath_Basic; };
bool bumpMappingSupported() const;
VertexPath getVertexPath() const;

4
src/celestia/celestiacore.cpp
View File

@ -1442,9 +1442,6 @@ void CelestiaCore::charEntered(const char *c_p, int modifiers)
case GLContext::GLPath_Basic:
flash(_("Render path: Basic"));
break;
case GLContext::GLPath_Multitexture:
flash(_("Render path: Multitexture"));
break;
case GLContext::GLPath_GLSL:
flash(_("Render path: OpenGL 2.0"));
break;
@ -4311,7 +4308,6 @@ bool CelestiaCore::initRenderer()
context->init(config->ignoreGLExtensions);
// Choose the render path, starting with the least desirable
context->setRenderPath(GLContext::GLPath_Basic);
context->setRenderPath(GLContext::GLPath_Multitexture);
context->setRenderPath(GLContext::GLPath_GLSL);
cout << _("render path: ") << context->getRenderPath() << '\n';

1
src/celestia/qt/qtglwidget.cpp
View File

@ -110,7 +110,6 @@ static GLContext::GLRenderPath getBestAvailableRenderPath(const GLContext& glc)
{
const GLContext::GLRenderPath renderPaths[] = {
GLContext::GLPath_GLSL,
GLContext::GLPath_Multitexture,
GLContext::GLPath_Basic,
};

2
src/celestia/qt/qtpreferencesdialog.cpp
View File

@ -158,8 +158,6 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, CelestiaCore* core) :
if (glContext->renderPathSupported(GLContext::GLPath_Basic))
ui.renderPathBox->addItem(_("Basic"), GLContext::GLPath_Basic);
if (glContext->renderPathSupported(GLContext::GLPath_Multitexture))
ui.renderPathBox->addItem(_("Multitexture"), GLContext::GLPath_Multitexture);
if (glContext->renderPathSupported(GLContext::GLPath_GLSL))
ui.renderPathBox->addItem(_("OpenGL 2.0"), GLContext::GLPath_GLSL);