fixed gtfs and text additions and makefile on Linux

GeoGL/data/gtfs/GTFSFile.cpp

@@ -50,9 +50,9 @@ namespace data {
 			}*/
 
 			ZipArchive::Ptr archive = ZipFile::Open(Filename);
-			//ZipArchiveEntry::Ptr entry = archive->GetEntry("routes.txt");
-			//std::istream* decompressStream = entry->GetDecompressionStream();
-			//ParseRoutes(decompressStream);
+			ZipArchiveEntry::Ptr entry = archive->GetEntry("routes.txt");
+			std::istream* decompressStream = entry->GetDecompressionStream();
+			ParseRoutes(decompressStream);
 
 		}
 

GeoGL/main.cpp

@@ -141,29 +141,6 @@ static void error_callback(int error, const char* description)
 	fputs(description, stderr);
 }
 
-//create a fake version of London
-void fakeLondon(Globe& globe) {
-	/*SceneGraphType* SG = globe.GetSceneGraph();
-	Ellipsoid e; //bit naughty, shouldn't globe do the coord conversion
-	Cylinder* eye = new Cylinder(10,100,20);
-	glm::translate(eye->modelMatrix,glm::vec3(0,100,0)); //move it up so the base is on the ground
-	glm::vec3 eye_pos = e.toVector(-0.119752*3.141592654/180.0,51.503313*3.141592654/180.0,0);
-	eye->Rotate(90.0*3.141592654/180.0,glm::vec3(0,1,0)); //tip it on its end
-	eye->Rotate(-85*3.141592654/180.0,glm::vec3(1,0,0)); //angle to river
-	eye->Rotate(-51.503313*3.141592654/180,glm::vec3(0,0,1)); //azimuthal rotation
-	eye->SetPos(eye_pos.x,eye_pos.y,eye_pos.z);
-	eye->AttachShader(globe.GetShader(0),true); //presumably shader 0 is the right one?
-	SG->push_back(eye);
-
-	Pyramid4* shard = new Pyramid4(100,306,100);
-	shard->Rotate(90*3.141592654/180,glm::vec3(1,0,0)); //rotate it so it's pointing up
-	glm::translate(shard->modelMatrix,glm::vec3(0,100,0)); //move it up so the base is on the ground
-	glm::vec3 shard_pos = e.toVector(-0.086598*3.141592654/180.0,51.504358*3.141592654/180.0,0);
-	shard->Rotate(-51.504358*3.141592654/180,glm::vec3(0,0,1)); //azimuthal rotation
-	shard->SetPos(shard_pos.x,shard_pos.y,shard_pos.z);
-	shard->AttachShader(globe.GetShader(0),true); //presumably shader 0 is the right one?
-	SG->push_back(shard);*/
-}
 
 
 //alternative main function for GLFW

makefile

@@ -26,6 +26,7 @@ FREETYPE_INCLUDE=/usr/include/freetype2
 #PIX-BUF_INCLUDE=/usr/include/gdk-pixbuf-2.0
 #ATK_INCLUDE=/usr/include/atk-1.0
 #GTKMM_INCLUDE=/usr/include/gtkmm-3.0
+WBENNY_LIBZIP_HOME=/home/richard/projects/github/GeoGL/externals/wbenny-ziplib
 
 CC=gcc
 CXX=g++
@@ -37,18 +38,18 @@ CPPFLAGS=-g -std=c++11 -DLINUX
 #note json cpp coming from projects folder i.e. not installed
 #-ljson_linux-gcc-4.8.2_libmt -lLeap
 LDFLAGS=-Wall -lstdc++ -lm -lGL -lGLU -lglut -lGLEW -lglfw -ljsoncpp \
--lpoly2tri -lfreetype -ljpeg -lcurl `pkg-config gtkmm-3.0 --libs` -lpthread
-LDLIBS=-L$(JSONCPP_HOME)/libs/linux-gcc-4.8.2 -L$(LEAPSDK_HOME)/lib/x64 -L$(POLY2TRI_HOME) -L$(LIBJPEG_HOME)
+-lpoly2tri -lfreetype -ljpeg -lcurl `pkg-config gtkmm-3.0 --libs` -lpthread -lzip
+LDLIBS=-L$(JSONCPP_HOME)/libs/linux-gcc-4.8.2 -L$(LEAPSDK_HOME)/lib/x64 -L$(POLY2TRI_HOME) -L$(LIBJPEG_HOME) -L$(WBENNY_LIBZIP_HOME)/Bin
 #-I$(JSONCPP_HOME)/include
 #-I$(LEAPSDK_HOME)/include
 #-I$(LIBJPEG_HOME)
 INCLUDEDIRS=-IGeoGL `pkg-config jsoncpp --cflags` -I$(POLY2TRI_HOME) -I$(FREETYPE_INCLUDE) -I$(LIBJPEG_HOME) \
-`pkg-config gtkmm-3.0 --cflags`
+`pkg-config gtkmm-3.0 --cflags` -I$(WBENNY_LIBZIP_HOME)/Source
 SOURCES=$(wildcard GeoGL/*.cpp) $(wildcard GeoGL/gengine/*.cpp) $(wildcard GeoGL/gengine/image/*.cpp) \
 $(wildcard GeoGL/gengine/events/*.cpp) $(wildcard GeoGL/cache/*.cpp) $(wildcard GeoGL/async/*.cpp) \
 $(wildcard GeoGL/net/*.cpp) $(wildcard GeoGL/gui/*.cpp) $(wildcard GeoGL/clipper/*.cpp) \
 $(wildcard GeoGL/abm/*.cpp) $(wildcard GeoGL/abm/sensor/*.cpp) $(wildcard GeoGL/io/*.cpp) $(wildcard usr/*.cpp) \
-$(wildcard GeoGL/algorithms/index/*.cpp) $(wildcard GeoGL/gis/*.cpp)
+$(wildcard GeoGL/algorithms/index/*.cpp) $(wildcard GeoGL/gis/*.cpp) $(wildcard GeoGL/text/*.cpp) $(wildcard GeoGL/data/gtfs/*.cpp)
 OBJECTS=$(SOURCES:.cpp=.o)
 EXECUTABLE=bin/GeoGLProgram