Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gsoc2023, stand-alone interactive program that demonstrates 2D arrangements embedded on the sphere #7678

Merged
merged 234 commits into from
Apr 25, 2024

Conversation

efifogel
Copy link
Member

@efifogel efifogel commented Aug 30, 2023

Summary of Changes

A stand-alone interactive program that demonstrates 2D arrangements embedded on the sphere. In particular, the program (i) reads a database of all administrative boundaries of the countries in the world, (ii) displays the globe with all countries and land covered by water (which is land not covered by countries) on a window, and (ii) enables interaction with the user. The user can rotate the globe and zoom in and out, and she or he can perform point-location queries to select countries. When a country is selected, it is highlighted.

This program has potential to grow and support many more features.

This program was developed by Deniz Diktas as part of the Google Summer of Code 2023.

Release Management

  • Affected package(s): Aos_2
  • Issue(s) solved (if any): Demonstrating 2D Arrangements Embedded on the Sphere #7656 , Demonstrating 2D Arrangements Embedded on the Sphere
  • Feature/Small Feature (if any):
  • Link to compiled documentation (obligatory for small feature) wrong link name to be changed
  • License and copyright ownership: TAU

TODO:

  • check branch size (a task for @sloriot)

efifogel and others added 30 commits May 10, 2023 11:55
…ve value, so I added 2*PI to make it in the range [0,2*PI)
…L/cgal-public-dev into gsoc2023-aos_sphere_demo-denizdiktas
…L/cgal-public-dev into gsoc2023-aos_sphere_demo-denizdiktas
…L/cgal-public-dev into gsoc2023-aos_sphere_demo-denizdiktas
… std::vector and defined two attribues, but this seems not to work properly (debug this)
…tely (previous code logic regarding the opengl vertex attributes was correct though)
…L/cgal-public-dev into gsoc2023-aos_sphere_demo-denizdiktas
@sloriot
Copy link
Member

sloriot commented Apr 10, 2024

Successfully tested in CGAL-6.0-Ic-21[56].

However the size of the branch is 11MB. I need to have a closer look

@github-actions github-actions bot removed the Tested label Apr 15, 2024
Copy link

This pull-request was previously marked with the label Tested, but has been modified with new commits. That label has been removed.

@sloriot
Copy link
Member

sloriot commented Apr 15, 2024

@lrineau ne_110m_admin_0_countries.json is 7.7M, (929K compressed) and the branch is 1.2M.

@sloriot sloriot removed the TODO label Apr 19, 2024
@sloriot
Copy link
Member

sloriot commented Apr 19, 2024

/mnt/testsuite/test/Arrangement_on_surface_2_earth_Demo/Aos.cpp:1333:9: warning: typedef ‘using Point_2 = CGAL::Arrangement_on_surface_2, CGAL::Arr_spherical_topology_traits_2, CGAL::Arr_face_extended_dcel, std::__cxx11::basic_string > > >::Point_2’ locally defined but not used [-Wunused-local-typedefs]
/mnt/testsuite/test/Arrangement_on_surface_2_earth_Demo/Aos_triangulator.cpp:224:11: warning: typedef ‘using Faces_ = class std::vector >’ locally defined but not used [-Wunused-local-typedefs]

@efifogel
Copy link
Member Author

Regarding my previous commit, I had a moment and tried the demo on a much more simple faked map, and noticed that the rendering was busted, so I fixed it.
I don't plan to make more changes in this PR.
Thanks for your last fix of the warnings.

@sloriot
Copy link
Member

sloriot commented Apr 24, 2024

Successfully tested in CGAL-6.0-Ic-228

(@lrineau you did not react to #7678 (comment))

@lrineau
Copy link
Member

lrineau commented Apr 25, 2024

@lrineau ne_110m_admin_0_countries.json is 7.7M, (929K compressed) and the branch is 1.2M.

Well, as far as I understand, there is nothing we can do. We will keep it as it is.

@lrineau lrineau added the rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' label Apr 25, 2024
@lrineau lrineau self-assigned this Apr 25, 2024
@lrineau lrineau added this to the 6.0-beta milestone Apr 25, 2024
@lrineau lrineau merged commit 94d4555 into CGAL:master Apr 25, 2024
9 checks passed
@lrineau lrineau removed the rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' label Apr 25, 2024
sloriot added a commit that referenced this pull request May 26, 2024
## Summary of Changes

Fix after #7678 was merge in `master`. There was an worrying CMake
warning.

## Release Management

* Affected package(s): Arr_2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants