starting to figure out map tiless

Former-commit-id: 824568134cd998da174616228d656fad5ecf0e61

Map.cpp

@@ -171,5 +171,8 @@ Map::Map() {
 
     QTInsert(&root, new Line(currentPoint, nextPoint), 0);
 	}
-
+}
+
+Map::~Map() {
+  delete mapPoints;
 } 

Map.h

@@ -74,16 +74,19 @@ typedef struct QuadTree{
 
 class Map {
 
-public:
+private:
+	int mapPoints_count;
+	float *mapPoints;
+
 	QuadTree root;
 
 	bool QTInsert(QuadTree *tree, Line *line, int depth);
 	std::vector<Line> getLinesRecursive(QuadTree *tree, float screen_lat_min, float screen_lat_max, float screen_lon_min, float screen_lon_max);
+public:
+
 	std::vector<Line> getLines(float screen_lat_min, float screen_lat_max, float screen_lon_min, float screen_lon_max);
 
 	Map(); 
-
+	~Map();
-	int mapPoints_count;
-	float *mapPoints;
 };
 #endif

View.cpp

@@ -168,7 +168,7 @@ void View::pxFromLonLat(float *dx, float *dy, float lon, float lat) {
     *dy = 6371.0 * (lat - centerLat) * M_PI / 180.0f;
 }
 
-void View::latLonFromScreenCoords(float *lat, float *lon, int x, int y) {
+void View::lonLatFromScreenCoords(float *lon, float *lat, int x, int y) {
     float scale_factor = (screen_width > screen_height) ? screen_width : screen_height;
 
     float dx = maxDist * (x  - (screen_width>>1)) / (0.95 * scale_factor * 0.5 );       
@@ -176,6 +176,22 @@ void View::latLonFromScreenCoords(float *lat, float *lon, int x, int y) {
 
     *lat = 180.0f * dy / (6371.0 * M_PI) + centerLat;
     *lon = 180.0 * dx / (cos(((*lat + centerLat)/2.0f) * M_PI / 180.0f) * 6371.0 * M_PI) + centerLon;
+
+    // if(*lat < -180.0) {
+    //     *lat = -180.0;
+    // }
+
+    // if(*lat > 180.0) {
+    //     *lat = 180.0;
+    // }
+    
+    // if(*lon < -90.0) {
+    //     *lon = -90.0;
+    // }
+
+    // if(*lon > 90.0) {
+    //     *lon = 90.0;
+    // }
 }
 
 
@@ -671,8 +687,8 @@ void View::drawLines(float screen_lat_min, float screen_lat_max, float screen_lo
 void View::drawGeography(int left, int top, int right, int bottom, int bailTime) {
     float screen_lat_min, screen_lat_max, screen_lon_min, screen_lon_max;
 
-    latLonFromScreenCoords(&screen_lat_min, &screen_lon_min, left, top);
+    lonLatFromScreenCoords(&screen_lon_min, &screen_lat_min, left, top);
-    latLonFromScreenCoords(&screen_lat_max, &screen_lon_max, right, bottom);
+    lonLatFromScreenCoords(&screen_lon_max, &screen_lat_max, right, bottom);
 
     drawLines(screen_lat_min, screen_lat_max, screen_lon_min, screen_lon_max, bailTime);    
 }
@@ -1105,7 +1121,7 @@ void View::animateCenterAbsolute(float x, float y) {
     float outLon = dx * (1.0/6371.0) * (180.0f / M_PI) / cos(((centerLat)/2.0f) * M_PI / 180.0f);
 
     //double outLon, outLat;
-    //latLonFromScreenCoords(&outLat, &outLon, event.tfinger.dx, event.tfinger.dy);
+    //lonLatFromScreenCoords(&outLat, &outLon, event.tfinger.dx, event.tfinger.dy);
 
     mapTargetLon = centerLon - outLon;
     mapTargetLat = centerLat - outLat;
@@ -1127,7 +1143,7 @@ void View::moveCenterAbsolute(float x, float y) {
     float outLon = dx * (1.0/6371.0) * (180.0f / M_PI) / cos(((centerLat)/2.0f) * M_PI / 180.0f);
 
     //double outLon, outLat;
-    //latLonFromScreenCoords(&outLat, &outLon, event.tfinger.dx, event.tfinger.dy);
+    //lonLatFromScreenCoords(&outLat, &outLon, event.tfinger.dx, event.tfinger.dy);
 
     centerLon += outLon;
     centerLat += outLat;
@@ -1153,7 +1169,7 @@ void View::moveCenterRelative(float dx, float dy) {
     float outLon = dx * (1.0/6371.0) * (180.0f / M_PI) / cos(((centerLat)/2.0f) * M_PI / 180.0f);
 
     //double outLon, outLat;
-    //latLonFromScreenCoords(&outLat, &outLon, event.tfinger.dx, event.tfinger.dy);
+    //lonLatFromScreenCoords(&outLat, &outLon, event.tfinger.dx, event.tfinger.dy);
 
     centerLon += outLon;
     centerLat += outLat;
@@ -1282,13 +1298,117 @@ void View::registerMouseMove(int x, int y) {
 // 
 //
 
+void View::drawTiles() {
+    int x = 0;
+    int y = 0; 
+
+    float dx, dy;
+    int x1, y1, x2, y2;
+
+
+    float downres = 32;
+
+    float currentLon, currentLat;
+
+    Tile *useTile;
+
+    int count = 0;
+
+    while(y < screen_height) {
+        x = 0;
+        while(x < screen_width) {
+            //printf("count = %d,y=%d, x=%d\n",count,y,x);
+            // if(count > 100) {
+            //     return;
+            // }
+            // count++;
+            lonLatFromScreenCoords(&currentLon, &currentLat, x, screen_height - y);
+
+            std::vector<Tile>::iterator currentTile = tiles.begin();
+            for(; currentTile != tiles.end(); ++currentTile) {
+                if(currentLon >= currentTile->lon_min &&
+                    currentLon < currentTile->lon_max &&
+                    currentLat >= currentTile->lat_min &&
+                    currentLat < currentTile->lat_max) {
+                      //  printf("existing\n");
+
+                        useTile = &(*currentTile); 
+                        break;
+                }
+            }
+
+            if(currentTile == tiles.end()) {
+               // printf("new\n");
+
+                useTile = new Tile;
+
+
+                useTile->lon_min = floor(currentLon * downres) / downres;
+                useTile->lon_max = ceil(currentLon * downres) / downres;
+                useTile->lat_min = floor(currentLat * downres) / downres;
+                useTile->lat_max = ceil(currentLat * downres) / downres;
+
+                useTile->texture = SDL_CreateTexture(renderer,
+                               SDL_PIXELFORMAT_ARGB8888,
+                               SDL_TEXTUREACCESS_TARGET,
+                               512, 512);
+
+                SDL_SetRenderTarget(renderer, useTile->texture);
+                
+                // SDL_SetRenderDrawColor(renderer, style.backgroundColor.r, style.backgroundColor.g, style.backgroundColor.b, 255);
+
+                SDL_SetRenderDrawColor(renderer, rand()%255,rand()%255,rand()%255,255);
+                SDL_RenderClear(renderer);
+                
+                drawGeography(0, 0, screen_width, screen_height, 0);
+
+                SDL_SetRenderTarget(renderer, NULL );   
+
+
+                tiles.push_back(*useTile);
+
+            }
+
+            pxFromLonLat(&dx, &dy, useTile->lon_min, useTile->lat_min);
+            screenCoords(&x1, &y1, dx, dy);
+            pxFromLonLat(&dx, &dy, useTile->lon_max, useTile->lat_max);
+            screenCoords(&x2, &y2, dx, dy);
+
+            //printf("%d %d %d %d\n",x1,y1,x2,y2);
+
+            // boxRGBA(renderer, x1, screen_height - y1, x2, screen_height -  y2, rand() %255, rand() % 255, rand()%255, 255);
+
+            //rectangleRGBA(renderer, x1, y1, x2, y2,255,0,255,255);
+            //pixelRGBA(renderer,x,y,255,255,255,255);
+
+            //printf("x -> x2, %d %d\n",x,x2);
+               SDL_Rect dest;
+
+            dest.x = x1;
+            dest.y = y1;
+            dest.w = x2-x1;
+            dest.h = y1-y2;
+
+            SDL_RenderCopy(renderer, useTile->texture, NULL, &dest);
+
+            x = x2 + 1;
+        }
+
+        y = y1 + 1;
+            //printf("y, %d, screen_height %d\n",y,screen_height);
+
+    }
+}
+
 void View::draw() {
     drawStartTime = now();
     
     moveMapToTarget();
     zoomMapToTarget();
 
-    //updatePlanes();
+    for(int i = 0; i < 4; i++) {
+        resolveLabelConflicts();
+    }
 
     if(mapRedraw && !mapMoved) {
         SDL_SetRenderTarget(renderer, mapTexture);
@@ -1308,18 +1428,13 @@ void View::draw() {
         currentMaxDist = maxDist;
     }
     
-    for(int i = 0; i < 4; i++) {
+    int shiftx = 0;
-        resolveLabelConflicts();
+    int shifty = 0;
-    }
 
-    //SDL_SetRenderDrawColor( renderer, 0, 15, 30, 0);
     SDL_SetRenderDrawColor(renderer, style.backgroundColor.r, style.backgroundColor.g, style.backgroundColor.b, 255);
 
     SDL_RenderClear(renderer);
 
-    int shiftx = 0;
-    int shifty = 0;
-
     if(mapMoved) {
         float dx, dy;
         int x1,y1, x2, y2;
@@ -1370,6 +1485,7 @@ void View::draw() {
         SDL_RenderCopy(renderer, mapTexture, NULL, NULL);
     }
 
+    drawTiles();
 
     drawScaleBars();
     drawPlanes();  

View.h

@@ -41,6 +41,14 @@ typedef struct Style {
     SDL_Color buttonColor;
 } Style;
 
+typedef struct Tile {
+	float lat_min;
+  	float lat_max;
+  	float lon_min;
+  	float lon_max;
+
+  	SDL_Texture *texture;
+}  Tile;
 
 
 class View {
@@ -68,55 +76,11 @@ class View {
 
 		Style style;
 
-	public:
-		int screenDist(float d);
-		void pxFromLonLat(float *dx, float *dy, float lon, float lat);
-		void latLonFromScreenCoords(float *lat, float *lon, int x, int y);
-		void screenCoords(int *outX, int *outY, float dx, float dy);
-		int outOfBounds(int x, int y);
-		void drawPlaneOffMap(int x, int y, int *returnx, int *returny, SDL_Color planeColor);
-		void drawPlaneIcon(int x, int y, float heading, SDL_Color planeColor);
-		void drawTrail(Aircraft *p);
-		void drawScaleBars();
-		void drawLines(float screen_lat_min, float screen_lat_max, float screen_lon_min, float screen_lon_max, int bailTime);
-		void drawGeography(int left, int top, int right, int bottom, int bailTime);
-		void drawSignalMarks(Aircraft *p, int x, int y);
-		void drawPlaneText(Aircraft *p);
-		void drawSelectedAircraftText(Aircraft *p);
-		void resolveLabelConflicts();
-		void drawPlanes();
-		void animateCenterAbsolute(float x, float y);
-		void moveCenterAbsolute(float x, float y);
-		void moveCenterRelative(float dx, float dy);
-		void zoomMapToTarget();
-		void moveMapToTarget();
-		void drawMouse();
-		void drawClick();
-		void registerClick(int tapcount, int x, int y);
-		void registerMouseMove(int x, int y);
-		void draw();
-		
-		void SDL_init();
-		void font_init();
-
-		View(AppData *appData);
-		~View();
-
-
-	////////////////
-		bool metric;
-
-	    float maxDist;
 	    float currentMaxDist;
 
-	    float centerLon;
-	    float centerLat;
-	   
-	    float mapTargetMaxDist;
 	    float mapTargetLat;
 	    float mapTargetLon;
 
-	    int mapMoved;
 	    int mapRedraw;
 	    float currentLon;
 	    float currentLat;
@@ -124,14 +88,7 @@ class View {
 		uint64_t drawStartTime;
 
 	    Map map;
-
+	    std::vector<Tile> tiles;
-	    int screen_upscale;
-	    int screen_uiscale;
-	    int screen_width;
-	    int screen_height;
-	    int screen_depth;
-	    int fullscreen;
-	    int screen_index;
 	   
 		SDL_Window		*window;
 		SDL_Renderer	*renderer;
@@ -150,6 +107,59 @@ class View {
 		int labelFontHeight;	
 		int messageFontWidth;
 		int messageFontHeight;
+
+		int screenDist(float d);
+		void pxFromLonLat(float *dx, float *dy, float lon, float lat);
+		void lonLatFromScreenCoords(float *lon, float *lat, int x, int y);
+		void screenCoords(int *outX, int *outY, float dx, float dy);
+		int outOfBounds(int x, int y);
+		void drawPlaneOffMap(int x, int y, int *returnx, int *returny, SDL_Color planeColor);
+		void drawPlaneIcon(int x, int y, float heading, SDL_Color planeColor);
+		void drawTrail(Aircraft *p);
+		void drawScaleBars();
+		void drawLines(float screen_lat_min, float screen_lat_max, float screen_lon_min, float screen_lon_max, int bailTime);
+		void drawGeography(int left, int top, int right, int bottom, int bailTime);
+		void drawSignalMarks(Aircraft *p, int x, int y);
+		void drawPlaneText(Aircraft *p);
+		void drawSelectedAircraftText(Aircraft *p);
+		void resolveLabelConflicts();
+		void drawPlanes();
+		void drawTiles();
+		void animateCenterAbsolute(float x, float y);
+		void moveCenterAbsolute(float x, float y);
+		void zoomMapToTarget();
+		void moveMapToTarget();
+		void drawMouse();
+		void drawClick();
+
+	public:
+		void registerClick(int tapcount, int x, int y);
+		void registerMouseMove(int x, int y);
+		void draw();
+		
+		void SDL_init();
+		void font_init();
+
+		void moveCenterRelative(float dx, float dy);
+
+		View(AppData *appData);
+		~View();
+
+		bool metric;
+
+	    float centerLon;
+	    float centerLat;
+  	    float maxDist;
+	    int mapMoved;
+	    float mapTargetMaxDist;
+
+	    int screen_upscale;
+	    int screen_uiscale;
+	    int screen_width;
+	    int screen_height;
+	    int screen_depth;
+	    int fullscreen;
+	    int screen_index;
 };
 
 #endif