From e9f115b61a45ecd1d780032fc03f6da6b24e9b1b Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 3 May 2005 18:32:20 +0000 Subject: cleanups cleanups --- src/Hill.H | 16 ++-------------- src/Hill.cxx | 44 +------------------------------------------- src/Panorama.cxx | 4 ++-- 3 files changed, 5 insertions(+), 59 deletions(-) diff --git a/src/Hill.H b/src/Hill.H index b850425..bd97121 100644 --- a/src/Hill.H +++ b/src/Hill.H @@ -1,5 +1,5 @@ // -// "$Id: Hill.H,v 1.8 2005/05/03 20:16:40 hofmann Exp $" +// "$Id: Hill.H,v 1.9 2005/05/03 20:32:20 hofmann Exp $" // // X11 header file for the Fast Light Tool Kit (FLTK). // @@ -28,8 +28,6 @@ class Mountain; class Mountain { private: - Mountain *next; - Mountain *next_visible; public: double phi, lam; @@ -45,17 +43,7 @@ class Mountain { Mountain(int x_tmp, int y_tmp); - ~Mountain(); - - void append(Mountain *m); - - void append_visible(Mountain *m); - - void clear_next_visible(); - - Mountain * get_next(); - - Mountain * get_next_visible(); + ~Mountain(); }; diff --git a/src/Hill.cxx b/src/Hill.cxx index b0c738f..5bef0fd 100644 --- a/src/Hill.cxx +++ b/src/Hill.cxx @@ -1,5 +1,5 @@ // -// "$Id: Hill.cxx,v 1.6 2005/05/03 20:16:40 hofmann Exp $" +// "$Id: Hill.cxx,v 1.7 2005/05/03 20:32:20 hofmann Exp $" // // PSEditWidget routines. // @@ -35,8 +35,6 @@ Mountain::Mountain(const char *n, double p, double l, double h) { alph = 0.0; x = 0; y = 0; - next = NULL; - next_visible = NULL; } Mountain::Mountain(int x_tmp, int y_tmp) { @@ -47,54 +45,14 @@ Mountain::Mountain(int x_tmp, int y_tmp) { alph = 0.0; x = x_tmp; y = y_tmp; - next = NULL; - next_visible = NULL; } Mountain::~Mountain() { - if (next) { - delete(next); - } - if (name) { free(name); } } -void -Mountain::append(Mountain *m) { - if (next) { - next->append(m); - } else { - next = m; - } -} - -Mountain * -Mountain::get_next() { - return next; -} - -void -Mountain::append_visible(Mountain *m) { - if (next_visible) { - next->append_visible(m); - } else { - next_visible = m; - } -} - -Mountain * -Mountain::get_next_visible() { - return next_visible; -} - -void -Mountain::clear_next_visible() { - next_visible = NULL; -} - - Mountains::Mountains() { fprintf(stderr, "===>huhu\n"); diff --git a/src/Panorama.cxx b/src/Panorama.cxx index 1267470..7700d5e 100644 --- a/src/Panorama.cxx +++ b/src/Panorama.cxx @@ -1,7 +1,7 @@ // -// "$Id: Panorama.cxx,v 1.23 2005/05/03 20:29:59 hofmann Exp $" +// "$Id: Panorama.cxx,v 1.24 2005/05/03 20:32:20 hofmann Exp $" // -// PSEditWidget routines. +// Panorama routines. // // Copyright 2004 by Johannes Hofmann // -- cgit v1.2.3