[Bf-blender-cvs] [5feb368] master: Carve: Remove empty implementation files
Sergey Sharybin
noreply at git.blender.org
Tue Jan 19 22:57:30 CET 2016
Commit: 5feb3688fb6a6191673477d673f864310673b823
Author: Sergey Sharybin
Date: Tue Jan 19 22:56:37 2016 +0100
Branches: master
https://developer.blender.org/rB5feb3688fb6a6191673477d673f864310673b823
Carve: Remove empty implementation files
===================================================================
M extern/carve/CMakeLists.txt
M extern/carve/files.txt
D extern/carve/lib/aabb.cpp
D extern/carve/lib/edge.cpp
===================================================================
diff --git a/extern/carve/CMakeLists.txt b/extern/carve/CMakeLists.txt
index 643bd42..bb81332 100644
--- a/extern/carve/CMakeLists.txt
+++ b/extern/carve/CMakeLists.txt
@@ -37,12 +37,10 @@ set(INC_SYS
set(SRC
carve-capi.cc
carve-util.cc
- lib/aabb.cpp
lib/carve.cpp
lib/convex_hull.cpp
lib/csg_collector.cpp
lib/csg.cpp
- lib/edge.cpp
lib/face.cpp
lib/geom2d.cpp
lib/geom3d.cpp
diff --git a/extern/carve/files.txt b/extern/carve/files.txt
index 5c02a04..9598d07 100644
--- a/extern/carve/files.txt
+++ b/extern/carve/files.txt
@@ -1,108 +1,107 @@
-include/carve/vertex_impl.hpp
-include/carve/aabb_impl.hpp
+include/carve/edge_impl.hpp
+include/carve/tag.hpp
+include/carve/colour.hpp
+include/carve/math_constants.hpp
include/carve/csg.hpp
-include/carve/triangle_intersection.hpp
-include/carve/pointset_iter.hpp
-include/carve/debug_hooks.hpp
-include/carve/mesh.hpp
-include/carve/triangulator_impl.hpp
-include/carve/edge_decl.hpp
-include/carve/collection/unordered.hpp
-include/carve/collection/unordered/tr1_impl.hpp
-include/carve/collection/unordered/fallback_impl.hpp
-include/carve/collection/unordered/std_impl.hpp
-include/carve/collection/unordered/vcpp_impl.hpp
-include/carve/collection/unordered/libstdcpp_impl.hpp
-include/carve/collection/unordered/boost_impl.hpp
-include/carve/convex_hull.hpp
+include/carve/heap.hpp
+include/carve/vector.hpp
+include/carve/djset.hpp
+include/carve/mesh_impl.hpp
+include/carve/polyline_iter.hpp
+include/carve/input.hpp
+include/carve/geom2d.hpp
+include/carve/aabb_impl.hpp
include/carve/geom.hpp
+include/carve/triangulator.hpp
+include/carve/pointset_iter.hpp
+include/carve/spacetree.hpp
+include/carve/vertex_impl.hpp
+include/carve/vcpp_config.h
+include/carve/octree_decl.hpp
+include/carve/rescale.hpp
include/carve/collection_types.hpp
+include/carve/faceloop.hpp
+include/carve/polyhedron_base.hpp
+include/carve/vertex_decl.hpp
include/carve/cbrt.h
-include/carve/util.hpp
-include/carve/iobj.hpp
-include/carve/polyline_decl.hpp
-include/carve/polyline_impl.hpp
-include/carve/win32.h
-include/carve/edge_impl.hpp
-include/carve/carve.hpp
-include/carve/polyline.hpp
-include/carve/face_decl.hpp
include/carve/matrix.hpp
-include/carve/classification.hpp
-include/carve/geom_impl.hpp
-include/carve/faceloop.hpp
-include/carve/mesh_ops.hpp
include/carve/tree.hpp
-include/carve/geom2d.hpp
-include/carve/face_impl.hpp
-include/carve/polyhedron_decl.hpp
-include/carve/interpolator.hpp
-include/carve/poly_decl.hpp
-include/carve/mesh_impl.hpp
-include/carve/gnu_cxx.h
-include/carve/mesh_simplify.hpp
-include/carve/triangulator.hpp
-include/carve/pointset_impl.hpp
+include/carve/debug_hooks.hpp
include/carve/rtree.hpp
-include/carve/math_constants.hpp
-include/carve/vector.hpp
-include/carve/octree_impl.hpp
-include/carve/pointset.hpp
include/carve/math.hpp
-include/carve/intersection.hpp
-include/carve/colour.hpp
-include/carve/kd_node.hpp
-include/carve/input.hpp
+include/carve/convex_hull.hpp
+include/carve/polyline.hpp
include/carve/geom3d.hpp
-include/carve/exact.hpp
-include/carve/rescale.hpp
-include/carve/polyhedron_base.hpp
-include/carve/heap.hpp
-include/carve/spacetree.hpp
-include/carve/polyhedron_impl.hpp
-include/carve/vcpp_config.h
include/carve/aabb.hpp
-include/carve/polyline_iter.hpp
-include/carve/djset.hpp
-include/carve/vertex_decl.hpp
-include/carve/csg_triangulator.hpp
-include/carve/poly.hpp
-include/carve/timing.hpp
-include/carve/octree_decl.hpp
include/carve/pointset_decl.hpp
-include/carve/tag.hpp
+include/carve/intersection.hpp
+include/carve/face_impl.hpp
include/carve/collection.hpp
include/carve/poly_impl.hpp
-lib/intersection.cpp
+include/carve/exact.hpp
+include/carve/timing.hpp
+include/carve/poly.hpp
+include/carve/mesh.hpp
+include/carve/win32.h
+include/carve/mesh_simplify.hpp
+include/carve/classification.hpp
+include/carve/collection/unordered/fallback_impl.hpp
+include/carve/collection/unordered/std_impl.hpp
+include/carve/collection/unordered/vcpp_impl.hpp
+include/carve/collection/unordered/boost_impl.hpp
+include/carve/collection/unordered/libstdcpp_impl.hpp
+include/carve/collection/unordered/tr1_impl.hpp
+include/carve/collection/unordered.hpp
+include/carve/pointset.hpp
+include/carve/mesh_ops.hpp
+include/carve/triangle_intersection.hpp
+include/carve/octree_impl.hpp
+include/carve/pointset_impl.hpp
+include/carve/carve.hpp
+include/carve/kd_node.hpp
+include/carve/polyhedron_impl.hpp
+include/carve/interpolator.hpp
+include/carve/edge_decl.hpp
+include/carve/face_decl.hpp
+include/carve/geom_impl.hpp
+include/carve/util.hpp
+include/carve/random/random.h
+include/carve/gnu_cxx.h
+include/carve/polyline_decl.hpp
+include/carve/triangulator_impl.hpp
+include/carve/iobj.hpp
+include/carve/csg_triangulator.hpp
+include/carve/polyline_impl.hpp
+include/carve/poly_decl.hpp
+include/carve/polyhedron_decl.hpp
+lib/math.cpp
+lib/intersect_classify_edge.cpp
+lib/csg_detail.hpp
+lib/polyhedron.cpp
+lib/csg.cpp
lib/intersect.cpp
-lib/triangulator.cpp
-lib/intersect_debug.hpp
-lib/csg_collector.hpp
lib/csg_data.hpp
-lib/convex_hull.cpp
-lib/intersect_classify_common.hpp
-lib/intersect_common.hpp
-lib/polyhedron.cpp
-lib/polyline.cpp
-lib/pointset.cpp
+lib/intersection.cpp
+lib/timing.cpp
+lib/intersect_classify_common_impl.hpp
lib/geom2d.cpp
-lib/math.cpp
+lib/csg_collector.hpp
+lib/mesh.cpp
lib/intersect_half_classify_group.cpp
+lib/octree.cpp
+lib/csg_collector.cpp
+lib/intersect_debug.hpp
+lib/intersect_classify_common.hpp
+lib/geom3d.cpp
lib/intersect_face_division.cpp
+lib/face.cpp
+lib/triangulator.cpp
lib/tag.cpp
-lib/aabb.cpp
lib/intersect_classify_group.cpp
-lib/csg_detail.hpp
-lib/mesh.cpp
-lib/timing.cpp
-lib/geom3d.cpp
+lib/polyline.cpp
+lib/intersect_common.hpp
+lib/convex_hull.cpp
lib/intersect_group.cpp
lib/carve.cpp
-lib/intersect_classify_edge.cpp
-lib/csg.cpp
-lib/face.cpp
-lib/csg_collector.cpp
+lib/pointset.cpp
lib/intersect_debug.cpp
-lib/edge.cpp
-lib/intersect_classify_common_impl.hpp
-lib/octree.cpp
diff --git a/extern/carve/lib/aabb.cpp b/extern/carve/lib/aabb.cpp
deleted file mode 100644
index 41d4e0e..0000000
--- a/extern/carve/lib/aabb.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Begin License:
-// Copyright (C) 2006-2014 Tobias Sargeant (tobias.sargeant at gmail.com).
-// All rights reserved.
-//
-// This file is part of the Carve CSG Library (http://carve-csg.com/)
-//
-// This file may be used under the terms of either the GNU General
-// Public License version 2 or 3 (at your option) as published by the
-// Free Software Foundation and appearing in the files LICENSE.GPL2
-// and LICENSE.GPL3 included in the packaging of this file.
-//
-// This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE.
-// End:
-
-
-#if defined(HAVE_CONFIG_H)
-# include <carve_config.h>
-#endif
-
-#include <carve/aabb.hpp>
-#include <carve/geom3d.hpp>
-
-namespace carve {
- namespace geom3d {
- }
-}
-
diff --git a/extern/carve/lib/edge.cpp b/extern/carve/lib/edge.cpp
deleted file mode 100644
index 68f01b5..0000000
--- a/extern/carve/lib/edge.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Begin License:
-// Copyright (C) 2006-2014 Tobias Sargeant (tobias.sargeant at gmail.com).
-// All rights reserved.
-//
-// This file is part of the Carve CSG Library (http://carve-csg.com/)
-//
-// This file may be used under the terms of either the GNU General
-// Public License version 2 or 3 (at your option) as published by the
-// Free Software Foundation and appearing in the files LICENSE.GPL2
-// and LICENSE.GPL3 included in the packaging of this file.
-//
-// This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-// INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE.
-// End:
-
-
-#if defined(HAVE_CONFIG_H)
-# include <carve_config.h>
-#endif
-
-#include <carve/poly.hpp>
-
More information about the Bf-blender-cvs
mailing list