songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
89,553 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

1270 Commits

Author SHA1 Message Date
Guillaume Damiand 31c0777594 Bug fix. 2019-07-11 11:46:07 +02:00
Maxime Gimeno 272b4360d0 Merge remote-tracking branch 'mine/CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-11 10:23:39 +02:00
Maxime Gimeno 480256cbe1 Add a #if for screenat 2019-07-11 10:22:34 +02:00
Jasmeet Singh 596a186963 Update has_zero_*() methods to incorporate rays and lines. 2019-07-10 17:08:34 -07:00
Jasmeet Singh a542fbdb45 Merge remote-tracking branch 'cgal/master' into gsoc2019-add_basic_viewer-jasmeet and resolve conflicts 2019-07-10 11:48:38 -07:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand 
CGAL: more viewers
 2019-07-10 14:22:50 +02:00
Maxime Gimeno 261c596cfc Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-10 14:04:34 +02:00
Maxime Gimeno 1184530530 More warnings fixed 2019-07-10 14:02:06 +02:00
Maxime Gimeno e6e8d232cb Merge branch 'CGAL_Qt-Fix_deprecation_warnings-GF' into CGAL_Qt-Fix_deprecation_warnings-4.14-GF 2019-07-10 11:52:58 +02:00
Maxime Gimeno 6e1e8e9dc4 add missing modifications 2019-07-09 10:22:30 +02:00
Maxime Gimeno 243c7b1c75 Replace matrix with worldTransform 2019-07-08 14:05:42 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF 
CMake>=3.13: opt for for new policies up to 3.15
 2019-07-01 11:16:30 +02:00
Jasmeet Singh 6843c2ed69 Add viewer for Nef Polyhedra. Only points viewed for now. 
File Buffer_for_vao.h modified to classify the ambiguous call to the function newell_single_step_3().
Added namespace identifier 'internal::' to avoid conflict with function in normal_vector_newell_3.h included in
Nef_polyhedron_3.h
 2019-06-27 12:44:38 -07:00
Jasmeet Singh c412d3b0f7 Fix bugs in Voronoi Diagram Viewer. Format code. Fix bug in voronoi diagram documentation. 
Faces have the same color after toggling vertices - fixed.
Rays and dual vertices have different colors from edges and voronoi vertices - fixed.
Toggle for Voronoi vertices created, now V would only toggle vornoi vertices, not all vertices - fixed
 2019-06-24 15:21:16 -07:00
Guillaume Damiand 012d44398f Remove 2 warnings. 2019-06-24 09:24:37 +02:00
Jasmeet Singh e769c14b00 Change NULL to nullptr in buffer initialization. 2019-06-21 13:20:23 -07:00
Jasmeet Singh e096af3133 Merge branch 'master' into gsoc2019-add_basic_viewer-jasmeet 2019-06-21 12:25:30 -07:00
Jasmeet Singh d1295ce338 Change order of constructor arguments so that existing derived classes from Basic_viewer which call this constructor set the arguments correctly. 2019-06-21 11:30:22 -07:00
Laurent Rineau 33e7de45e9 Merge pull request #3919 from maxGimeno/Add_3mf_wrapper-GF 
Stream_support: Add a 3mf wrapper
 2019-06-20 14:21:11 +02:00
Jasmeet Singh ce1b306d00 Add m_buffer_for_mono_lines and m_buffer_for_colored_lines to view lines. 
Trying to visualize bisectors. Formatting changes.
 2019-06-19 19:49:09 -07:00
Jasmeet Singh 43015b0059 Add special KeyPressEvent for rays. Format typedefs. Set cgal_test_suit = qEnvironmentVariableIsSet("CGAL_TEST_SUITE") 
Adding these changes after learning from the viewers generated by GDamiand.
 2019-06-19 14:24:40 -07:00
Jasmeet Singh 955a982a5f Add an example for Voronoi diagram basic viewer. 
For rays: draw a really big segment without modifying bounding box.
Hence, the initial screen of the viewer is correctly adjusted.
For faces: drawing only bounded faces for now. The function getSecondPoint(Halfedge)
can help to draw unbounded faces. Keypress R to view/unview rays.
 2019-06-19 13:43:07 -07:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Guillaume Damiand cbdd2d536e In 2D, the viewer should also fix the camera orientation (and not only contraint it) 2019-06-19 11:02:17 +02:00
