ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix correct spelling of deferred

Browse Source
This commit is contained in:
Benau 2018-01-25 15:38:10 +08:00
parent ff38cb6423
commit 2448b10cd4
18 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/central_settings.cpp
View File

@ -384,7 +384,7 @@ bool CentralVideoSettings::isTextureCompressionEnabled() const
return supportsTextureCompression() && UserConfigParams::m_texture_compression;
}
bool CentralVideoSettings::isDefferedEnabled() const
bool CentralVideoSettings::isDeferredEnabled() const
{
return UserConfigParams::m_dynamic_lights && !GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_ADVANCED_PIPELINE);
}

2
src/graphics/central_settings.hpp
View File

@ -95,7 +95,7 @@ public:
// "Macro" around feature support and user config
bool isShadowEnabled() const;
bool isTextureCompressionEnabled() const;
bool isDefferedEnabled() const;
bool isDeferredEnabled() const;
};
extern CentralVideoSettings* CVS;

2
src/graphics/cpu_particle_manager.cpp
View File

@ -297,7 +297,7 @@ void CPUParticleManager::drawAll()
{
ParticleRenderer::getInstance()->setTextureUnits
(cur_mat->getTexture()->getOpenGLTextureName(),
CVS->isDefferedEnabled() ?
CVS->isDeferredEnabled() ?
irr_driver->getDepthStencilTexture() : 0);
ParticleRenderer::getInstance()->setUniforms(flips, billboard);
}

2
src/graphics/referee.cpp
View File

