songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added json database file and refered to it

This commit is contained in:
Efi Fogel 2023-08-29 15:15:27 +03:00
parent e85b59374e
commit a7e3885200
2 changed files with 362630 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Arrangement_on_surface_2/demo/earth/Main_widget.cpp
View File

@ -113,7 +113,7 @@ void Main_widget::initializeGL()
{ {
qDebug() << "loading arr.."; qDebug() << "loading arr..";
//auto arrh = Aos::construct(m_countries); //auto arrh = Aos::construct(m_countries);
m_arrh = Aos::load_arr("C:/work/gsoc2023/ne_110m_admin_0_countries.json"); m_arrh = Aos::load_arr("../../../Data/data/arrangements_3/sphere/ne_110m_admin_0_countries.json");
if (m_arrh == nullptr) if (m_arrh == nullptr)
{ {
qDebug() << "** FAILED TO LOAD THE ARRANGEMENT!!!"; qDebug() << "** FAILED TO LOAD THE ARRANGEMENT!!!";
@ -141,7 +141,7 @@ void Main_widget::initializeGL()
//country_triangles->set_color(colors[color_map[country_name]]); //country_triangles->set_color(colors[color_map[country_name]]);
m_gr_country_triangles.emplace(country_name, std::move(country_triangles)); m_gr_country_triangles.emplace(country_name, std::move(country_triangles));
} }
//qDebug() << "num triangles = " << triangle_points.size() / 3; //qDebug() << "num triangles = " << triangle_points.size() / 3;
//m_gr_all_triangles = std::make_unique<Triangles>(triangle_points); //m_gr_all_triangles = std::make_unique<Triangles>(triangle_points);
} }
@ -171,14 +171,14 @@ void Main_widget::init_camera()
m_camera_manip_rot = std::make_unique<Camera_manip_rot>(m_camera); m_camera_manip_rot = std::make_unique<Camera_manip_rot>(m_camera);
//m_camera_manip_rot = std::make_unique<Camera_manip_rot_bpa>(m_camera); //m_camera_manip_rot = std::make_unique<Camera_manip_rot_bpa>(m_camera);
m_camera_manip_zoom = std::make_unique<Camera_manip_zoom>(m_camera); m_camera_manip_zoom = std::make_unique<Camera_manip_zoom>(m_camera);
// this makes z-axes point upwards! // this makes z-axes point upwards!
m_model.rotate(-90, 1, 0, 0); m_model.rotate(-90, 1, 0, 0);
// register the zoom-changed function // register the zoom-changed function
Message_manager::add("zoom_changed", [&] Message_manager::add("zoom_changed", [&]
{ {
qDebug() << "ZOOM CHANGED!!!"; qDebug() << "ZOOM CHANGED!!!";
//const auto error = compute_backprojected_error(0.5); //const auto error = compute_backprojected_error(0.5);
//qDebug() << "new error = " << error; //qDebug() << "new error = " << error;
m_update_approx_error = true; m_update_approx_error = true;
@ -252,7 +252,7 @@ void Main_widget::resizeGL(int w, int h)
{ {
m_camera_manip_rot->resizeGL(w, h); m_camera_manip_rot->resizeGL(w, h);
m_pick_handler->resizeGL(w, h); m_pick_handler->resizeGL(w, h);
m_vp_width = w; m_vp_width = w;
m_vp_height = h; m_vp_height = h;
@ -294,7 +294,7 @@ void Main_widget::paintGL()
const auto normal_matrix = model_view.normalMatrix(); const auto normal_matrix = model_view.normalMatrix();
// compute the cutting plane // compute the cutting plane
// remember that we are passing the local vertex positions of the sphere // remember that we are passing the local vertex positions of the sphere
// between the vertex and fragment shader stages, so we need to convert // between the vertex and fragment shader stages, so we need to convert
// the camera-pos in world coords to sphere's local coords! // the camera-pos in world coords to sphere's local coords!
auto c = m_model.inverted() * m_camera.get_pos(); auto c = m_model.inverted() * m_camera.get_pos();
@ -378,7 +378,7 @@ void Main_widget::paintGL()
sp.set_uniform("u_color", QVector4D(0, 1, 1, 1)); sp.set_uniform("u_color", QVector4D(0, 1, 1, 1));
m_gr_identification_curve->draw(); m_gr_identification_curve->draw();
// draw all countries' borders // draw all countries' borders
float a = 0.0; float a = 0.0;
sp.set_uniform("u_color", QVector4D(a, a, a, 1)); sp.set_uniform("u_color", QVector4D(a, a, a, 1));
m_gr_all_country_borders->draw(); m_gr_all_country_borders->draw();

362621
Data/data/arrangements_3/sphere/ne_110m_admin_0_countries.json Normal file
View File

File diff suppressed because it is too large Load Diff