Renamed VertexTypes.h to Vertex.h.
This commit is contained in:
David Williams
parent
d7d1d99ca9
commit
82f9d6ad6f
@ -27,7 +27,6 @@ SET(CORE_SRC_FILES
|
||||
source/ArraySizes.cpp
|
||||
source/AStarPathfinder.cpp
|
||||
source/Region.cpp
|
||||
source/VertexTypes.cpp
|
||||
)
|
||||
|
||||
#Projects headers files
|
||||
@ -66,6 +65,8 @@ SET(CORE_INC_FILES
|
||||
include/PolyVoxCore/MarchingCubesSurfaceExtractor.inl
|
||||
include/PolyVoxCore/Material.h
|
||||
include/PolyVoxCore/MaterialDensityPair.h
|
||||
include/PolyVoxCore/Mesh.h
|
||||
include/PolyVoxCore/Mesh.inl
|
||||
include/PolyVoxCore/MinizBlockCompressor.h
|
||||
include/PolyVoxCore/MinizBlockCompressor.inl
|
||||
include/PolyVoxCore/Pager.h
|
||||
@ -84,13 +85,11 @@ SET(CORE_INC_FILES
|
||||
include/PolyVoxCore/SimpleVolume.inl
|
||||
include/PolyVoxCore/SimpleVolumeBlock.inl
|
||||
include/PolyVoxCore/SimpleVolumeSampler.inl
|
||||
include/PolyVoxCore/Mesh.h
|
||||
include/PolyVoxCore/Mesh.inl
|
||||
include/PolyVoxCore/UncompressedBlock.h
|
||||
include/PolyVoxCore/UncompressedBlock.inl
|
||||
include/PolyVoxCore/Vector.h
|
||||
include/PolyVoxCore/Vector.inl
|
||||
include/PolyVoxCore/VertexTypes.h
|
||||
include/PolyVoxCore/Vertex.h
|
||||
include/PolyVoxCore/VolumeResampler.h
|
||||
include/PolyVoxCore/VolumeResampler.inl
|
||||
include/PolyVoxCore/VoxelFilters.h
|
||||
|
||||
@ -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
|
||||
{
|
||||
|
||||
@ -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
|
||||
{
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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__
|
||||
@ -1 +0,0 @@
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user