AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Renamed VertexTypes.h to Vertex.h.

Browse Source
This commit is contained in:
David Williams
2014-06-02 08:57:30 +02:00
parent d7d1d99ca9
commit 82f9d6ad6f
6 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/PolyVoxCore/include/PolyVoxCore/CubicSurfaceExtractor.h
View File

@@ -32,7 +32,7 @@ freely, subject to the following restrictions:
#include "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these?
#include "PolyVoxCore/DefaultIsQuadNeeded.h"
#include "PolyVoxCore/Mesh.h"
#include "PolyVoxCore/VertexTypes.h"
#include "PolyVoxCore/Vertex.h"
namespace PolyVox
{

2
library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
View File

@@ -31,7 +31,7 @@ freely, subject to the following restrictions:
#include "PolyVoxCore/BaseVolume.h" //For wrap modes... should move these?
#include "PolyVoxCore/Mesh.h"
#include "PolyVoxCore/DefaultMarchingCubesController.h"
#include "PolyVoxCore/VertexTypes.h"
#include "PolyVoxCore/Vertex.h"
namespace PolyVox
{

2
library/PolyVoxCore/include/PolyVoxCore/Mesh.h
View File

@@ -27,7 +27,7 @@ freely, subject to the following restrictions:
#include "Impl/TypeDef.h"
#include "PolyVoxCore/Region.h"
#include "PolyVoxCore/VertexTypes.h" //Should probably do away with this on in the future...
#include "PolyVoxCore/Vertex.h" //Should probably do away with this on in the future...
#include <algorithm>
#include <cstdlib>

102
library/PolyVoxCore/include/PolyVoxCore/VertexTypes.h → library/PolyVoxCore/include/PolyVoxCore/Vertex.h
View File

@@ -1,51 +1,51 @@
/*******************************************************************************
Copyright (c) 2005-2009 David Williams
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*******************************************************************************/
#ifndef __PolyVox_SurfaceVertex_H__
#define __PolyVox_SurfaceVertex_H__
#include "Impl/TypeDef.h"
#include "PolyVoxCore/Vector.h"
#include <bitset>
#include <vector>
namespace PolyVox
{
#ifdef SWIG
struct Vertex
#else
template<typename _DataType>
struct POLYVOX_API Vertex
#endif
{
typedef _DataType DataType;
Vector3DFloat position;
Vector3DFloat normal;
DataType data;
};
}
#endif
/*******************************************************************************
Copyright (c) 2005-2009 David Williams
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*******************************************************************************/
#ifndef __PolyVox_Vertex_H__
#define __PolyVox_Vertex_H__
#include "Impl/TypeDef.h"
#include "PolyVoxCore/Vector.h"
#include <bitset>
#include <vector>
namespace PolyVox
{
#ifdef SWIG
struct Vertex
#else
template<typename _DataType>
struct POLYVOX_API Vertex
#endif
{
typedef _DataType DataType;
Vector3DFloat position;
Vector3DFloat normal;
DataType data;
};
}
#endif // __PolyVox_Vertex_H__