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

[Index|Vertex]Buffer::Fill now takes discard arg

Browse Source 
Former-commit-id: 384ffdb12d82c1e960249abcaf407ccbfe0939cf
This commit is contained in:
Lynix
2013-03-20 15:40:37 +01:00
parent c280457196
commit 6a7eb137d7
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/IndexBuffer.hpp
View File

@@ -25,7 +25,7 @@ class NAZARA_API NzIndexBuffer : public NzResource
NzIndexBuffer(const NzIndexBuffer& indexBuffer); NzIndexBuffer(const NzIndexBuffer& indexBuffer);
~NzIndexBuffer(); ~NzIndexBuffer();
bool Fill(const void* data, unsigned int offset, unsigned int length); bool Fill(const void* data, unsigned int offset, unsigned int length, bool forceDiscard = false);
NzBuffer* GetBuffer() const; NzBuffer* GetBuffer() const;
unsigned int GetIndexCount() const; unsigned int GetIndexCount() const;

2
include/Nazara/Utility/VertexBuffer.hpp
View File

@@ -26,7 +26,7 @@ class NAZARA_API NzVertexBuffer : public NzResource
NzVertexBuffer(const NzVertexBuffer& vertexBuffer); NzVertexBuffer(const NzVertexBuffer& vertexBuffer);
~NzVertexBuffer(); ~NzVertexBuffer();
bool Fill(const void* data, unsigned int offset, unsigned int length); bool Fill(const void* data, unsigned int offset, unsigned int length, bool forceDiscard = false);
NzBuffer* GetBuffer() const; NzBuffer* GetBuffer() const;
void* GetPointer(); void* GetPointer();

2
src/Nazara/3D/Scene.cpp
View File

@@ -94,6 +94,8 @@ void NzScene::Cull()
void NzScene::Draw() void NzScene::Draw()
{ {
NzRenderer::Clear(nzRendererClear_Depth);
LightComparator lightComparator; LightComparator lightComparator;
// Pour les meshs squelettiques, on utilise un buffer commun // Pour les meshs squelettiques, on utilise un buffer commun

4
src/Nazara/Utility/IndexBuffer.cpp
View File

@@ -64,7 +64,7 @@ m_startIndex(indexBuffer.m_startIndex)
NzIndexBuffer::~NzIndexBuffer() = default; NzIndexBuffer::~NzIndexBuffer() = default;
bool NzIndexBuffer::Fill(const void* data, unsigned int offset, unsigned int length) bool NzIndexBuffer::Fill(const void* data, unsigned int offset, unsigned int length, bool forceDiscard)
{ {
#if NAZARA_UTILITY_SAFE #if NAZARA_UTILITY_SAFE
if (!m_buffer) if (!m_buffer)
@@ -80,7 +80,7 @@ bool NzIndexBuffer::Fill(const void* data, unsigned int offset, unsigned int len
} }
#endif #endif
return m_buffer->Fill(data, m_startIndex+offset, length); return m_buffer->Fill(data, m_startIndex+offset, length, forceDiscard);
} }
NzBuffer* NzIndexBuffer::GetBuffer() const NzBuffer* NzIndexBuffer::GetBuffer() const

4
src/Nazara/Utility/VertexBuffer.cpp
View File

@@ -70,7 +70,7 @@ m_vertexCount(vertexBuffer.m_vertexCount)
NzVertexBuffer::~NzVertexBuffer() = default; NzVertexBuffer::~NzVertexBuffer() = default;
bool NzVertexBuffer::Fill(const void* data, unsigned int offset, unsigned int length) bool NzVertexBuffer::Fill(const void* data, unsigned int offset, unsigned int length, bool forceDiscard)
{ {
#if NAZARA_UTILITY_SAFE #if NAZARA_UTILITY_SAFE
if (offset+length > m_vertexCount) if (offset+length > m_vertexCount)
@@ -80,7 +80,7 @@ bool NzVertexBuffer::Fill(const void* data, unsigned int offset, unsigned int le
} }
#endif #endif
return m_buffer->Fill(data, m_startVertex+offset, length); return m_buffer->Fill(data, m_startVertex+offset, length, forceDiscard);
} }
NzBuffer* NzVertexBuffer::GetBuffer() const NzBuffer* NzVertexBuffer::GetBuffer() const