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

341 Commits

Author SHA1 Message Date
Maxime Gimeno 4b66010b75 Fix znear management in orthographic mode 2019-05-21 13:33:05 +02:00
Maxime Gimeno 1ffd2842ca Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2019-04-02 13:51:52 +02:00
Maxime Gimeno 1bd785ae44 Don't select clipped points 2019-03-26 15:30:34 +01:00
Maxime Gimeno b96bd1058f Fix mesh_3 2019-03-13 13:16:12 +01:00
Maxime Gimeno 94541df835 Update to master 2019-03-07 14:33:10 +01:00
Maxime Gimeno 2fd1a984af Fix blending order so that the edges with antialiasing blend with the triangles and not with the background 2019-03-04 10:35:14 +01:00
Maxime Gimeno 4f97ab767b Update to master. 2019-02-15 14:34:34 +01:00
Maxime Gimeno f5f2ebfb51 Force Fusion style for colored button so they are displayed on all platforms. 2019-02-08 14:26:02 +01:00
Laurent Rineau b4cab8e6b6 Merge pull request #3611 from maxGimeno/Demo-Rename_shader_files-GF 
Polyhedron_demo: Rename shader files
 2019-02-07 13:31:18 +01:00
Sébastien Loriot 6c6244d9b8 Merge pull request #3516 from maxGimeno/Demo-fixes-GF 
Polyhedron Demo: Fixes.
 2019-01-31 11:41:58 +01:00
Maxime Gimeno f528e8f532 replace in calls too 2019-01-22 10:46:30 +01:00
Maxime Gimeno b783e78223 Fix conflicts and display_property_plugin 2019-01-21 14:58:28 +01:00
Maxime Gimeno 2a49dfcb05 Fix conflict 2019-01-11 09:47:34 +01:00
Maxime Gimeno 82b935d586 Fix selection when mesh item is selected. 2019-01-10 11:21:01 +01:00
Maxime Gimeno 39560e6c46 Fix memory leaks 2018-12-19 09:43:59 +01:00
Maxime Gimeno c0c31c97b0 Fix memory leaks 2018-12-17 12:45:12 +01:00
Maxime Gimeno 2940102bdc Fix picking with alpha 
Fix picking with alpha
 2018-12-11 16:17:34 +01:00
Maxime Gimeno 0323dfe5e2 Fix picking with alpha 2018-12-11 16:13:06 +01:00
Maxime Gimeno 2767d12017 Revert "Fix crash on windows. Note: This property was useful once, the bug on closure must have been fixed by something else because the property is not guarding anything anymore." 
This reverts commit d357f5ee5e.
 2018-11-29 11:17:02 +01:00
Maxime Gimeno 4571c4555e Merge remote-tracking branch 'cgal/master' into Demo-Multiple_viewers-GF 2018-11-28 11:58:55 +01:00
Maxime Gimeno d357f5ee5e Fix crash on windows. Note: This property was useful once, the bug on closure must have been fixed by something else because the property is not guarding anything anymore. 2018-11-27 16:34:21 +01:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Maxime Gimeno 31966f5b4b Remove key_C for clipping entire scene. 2018-11-08 10:04:06 +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 cbf50bb849 Clarifies the usage of the indices in the help window of the viewer. 2018-10-11 14:00:09 +02:00
Maxime Gimeno 278600266d Add external plugin to AABB_tree for do_intersect demo. 2018-10-09 10:28:42 +02:00
Maxime Gimeno 32de514dd8 Fix printIds and zoomtoid now applies to the currentViewer. 2018-10-08 15:55:44 +02:00
Maxime Gimeno b0bf4e371f Remove wrong permissions 2018-10-08 12:07:26 +02:00
Maxime Gimeno c3fab3df15 workaround for multiple linking under windows. 2018-10-03 09:16:27 +02:00
Maxime Gimeno 787294156a more plugins 2018-09-27 14:51:28 +02:00
Maxime Gimeno 97fcf113a6 Clip_polyhedron_plugin multiviewered 2018-09-27 09:47:14 +02:00
Maxime Gimeno 2eaa9a2a7b Done edit_item 2018-09-26 11:32:09 +02:00
Maxime Gimeno 6d54163bbd Edit_sphere_item 2018-09-25 12:13:37 +02:00
Maxime Gimeno a7a3dd3bd8 finish image_item and planes 2018-09-19 16:11:12 +02:00
Maxime Gimeno 3ec39c1d08 WIP image_item. Working scene_image_item. 2018-09-19 10:58:18 +02:00
Maxime Gimeno 59bf7cbd69 Fix spheres_item 2018-09-18 09:53:13 +02:00
Maxime Gimeno a75bb723fc Fix c3t3_item 2018-09-17 15:13:58 +02:00
Maxime Gimeno a05e0f5fa2 WIP 2018-09-14 15:35:01 +02:00
Maxime Gimeno dbf89becb3 Fix offset for subviewers 2018-09-05 11:12:19 +02:00
Maxime Gimeno ed2226814e Use MDI Area for sub viewers 2018-09-04 17:45:11 +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 4be9d68e0b Fix conflicts 2018-08-23 16:42:05 +02:00
Maxime Gimeno 5489d35c96 Add a fullscreen-ish mode that hides all dockwidgets. 
Move spacer in selection widget.
 2018-08-23 09:45:43 +02:00
