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

Merge branch 'NDK' into NDK-ShadowMapping

Browse Source 
Conflicts:
	SDK/include/NDK/Systems/RenderSystem.hpp
	SDK/src/NDK/Systems/RenderSystem.cpp

Former-commit-id: 2772ff703c9d68d536667c469aca85084be4b861
This commit is contained in:
Lynix
2015-09-19 14:47:02 +02:00
parent aa303f9028 67a9dc692a
commit 025d873228
72 changed files with 349 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Core/Bitset.inl
View File

@@ -245,7 +245,7 @@ template<typename Block, class Allocator>
void NzBitset<Block, Allocator>::Resize(unsigned int bitCount, bool defaultVal)
{
// On commence par changer la taille du conteneur, avec la valeur correcte d'initialisation
unsigned int lastBlockIndex = m_blocks.size()-1;
unsigned int lastBlockIndex = m_blocks.size() - 1;
m_blocks.resize(ComputeBlockCount(bitCount), (defaultVal) ? fullBitMask : 0U);
unsigned int remainingBits = GetBitIndex(m_bitCount);
@@ -304,7 +304,7 @@ template<typename Block, class Allocator>
void NzBitset<Block, Allocator>::Swap(NzBitset& bitset)
{
std::swap(m_bitCount, bitset.m_bitCount);
std::swap(m_blocks, bitset.m_blocks);
std::swap(m_blocks, bitset.m_blocks);
}
template<typename Block, class Allocator>
@@ -358,7 +358,7 @@ T NzBitset<Block, Allocator>::To() const
{
static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "T must be a unsigned integral type");
NazaraAssert(m_bitCount <= std::numeric_limits<T>::digits, "Bit count cannot be greater than UInt32 bit count");
NazaraAssert(m_bitCount <= std::numeric_limits<T>::digits, "Bit count cannot be greater than T bit count");
T value = 0;
for (unsigned int i = 0; i < m_blocks.size(); ++i)

10
include/Nazara/Core/ByteArray.inl
View File

@@ -65,6 +65,16 @@ inline NzByteArray::iterator NzByteArray::Erase(const_iterator first, const_iter
return m_array.erase(first, last);
}
inline NzByteArray::reference NzByteArray::Front()
{
return m_array.front();
}
inline NzByteArray::const_reference NzByteArray::Front() const
{
return m_array.front();
}
inline NzByteArray::allocator_type NzByteArray::GetAllocator() const
{
return m_array.get_allocator();

2
include/Nazara/Core/String.hpp
View File

@@ -307,7 +307,7 @@ class NAZARA_CORE_API NzString : public NzHashable
bool FillHash(NzAbstractHash* hash) const;
inline void ReleaseString();
static std::shared_ptr<SharedString> GetEmptyString();
static const std::shared_ptr<SharedString>& GetEmptyString();
std::shared_ptr<SharedString> m_sharedString;