sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit missing files

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-24 21:07:17 +02:00
parent ba7c56ddfa
commit 7140e322c1
11 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Renderer/RenderPipeline.hpp
View File

@@ -18,7 +18,7 @@ namespace Nz
struct VertexBufferData
{
std::size_t binding;
VertexDeclarationConstRef declaration;
std::shared_ptr<const VertexDeclaration> declaration;
};
std::shared_ptr<RenderPipelineLayout> pipelineLayout;

16
include/Nazara/Renderer/RenderStates.hpp
View File

@@ -19,10 +19,10 @@ namespace Nz
struct RenderStates
{
FaceFilling faceFilling = FaceFilling_Fill;
FaceSide cullingSide = FaceSide_Back;
RendererComparison depthCompare = RendererComparison_Less;
PrimitiveMode primitiveMode = PrimitiveMode_TriangleList;
FaceFilling faceFilling = FaceFilling::Fill;
FaceSide cullingSide = FaceSide::Back;
RendererComparison depthCompare = RendererComparison::Less;
PrimitiveMode primitiveMode = PrimitiveMode::TriangleList;
struct
{
@@ -36,10 +36,10 @@ namespace Nz
struct
{
RendererComparison compare = RendererComparison_Always;
StencilOperation depthFail = StencilOperation_Keep;
StencilOperation fail = StencilOperation_Keep;
StencilOperation pass = StencilOperation_Keep;
RendererComparison compare = RendererComparison::Always;
StencilOperation depthFail = StencilOperation::Keep;
StencilOperation fail = StencilOperation::Keep;
StencilOperation pass = StencilOperation::Keep;
UInt32 compareMask = 0xFFFFFFFF;
UInt32 reference = 0;
UInt32 writeMask = 0xFFFFFFFF;

2
include/Nazara/Renderer/RenderWindowParameters.hpp
View File

@@ -15,7 +15,7 @@ namespace Nz
{
struct RenderWindowParameters
{
std::vector<PixelFormat> depthFormats = {Nz::PixelFormat_Depth32, Nz::PixelFormat_Depth24}; //< By order of preference
std::vector<PixelFormat> depthFormats = {Nz::PixelFormat::Depth32, Nz::PixelFormat::Depth24}; //< By order of preference
bool verticalSync = false;
};
}

12
include/Nazara/Renderer/TextureSampler.hpp
View File

@@ -17,12 +17,12 @@ namespace Nz
struct TextureSamplerInfo
{
float anisotropyLevel = 0.f;
SamplerFilter magFilter = SamplerFilter_Linear;
SamplerFilter minFilter = SamplerFilter_Linear;
SamplerMipmapMode mipmapMode = SamplerMipmapMode_Linear;
SamplerWrap wrapModeU = SamplerWrap_Clamp;
SamplerWrap wrapModeV = SamplerWrap_Clamp;
SamplerWrap wrapModeW = SamplerWrap_Clamp;
SamplerFilter magFilter = SamplerFilter::Linear;
SamplerFilter minFilter = SamplerFilter::Linear;
SamplerMipmapMode mipmapMode = SamplerMipmapMode::Linear;
SamplerWrap wrapModeU = SamplerWrap::Clamp;
SamplerWrap wrapModeV = SamplerWrap::Clamp;
SamplerWrap wrapModeW = SamplerWrap::Clamp;
inline bool operator==(const TextureSamplerInfo& samplerInfo) const;
inline bool operator!=(const TextureSamplerInfo& samplerInfo) const;