summaryrefslogtreecommitdiff
path: root/math/carve/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/carve/files')
-rw-r--r--math/carve/files/patch-CMakeLists.txt31
-rw-r--r--math/carve/files/patch-common_read_ply.cpp11
-rw-r--r--math/carve/files/patch-common_scene.cpp20
-rw-r--r--math/carve/files/patch-external_gtest-1.5.0_include_gtest_internal_gtest-port.h10
-rw-r--r--math/carve/files/patch-glu_triangulator.cpp22
-rw-r--r--math/carve/files/patch-include-carve_kd_node.hpp20
-rw-r--r--math/carve/files/patch-include-carve_polyhedron_impl.hpp42
-rw-r--r--math/carve/files/patch-include_CMakeLists.txt18
-rw-r--r--math/carve/files/patch-lib_intersect_classify_common_impl.hpp10
-rw-r--r--math/carve/files/patch-src_CMakeLists.txt28
-rw-r--r--math/carve/files/patch-src_extrude.cpp10
11 files changed, 0 insertions, 222 deletions
diff --git a/math/carve/files/patch-CMakeLists.txt b/math/carve/files/patch-CMakeLists.txt
deleted file mode 100644
index c6b4903b9cae..000000000000
--- a/math/carve/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- CMakeLists.txt.orig 2011-08-26 22:17:26.000000000 +0200
-+++ CMakeLists.txt 2012-02-17 18:00:25.000000000 +0100
-@@ -33,7 +33,7 @@
- set(HAVE_BOOST_UNORDERED_COLLECTIONS FALSE)
-
- if(CARVE_SYSTEM_BOOST)
-- find_package(BOOST 1.40)
-+ find_package(Boost 1.40)
- if(Boost_FOUND)
- include_directories(${Boost_INCLUDE_DIRS})
- message(STATUS "Using system boost")
-@@ -94,8 +94,8 @@
- add_definitions(-DGLUI_USE_STATIC_LIB)
- add_definitions(-DGLEW_STATIC)
- endif(WIN32)
-- add_subdirectory(external/GLEW)
-- add_subdirectory(external/GLUI)
-+ #add_subdirectory(external/GLEW)
-+ #add_subdirectory(external/GLUI)
-
- endif(NOT OPENGL_FOUND)
-
-@@ -110,6 +110,8 @@
- )
- include_directories(${carve_BINARY_DIR}/include)
-
-+configure_file( ${CMAKE_SOURCE_DIR}/include/carve/cmake-config.h.in ${CMAKE_SOURCE_DIR}/include/carve/config.h)
-+
- add_subdirectory(lib)
- add_subdirectory(include)
- add_subdirectory(common)
diff --git a/math/carve/files/patch-common_read_ply.cpp b/math/carve/files/patch-common_read_ply.cpp
deleted file mode 100644
index 81c291a6e1de..000000000000
--- a/math/carve/files/patch-common_read_ply.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- common/read_ply.cpp.orig 2013-02-22 09:51:55.000000000 +0100
-+++ common/read_ply.cpp 2013-02-22 09:52:16.000000000 +0100
-@@ -255,7 +255,7 @@
- carve::poly::Polyhedron *readFile(std::istream &in, const carve::math::Matrix &transform) {
- carve::input::Input inputs;
- if (!readFile<filetype_t>(in, inputs, transform)) {
-- return false;
-+ return NULL;
- }
- for (std::list<carve::input::Data *>::const_iterator i = inputs.input.begin(); i != inputs.input.end(); ++i) {
- carve::poly::Polyhedron *poly = inputs.create<carve::poly::Polyhedron>(*i);
diff --git a/math/carve/files/patch-common_scene.cpp b/math/carve/files/patch-common_scene.cpp
deleted file mode 100644
index b90557ecb9a6..000000000000
--- a/math/carve/files/patch-common_scene.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- common/scene.cpp.orig 2011-08-26 22:17:26.000000000 +0200
-+++ common/scene.cpp 2014-02-13 15:16:11.000000000 +0100
-@@ -31,7 +31,7 @@
- static int lastbutton = 0;
-
- static Scene *g_scene = NULL;
--static int g_mainWindow = NULL;
-+static int g_mainWindow = 0;
- static GLUI *g_rightPanel = NULL;
- static double near_plane = 0.2;
- static double far_plane = 200;
-@@ -412,7 +412,7 @@
- GLUI_Master.set_glutKeyboardFunc(s_key);
- GLUI_Master.set_glutSpecialFunc(NULL);
- GLUI_Master.set_glutMouseFunc(s_click);
-- GLUI_Master.set_glutMotionFunc(s_drag);
-+ //GLUI_Master.set_glutMotionFunc(s_drag);
-
- g_rightPanel = GLUI_Master.create_glui_subwindow(g_mainWindow, GLUI_SUBWINDOW_RIGHT);
-
diff --git a/math/carve/files/patch-external_gtest-1.5.0_include_gtest_internal_gtest-port.h b/math/carve/files/patch-external_gtest-1.5.0_include_gtest_internal_gtest-port.h
deleted file mode 100644
index 69cabda0c409..000000000000
--- a/math/carve/files/patch-external_gtest-1.5.0_include_gtest_internal_gtest-port.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- external/gtest-1.5.0/include/gtest/internal/gtest-port.h.orig 2011-08-26 20:16:23.000000000 +0000
-+++ external/gtest-1.5.0/include/gtest/internal/gtest-port.h
-@@ -176,6 +176,7 @@
- #ifndef _WIN32_WCE
- #include <sys/stat.h>
- #endif // !_WIN32_WCE
-+#include <unistd.h>
-
- #include <iostream> // NOLINT
- #include <sstream> // NOLINT
diff --git a/math/carve/files/patch-glu_triangulator.cpp b/math/carve/files/patch-glu_triangulator.cpp
deleted file mode 100644
index 4eccd17262ba..000000000000
--- a/math/carve/files/patch-glu_triangulator.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/glu_triangulator.cpp.orig 2011-11-16 11:53:05.000000000 +0100
-+++ src/glu_triangulator.cpp 2011-11-16 11:55:12.000000000 +0100
-@@ -111,7 +111,7 @@
- size_t f = 0;
- while (f < faces.size()) {
- carve::poly::Face<3> *face = faces[f];
-- if (face->vertices.size() == 3) {
-+ if (face->nVertices() == 3) {
- ++f;
- continue;
- }
-@@ -123,8 +123,8 @@
- gluTessBeginPolygon(tess, (void *)this);
- gluTessBeginContour(tess);
-
-- for (size_t i = 0; i < face->vertices.size(); ++i) {
-- gluTessVertex(tess, (GLdouble *)face->vertices[i]->v.v, (GLvoid *)face->vertices[i]);
-+ for (size_t i = 0; i < face->nVertices(); ++i) {
-+ gluTessVertex(tess, (GLdouble *)face->vertex(i)->v.v, (GLvoid *)face->vertex(i));
- }
-
- gluTessEndContour(tess);
diff --git a/math/carve/files/patch-include-carve_kd_node.hpp b/math/carve/files/patch-include-carve_kd_node.hpp
deleted file mode 100644
index 4641ceab8410..000000000000
--- a/math/carve/files/patch-include-carve_kd_node.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- include/carve/kd_node.hpp.orig 2013-02-22 09:47:07.000000000 +0100
-+++ include/carve/kd_node.hpp 2013-02-22 09:50:00.000000000 +0100
-@@ -238,7 +238,7 @@
- // q_t - the priority queue value type.
- // q_t.first: distance from object to query point.
- // q_t.second: pointer to object
-- typedef std::pair<double, const typename kd_node::data_t *> q_t;
-+ typedef std::pair<double, const data_t *> q_t;
-
- // the queue priority should sort from smallest distance to largest, and on equal distance, by object pointer.
- struct pcmp {
-@@ -266,7 +266,7 @@
- }
- }
-
-- const typename kd_node::data_t *next() {
-+ const data_t *next() {
- while (1) {
- if (pq.size()) {
- q_t t = pq.top();
diff --git a/math/carve/files/patch-include-carve_polyhedron_impl.hpp b/math/carve/files/patch-include-carve_polyhedron_impl.hpp
deleted file mode 100644
index ecede7fdc8a2..000000000000
--- a/math/carve/files/patch-include-carve_polyhedron_impl.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- include/carve/polyhedron_impl.hpp.orig 2013-02-22 09:41:13.000000000 +0100
-+++ include/carve/polyhedron_impl.hpp 2013-02-22 09:46:30.000000000 +0100
-@@ -88,9 +88,9 @@
- *(*result)++ = f;
-
- int r = 1;
-- for (size_t i = 0; i < f->edges.size(); ++i) {
-- const std::vector<const face_t *> &edge_faces = connectivity.edge_to_face[edgeToIndex_fast(f->edges[i])];
-- const face_t *f2 = connectedFace(f, f->edges[i]);
-+ for (size_t i = 0; i < f->nEdges(); ++i) {
-+ const std::vector<const face_t *> &edge_faces = connectivity.edge_to_face[edgeToIndex_fast(f->edge(i))];
-+ const face_t *f2 = connectedFace(f, f->edge(i));
- if (f2) {
- r += _faceNeighbourhood(f2, depth - 1, (*result));
- }
-@@ -116,7 +116,7 @@
- int r = 0;
- const std::vector<const face_t *> &edge_faces = connectivity.edge_to_face[edgeToIndex_fast(e)];
- for (size_t i = 0; i < edge_faces.size(); ++i) {
-- face_t *f = edge_faces[i];
-+ const face_t *f = edge_faces[i];
- if (f && f->manifold_id == m_id) { r += _faceNeighbourhood(f, depth, &result); }
- }
- return r;
-@@ -131,7 +131,7 @@
- int r = 0;
- const std::vector<const face_t *> &vertex_faces = connectivity.vertex_to_face[vertexToIndex_fast(v)];
- for (size_t i = 0; i < vertex_faces.size(); ++i) {
-- face_t *f = vertex_faces[i];
-+ const face_t *f = vertex_faces[i];
- if (f && f->manifold_id == m_id) { r += _faceNeighbourhood(f, depth, &result); }
- }
- return r;
-@@ -142,7 +142,7 @@
- // accessing connectivity information.
- template<typename T>
- int Geometry<3>::vertexToEdges(const vertex_t *v, T result) const {
-- std::vector<const edge_t *> &e = connectivity.vertex_to_edge[vertexToIndex_fast(v)];
-+ const std::vector<const edge_t *> &e = connectivity.vertex_to_edge[vertexToIndex_fast(v)];
- std::copy(e.begin(), e.end(), result);
- return e.size();
- }
diff --git a/math/carve/files/patch-include_CMakeLists.txt b/math/carve/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 97ced68c0727..000000000000
--- a/math/carve/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- include/CMakeLists.txt.orig 2012-02-17 18:09:09.000000000 +0100
-+++ include/CMakeLists.txt 2012-02-17 18:09:18.000000000 +0100
-@@ -3,6 +3,7 @@
- DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
- FILES_MATCHING
- PATTERN "*.hpp"
-+ PATTERN "*.h"
- PATTERN "internal" EXCLUDE
- REGEX "external/boost" EXCLUDE
- )
-@@ -11,6 +12,7 @@
- DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
- FILES_MATCHING
- PATTERN "*.hpp"
-+ PATTERN "*.h"
- PATTERN "internal" EXCLUDE
- )
- endif(CARVE_SYSTEM_BOOST)
diff --git a/math/carve/files/patch-lib_intersect_classify_common_impl.hpp b/math/carve/files/patch-lib_intersect_classify_common_impl.hpp
deleted file mode 100644
index 0a54405bf2ea..000000000000
--- a/math/carve/files/patch-lib_intersect_classify_common_impl.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/intersect_classify_common_impl.hpp.orig 2011-12-06 12:41:50.000000000 +0100
-+++ lib/intersect_classify_common_impl.hpp 2011-12-06 12:41:59.000000000 +0100
-@@ -250,6 +250,7 @@
- std::cerr << "d = " << d << std::endl;
- #endif
- fc = d < 0 ? FACE_IN : FACE_OUT;
-+ break;
- }
- default:
- CARVE_FAIL("unhandled switch case -- should not happen");
diff --git a/math/carve/files/patch-src_CMakeLists.txt b/math/carve/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 3cd8c7363f5d..000000000000
--- a/math/carve/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/CMakeLists.txt.orig 2011-08-26 22:17:26.000000000 +0200
-+++ src/CMakeLists.txt 2012-02-17 11:06:58.000000000 +0100
-@@ -1,7 +1,7 @@
- include_directories("${carve_SOURCE_DIR}/include")
- include_directories("${carve_SOURCE_DIR}/external/GLOOP/include")
--include_directories("${carve_SOURCE_DIR}/external/GLEW/include")
--include_directories("${carve_SOURCE_DIR}/external/GLUI/include")
-+#include_directories("${carve_SOURCE_DIR}/external/GLEW/include")
-+#include_directories("${carve_SOURCE_DIR}/external/GLUI/include")
- include_directories("${carve_SOURCE_DIR}/common")
- include_directories(${OPENGL_INCLUDE_DIR})
-
-@@ -20,7 +20,7 @@
- if(CARVE_WITH_GUI)
- add_executable (view view.cpp)
- target_link_libraries(view carve_fileformats carve_misc carve_ui carve gloop_model glui ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
-- install(TARGETS view RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-+ install(TARGETS view RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/carve")
- endif(CARVE_WITH_GUI)
-
- add_executable (triangulate triangulate.cpp)
-@@ -43,5 +43,5 @@
-
- foreach(tgt intersect triangulate convert)
- install(TARGETS ${tgt}
-- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/carve")
- endforeach(tgt)
diff --git a/math/carve/files/patch-src_extrude.cpp b/math/carve/files/patch-src_extrude.cpp
deleted file mode 100644
index 8618cb8fe5c5..000000000000
--- a/math/carve/files/patch-src_extrude.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/extrude.cpp.orig 2011-12-01 11:57:16.000000000 +0100
-+++ src/extrude.cpp 2011-12-01 11:59:06.000000000 +0100
-@@ -31,6 +31,7 @@
- #include "write_ply.hpp"
-
- #include <iostream>
-+#include <stdexcept>
-
- template<unsigned ndim>
- carve::geom::vector<ndim> lerp(
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 03:41:42 +0000