mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-23 12:15:30 +02:00
WIP.
This commit is contained in:
parent
00f3682bbe
commit
f52f146db5
1 changed files with 14 additions and 5 deletions
|
@ -515,13 +515,22 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
|
||||||
addPipeline(
|
addPipeline(
|
||||||
Key::Builder().withSkinned().withDepthOnly().withFade(),
|
Key::Builder().withSkinned().withDepthOnly().withFade(),
|
||||||
skinModelShadowFadeVertex, modelShadowFadePixel, batchSetter, itemSetter);
|
skinModelShadowFadeVertex, modelShadowFadePixel, batchSetter, itemSetter);
|
||||||
|
|
||||||
|
// Now repeat for dual quaternion
|
||||||
|
// Depth-only
|
||||||
|
addPipeline(
|
||||||
|
Key::Builder().withSkinned().withDepthOnly().withDualQuatSkinned(),
|
||||||
|
skinModelShadowDualQuatVertex, modelShadowPixel, nullptr, nullptr);
|
||||||
|
// Same thing but with Fade on
|
||||||
|
addPipeline(
|
||||||
|
Key::Builder().withSkinned().withDepthOnly().withFade().withDualQuatSkinned(),
|
||||||
|
skinModelShadowDualQuatVertex, modelShadowFadePixel, batchSetter, itemSetter);
|
||||||
}
|
}
|
||||||
|
|
||||||
void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter) {
|
void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::BatchSetter& batchSetter, const render::ShapePipeline::ItemSetter& itemSetter) {
|
||||||
// Vertex shaders
|
// Vertex shaders
|
||||||
auto modelVertex = model_vert::getShader();
|
auto modelVertex = model_vert::getShader();
|
||||||
auto modelNormalMapVertex = model_normal_map_vert::getShader();
|
auto modelNormalMapVertex = model_normal_map_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();
|
||||||
auto skinModelNormalMapFadeVertex = skin_model_normal_map_fade_vert::getShader();
|
auto skinModelNormalMapFadeVertex = skin_model_normal_map_fade_vert::getShader();
|
||||||
|
@ -575,19 +584,19 @@ void initForwardPipelines(ShapePlumber& plumber, const render::ShapePipeline::Ba
|
||||||
|
|
||||||
// Dual Quaternion
|
// Dual Quaternion
|
||||||
addPipeline(
|
addPipeline(
|
||||||
Key::Builder().withMaterial().withSkinned(),
|
Key::Builder().withMaterial().withSkinned().withDualQuatSkinned(),
|
||||||
skinModelDualQuatVertex, modelPixel, nullptr, nullptr);
|
skinModelDualQuatVertex, modelPixel, nullptr, nullptr);
|
||||||
addPipeline(
|
addPipeline(
|
||||||
Key::Builder().withMaterial().withSkinned().withTangents(),
|
Key::Builder().withMaterial().withSkinned().withTangents().withDualQuatSkinned(),
|
||||||
skinModelNormalMapDualQuatVertex, modelNormalMapPixel, nullptr, nullptr);
|
skinModelNormalMapDualQuatVertex, modelNormalMapPixel, nullptr, nullptr);
|
||||||
addPipeline(
|
addPipeline(
|
||||||
Key::Builder().withMaterial().withSkinned(),
|
Key::Builder().withMaterial().withSkinned(),
|
||||||
skinModelDualQuatVertex, modelSpecularMapPixel, nullptr, nullptr);
|
skinModelDualQuatVertex, modelSpecularMapPixel, nullptr, nullptr);
|
||||||
addPipeline(
|
addPipeline(
|
||||||
Key::Builder().withMaterial().withSkinned().withTangents().withSpecular(),
|
Key::Builder().withMaterial().withSkinned().withTangents().withSpecular().withDualQuatSkinned(),
|
||||||
skinModelNormalMapDualQuatVertex, modelNormalSpecularMapPixel, nullptr, nullptr);
|
skinModelNormalMapDualQuatVertex, modelNormalSpecularMapPixel, nullptr, nullptr);
|
||||||
addPipeline(
|
addPipeline(
|
||||||
Key::Builder().withMaterial().withSkinned().withTangents().withFade(),
|
Key::Builder().withMaterial().withSkinned().withTangents().withFade().withDualQuatSkinned(),
|
||||||
skinModelNormalMapFadeDualQuatVertex, modelNormalMapFadePixel, batchSetter, itemSetter, nullptr, nullptr);
|
skinModelNormalMapFadeDualQuatVertex, modelNormalMapFadePixel, batchSetter, itemSetter, nullptr, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue