From 631c9ab968ca100bbf5b6679c697fb4beae6b782 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 25 Aug 2003 17:11:43 +0000 Subject: [PATCH] Fixed to compile and install using an ANSI C++ compiler like G++ 3.3. Some conditionals may be required to build with other compilers. --- src/Prep/Terra/.cvsignore | 5 +++++ src/Prep/Terra/GreedyInsert.cc | 7 ++++++- src/Prep/Terra/Heap.cc | 5 ++++- src/Prep/Terra/Makefile.am | 19 +++++++++++++++++-- src/Prep/Terra/Map.cc | 3 +++ src/Prep/Terra/Map.h | 4 +++- src/Prep/Terra/Mask.cc | 5 ++++- src/Prep/Terra/Mask.h | 4 ++++ src/Prep/Terra/Quadedge.cc | 5 ++++- src/Prep/Terra/Subdivision.cc | 5 ++++- src/Prep/Terra/Vec2.h | 6 +++++- src/Prep/Terra/Vec3.h | 3 ++- src/Prep/Terra/cmdline.cc | 9 +++++++-- src/Prep/Terra/glHacks.h | 3 +++ src/Prep/Terra/greedy.cc | 3 +++ src/Prep/Terra/gui.cc | 7 +++++-- src/Prep/Terra/output.cc | 10 +++++++++- 17 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 src/Prep/Terra/.cvsignore diff --git a/src/Prep/Terra/.cvsignore b/src/Prep/Terra/.cvsignore new file mode 100644 index 00000000..92f35e53 --- /dev/null +++ b/src/Prep/Terra/.cvsignore @@ -0,0 +1,5 @@ +.deps +Makefile +Makefile.in +terra +xterra diff --git a/src/Prep/Terra/GreedyInsert.cc b/src/Prep/Terra/GreedyInsert.cc index 49b16725..9aa73c2e 100644 --- a/src/Prep/Terra/GreedyInsert.cc +++ b/src/Prep/Terra/GreedyInsert.cc @@ -1,9 +1,14 @@ -#include +#include +#include #include "GreedyInsert.h" #include "Mask.h" extern ImportMask *MASK; +using std::cerr; +using std::endl; + + void TrackedTriangle::update(Subdivision& s) { GreedySubdivision& gs = (GreedySubdivision&)s; diff --git a/src/Prep/Terra/Heap.cc b/src/Prep/Terra/Heap.cc index 5cd128c2..7c8ce36b 100644 --- a/src/Prep/Terra/Heap.cc +++ b/src/Prep/Terra/Heap.cc @@ -1,7 +1,10 @@ #include -#include +#include #include "Heap.h" +using std::cerr; +using std::endl; + void Heap::swap(int i,int j) { diff --git a/src/Prep/Terra/Makefile.am b/src/Prep/Terra/Makefile.am index da2500be..8d4c66ca 100644 --- a/src/Prep/Terra/Makefile.am +++ b/src/Prep/Terra/Makefile.am @@ -1,6 +1,21 @@ -EXTRA_DIST = \ +AM_CXXFLAGS = -DIOSTREAMH + +bin_PROGRAMS = terra xterra + +terra_SOURCES = \ Array.h Geom.h GreedyInsert.cc GreedyInsert.h Heap.cc Heap.h \ Makefile-gcc-2.95 Makefile.am Makefile.orig Map.cc Map.h Mask.cc \ Mask.h Quadedge.cc Quadedge.h Subdivision.cc Subdivision.h Vec2.h \ Vec3.h cmdline.cc glHacks.cc glHacks.h greedy.cc gui.cc gui.h \ - output.cc terra.cc terra.h version.h xterra.cc + output.cc terra.cc terra.h version.h + +terra_LDADD = -lGL -lGLU -lglut + +xterra_SOURCES = \ + Array.h Geom.h GreedyInsert.cc GreedyInsert.h Heap.cc Heap.h \ + Makefile-gcc-2.95 Makefile.am Makefile.orig Map.cc Map.h Mask.cc \ + Mask.h Quadedge.cc Quadedge.h Subdivision.cc Subdivision.h Vec2.h \ + Vec3.h cmdline.cc glHacks.cc glHacks.h greedy.cc gui.cc gui.h \ + output.cc terra.h version.h xterra.cc + +xterra_LDADD = -lGL -lGLU -lglut \ No newline at end of file diff --git a/src/Prep/Terra/Map.cc b/src/Prep/Terra/Map.cc index 1e36b7e8..d5e5b0bd 100644 --- a/src/Prep/Terra/Map.cc +++ b/src/Prep/Terra/Map.cc @@ -3,6 +3,9 @@ #include "Geom.h" #include "Map.h" +using std::cerr; +using std::endl; + void Map::findLimits() { min = HUGE; diff --git a/src/Prep/Terra/Map.h b/src/Prep/Terra/Map.h index 3d6bf6a1..62e63534 100644 --- a/src/Prep/Terra/Map.h +++ b/src/Prep/Terra/Map.h @@ -2,7 +2,9 @@ #define MAP_INCLUDED #include -#include +#include + +using std::istream; #include "Geom.h" diff --git a/src/Prep/Terra/Mask.cc b/src/Prep/Terra/Mask.cc index 474cdb67..526c3a8c 100644 --- a/src/Prep/Terra/Mask.cc +++ b/src/Prep/Terra/Mask.cc @@ -1,10 +1,13 @@ #include #include -#include +#include #include "Geom.h" #include "Mask.h" +using std::cerr; +using std::endl; + RealMask *readMask(istream& in) { diff --git a/src/Prep/Terra/Mask.h b/src/Prep/Terra/Mask.h index 60d838ec..b964bf8c 100644 --- a/src/Prep/Terra/Mask.h +++ b/src/Prep/Terra/Mask.h @@ -1,6 +1,10 @@ #ifndef MASK_INCLUDED // -*- C++ -*- #define MASK_INCLUDED +#include + +using std::istream; + class ImportMask { diff --git a/src/Prep/Terra/Quadedge.cc b/src/Prep/Terra/Quadedge.cc index 153de0c0..ef3e26b0 100644 --- a/src/Prep/Terra/Quadedge.cc +++ b/src/Prep/Terra/Quadedge.cc @@ -1,8 +1,11 @@ #include -#include +#include #include "Quadedge.h" +using std::cerr; +using std::endl; + Edge::Edge(const Edge&) { cerr << "Edge: Edge assignments are forbidden." << endl; diff --git a/src/Prep/Terra/Subdivision.cc b/src/Prep/Terra/Subdivision.cc index 9821909f..b57ee138 100644 --- a/src/Prep/Terra/Subdivision.cc +++ b/src/Prep/Terra/Subdivision.cc @@ -1,9 +1,12 @@ #include -#include +#include #include +#include "Geom.h" #include "Subdivision.h" +using std::cerr; +using std::endl; Edge *Subdivision::makeEdge(Vec2& org, Vec2& dest) diff --git a/src/Prep/Terra/Vec2.h b/src/Prep/Terra/Vec2.h index 85230dfc..388a0c50 100644 --- a/src/Prep/Terra/Vec2.h +++ b/src/Prep/Terra/Vec2.h @@ -3,6 +3,9 @@ #include +using std::ostream; +using std::istream; + class Vec2 { protected: real elt[2]; @@ -165,7 +168,8 @@ inline ostream& operator<<(ostream& out, const Vec2& v) inline istream& operator>>(istream& in, Vec2& v) { - return in >> "[" >> v[0] >> v[1] >> "]"; + char c; + return in >> c >> v[0] >> v[1] >> c; } #endif diff --git a/src/Prep/Terra/Vec3.h b/src/Prep/Terra/Vec3.h index 2c6bbac5..1e1bf253 100644 --- a/src/Prep/Terra/Vec3.h +++ b/src/Prep/Terra/Vec3.h @@ -173,7 +173,8 @@ inline ostream& operator<<(ostream& out, const Vec3& v) inline istream& operator>>(istream& in, Vec3& v) { - return in >> "[" >> v[0] >> v[1] >> v[2] >> "]"; + char c; + return in >> c >> v[0] >> v[1] >> v[2] >> c; } #endif diff --git a/src/Prep/Terra/cmdline.cc b/src/Prep/Terra/cmdline.cc index dba88b7c..b34dbaa8 100644 --- a/src/Prep/Terra/cmdline.cc +++ b/src/Prep/Terra/cmdline.cc @@ -1,9 +1,14 @@ #include #include -#include -#include +#include +#include #include "terra.h" +using std::ifstream; +using std::cin; +using std::cerr; +using std::endl; + GreedySubdivision *mesh; Map *DEM; diff --git a/src/Prep/Terra/glHacks.h b/src/Prep/Terra/glHacks.h index 7750b205..5af143e8 100644 --- a/src/Prep/Terra/glHacks.h +++ b/src/Prep/Terra/glHacks.h @@ -7,6 +7,9 @@ #include #include +using std::ostream; +using std::endl; + /************************************************************************* * diff --git a/src/Prep/Terra/greedy.cc b/src/Prep/Terra/greedy.cc index a37e8407..1535f09a 100644 --- a/src/Prep/Terra/greedy.cc +++ b/src/Prep/Terra/greedy.cc @@ -1,5 +1,8 @@ #include "terra.h" +using std::cerr; +using std::endl; + void scripted_preinsertion(istream& script) { char op[4]; diff --git a/src/Prep/Terra/gui.cc b/src/Prep/Terra/gui.cc index 291e2b6b..76550f8c 100644 --- a/src/Prep/Terra/gui.cc +++ b/src/Prep/Terra/gui.cc @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include "glHacks.h" @@ -7,6 +7,9 @@ #include "terra.h" #include "gui.h" +using std::cout; +using std::endl; + int mesh_view; int surf_view; diff --git a/src/Prep/Terra/output.cc b/src/Prep/Terra/output.cc index 5269752d..9953b2bc 100644 --- a/src/Prep/Terra/output.cc +++ b/src/Prep/Terra/output.cc @@ -1,5 +1,13 @@ #include "terra.h" -#include +#include + +using std::cerr; +using std::cout; +using std::endl; +using std::istream; +using std::ostream; +using std::ofstream; +using std::streampos; void generate_output(char *filename, FileFormat format)