Jasmeet Singh cd3cfc0bc5 Remove wireframe toggle button as it is unavailable in qOpenGLFunctions 2019-06-18 18:27:00 -07:00
Jasmeet Singh ff5e9a3820 Add compute_face() functionality and get_second_point() to find intersection of ray with bounding box 
Show wireframe. Not building successfully as qOpenGLFunctions do not support glPolygonMode(). Comitting to save progress.
 2019-06-18 17:51:22 -07:00
Jasmeet Singh 2874ce940c Merge remote-tracking branch 'jasmeet9323/cgal/master' into gsoc2019-add_basic_viewer-jasmeet 
Sync my branch with remote to avoid conflicts during PR.
 2019-06-18 12:56:28 -07:00
Jasmeet Singh 4f9df720ea Toggle ray display with keypress R. Start adding face viewer 2019-06-17 20:45:04 -07:00
Jasmeet Singh 1cc0d12aa4 Revert formatting of the rest of Basic_viewer_qt.h file 2019-06-17 20:13:30 -07:00
Jasmeet Singh 1d4b6242f4 Show rays upto a bounding box 2019-06-17 20:02:08 -07:00
jasmeet9323 1a04afdae4 Experimenting with bounding box-ray intersection 2019-06-17 14:20:30 -07:00
Jasmeet Singh 1c852ed586 Add several points to display a ray. 
The viewer stopped displaying anything.
 2019-06-14 21:59:03 -07:00
Jasmeet Singh abe9f2f7e4 Checking directions of rays. 2019-06-14 19:18:55 -07:00
Jasmeet Singh a06f4f9aa2 Add method add_line(point, vector) in Basic_viewer_qt to view rays. 2019-06-12 23:38:38 -07:00
Jasmeet Singh 608ba3eee8 Start to implement infinite line in basic viewer. 2019-06-12 23:05:10 -07:00
Andreas Fabri 4581f1b7a8 Morte replacements 2019-06-05 08:39:55 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF 
Fix some typos in code/comments/documentation
 2019-05-23 08:50:14 +02:00
Maxime Gimeno 4b66010b75 Fix znear management in orthographic mode 2019-05-21 13:33:05 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Laurent Rineau 9cbfcee84f Merge branch 'master' into CGAL-Exact_algebraic-GF 2019-05-13 18:11:00 +02:00
Andreas Fabri ca301e95a9 The divide is only needed for drawing purposes so we call to_double 
in case the number type is a ring type
 2019-05-03 12:13:50 +02:00
Sebastien Loriot c27e27d8ea
Merge pull request #3853 from afabri/CGAL-cleanup_CMakeLists-GF 
CMakeLists.txt: Remove unnecessary include directories
 2019-04-29 14:30:13 +02:00
Sebastien Loriot b87db08b08
Merge pull request #3355 from maxGimeno/Demo-Multiple_viewers-GF 
Polyhedron demo: Multiple Viewers
 2019-04-23 10:34:26 +02:00
Maxime Gimeno 0ec9d7ec6b Add misisng automoc 2019-04-23 09:01:15 +02:00
Maxime Gimeno aef3c573a3 Fix moc include in P2T2_demo cpp 2019-04-19 15:14:40 +02:00
Maxime Gimeno 8860f12b25 Use automoc as much as possible 2019-04-18 16:11:08 +02:00
Andreas Fabri ab0b6eae36 Remove unnecessary include directories 2019-04-15 12:54:37 +02:00
Maxime GIMENO 41033a80be
Merge branch 'master' into Graphics_view-Fix_demo_IO-GF 2019-04-12 16:10:36 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF 
[Small Feature] Reworked CGAL::Color
 2019-04-12 15:54:30 +02:00
Sébastien Loriot db65bd8ecc Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-11 21:38:48 +02:00
albert-github 1dd7473818 Correction of links 
Correction of redirected links and links that moved to another place.
 2019-04-11 21:37:05 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Maxime Gimeno de47fb3348 Fix conflicts 2019-04-09 10:31:10 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Maxime Gimeno 422cd589c1 Add missing includes to get BOOST_VERSION and BOOST_GCC 2019-04-03 10:27:55 +02:00
