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

5755 Commits

Author SHA1 Message Date
Maxime Gimeno d7499281ba Use the QFileInfo's size to check the file isn't empty. 2018-07-11 09:47:01 +02:00
Maxime Gimeno fd7e7fb08a Add the plugin dir to the path for windows. 2018-07-10 11:11:55 +02:00
Maxime Gimeno 245a2cf3e0 Ask for read permission instead of write permisison when loading an item. 2018-07-10 09:43:40 +02:00
Maxime Gimeno 6f220879e5 Use adapted char as list separator in env_path 2018-07-09 15:17:22 +02:00
Maxime Gimeno f395672771 Fix Polyhedron_item 2018-07-09 14:51:36 +02:00
Maxime Gimeno 792efdffd8 Fix Polylines display 2018-07-09 10:26:43 +02:00
Maxime Gimeno 64538cfca5 Remove remaining InageInterface form ViewerUI_FILES. It is now in CGAL/Qt/. 2018-07-09 09:41:49 +02:00
Sebastien Loriot dc4d891d0b
Merge pull request #3203 from maxGimeno/Demo-Fix_sm_convex_triangulation-GF 
Polyhedron_demo: Fix triangulate_convex_facet in Scene_surface_mesh_item
 2018-07-09 09:18:41 +02:00
Maxime Gimeno 9d62107031 Change default values for lighting. 2018-07-06 16:35:51 +02:00
Maxime Gimeno 818e0d1f11 Clean-up 2018-07-06 12:33:52 +02:00
Maxime Gimeno 4086888964 Update glCode in 3D demos 2018-07-06 12:08:22 +02:00
Simon Giraudot c15704177d Add dependency to Boost BZIP2 on Windows 2018-07-06 11:23:15 +02:00
Sébastien Loriot 72f797cfb9 remove extra typename 2018-07-06 09:49:17 +02:00
Laurent Rineau e377aa4233 accelerate_distance_queries!!! 2018-07-05 17:13:34 +02:00
Laurent Rineau bda84781b1 Reimplement the offset_meshing_plugin using Mesh_3 2018-07-05 17:13:32 +02:00
Laurent Rineau 0ba13e5beb Fix inclusions 2018-07-05 17:12:09 +02:00
Laurent Rineau 51511f6267 Fix -Wconversion warnings 2018-07-05 17:12:09 +02:00
Maxime Gimeno ec0f5657db update last shaders 2018-07-05 16:23:27 +02:00
Maxime Gimeno 2e3e9df90a Fix conflicts 2018-07-05 16:16:18 +02:00
Maxime Gimeno b69175a868 Use texture() instead of deprecated texture2D() in recent shaders. 2018-07-05 15:55:19 +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 09d7625e67 Fix Possible memory leaks 2018-07-05 14:47:06 +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
Simon Giraudot 566e84f154 Fix conversion warnings 2018-07-05 09:08:28 +02:00
Simon Giraudot a1df51aafb Reset training set of selection + fix warning + info to the user 2018-07-05 09:08:28 +02:00
Simon Giraudot 3539966104 Improve OpenCV find_package(), only get required components 2018-07-05 09:08:28 +02:00
Simon Giraudot 154e29c66d Update Classification plugin 2018-07-05 09:07:33 +02:00
Simon Giraudot 01cff92bc4 Update classification plugin with cluster's API 2018-07-05 09:07:32 +02:00
Simon Giraudot 3f37fa504f WIP: better API of feature generators + eigen analysis 2018-07-05 09:07:32 +02:00
Simon Giraudot 49aea9ec26 Update mesh classification 2018-07-05 09:07:32 +02:00
Simon Giraudot f9ccc86238 Recover Mesh Classification from outdated dirty branch 2018-07-05 09:07:31 +02:00
Mael 74e569db86 Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-07-04 16:55:30 +02:00
Laurent Rineau 20959db103 Merge pull request #3062 from maxGimeno/BGL-Copy_face_graph_use_np-GF 
BGL: copy_face_graph() with NamedParameters
 2018-07-04 16:49:54 +02:00
Laurent Rineau 5bf468235e Merge pull request #3197 from maxGimeno/Demo-Fix_soup_colors-GF 
Polyhedron Demo: Fix Colors for Polygon soups
 2018-07-04 16:49:51 +02:00
Laurent Rineau a2c30daa17 Merge pull request #3106 from maxGimeno/PMP-Extrude-GF 
PMP: extrude_mesh()
 2018-07-04 16:49:48 +02:00
