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

Fix a shitloads of warnings on VS

Browse Source 
Former-commit-id: fca61118f4e0530ed2eaaf9ff96de29806aa5aa8
This commit is contained in:
Lynix
2015-11-25 18:19:26 +01:00
parent c6d16c0128
commit bbe8a776e8
42 changed files with 406 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/Nazara/Utility/VertexDeclaration.hpp
View File

@@ -34,12 +34,12 @@ namespace Nz
~VertexDeclaration();
void DisableComponent(VertexComponent component);
void EnableComponent(VertexComponent component, ComponentType type, unsigned int offset);
void EnableComponent(VertexComponent component, ComponentType type, std::size_t offset);
void GetComponent(VertexComponent component, bool* enabled, ComponentType* type, unsigned int* offset) const;
unsigned int GetStride() const;
void GetComponent(VertexComponent component, bool* enabled, ComponentType* type, std::size_t* offset) const;
std::size_t GetStride() const;
void SetStride(unsigned int stride);
void SetStride(std::size_t stride);
VertexDeclaration& operator=(const VertexDeclaration& declaration);
@@ -58,7 +58,7 @@ namespace Nz
{
ComponentType type; // Le type de donnée
bool enabled = false; // Ce composant est-il activé ?/
unsigned int offset; // La position, en octets, de la première donnée
std::size_t offset; // La position, en octets, de la première donnée
/*
** -Lynix:
@@ -70,7 +70,7 @@ namespace Nz
};
Component m_components[VertexComponent_Max+1];
unsigned int m_stride;
std::size_t m_stride;
static VertexDeclaration s_declarations[VertexLayout_Max+1];
static VertexDeclarationLibrary::LibraryMap s_library;

2
include/Nazara/Utility/VertexMapper.inl
View File

@@ -16,7 +16,7 @@ namespace Nz
// Ensuite le composant qui nous intéresse
bool enabled;
ComponentType type;
unsigned int offset;
std::size_t offset;
declaration->GetComponent(component, &enabled, &type, &offset);
if (enabled)