Maxime Gimeno 1ffd2842ca Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-04-02 13:51:52 +02:00
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Andreas Fabri 7c2674abc8 More links fixed 2019-03-20 08:38:40 +01:00
Maxime Gimeno e02eef8aa3 add misisng highp in compatibility shaders 2019-03-18 09:33:22 +01:00
Maxime Gimeno 1761c62087 Fix forgotten compileSoureShader 2019-03-18 09:24:01 +01:00
Maxime Gimeno 0059f92326 Fix normals to normal 2019-03-15 16:07:52 +01:00
Maxime Gimeno 38828181aa Dont call mat3() constructor 2019-03-15 15:38:44 +01:00
Maxime Gimeno f39fce13e3 Remove remaining #version from compatibility glsl and use compatibility shaders in basic_viewer 2019-03-15 13:36:36 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Maxime Gimeno 0b31e6e5d8 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-03-07 14:01:02 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man 
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
 2019-02-14 10:32:39 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF 
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
 2019-02-13 15:25:07 +00:00
Maxime Gimeno d069b6f673 Only use -Wdeprecated-copy if GCC version is >=9 2019-01-30 11:15:51 +01:00
Andreas Fabri a7d65b7913 Try to fix Polyhedron examples with Basic Viewer 2019-01-24 18:22:02 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Laurent Rineau c9164a0660
Merge branch 'master' into Stream_support-Dont_use_vtk_for_vtu-GF 2019-01-22 12:06:08 +01:00
Maxime Gimeno b783e78223 Fix conflicts and display_property_plugin 2019-01-21 14:58:28 +01:00
Laurent Rineau 80717c6f41 Merge pull request #3406 from mglisse/cgal-public-dev/Number_types-boost_mp-glisse-2 
Support Boost.Multiprecision
 2019-01-18 16:37:49 +01:00
Laurent Rineau 1754057d24 My changes to write_vtu 2019-01-16 16:50:45 +01:00
Maxime Gimeno cb10422e3c Fix indentation and markdown 2019-01-16 10:44:30 +01:00
Andreas Fabri f627339eea Fix Vec and Exponent_vector 2019-01-15 18:32:48 +01:00
Maxime Gimeno e107612c31 Fix pre processor test 2019-01-10 08:54:49 +01:00
Maxime Gimeno 743569f854 Also disable WKT if gcc version is <4.5 2019-01-09 16:32:08 +01:00
Maxime Gimeno 3b1b6e2401 Merge remote-tracking branch 'cgal/master' into Graphics_view-Fix_demo_IO-GF 2019-01-09 12:35:04 +01:00
Maxime Gimeno 1006be85bd Fix Conflicts 2019-01-09 12:29:20 +01:00
Maxime Gimeno 955053e239 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-12-11 10:49:41 +01:00
Laurent Rineau 1813a1ca45 Merge pull request #3488 from gdamiand/LCC_demo-gdamiand 
LCC demo
 2018-12-10 14:38:20 +01:00
Maxime Gimeno 3049da5111 Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-12-07 14:55:08 +01:00
Maxime Gimeno 46545fd1b1 Move } outside the #ifdef 2018-11-29 11:51:59 +01:00
Maxime Gimeno 4571c4555e Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-11-28 11:58:55 +01:00
Guillaume Damiand 4b8bd40d8c Bugfix in Buffer_for_vao.h, in the method is_facet_convex. 2018-11-27 18:21:57 +01:00
Guillaume Damiand edfdc8d346 Readd the random face color option for lcc viewer. 2018-11-27 17:02:38 +01:00
Guillaume Damiand a5e1edd698 Continue to update the lcc demo and the basic viewer. 2018-11-27 11:59:29 +01:00
Guillaume Damiand 9c3faed5c5 Bug fixes; nyf 2018-11-26 22:06:13 +01:00
Maxime Gimeno 7b13f4a969 Add misisng license header, rename vtu functions and update change.md 2018-11-23 10:11:23 +01:00
Laurent Rineau 6c72c9fa06
Remove lines added by error one year ago 2018-11-22 13:20:05 +00:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00
Maxime Gimeno 33482dc532 Fix conflicts 2018-11-21 10:55:09 +01:00
Maxime Gimeno 5180876290 Fix ambiguity between 2D and 3D write_VTU and restore gone bool binary in write_VTU 3D 2018-11-21 10:48:16 +01:00
Sebastien Loriot 641efa944b
Merge pull request #3424 from maxGimeno/Demo-Some_fixes-GF 
Polyhedron demo: some fixes
 2018-11-15 19:57:46 +01:00
Maxime Gimeno 080f63b1b8 Disable WKT for boost < 1.56 2018-11-07 11:58:50 +01:00
Sébastien Loriot 3dc3659273 fix warnings 2018-11-05 13:29:17 +01:00