From 1aa1978de12b1290ff929eadeb68773c243a4d66 Mon Sep 17 00:00:00 2001 From: David Williams Date: Sun, 8 Jul 2012 08:52:36 +0200 Subject: [PATCH] Removed now redundant cpp files. Removed a test which we don't need any more. --- library/PolyVoxCore/CMakeLists.txt | 3 -- library/PolyVoxCore/source/Density.cpp | 28 ------------- library/PolyVoxCore/source/Material.cpp | 33 --------------- .../source/MaterialDensityPair.cpp | 28 ------------- tests/CMakeLists.txt | 4 -- tests/TestVoxels.cpp | 40 ------------------- tests/TestVoxels.h | 38 ------------------ 7 files changed, 174 deletions(-) delete mode 100644 library/PolyVoxCore/source/Density.cpp delete mode 100644 library/PolyVoxCore/source/Material.cpp delete mode 100644 library/PolyVoxCore/source/MaterialDensityPair.cpp delete mode 100644 tests/TestVoxels.cpp delete mode 100644 tests/TestVoxels.h diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 98433464..528fae18 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -6,11 +6,8 @@ PROJECT(PolyVoxCore) SET(CORE_SRC_FILES source/ArraySizes.cpp source/AStarPathfinder.cpp - source/Density.cpp source/GradientEstimators.cpp source/Log.cpp - source/Material.cpp - source/MaterialDensityPair.cpp source/MeshDecimator.cpp source/Region.cpp source/SimpleInterface.cpp diff --git a/library/PolyVoxCore/source/Density.cpp b/library/PolyVoxCore/source/Density.cpp deleted file mode 100644 index 71fada1d..00000000 --- a/library/PolyVoxCore/source/Density.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* -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. -*******************************************************************************/ - -#include "PolyVoxCore/Density.h" - -namespace PolyVox -{ -} diff --git a/library/PolyVoxCore/source/Material.cpp b/library/PolyVoxCore/source/Material.cpp deleted file mode 100644 index 27d34678..00000000 --- a/library/PolyVoxCore/source/Material.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* -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. -*******************************************************************************/ - -#include "PolyVoxCore/Material.h" - -namespace PolyVox -{ - //template<> - //typename VoxelTypeTraits::DensityType convertToDensity(Material8 voxel) - //{ - // return voxel.getDensity(); - //} -} diff --git a/library/PolyVoxCore/source/MaterialDensityPair.cpp b/library/PolyVoxCore/source/MaterialDensityPair.cpp deleted file mode 100644 index ccdfe5d9..00000000 --- a/library/PolyVoxCore/source/MaterialDensityPair.cpp +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* -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. -*******************************************************************************/ - -#include "PolyVoxCore/MaterialDensityPair.h" - -namespace PolyVox -{ -} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 953743c5..e003bdef 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -87,7 +87,3 @@ ADD_TEST(VectorEqualityTest ${LATEST_TEST} testEquality) # Volume subclass tests CREATE_TEST(TestVolumeSubclass.h TestVolumeSubclass.cpp TestVolumeSubclass) ADD_TEST(VolumeSubclassExtractSurfaceTest ${LATEST_TEST} testExtractSurface) - -# Voxel tests -CREATE_TEST(TestVoxels.h TestVoxels.cpp TestVoxels) -ADD_TEST(VoxelsTraitsTest ${LATEST_TEST} testVoxelTypeLimits) diff --git a/tests/TestVoxels.cpp b/tests/TestVoxels.cpp deleted file mode 100644 index b20e421f..00000000 --- a/tests/TestVoxels.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* -Copyright (c) 2010 Matt 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. -*******************************************************************************/ - -#include "TestVoxels.h" - -#include "PolyVoxCore/Density.h" -#include "PolyVoxCore/Material.h" -#include "PolyVoxCore/MaterialDensityPair.h" - -#include - -#include - -using namespace PolyVox; - -void TestVoxels::testVoxelTypeLimits() -{ -} - -QTEST_MAIN(TestVoxels) diff --git a/tests/TestVoxels.h b/tests/TestVoxels.h deleted file mode 100644 index b301133a..00000000 --- a/tests/TestVoxels.h +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* -Copyright (c) 2010 Matt 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_TestVoxels_H__ -#define __PolyVox_TestVoxels_H__ - -#include - -class TestVoxels: public QObject -{ - Q_OBJECT - - private slots: - void testVoxelTypeLimits(); -}; - -#endif -