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

1084 Commits

Author SHA1 Message Date
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
Guillaume Damiand 7d406fbb9c
Merge branch 'master' into CGAL-cmake_cleanup-gdamiand 2018-11-05 07:32:58 +01:00
Maxime Gimeno 9539e5e1ef Merge remote-tracking branch 'cgal/master' into Demo-Some_fixes-GF 2018-10-31 09:39:40 +01:00
Sébastien Loriot e925b1aba6 Merge pull request #3225 from maxGimeno/Demo-Remove_polyhedron_item-GF 
Polyhedron demo: remove the Scene_polyhedron_item
 2018-10-30 15:50:17 +01:00
Maxime Gimeno f14a335e10 Fix is_degenerate_triangle bug and NaN failures in highlighting Euler. 2018-10-29 11:12:28 +01:00
Laurent Rineau 821f9c015e Merge pull request #3311 from sloriot/Doc-Pkg_link_name 
Update the name of package names reference links
 2018-10-29 10:27:53 +01:00
Laurent Rineau 73dd93c4e1 Merge pull request #3405 from gdamiand/CGAL_basic_viewers-bugfix-gdamiand 
Basic viewers: bugfix for Epeck
 2018-10-29 10:27:37 +01:00
Maxime Gimeno ceee4b8e2d fix axis system 2018-10-26 17:24:10 +02:00
Guillaume Damiand ef771d0f97 Re-add include({CGAL_USE_FILE}) is demo with core or image io, and set(CMAKE_INCLUDE_CURRENT_DIR ON) in others. 2018-10-19 09:51:14 +02:00
Guillaume Damiand 0bd9088b5a Remove all include( ) and include( CGAL_CreateSingleSourceCGALProgram ) in CMakeLists.txt; they are no more required. 2018-10-17 14:17:08 +02:00
Guillaume Damiand 7f09308d33 Remove all include_directories(BEFORE ../../include) in CMakeLists.txt 2018-10-17 13:07:22 +02:00
Laurent Rineau a7c5c92f2f Check for CMakeLists.txt also in demos 2018-10-16 12:42:49 +02:00
Maxime Gimeno 9e563d1307 Fix conflicts 2018-10-16 09:30:04 +02:00
Guillaume Damiand f8a9bec308 Expose local type so that we can use them in basic viewers. 2018-10-15 14:18:24 +02:00
Sébastien Loriot ea240cfac5 use \PkgXXX instead of \PkgXXXSummary 2018-10-08 10:28:44 +02:00
Sébastien Loriot a2e8a1c68f add the suffix Ref to doxygen link to reference 2018-10-08 10:26:56 +02:00
Maxime Gimeno 32c0064900 Use the same QSettings everytime to save 200ms everytime. 2018-10-05 15:56:42 +02:00
Maxime Gimeno 9ca2833588 Fix conflicts, fix polygon_soup normals computation, change Extrude Item text. 2018-09-24 11:34:32 +02:00
Guillaume Damiand 865e6bf01e Move operator << inside CGAL::qglviewer namespace. 2018-09-11 17:26:15 +02:00
Guillaume Damiand 1db0bd0a79 Bugfix for operator<< 2018-09-11 11:46:26 +02:00
Guillaume Damiand 64c7a083ce Bugfix in doc 2018-09-11 11:46:13 +02:00
Maxime Gimeno 805e4669e4 Avoid having the visual hints hidden by the mesh when zooming too much. 2018-08-21 09:32:29 +02:00
Maxime Gimeno 818e0d1f11 Clean-up 2018-07-06 12:33:52 +02:00
Maxime Gimeno c8adcc3e86 Downgrade to GLSL 150 (OpenGL 3.3) because of some systems. 2018-07-05 15:35:30 +02:00
Maxime Gimeno b68f63e508 Fix basic_viewer 2018-07-05 15:21:58 +02:00
Maxime Gimeno 4c58c214c3 make 2 versions of all shaders : 1 for --old and 1 for 4.3 2018-07-05 14:34:10 +02:00
Maxime Gimeno 640243a658 Remove calls to glLineWidth, as OpenGL ES 2.0 doesn't support higher than 1. 2018-07-05 10:37:41 +02:00
Maxime Gimeno 9a258d081f Remove remaining calls to GL_LIGHT smth 2018-07-04 15:37:24 +02:00
Jane bace15874b to the app to force use 2.1 context.he commit. 2018-07-04 13:34:26 +01:00
Maxime Gimeno 73adc3e300 Fix edit_plugin 2018-07-04 13:58:01 +02:00
Jane d72fd85053 context is correct.commit message for your changes. Lines starting 2018-07-04 12:52:27 +01:00
Maxime Gimeno f80f318503 WIP Shader fixes 2018-07-03 13:53:57 +02:00
Maxime Gimeno 2dbbca18b3 Restore point size 2018-07-02 11:09:48 +02:00
Maxime Gimeno 54e0e16167 Restore 4.3 context 2018-07-02 10:04:40 +02:00
Jane 93d9e8e227 Remove problematic gl calls 2018-06-29 18:40:25 +02:00
Maxime Gimeno 301416c151 Pass to OpenGL_ES_2 2018-06-29 12:06:06 +02:00
Laurent Rineau 742dd907ed Merge pull request #3074 from maxGimeno/Demo-Add_transparency-GF 
Polyhedron demo: add Depth-peeling and Rendering Helpers
 2018-06-28 16:04:12 +02:00
Laurent Rineau b86fff3f90 Merge pull request #3128 from sgiraudot/Solver_interface-Warn_against_diagonalize_traits-GF 
Solver Interface: deprecate CGAL::Diagonalize_traits
 2018-06-27 10:21:37 +02:00
Maxime Gimeno 2f4f22d236 Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF 2018-06-21 11:42:26 +02:00
Laurent Rineau 5ec1b841b7 Merge pull request #3170 from MaelRL/CGAL-Fix_some_STL_extension_namespaces-GF 
STL_Extension: move CGAL::iterator and CGAL::unary/binary functions to CGAL::cpp98::
 2018-06-20 17:21:01 +02:00
Simon Giraudot 06c0835a3b Add Eigen dependency in CMakeLists of demos that need it 2018-06-19 11:00:02 +02:00
Laurent Rineau 2b33f0690d Merge pull request #2687 from maxGimeno/OpenGL-debugging_option-GF 
Polyhedron demo: add some OpenGL debugging information
 2018-06-14 17:36:54 +02:00
Laurent Rineau 08043e442c Merge pull request #2835 from gdamiand/CGAL-basic_viewers-gdamiand 
Add basic viewers
 2018-06-14 17:36:37 +02:00
Laurent Rineau 3a4121b207 Merge pull request #3148 from maxGimeno/Demo-Fix_orthographic_projection-GF 
Polyhedron demo:Fix_orthographic selection

# Conflicts:
#	GraphicsView/include/CGAL/Qt/qglviewer_impl.h
 2018-06-14 17:36:26 +02:00
Mael Rouxel-Labbé 6283291c8a Moved CGAL::iterator to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Laurent Rineau a3a2a1d9de
Use Vec in the CGAL::qglviewer namespace 2018-06-12 16:15:34 +00:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Laurent Rineau 1df3c3e922 Merge branch 'master' into GraphicsView-no_using_namespace_std-GF 2018-06-12 17:37:15 +02:00
Guillaume Damiand c08546276b Factorize draw functions in Basic_viewer_qt.h, when CGAL_USE_BASIC_VIEWER is not defined. 2018-06-11 13:06:20 +02:00