@ -162,7 +162,7 @@ Referee::Referee()
m_scene_node->setFrameLoop(m_st_first_start_frame,
m_st_last_start_frame);
#ifndef SERVER_ONLY
if (CVS->isGLSL() && CVS->isDefferedEnabled())
if (CVS->isGLSL() && CVS->isDeferredEnabled())
{
m_light = irr_driver->addLight(core::vector3df(0.0f, 0.0f, 0.6f), 0.7f, 2.0f,
0.7f /* r */, 0.0 /* g */, 0.0f /* b */, false /* sun */, m_scene_node);

6
src/graphics/rtts.cpp
View File

@ -107,7 +107,7 @@ RTT::RTT(unsigned int width, unsigned int height, float rtt_scale,
type = GL_UNSIGNED_BYTE;
}
#endif
if (!CVS->isDefferedEnabled())
if (!CVS->isDeferredEnabled())
{
// RTT is used in only deferred shading which need hdr framebuffer
rgba_internal_format = GL_RGBA8;
@ -118,7 +118,7 @@ RTT::RTT(unsigned int width, unsigned int height, float rtt_scale,
{
m_render_target_textures[RTT_COLOR] = generateRTT(res, rgba_internal_format, rgba_format, type);
}
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
m_render_target_textures[RTT_NORMAL_AND_DEPTH] = generateRTT(res, GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV);
m_render_target_textures[RTT_TMP1] = generateRTT(res, rgba_internal_format, rgba_format, type);
@ -169,7 +169,7 @@ RTT::RTT(unsigned int width, unsigned int height, float rtt_scale,
m_frame_buffers.push_back(new FrameBuffer(somevector, m_depth_stencil_tex, res.Width, res.Height));
}
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
somevector.clear();
somevector.push_back(m_render_target_textures[RTT_NORMAL_AND_DEPTH]);

16
src/graphics/shader_based_renderer.cpp
View File

@ -488,7 +488,7 @@ void ShaderBasedRenderer::renderScene(scene::ICameraSceneNode * const camnode,
// Now all instancing data from mesh and particle are done drawing
m_draw_calls.setFenceSync();
if (!CVS->isDefferedEnabled() && !forceRTT)
if (!CVS->isDeferredEnabled() && !forceRTT)
{
glDisable(GL_DEPTH_TEST);
glDepthMask(GL_FALSE);
@ -627,9 +627,9 @@ void ShaderBasedRenderer::onLoadWorld()
const core::recti &viewport = Camera::getCamera(0)->getViewport();
unsigned int width = viewport.LowerRightCorner.X - viewport.UpperLeftCorner.X;
unsigned int height = viewport.LowerRightCorner.Y - viewport.UpperLeftCorner.Y;
RTT* rtts = new RTT(width, height, CVS->isDefferedEnabled() ?
RTT* rtts = new RTT(width, height, CVS->isDeferredEnabled() ?
UserConfigParams::m_scale_rtts_factor : 1.0f,
!CVS->isDefferedEnabled());
!CVS->isDeferredEnabled());
setRTT(rtts);
}
@ -724,7 +724,7 @@ void ShaderBasedRenderer::render(float dt)
RaceGUIBase *rg = world->getRaceGUI();
if (rg) rg->update(dt);
if (!CVS->isDefferedEnabled())
if (!CVS->isDeferredEnabled())
{
prepareForwardRenderer();
}
@ -748,12 +748,12 @@ void ShaderBasedRenderer::render(float dt)
oss << "drawAll() for kart " << cam;
PROFILER_PUSH_CPU_MARKER(oss.str().c_str(), (cam+1)*60,
0x00, 0x00);
camera->activate(!CVS->isDefferedEnabled());
camera->activate(!CVS->isDeferredEnabled());
rg->preRenderCallback(camera); // adjusts start referee
irr_driver->getSceneManager()->setActiveCamera(camnode);
computeMatrixesAndCameras(camnode, m_rtts->getWidth(), m_rtts->getHeight());
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
renderSceneDeferred(camnode, dt, track->hasShadows(), false);
}
@ -772,7 +772,7 @@ void ShaderBasedRenderer::render(float dt)
debugPhysics();
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
renderPostProcessing(camera);
}
@ -861,7 +861,7 @@ void ShaderBasedRenderer::renderToTexture(GL3RenderTarget *render_target,
if (CVS->isARBUniformBufferObjectUsable())
uploadLightingData();
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
renderSceneDeferred(camera, dt, false, true);
render_target->setFrameBuffer(m_post_processing

2
src/graphics/shader_files_manager.cpp
View File

@ -171,7 +171,7 @@ ShaderFilesManager::SharedShader ShaderFilesManager::loadShader
code << "#define UBO_DISABLED\n";
if (CVS->needsVertexIdWorkaround())
code << "#define Needs_Vertex_Id_Workaround\n";
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
code << "#define Advanced_Lighting_Enabled\n";
#if !defined(USE_GLES2)

2
src/graphics/skid_marks.cpp
View File

@ -220,7 +220,7 @@ SkidMarks::SkidMarkQuads::SkidMarkQuads(const Vec3 &left,
video::SColor(255, SkidMarks::m_start_grey, SkidMarks::m_start_grey,
SkidMarks::m_start_grey));
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
m_start_color.setRed(SP::srgb255ToLinear(m_start_color.getRed()));
m_start_color.setGreen(SP::srgb255ToLinear(m_start_color.getGreen()));

4
src/graphics/skybox.cpp
View File

@ -179,7 +179,7 @@ void Skybox::generateCubeMapFromTextures()
glBindTexture(GL_TEXTURE_CUBE_MAP, m_cube_map);
bool needs_srgb_format = CVS->isDefferedEnabled();
bool needs_srgb_format = CVS->isDeferredEnabled();
GLint format = GL_RGBA;
GLint internal_format = needs_srgb_format ? GL_SRGB8_ALPHA8 : GL_RGBA8;
@ -218,7 +218,7 @@ void Skybox::generateSpecularCubemap()
}
glGenerateMipmap(GL_TEXTURE_CUBE_MAP);
if (!CVS->isDefferedEnabled())
if (!CVS->isDeferredEnabled())
return;
#if !defined(USE_GLES2)

8
src/graphics/sp/sp_base.cpp
View File

@ -327,7 +327,7 @@ void loadShaders()
// Displace shader is not specifiable in XML due to complex callback
std::shared_ptr<SPShader> sps;
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
// This displace shader will be drawn the last in transparent pass
sps = std::make_shared<SPShader>("displace", displaceShaderInit,
@ -345,7 +345,7 @@ void loadShaders()
// ========================================================================
// Glow shader
// ========================================================================
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
sps = std::make_shared<SPShader>
("sp_glow_shader", [](SPShader* shader)
@ -740,7 +740,7 @@ void prepareDrawCalls()
g_skinning_mesh.clear();
mathPlaneFrustumf(g_frustums[0], irr_driver->getProjViewMatrix());
g_handle_shadow = Track::getCurrentTrack() &&
Track::getCurrentTrack()->hasShadows() && CVS->isDefferedEnabled() &&
Track::getCurrentTrack()->hasShadows() && CVS->isDeferredEnabled() &&
CVS->isShadowEnabled();
if (g_handle_shadow)
@ -921,7 +921,7 @@ void addObject(SPMeshNode* node)
}
mb->addInstanceData(id, (DrawCallType)dc_type);
if (UserConfigParams::m_glow && node->hasGlowColor() &&
CVS->isDefferedEnabled() && dc_type == DCT_NORMAL)
CVS->isDeferredEnabled() && dc_type == DCT_NORMAL)
{
video::SColorf gc = node->getGlowColor();
unsigned key = gc.toSColor().color;

2
src/graphics/sp/sp_mesh_buffer.cpp
View File

@ -167,7 +167,7 @@ void SPMeshBuffer::uploadGLMesh()
offset += 4;
video::SColor vc = m_vertices[i].m_color;
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
vc.setRed(srgb255ToLinear(vc.getRed()));
vc.setGreen(srgb255ToLinear(vc.getGreen()));

2
src/graphics/sp/sp_shader.cpp
View File

@ -271,7 +271,7 @@ void SPShader::unload()
bool SPShader::isSrgbForTextureLayer(unsigned layer) const
{
#ifndef SERVER_ONLY
if (!CVS->isDefferedEnabled())
if (!CVS->isDeferredEnabled())
{
return false;
}

6
src/graphics/sp/sp_shader_manager.cpp
View File

@ -211,7 +211,7 @@ void SPShaderManager::loadEachShader(const std::string& file_name)
std::array<PassInfo, 2> pi;
loadPassInfo(xml->getNode("first-pass"), pi[0]);
if (!si.m_transparent_shader && CVS->isDefferedEnabled())
if (!si.m_transparent_shader && CVS->isDeferredEnabled())
{
loadPassInfo(xml->getNode("shadow-pass"), pi[1]);
}
@ -221,7 +221,7 @@ void SPShaderManager::loadEachShader(const std::string& file_name)
" file %s", file_name.c_str());
return;
}
if (!si.m_fallback_name.empty() && !CVS->isDefferedEnabled())
if (!si.m_fallback_name.empty() && !CVS->isDeferredEnabled())
{
std::shared_ptr<SPShader> fallback_shader =
getSPShader(si.m_fallback_name);
@ -362,7 +362,7 @@ void SPShaderManager::loadPassInfo(const XMLNode* pass, PassInfo& pi)
#ifndef SERVER_ONLY
if (!srgb_props.empty())
{
srgb = srgb_props == "Y" && CVS->isDefferedEnabled();
srgb = srgb_props == "Y" && CVS->isDeferredEnabled();
}
#endif
prefilled_texture->get("sampler", &sampler_props);

4
src/graphics/stk_text_billboard.cpp
View File

@ -35,14 +35,14 @@ STKTextBillboard::STKTextBillboard(const video::SColor& color_top,
{
using namespace SP;
m_color_top = color_top;
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
m_color_top.setRed(srgb255ToLinear(m_color_top.getRed()));
m_color_top.setGreen(srgb255ToLinear(m_color_top.getGreen()));
m_color_top.setBlue(srgb255ToLinear(m_color_top.getBlue()));
}
m_color_bottom = color_bottom;
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
video::SColorf tmp(m_color_bottom);
m_color_bottom.setRed(srgb255ToLinear(m_color_bottom.getRed()));

4
src/graphics/stk_texture.cpp
View File

@ -42,7 +42,7 @@ STKTexture::STKTexture(const std::string& path, TexConfig* tc, bool no_upload)
if (m_tex_config)
{
if (ProfileWorld::isNoGraphics() ||
(!CVS->isDefferedEnabled()) || !CVS->isGLSL())
(!CVS->isDeferredEnabled()) || !CVS->isGLSL())
{
m_tex_config->m_srgb = false;
}
@ -217,7 +217,7 @@ void STKTexture::formatConversion(uint8_t* data, unsigned int* format,
{
alpha /= 255.0f;
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
alpha = pow(alpha, 1.0f / 2.2f);
}

2
src/items/rubber_band.cpp
View File

@ -52,7 +52,7 @@ RubberBand::RubberBand(Plunger *plunger, AbstractKart *kart)
return;
}
video::SColor color(77, 179, 0, 0);
if (CVS->isDefferedEnabled())
if (CVS->isDeferredEnabled())
{
color.setRed(SP::srgb255ToLinear(color.getRed()));
color.setGreen(SP::srgb255ToLinear(color.getGreen()));

2
src/karts/kart_model.cpp
View File

@ -504,7 +504,7 @@ scene::ISceneNode* KartModel::attachModel(bool animated_models, bool human_playe
irr_driver->addMesh(obj.getModel(), "kart_headlight",
parent, getRenderInfo());
#ifndef SERVER_ONLY
if (human_player && CVS->isGLSL() && CVS->isDefferedEnabled())
if (human_player && CVS->isGLSL() && CVS->isDeferredEnabled())
{
obj.setLight(headlight_model, each_energy, each_radius);
}

2
src/tracks/graph.cpp
View File

@ -350,7 +350,7 @@ void Graph::createMeshSP(bool show_invisible, bool enable_transparency,
spmb->recalculateBoundingBox();
std::string shader_name = enable_transparency ? "alphablend" : "unlit";
#ifndef SERVER_ONLY
if (!CVS->isDefferedEnabled())
if (!CVS->isDeferredEnabled())
{
shader_name = "solid";
}