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

1215 Commits

Author SHA1 Message Date
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
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 33a3996fa1 Rename write_VTU and write_VTP 2018-10-29 15:02:20 +01:00
Maxime Gimeno 5f38a107a1 Update. 2018-10-29 11:50:57 +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
Marc Glisse 962ff6e085 Go through int for enum -> FT. 2018-10-15 17:02:27 +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
Maxime Gimeno b0bf4e371f Remove wrong permissions 2018-10-08 12:07:26 +02:00
Maxime Gimeno 20a6797bea Replace nullptr by NULL in qglviewer. 2018-10-08 11:55: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 d6c1301e0a Fix conflicts 2018-10-04 14:06:16 +02:00
Maxime Gimeno 49b88e533f Move and split vtk_io.h to Mesh_2 and Mesh_3 to avoid license and dependencies problems. Also fix vtu writer of VTK_io_plugin for polygon meshes. 2018-10-03 11:15:37 +02:00
Maxime Gimeno c3fab3df15 workaround for multiple linking under windows. 2018-10-03 09:16:27 +02:00
Maxime Gimeno ab3ad395fc RemoveViewer on context destroyed 2018-10-03 09:02:43 +02:00
Maxime Gimeno 6d54163bbd Edit_sphere_item 2018-09-25 12:13:37 +02:00
Maxime Gimeno 9ca2833588 Fix conflicts, fix polygon_soup normals computation, change Extrude Item text. 2018-09-24 11:34:32 +02:00
Maxime Gimeno 665c25886a Done textured_item and selection_item 2018-09-20 15:11:43 +02:00
Guillaume Damiand 865e6bf01e Move operator << inside CGAL::qglviewer namespace. 2018-09-11 17:26:15 +02:00
Maxime Gimeno fd27bd9c09 Share VBOs between viewers. 2018-09-11 13:06:02 +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
Guillaume Damiand 243a12be43 Fix viewer in 2D for 2D data sets. 2018-09-10 12:20:10 +02:00
Guillaume Damiand bf20b43ea5 Start to implement 2D mode for viewers; nyf. 2018-09-07 20:19:41 +02:00
Guillaume Damiand fc6e3c6a5a Improve the face end for non convex face to allow to draw faces with holes. 2018-09-07 19:19:40 +02:00
Guillaume Damiand 71555b18cf Update namespace 2018-09-06 18:46:39 +02:00
Guillaume Damiand 2c8af2ebcc Update all draw_XXX functions to use specialized version, allowing to use different draw in a same program. 2018-09-06 18:43:32 +02:00
Maxime Gimeno e5aaab93d5 Remove visibleBbox from scene. Working subviewer. 2018-09-04 10:35:46 +02:00
Maxime Gimeno 06ce5dddca WIP : trying to figure out why the items are not drawn. 2018-09-03 10:51:01 +02:00
Maxime Gimeno daac3e124d WIP: integrate is_sharing in qglviewer 2018-09-03 09:21:09 +02:00
Maxime Gimeno 223fa687c2 Add function for CDT. and use it in Triangulation_2 demo. Missing Doc 2018-08-27 16:29:47 +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