Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 18:41:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix merge issues

Browse source
This commit is contained in:
Brad Davis 2018-02-22 18:08:56 -08:00
parent aeb29db37d
commit e0e7fb04f2
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/render-utils/src/RenderPipelines.cpp
View file

@ -30,7 +30,6 @@
#include "model_lightmap_fade_vert.h" #include "model_lightmap_fade_vert.h"
#include "model_lightmap_normal_map_fade_vert.h" #include "model_lightmap_normal_map_fade_vert.h"
#include "model_translucent_vert.h" #include "model_translucent_vert.h"
#include "model_translucent_normal_map_vert.h"
#include "skin_model_fade_vert.h" #include "skin_model_fade_vert.h"
#include "skin_model_normal_map_fade_vert.h" #include "skin_model_normal_map_fade_vert.h"
@ -65,12 +64,10 @@
#include "model_lightmap_normal_map_frag.h" #include "model_lightmap_normal_map_frag.h"
#include "model_translucent_frag.h" #include "model_translucent_frag.h"
#include "model_translucent_unlit_frag.h" #include "model_translucent_unlit_frag.h"
#include "model_translucent_normal_map_frag.h"
#include "model_lightmap_fade_frag.h" #include "model_lightmap_fade_frag.h"
#include "model_lightmap_normal_map_fade_frag.h" #include "model_lightmap_normal_map_fade_frag.h"
#include "model_translucent_fade_frag.h" #include "model_translucent_fade_frag.h"
#include "model_translucent_normal_map_fade_frag.h"
#include "model_translucent_unlit_fade_frag.h" #include "model_translucent_unlit_fade_frag.h"
#include "overlay3D_vert.h" #include "overlay3D_vert.h"
@ -184,7 +181,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
auto modelLightmapVertex = model_lightmap_vert::getShader(); auto modelLightmapVertex = model_lightmap_vert::getShader();
auto modelLightmapNormalMapVertex = model_lightmap_normal_map_vert::getShader(); auto modelLightmapNormalMapVertex = model_lightmap_normal_map_vert::getShader();
auto modelTranslucentVertex = model_translucent_vert::getShader(); auto modelTranslucentVertex = model_translucent_vert::getShader();
auto modelTranslucentFadeVertex = model_translucent_fade_vert::getShader(); // auto modelTranslucentFadeVertex = model_translucent_fade_vert::getShader();
auto modelShadowVertex = model_shadow_vert::getShader(); auto modelShadowVertex = model_shadow_vert::getShader();
auto skinModelVertex = skin_model_vert::getShader(); auto skinModelVertex = skin_model_vert::getShader();
auto skinModelNormalMapVertex = skin_model_normal_map_vert::getShader(); auto skinModelNormalMapVertex = skin_model_normal_map_vert::getShader();
@ -281,7 +278,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
simpleVertex, simpleTranslucentUnlitPixel, nullptr, nullptr); simpleVertex, simpleTranslucentUnlitPixel, nullptr, nullptr);
addPipeline( addPipeline(
Key::Builder().withMaterial().withTranslucent().withTangents(), Key::Builder().withMaterial().withTranslucent().withTangents(),
modelTranslucentNormalMapVertex, modelTranslucentNormalMapPixel, nullptr, nullptr); modelTranslucentVertex, modelTranslucentPixel, nullptr, nullptr);
addPipeline( addPipeline(
// FIXME: Ignore lightmap for translucents meshpart // FIXME: Ignore lightmap for translucents meshpart
Key::Builder().withMaterial().withTranslucent().withLightmap(), Key::Builder().withMaterial().withTranslucent().withLightmap(),
@ -301,7 +298,7 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
simpleFadeVertex, simpleTranslucentUnlitFadePixel, batchSetter, itemSetter); simpleFadeVertex, simpleTranslucentUnlitFadePixel, batchSetter, itemSetter);
addPipeline( addPipeline(
Key::Builder().withMaterial().withTranslucent().withTangents().withFade(), Key::Builder().withMaterial().withTranslucent().withTangents().withFade(),
modelTranslucentNormalMapVertex, modelTranslucentNormalMapFadePixel, batchSetter, itemSetter); modelNormalMapFadeVertex, modelTranslucentFadePixel, batchSetter, itemSetter);
addPipeline( addPipeline(
// FIXME: Ignore lightmap for translucents meshpart // FIXME: Ignore lightmap for translucents meshpart
Key::Builder().withMaterial().withTranslucent().withLightmap().withFade(), Key::Builder().withMaterial().withTranslucent().withLightmap().withFade(),