Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping
This commit is contained in:
Lynix
@@ -33,8 +33,8 @@ namespace Nz
|
||||
Vector2f uv;
|
||||
};
|
||||
|
||||
std::size_t s_maxQuads = std::numeric_limits<UInt16>::max() / 6;
|
||||
std::size_t s_vertexBufferSize = 4 * 1024 * 1024; // 4 MiB
|
||||
UInt32 s_maxQuads = std::numeric_limits<UInt16>::max() / 6;
|
||||
UInt32 s_vertexBufferSize = 4 * 1024 * 1024; // 4 MiB
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -101,12 +101,15 @@ namespace Nz
|
||||
if (!layer.opaqueModels.empty())
|
||||
DrawOpaqueModels(sceneData, layer);
|
||||
|
||||
if (!layer.transparentModels.empty())
|
||||
if (!layer.depthSortedMeshes.empty())
|
||||
DrawTransparentModels(sceneData, layer);
|
||||
|
||||
if (!layer.basicSprites.empty())
|
||||
if (!layer.opaqueSprites.empty())
|
||||
DrawBasicSprites(sceneData, layer);
|
||||
|
||||
if (!layer.depthSortedSprites.empty())
|
||||
DrawOrderedSprites(sceneData, layer);
|
||||
|
||||
if (!layer.billboards.empty())
|
||||
DrawBillboards(sceneData, layer);
|
||||
|
||||
@@ -309,7 +312,10 @@ namespace Nz
|
||||
Renderer::SetMatrix(MatrixType_World, Matrix4f::Identity());
|
||||
Renderer::SetVertexBuffer(&m_spriteBuffer);
|
||||
|
||||
for (auto& pipelinePair : layer.basicSprites)
|
||||
const unsigned int overlayTextureUnit = Material::GetTextureUnit(TextureMap_Overlay);
|
||||
const std::size_t maxSpriteCount = std::min<std::size_t>(s_maxQuads, m_spriteBuffer.GetVertexCount() / 4);
|
||||
|
||||
for (auto& pipelinePair : layer.opaqueSprites)
|
||||
{
|
||||
const MaterialPipeline* pipeline = pipelinePair.first;
|
||||
auto& pipelineEntry = pipelinePair.second;
|
||||
@@ -331,6 +337,9 @@ namespace Nz
|
||||
// Position of the camera
|
||||
shader->SendVector(shaderUniforms->eyePosition, sceneData.viewer->GetEyePosition());
|
||||
|
||||
// Overlay texture unit
|
||||
shader->SendInteger(shaderUniforms->textureOverlay, overlayTextureUnit);
|
||||
|
||||
lastShader = shader;
|
||||
}
|
||||
|
||||
@@ -343,10 +352,6 @@ namespace Nz
|
||||
{
|
||||
material->Apply(pipelineInstance);
|
||||
|
||||
unsigned int overlayTextureUnit = Material::GetTextureUnit(TextureMap_Overlay);
|
||||
|
||||
shader->SendInteger(shaderUniforms->textureOverlay, overlayTextureUnit);
|
||||
|
||||
Renderer::SetTextureSampler(overlayTextureUnit, material->GetDiffuseSampler());
|
||||
|
||||
auto& overlayMap = matEntry.overlayMap;
|
||||
@@ -370,7 +375,6 @@ namespace Nz
|
||||
VertexStruct_XYZ_Color_UV* vertices = static_cast<VertexStruct_XYZ_Color_UV*>(vertexMapper.GetPointer());
|
||||
|
||||
std::size_t spriteCount = 0;
|
||||
std::size_t maxSpriteCount = std::min<std::size_t>(s_maxQuads, m_spriteBuffer.GetVertexCount() / 4);
|
||||
|
||||
do
|
||||
{
|
||||
@@ -797,6 +801,142 @@ namespace Nz
|
||||
}
|
||||
}
|
||||
|
||||
void ForwardRenderTechnique::DrawOrderedSprites(const SceneData & sceneData, ForwardRenderQueue::Layer & layer) const
|
||||
{
|
||||
NazaraAssert(sceneData.viewer, "Invalid viewer");
|
||||
|
||||
Renderer::SetIndexBuffer(&s_quadIndexBuffer);
|
||||
Renderer::SetMatrix(MatrixType_World, Matrix4f::Identity());
|
||||
Renderer::SetVertexBuffer(&m_spriteBuffer);
|
||||
|
||||
const Material* lastMaterial = nullptr;
|
||||
const MaterialPipeline* lastPipeline = nullptr;
|
||||
const Shader* lastShader = nullptr;
|
||||
const Texture* lastOverlay = nullptr;
|
||||
const MaterialPipeline::Instance* pipelineInstance = nullptr;
|
||||
|
||||
const unsigned int overlayTextureUnit = Material::GetTextureUnit(TextureMap_Overlay);
|
||||
|
||||
bool updateVertexBuffer = true;
|
||||
const std::size_t maxSpriteCount = std::min<std::size_t>(s_maxQuads, m_spriteBuffer.GetVertexCount() / 4);
|
||||
|
||||
std::size_t alreadyDrawnCount = 0;
|
||||
std::size_t spriteIndex = 0;
|
||||
std::size_t spriteChainOffset = 0;
|
||||
auto splitChainIt = layer.depthSortedSprites.end();
|
||||
|
||||
for (auto it = layer.depthSortedSprites.begin(); it != layer.depthSortedSprites.end();)
|
||||
{
|
||||
if (updateVertexBuffer)
|
||||
{
|
||||
// We open the buffer in writing mode
|
||||
BufferMapper<VertexBuffer> vertexMapper(m_spriteBuffer, BufferAccess_DiscardAndWrite);
|
||||
VertexStruct_XYZ_Color_UV* vertices = static_cast<VertexStruct_XYZ_Color_UV*>(vertexMapper.GetPointer());
|
||||
|
||||
std::size_t availableSpriteSpace = maxSpriteCount;
|
||||
bool split = false;
|
||||
for (auto it2 = it; it2 != layer.depthSortedSprites.end(); ++it2)
|
||||
{
|
||||
const ForwardRenderQueue::UnbatchedSpriteData& spriteData = layer.depthSortedSpriteData[*it2];
|
||||
|
||||
std::size_t count = std::min(availableSpriteSpace, spriteData.spriteCount - spriteChainOffset);
|
||||
|
||||
std::memcpy(vertices, spriteData.vertices + spriteChainOffset * 4, 4 * count * sizeof(VertexStruct_XYZ_Color_UV));
|
||||
vertices += count * 4;
|
||||
|
||||
availableSpriteSpace -= count;
|
||||
|
||||
// Have we treated the entire chain ?
|
||||
if (count != spriteData.spriteCount)
|
||||
{
|
||||
// Oops, not enough space to store current chain
|
||||
spriteChainOffset += count;
|
||||
splitChainIt = it2;
|
||||
split = true;
|
||||
break;
|
||||
}
|
||||
|
||||
// Switch to next sprite chain, if any
|
||||
spriteChainOffset = 0;
|
||||
}
|
||||
|
||||
spriteIndex = 0;
|
||||
updateVertexBuffer = false;
|
||||
|
||||
if (!split)
|
||||
splitChainIt = layer.depthSortedSprites.end();
|
||||
}
|
||||
|
||||
std::size_t index = *it;
|
||||
|
||||
const ForwardRenderQueue::UnbatchedSpriteData& spriteData = layer.depthSortedSpriteData[index];
|
||||
|
||||
const Material* material = spriteData.material;
|
||||
if (material != lastMaterial)
|
||||
{
|
||||
const MaterialPipeline* pipeline = material->GetPipeline();
|
||||
if (pipeline != lastPipeline)
|
||||
{
|
||||
pipelineInstance = &pipeline->Apply(ShaderFlags_TextureOverlay | ShaderFlags_VertexColor);
|
||||
|
||||
const Shader* shader = pipelineInstance->uberInstance->GetShader();
|
||||
|
||||
// Uniforms are conserved in our program, there's no point to send them back until they change
|
||||
if (shader != lastShader)
|
||||
{
|
||||
// Index of uniforms in the shader
|
||||
const ShaderUniforms* shaderUniforms = GetShaderUniforms(shader);
|
||||
|
||||
// Ambient color of the scene
|
||||
shader->SendColor(shaderUniforms->sceneAmbient, sceneData.ambientColor);
|
||||
// Position of the camera
|
||||
shader->SendVector(shaderUniforms->eyePosition, sceneData.viewer->GetEyePosition());
|
||||
// Overlay texture unit
|
||||
shader->SendInteger(shaderUniforms->textureOverlay, overlayTextureUnit);
|
||||
|
||||
lastShader = shader;
|
||||
}
|
||||
|
||||
lastPipeline = pipeline;
|
||||
}
|
||||
|
||||
material->Apply(*pipelineInstance);
|
||||
|
||||
Renderer::SetTextureSampler(overlayTextureUnit, material->GetDiffuseSampler());
|
||||
|
||||
lastMaterial = material;
|
||||
}
|
||||
|
||||
const Texture* overlay = (spriteData.overlay) ? spriteData.overlay : &m_whiteTexture;
|
||||
if (overlay != lastOverlay)
|
||||
{
|
||||
Renderer::SetTexture(overlayTextureUnit, overlay);
|
||||
lastOverlay = overlay;
|
||||
}
|
||||
|
||||
std::size_t spriteCount;
|
||||
if (it != splitChainIt)
|
||||
{
|
||||
spriteCount = spriteData.spriteCount - alreadyDrawnCount;
|
||||
alreadyDrawnCount = 0;
|
||||
|
||||
++it;
|
||||
}
|
||||
else
|
||||
{
|
||||
spriteCount = spriteChainOffset;
|
||||
|
||||
alreadyDrawnCount = spriteCount;
|
||||
updateVertexBuffer = true;
|
||||
|
||||
// Restart at current iterator next time
|
||||
}
|
||||
|
||||
Renderer::DrawIndexedPrimitives(PrimitiveMode_TriangleList, spriteIndex * 6, spriteCount * 6);
|
||||
spriteIndex += spriteCount;
|
||||
}
|
||||
}
|
||||
|
||||
/*!
|
||||
* \brief Draws transparent models
|
||||
*
|
||||
@@ -816,9 +956,9 @@ namespace Nz
|
||||
const ShaderUniforms* shaderUniforms = nullptr;
|
||||
unsigned int lightCount = 0;
|
||||
|
||||
for (unsigned int index : layer.transparentModels)
|
||||
for (std::size_t index : layer.depthSortedMeshes)
|
||||
{
|
||||
const ForwardRenderQueue::TransparentModelData& modelData = layer.transparentModelData[index];
|
||||
const ForwardRenderQueue::UnbatchedModelData& modelData = layer.depthSortedMeshData[index];
|
||||
|
||||
// Material
|
||||
const Material* material = modelData.material;
|
||||
@@ -885,8 +1025,8 @@ namespace Nz
|
||||
if (shaderUniforms->hasLightUniforms && lightCount < NAZARA_GRAPHICS_MAX_LIGHT_PER_PASS)
|
||||
{
|
||||
// Compute the closest lights
|
||||
Vector3f position = matrix.GetTranslation() + modelData.squaredBoundingSphere.GetPosition();
|
||||
float radius = modelData.squaredBoundingSphere.radius;
|
||||
Vector3f position = matrix.GetTranslation() + modelData.obbSphere.GetPosition();
|
||||
float radius = modelData.obbSphere.radius;
|
||||
ChooseLights(Spheref(position, radius), false);
|
||||
|
||||
for (std::size_t i = lightCount; i < NAZARA_GRAPHICS_MAX_LIGHT_PER_PASS; ++i)
|
||||
|
||||
Reference in New Issue
Block a user