Trygve/contour-creator
1
0
Fork 0
mirror of https://gitlab.com/Trygve/contour-creator.git synced 2024-11-24 00:00:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved vector_cellmap function

Browse Source
This commit is contained in:
esther 2024-05-02 21:02:48 +02:00
parent 0188b9e29d
commit 77467594bd
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/contour_creator.hh
View File

@ -43,10 +43,13 @@ class Point
int x; int x;
int y; int y;
int mscase; int mscase;
Point * next;
Point * previous;
Point(int x, int y, int mscase){ Point(int x, int y, int mscase){
this -> x = x; this -> x = x;
this -> y = y; this -> y = y;
this -> mscase = mscase; this -> mscase = mscase;
this -> next = nullptr;
this -> previous = nullptr;
}; };
}; };

49
src/main.cpp
View File

@ -5,6 +5,7 @@
#include <gdal/ogr_feature.h> #include <gdal/ogr_feature.h>
#include <gdal/ogr_geometry.h> #include <gdal/ogr_geometry.h>
#include <iostream> #include <iostream>
#include <iterator>
#include <ostream> #include <ostream>
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
@ -15,9 +16,9 @@
std::vector<Point> produce_cellmap(HeightMap* heightmap, float z) std::vector<Point> produce_cellmap(HeightMap* heightmap, float z)
{ {
int length = (heightmap->width-1)*(heightmap->height-1); int length = (heightmap->width-1)*(heightmap->height-1); // Defining length of vector
uint8_t *cells = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length); uint8_t *cells = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length);
std::vector<Point> points; std::vector<Point> points; // Initiating a vector of points
for (int i = 0; i<length; i++) { for (int i = 0; i<length; i++) {
int y = i/(heightmap->width-1); int y = i/(heightmap->width-1);
int x = i%(heightmap->width-1); int x = i%(heightmap->width-1);
@ -50,38 +51,28 @@ std::vector<std::vector<Point>> vector_cellmap(HeightMap* heightmap, int interva
#pragma omp for #pragma omp for
for (int i = 1; i <= num_contours; i++) for (int i = 1; i <= num_contours; i++)
{ {
auto points = produce_cellmap(heightmap, heightmap->min + interval*i) ; auto points = produce_cellmap(heightmap, heightmap->min + interval*i);
std::vector<Point> line;
line.push_back(points.back());
points.pop_back();
while (points.size() != 0){
Point current_point = points.back(); for (int j = 0; j < points.size(); j++){
for (int j=0; j < points.size(); j++){ Point current = points[j];
Point next = points[j]; //std::cout << points_allocated << " " << points.size() << "\n";
if (&next != &points.back()) { for (int k = 0; k < points.size(); k++){
if (next.x +1 == current_point.x) { Point candidate = points[k];
line.push_back(next); if (candidate.next != nullptr) {
points.erase(points.begin()+j); if (candidate.x +1 == current.x) {
current.next = &candidate;
} }
else if (next.x -1 == current_point.x) { else if (candidate.x -1 == current.x) {
line.push_back(next); current.next = &candidate;
points.erase(points.begin()+j);
} }
else if (next.y +1 == current_point.y) { else if (candidate.y +1 == current.x) {
line.push_back(next); current.next = &candidate;
points.erase(points.begin()+j);
} }
else if (next.y -1 == current_point.y) { else if (candidate.y -1 == current.x) {
line.push_back(next); current.next = &candidate;
points.erase(points.begin()+j);
}
else {
vec_private.push_back(line);
std::vector<Point> line;
line.push_back(points.back());
points.pop_back();
} }
} }
} }
} }