- Fixed makefile. (by zear)

- Fixed globe memory leak. (by Daiky)
- Globe cleanup and stuff.

git-svn-id: https://openxcom.svn.sourceforge.net/svnroot/openxcom/trunk@186 11c4a5ed-7179-4546-81a6-367b3be9d812

Author: SupSuper

src/Geoscape/Globe.cpp

@@ -214,15 +214,15 @@ Globe::~Globe()
 	delete _mkCrashedUfo;
 	delete _mkAlienSite;
 
-	for (std::vector<Polygon*>::iterator i = _ocean.begin(); i != _ocean.end(); i++)
+	for (std::list<Polygon*>::iterator i = _ocean.begin(); i != _ocean.end(); i++)
 	{
 		delete *i;
 	}
-	for (std::vector<Polygon*>::iterator i = _cacheOcean.begin(); i != _cacheOcean.end(); i++)
+	for (std::list<Polygon*>::iterator i = _cacheOcean.begin(); i != _cacheOcean.end(); i++)
 	{
 		delete *i;
 	}
-	for (std::vector<Polygon*>::iterator i = _cacheLand.begin(); i != _cacheLand.end(); i++)
+	for (std::list<Polygon*>::iterator i = _cacheLand.begin(); i != _cacheLand.end(); i++)
 	{
 		delete *i;
 	}
@@ -327,7 +327,7 @@ bool Globe::insidePolygon(double lon, double lat, Polygon *poly) const
  * @param polygons Pointer to the polygon set.
  * @sa http://www.ufopaedia.org/index.php?title=WORLD.DAT
  */
-void Globe::loadDat(const std::string &filename, std::vector<Polygon*> *polygons)
+void Globe::loadDat(const std::string &filename, std::list<Polygon*> *polygons)
 {
 	// Load file
 	std::ifstream mapFile (filename.c_str(), std::ios::in | std::ios::binary);
@@ -513,7 +513,7 @@ void Globe::center(double lon, double lat)
 bool Globe::insideLand(double lon, double lat) const
 {
 	bool inside = false;
-	for (std::vector<Polygon*>::iterator i = _res->getPolygons()->begin(); i < _res->getPolygons()->end() && !inside; i++)
+	for (std::list<Polygon*>::iterator i = _res->getPolygons()->begin(); i != _res->getPolygons()->end() && !inside; i++)
 	{
 		inside = insidePolygon(lon, lat, *i);
 	}
@@ -610,14 +610,27 @@ std::vector<Target*> Globe::getTargets(int x, int y, bool craft) const
  */
 void Globe::cachePolygons()
 {
-	// Cache ocean
-	for (std::vector<Polygon*>::iterator i = _cacheOcean.begin(); i != _cacheOcean.end(); i++)
+	cache(&_ocean, &_cacheOcean);
+	cache(_res->getPolygons(), &_cacheLand);
+	draw();
+}
+
+/**
+ * Caches a set of polygons.
+ * @param polygons Pointer to list of polygons.
+ * @param cache Pointer to cache.
+ */
+void Globe::cache(std::list<Polygon*> *polygons, std::list<Polygon*> *cache)
+{
+	// Clear existing cache
+	for (std::list<Polygon*>::iterator i = cache->begin(); i != cache->end(); i++)
 	{
 		delete *i;
 	}	
-	_cacheOcean.clear();
+	cache->clear();
 
-	for (std::vector<Polygon*>::iterator i = _ocean.begin(); i != _ocean.end(); i++)
+	// Pre-calculate values to cache
+	for (std::list<Polygon*>::iterator i = polygons->begin(); i != polygons->end(); i++)
 	{
 		// Is quad on the back face?
 		bool backFace = true;
@@ -639,42 +652,8 @@ void Globe::cachePolygons()
 			p->setY(j, y);
 		}
 
-		_cacheOcean.push_back(p);
-	}
-
-	// Cache land
-	for (std::vector<Polygon*>::iterator i = _cacheLand.begin(); i != _cacheLand.end(); i++)
-	{
-		delete *i;
-	}	
-	_cacheLand.clear();
-
-	for (std::vector<Polygon*>::iterator i = _res->getPolygons()->begin(); i != _res->getPolygons()->end(); i++)
-	{
-		// Don't draw if polygon is facing back
-		bool backFace = true;
-		for (int j = 0; j < (*i)->getPoints(); j++)
-		{
-			backFace = backFace && pointBack((*i)->getLongitude(j), (*i)->getLatitude(j));
-		}
-		if (backFace)
-			continue;
-
-		Polygon* p = new Polygon(**i);
-
-		// Convert coordinates
-		for (int j = 0; j < p->getPoints(); j++)
-		{
-			Sint16 x, y;
-			polarToCart(p->getLongitude(j), p->getLatitude(j), &x, &y);
-			p->setX(j, x);
-			p->setY(j, y);
-		}
-
-		_cacheLand.push_back(p);
+		cache->push_back(p);
 	}
-
-	draw();
 }
 
 /**
@@ -772,7 +751,7 @@ void Globe::drawOcean()
 
 	filledCircleColor(getSurface(), _cenX, _cenY, (Sint16)floor(_radius[_zoom]), Palette::getRGBA(this->getPalette(), Palette::blockOffset(12)+28));
 
-	for (std::vector<Polygon*>::iterator i = _cacheOcean.begin(); i != _cacheOcean.end(); i++)
+	for (std::list<Polygon*>::iterator i = _cacheOcean.begin(); i != _cacheOcean.end(); i++)
 	{
 		double tmpLon = (*i)->getLongitude(0);
 
@@ -806,7 +785,7 @@ void Globe::drawLand()
 	double minLon = 0.0, maxLon = 0.0, curTime = _save->getTime()->getDaylight();
 	Sint16 x[4], y[4];
 
-	for (std::vector<Polygon*>::iterator i = _cacheLand.begin(); i != _cacheLand.end(); i++)
+	for (std::list<Polygon*>::iterator i = _cacheLand.begin(); i != _cacheLand.end(); i++)
 	{
 		// Convert coordinates
 		for (int j = 0; j < (*i)->getPoints(); j++)
@@ -847,7 +826,7 @@ void Globe::drawDetail()
 		// Lock the surface
 		_countries->lock();
 
-		for (std::vector<Polyline*>::iterator i = _res->getPolylines()->begin(); i != _res->getPolylines()->end(); i++)
+		for (std::list<Polyline*>::iterator i = _res->getPolylines()->begin(); i != _res->getPolylines()->end(); i++)
 		{
 			Sint16 x[2], y[2];
 			for (int j = 0; j < (*i)->getPoints() - 1; j++)
@@ -871,6 +850,11 @@ void Globe::drawDetail()
 	// Draw the country names
 	if (_zoom >= 2)
 	{
+		Text *label = new Text(_res->getFont("BIGLETS.DAT"), _res->getFont("SMALLSET.DAT"), 80, 9, 0, 0);
+		label->setPalette(getPalette());
+		label->setAlign(ALIGN_CENTER);
+		label->setColor(Palette::blockOffset(15)-1);
+
 		Sint16 x, y;
 		for (std::map<LangString, Country*>::iterator i = _save->getCountries()->begin(); i != _save->getCountries()->end(); i++)
 		{
@@ -881,18 +865,23 @@ void Globe::drawDetail()
 			// Convert coordinates
 			polarToCart(i->second->getLabelLongitude(), i->second->getLabelLatitude(), &x, &y);
 
-			Text *label = new Text(_res->getFont("BIGLETS.DAT"), _res->getFont("SMALLSET.DAT"), 80, 9, x - 40, y);
-			label->setPalette(getPalette());
-			label->setAlign(ALIGN_CENTER);
+			label->setX(x - 40);
+			label->setY(y);
 			label->setText(_res->getLanguage()->getString(i->first));
-			label->setColor(Palette::blockOffset(15)-1);
 			label->blit(_countries);
 		}
+
+		delete label;
 	}
 
 	// Draw the city markers
 	if (_zoom >= 3)
 	{
+		Text *label = new Text(_res->getFont("BIGLETS.DAT"), _res->getFont("SMALLSET.DAT"), 80, 9, 0, 0);
+		label->setPalette(getPalette());
+		label->setAlign(ALIGN_CENTER);
+		label->setColor(Palette::blockOffset(8)+10);
+
 		Sint16 x, y;
 		for (std::map<LangString, Region*>::iterator i = _save->getRegions()->begin(); i != _save->getRegions()->end(); i++)
 		{
@@ -910,14 +899,14 @@ void Globe::drawDetail()
 				_mkCity->setPalette(getPalette());
 				_mkCity->blit(_countries);
 
-				Text *label = new Text(_res->getFont("BIGLETS.DAT"), _res->getFont("SMALLSET.DAT"), 80, 9, x - 40, y + 2);
-				label->setPalette(getPalette());
-				label->setAlign(ALIGN_CENTER);
+				label->setX(x - 40);
+				label->setY(y + 2);
 				label->setText(_res->getLanguage()->getString((*j)->getName()));
-				label->setColor(Palette::blockOffset(8)+10);
 				label->blit(_countries);
 			}
 		}
+
+		delete label;
 	}
 }
 

src/Geoscape/Globe.h

@@ -20,6 +20,7 @@
 #define OPENXCOM_GLOBE_H
 
 #include <vector>
+#include <list>
 #include <string>
 #include "../Engine/InteractiveSurface.h"
 
@@ -51,7 +52,7 @@ class Globe : public InteractiveSurface
 	Surface *_markers, *_countries;
 	bool _blink, _detail;
 	Timer *_blinkTimer, *_rotTimer;
-	std::vector<Polygon*> _ocean, _cacheOcean, _cacheLand;
+	std::list<Polygon*> _ocean, _cacheOcean, _cacheLand;
 	Surface *_mkXcomBase, *_mkAlienBase, *_mkCraft, *_mkWaypoint, *_mkCity;
 	Surface *_mkFlyingUfo, *_mkLandedUfo, *_mkCrashedUfo, *_mkAlienSite;
 
@@ -61,13 +62,15 @@ class Globe : public InteractiveSurface
 	bool insidePolygon(double lon, double lat, Polygon *poly) const;
 	/// Checks if a target is near a point.
 	bool targetNear(Target* target, int x, int y) const;
+	/// Caches a set of polygons.
+	void cache(std::list<Polygon*> *polygons, std::list<Polygon*> *cache);
 public:
 	/// Creates a new globe at the specified position and size.
 	Globe(int cenX, int cenY, int width, int height, int x = 0, int y = 0);
 	/// Cleans up the globe.
 	~Globe();
 	/// Loads a set of polygons from a DAT file.
-	static void loadDat(const std::string &filename, std::vector<Polygon*> *polygons);
+	static void loadDat(const std::string &filename, std::list<Polygon*> *polygons);
 	/// Converts polar coordinates to cartesian coordinates.
 	void polarToCart(double lon, double lat, Sint16 *x, Sint16 *y) const;
 	/// Converts cartesian coordinates to polar coordinates.

src/Makefile

@@ -20,7 +20,7 @@ BIN = openxcom
 endif
 
 # Compiler settings
-CXXFLAGS = -Wall -O2 `$(SDL-CONFIG) --cflags` $(addprefix -d,$(TARGET))
+CXXFLAGS = -Wall -O2 `$(SDL-CONFIG) --cflags` $(addprefix -D,$(TARGET))
 LDFLAGS = `$(SDL-CONFIG) --libs` -lSDL_gfx -lSDL_mixer
 
 # Rules

src/Resource/ResourcePack.cpp

@@ -58,11 +58,11 @@ ResourcePack::~ResourcePack()
 	{
 		delete i->second;
 	}
-	for (std::vector<Polygon*>::iterator i = _polygons.begin(); i != _polygons.end(); i++)
+	for (std::list<Polygon*>::iterator i = _polygons.begin(); i != _polygons.end(); i++)
 	{
 		delete *i;
 	}
-	for (std::vector<Polyline*>::iterator i = _polylines.begin(); i != _polylines.end(); i++)
+	for (std::list<Polyline*>::iterator i = _polylines.begin(); i != _polylines.end(); i++)
 	{
 		delete *i;
 	}
@@ -195,7 +195,7 @@ SurfaceSet *const ResourcePack::getSurfaceSet(const std::string &name)
  * Returns the list of polygons in the resource set.
  * @return Pointer to the list of polygons.
  */
-std::vector<Polygon*> *const ResourcePack::getPolygons()
+std::list<Polygon*> *const ResourcePack::getPolygons()
 {
 	return &_polygons;
 }
@@ -204,7 +204,7 @@ std::vector<Polygon*> *const ResourcePack::getPolygons()
  * Returns the list of polylines in the resource set.
  * @return Pointer to the list of polylines.
  */
-std::vector<Polyline*> *const ResourcePack::getPolylines()
+std::list<Polyline*> *const ResourcePack::getPolylines()
 {
 	return &_polylines;
 }

src/Resource/ResourcePack.h

@@ -21,7 +21,7 @@
 
 #include <map>
 #include <string>
-#include <vector>
+#include <list>
 #include "SDL.h"
 
 class Language;
@@ -55,8 +55,8 @@ class ResourcePack
 	std::map<std::string, Surface*> _surfaces;
 	std::map<std::string, SurfaceSet*> _sets;
 	std::map<std::string, SoundSet*> _sounds;
-	std::vector<Polygon*> _polygons;
-	std::vector<Polyline*> _polylines;
+	std::list<Polygon*> _polygons;
+	std::list<Polyline*> _polylines;
 	std::map<std::string, Music*> _musics;
 
 	/// Converts a filename to its existing case-insensitive name.
@@ -79,9 +79,9 @@ class ResourcePack
 	/// Gets a particular surface set.
 	SurfaceSet *const getSurfaceSet(const std::string &name);
 	/// Gets the list of world polygons.
-	std::vector<Polygon*> *const getPolygons();
+	std::list<Polygon*> *const getPolygons();
 	/// Gets the list of world polylines.
-	std::vector<Polyline*> *const getPolylines();
+	std::list<Polyline*> *const getPolylines();
 	/// Gets a particular music.
 	Music *const getMusic(const std::string &name);
 	/// Gets a particular sound set.