Maxime Gimeno 3b3c4579ee Fix triangulate_convex_facet 2018-07-04 15:46:51 +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 6469c0e03b Fix misisng alpha default values and polylines slider 2018-07-03 14:09:45 +02:00
Maxime Gimeno f80f318503 WIP Shader fixes 2018-07-03 13:53:57 +02:00
Maxime Gimeno 2c83b2c2f5 Revert "Remove #version 120 for ES 2 functions shaders. NEED tests on mesa !" 
This reverts commit d60ae02340.
 2018-07-03 12:28:16 +02:00
Maxime Gimeno d60ae02340 Remove #version 120 for ES 2 functions shaders. NEED tests on mesa ! 2018-07-03 11:12:03 +02:00
Jane c8c12fdff4 Fix textured_polys. 2018-07-02 16:26:55 +01:00
Maxime Gimeno 441f2b8da6 Applying new Edges and fix buggy items. 2018-07-02 16:40:45 +02:00
Maxime Gimeno 2dbbca18b3 Restore point size 2018-07-02 11:09:48 +02:00
Jane 93d9e8e227 Remove problematic gl calls 2018-06-29 18:40:25 +02:00
Maxime Gimeno a584af827b Fix Conflicts 2018-06-29 18:21:24 +02:00
Laurent Rineau cb8608f763
Merge branch 'master' into Demo-Lighting_system-GF 2018-06-29 17:06:44 +02:00
Maxime Gimeno 8e0c840bbb Set default alpha to 1.0f for PROGRAM_WITH_LIGHT 2018-06-29 15:35:29 +02:00
Maxime Gimeno 301416c151 Pass to OpenGL_ES_2 2018-06-29 12:06:06 +02:00
Maxime Gimeno ff0ad59da9 Fixes : 
- Make lighting changes real-time
 - Light is fixed in the world
 - slider is horizontal
 2018-06-28 17:01:16 +02:00
Mael Rouxel-Labbé fd076c3c6d Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-28 16:25:54 +02:00
Laurent Rineau 2d9000efde Merge pull request #3111 from sloriot/PMP-coref_preserve_face_attributes 
Add a visitor to track the creation of faces in corefinement functions
 2018-06-28 16:09:37 +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 10a84aa34e Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-27 10:33:24 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF 
Point Set Processing: Callbacks
 2018-06-27 10:21:40 +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
Laurent Rineau e5a960fc1a Merge pull request #3144 from maxGimeno/Demo-Automatically_choose_between_poly_and_sm_selection_io_plugin-GF 
Polyhedron demo: Automatically decide between selection_io_plugin or selection_io_sm_plugin
 2018-06-27 10:21:30 +02:00
Maxime Gimeno 6c289c2cff Fix warning 2018-06-26 15:11:43 +02:00
Sébastien Loriot 6d89662e2a use need API + add missing overload 2018-06-26 00:17:30 +02:00
Maxime Gimeno 5fe8c5ad4e replace M_PI by CGAL_PI 2018-06-22 10:41:08 +02:00
Maxime Gimeno 36ebd8e5c4 Fix conflicts and fix missing moc 2018-06-21 15:29:16 +02:00
Laurent Rineau b44ad18983
Merge branch 'master' into PMP-stitch_after_orient-GF 2018-06-21 12:31:26 +02:00
Maxime Gimeno 9cf3cb5ca6 Add possibly missing include 2018-06-21 11:51:29 +02:00
Maxime Gimeno 2f4f22d236 Merge remote-tracking branch 'cgal/master' into Demo-Add_transparency-GF 2018-06-21 11:42:26 +02:00
Sébastien Loriot 0abfba8ac0 Update branch 'PMP-coref_preserve_face_attributes' from master@5ceb529d0f 2018-06-21 10:53:59 +02:00
Mael Rouxel-Labbé 7490f34560 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-21 10:15:25 +02:00
Laurent Rineau b08fb6c4ed Merge pull request #3069 from sloriot/PMP-isotropic_remeshing_user_projection 
Fix constrained edge map update and add user projection functor as input
 2018-06-20 17:21:10 +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 a043df3619 Fix scene_callback_signaler_EXPORTS variable 2018-06-20 11:02:57 +02:00