Maxime Gimeno 949f93ab80 Add Default Rendering Mode for Surface_mesh and Point_set items to the settings. 2018-08-21 17:21:51 +02:00
Maxime Gimeno 7ff58adcc7 Move some settings to Preferences and save them. 2018-08-21 15:17:20 +02:00
Maxime Gimeno d51475b835 Merge remote-tracking branch 'cgal/master' into Demo-Remove_polyhedron_item-GF 2018-08-20 08:58:53 +02:00
Maxime Gimeno 7e1b43c62f Add new item and new program for heat intensity display. 2018-08-01 15:47:37 +02:00
Maxime Gimeno 94ee27767d remove unused capture in lambda. 2018-07-31 14:18:53 +02:00
Maxime Gimeno 8d8330f943 Fix conflicts 2018-07-27 12:12:06 +02:00
Maxime Gimeno 02eb21861e Make light position fixed in Camera coordinates and fix reset Default. 2018-07-16 15:17:52 +02:00
Maxime Gimeno 5f7293f859 Finish removing polyhedorn 2018-07-12 10:18:50 +02:00
Maxime Gimeno 9d62107031 Change default values for lighting. 2018-07-06 16:35:51 +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
Maxime Gimeno 9a258d081f Remove remaining calls to GL_LIGHT smth 2018-07-04 15:37:24 +02: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
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
Maxime Gimeno 36ebd8e5c4 Fix conflicts and fix missing moc 2018-06-21 15:29:16 +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 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
Maxime Gimeno 8e7fc0b852 Merge master to solve conflicts. 2018-06-13 09:40:56 +02:00
Laurent Rineau 5c6eee6ac3 Merge branch 'master' into Demo-Fix_orthographic_projection-GF 2018-06-12 18:01:55 +02:00
Maxime Gimeno a095792683 Remove remaining include Viewer.moc 2018-06-12 09:02:22 +02:00
Maxime Gimeno 4843c0562c remove unwanted include for moc. 2018-06-12 08:59:12 +02:00
Maxime Gimeno 87fb0cc39a Remove remaining legacy code that generated GL_STACK_UNDERFLOW errors. 2018-06-07 09:56:08 +02:00
Maxime Gimeno 1c6a96d1cf Add qt gl debugging info. 2018-06-06 16:59:34 +02:00
Laurent Rineau 74844169a7 Fix a few -Wconversion warnings in the demo 2018-06-05 14:48:47 +02:00
Maxime Gimeno 21359581c4 Add viewer's modifications to CGAL_Qt5 2018-06-04 12:00:22 +02:00
Maxime Gimeno 12ba1084ad Add classes and functions to factorize and facilitate rendering an item. 
Make Surface_mesh_item use them.
 2018-06-04 12:00:21 +02:00
Maxime Gimeno 0add845fae Fix snapshot with alpha. 2018-06-04 12:00:21 +02:00
Maxime Gimeno cf6a5f7cae fix moverowup/down 2018-06-04 12:00:21 +02:00
Maxime Gimeno c8d5453a31 Fix c3t3 and add action to viewer to set total number of passes 2018-06-04 12:00:21 +02:00
Maxime Gimeno 1882658a94 Add depth-peeling to the scene. 2018-06-04 12:00:20 +02:00
Maxime Gimeno 025968643b Fix_orthographic selection 2018-06-04 11:44:56 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Jane Tournois e9c7042c05 remove include of moc file (causes a warning on msvc) 2018-05-17 10:20:56 +02:00
Jane Tournois 3042d68fb1 remove code that depends on QGLViewer version 2018-05-17 10:20:56 +02:00
Maxime Gimeno 495b087c6f Finish snapshot implem 2018-05-17 10:20:56 +02:00
Maxime Gimeno 37c52e6bbc WIP SnapShot and SPDX LICENSE update. 2018-05-17 10:20:56 +02:00
Maxime Gimeno 0c74a68952 WIP Header_only 2018-05-17 10:20:55 +02:00
Maxime Gimeno cbc0ce1130 remove snapsjot functions and files from qglviewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 50c471253a Move context creation to qglviewer. Replace initializeGL() by init()in demo viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 4c6546a558 Clean-up the viewer 2018-05-17 10:20:55 +02:00
Maxime Gimeno 39a0b8a8d5 Restore pivot point drawing 2018-05-17 10:20:55 +02:00