Maxime GIMENO e54d577b59
Merge branch 'master' into PMP-Extrude-GF 2018-06-20 08:50:03 +02:00
Maxime Gimeno 60aface6a8 add plugin to the test list 2018-06-20 08:47:45 +02:00
Simon Giraudot 7048b5cb17 Update diagonalize traits inclusions + deprecation warnings 2018-06-19 10:57:55 +02:00
Mael Rouxel-Labbé 1cbd753174 Fixed namespace 2018-06-19 10:34:26 +02:00
Sébastien Loriot 78e4b69359 update plugin using internal function with updated signature 2018-06-19 09:57:50 +02:00
Simon Giraudot c0e79003fc Provide a more generic cpp11::sleep_for() function that handles TBB/STD/MSVC2013 specificities 2018-06-18 16:05:18 +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 1378e30dfb Merge pull request #3165 from maxGimeno/Demo-Fix_dockwidgets_sizing-GF 
Polyhedron demo : Change the sizing preferency for DockWidgets
 2018-06-14 17:36:46 +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 0984402c3d Fix dllimport/-export issue on Windows 2018-06-14 11:11:19 +02:00
Mael Rouxel-Labbé 26c857a431 Moved unary/binary_function to CGAL::cpp98 2018-06-13 15:58:19 +02:00
Maxime Gimeno fdf94c8ee5 Upgrade minimum cmake version in examples to silent cmake warnings 2018-06-13 10:55:41 +02:00
Guillaume Damiand bc4eca82b3 Need double cast 2018-06-13 10:47:44 +02:00
Laurent Rineau ffd78e296e Workaround a strange error from g++ 
There was a warning:
```
[100%] Building CXX object demo/Polyhedron/CMakeFiles/polyhedron_demo.dir/MainWindow.cpp.o
/home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp: In constructor ‘MainWindow::MainWindow(bool, QWidget*)’:
/home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp:312:11: error: request for member ‘addDockWidget’ is ambiguous
     this->addDockWidget(Qt::BottomDockWidgetArea, dock);
           ^~~~~~~~~~~~~
In file included from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.h:8:0,
                 from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp:4:
/home/lrineau/Git/cgal/Three/include/CGAL/Three/Three.h:54:8: note: candidates are: void CGAL::Three::Three::addDockWidget(QDockWidget*)
   void addDockWidget(QDockWidget* dock_widget);
        ^~~~~~~~~~~~~
In file included from /usr/include/qt5/QtWidgets/QMainWindow:1:0,
                 from /home/lrineau/Git/cgal/GraphicsView/include/CGAL/Qt/DemosMainWindow.h:31,
                 from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.h:7,
                 from /home/lrineau/Git/cgal/Polyhedron/demo/Polyhedron/MainWindow.cpp:4:
/usr/include/qt5/QtWidgets/qmainwindow.h:166:10: note:                 void QMainWindow::addDockWidget(Qt::DockWidgetArea, QDockWidget*, Qt::Orientation)
     void addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget,
          ^~~~~~~~~~~~~
/usr/include/qt5/QtWidgets/qmainwindow.h:165:10: note:                 void QMainWindow::addDockWidget(Qt::DockWidgetArea, QDockWidget*)
     void addDockWidget(Qt::DockWidgetArea area, QDockWidget *dockwidget);
          ^~~~~~~~~~~~~
```

That is strange, because the call is not ambiguous at all: all three
candidates have different numbers of parameters!

Anyway, the workaround is an explicit qualified call to
`QMainWindow::addDockWidget`.
 2018-06-13 10:45:33 +02:00
Laurent Rineau 13f6863397 Fix the indentation 2018-06-13 10:45:00 +02:00
Maxime Gimeno 1d4b1f9183 Merge master to solve conflicts 2018-06-13 09:48:07 +02:00
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Guillaume Damiand f6fd8cae4c Remove a warning; when using test suite, compile all the code but run nothing. 2018-06-13 09:14:18 +02:00
Mael Rouxel-Labbé 340e5d3b5a Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-12 23:29:43 +02:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Laurent Rineau 97d59289e1 Merge pull request #3029 from maxGimeno/Demo-Use_img_offset-GF 
Polyhedron demo: Use image's offset in display
 2018-06-12 16:38:42 +02:00
Laurent Rineau 3ec18a14a5 Merge pull request #3097 from maxGimeno/Demo-Fix_triangulate_primitive-GF 
Polyhedron demo: Fix triangulation of facets
 2018-06-12 16:38:36 +02:00
Laurent Rineau 3845494b5c Merge pull request #3151 from lrineau/Mesh_3-fix_uninitialized_variables-GF 
Mesh_3: Fix the warnings about uninitialized variables
 2018-06-12 16:38:27 +02:00
Maxime Gimeno 5921e0871d Fix warnings in scene_group_item 2018-06-12 13:43:00 +02:00
Guillaume Damiand 3c6dc005de Update Polyhedron examples, to remove .cin input file. 2018-06-12 09:36:48 +02:00
Maxime Gimeno c17b4a3716 Fix (maybe) the problems of DockWidgets sizing 2018-06-12 09:26:49 +02:00