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

83 Commits

Author SHA1 Message Date
Guillaume Damiand f506515008 Bug fix in lcc basic viewer when lcc is null 2021-01-12 18:24:43 +01:00
Sébastien Loriot 52164b1fba First pass on removing license notice in header for LGPL files 2019-10-19 15:40:30 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Guillaume Damiand a5e1edd698 Continue to update the lcc demo and the basic viewer. 2018-11-27 11:59:29 +01:00
Guillaume Damiand 5d7723af4a Update LCC demo 2018-11-27 09:10:03 +01:00
Guillaume Damiand 9c3faed5c5 Bug fixes; nyf 2018-11-26 22:06:13 +01:00
Guillaume Damiand 8297e2b849 Start to update the LCC demo, in order to re-use LCC basic viewer. 2018-11-26 16:33:39 +01:00
Maxime Gimeno 4086888964 Update glCode in 3D demos 2018-07-06 12:08:22 +02:00
Andreas Fabri 4712fbeb0d Fixes in Linear cell complex demo 2018-05-18 07:51:41 +01:00
Maxime Gimeno 25685fbedd add missing include 2018-05-17 10:43:03 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 2018-05-17 10:20:56 +02:00
Andreas Fabri ff0836ec79 cleanup 2018-05-17 10:20:56 +02:00
Maxime Gimeno 6584abd90b Use integrated qglviewer for 3D demos 2018-05-17 10:20:55 +02:00
Laurent Rineau 3c6640bf59 Merge pull request #1436 from lrineau/CGAL-new_cmake-GF 
Renewal of CMake scripts: header-only, ctest, CMake>=3.1

# Conflicts:
#	Installation/config/testfiles/CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG.cpp
 2017-12-05 18:20:05 +01:00
Laurent Rineau 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Sébastien Loriot 0698f79aff add SPDX identifier for files under the LGPL-3+ license 2017-11-12 10:17:50 +01:00
Maxime Gimeno 4a4cb688fe FIx LCC demo for QGLViewer v2.7 2017-07-03 09:35:14 +02:00
Guillaume Damiand a9ac4013fa Update lcc demo and viewer to allow to reverse normal and to change the light. 2016-11-29 11:43:46 +01:00
Guillaume Damiand a0fb8e0a26 Update LCC operations to work with CMap and GMap 2016-11-29 11:43:35 +01:00
Guillaume Damiand 8d22d7e7dc Update LCC to be compatible both for CMap and GMap. 2016-11-29 11:43:34 +01:00
Laurent Rineau 8b22743b06 Merge pull request #766 from maxGimeno/LCC_Demo-MSAA_removal-GF 
Removal of the MSAA in LCC

Conflicts:
	GraphicsView/include/CGAL/Qt/CreateOpenGLContext.h
	Linear_cell_complex/demo/Linear_cell_complex/Viewer.cpp
 2016-02-11 15:13:18 +01:00
Maxime Gimeno 9da8afe1f1 Removal of the MSAA in LCC 2016-02-11 14:27:44 +01:00
Maxime Gimeno 0a37521263 Revert "Fix for the context" 
This reverts commit 552aaa159f.

Conflicts:
	Linear_cell_complex/examples/Linear_cell_complex/linear_cell_complex_3_viewer_qt.h
 2016-02-11 14:16:04 +01:00
Maxime Gimeno 552aaa159f Fix for the context 2016-02-09 14:48:26 +01:00
Maxime Gimeno eb867bb810 Addition of a specific function for the MSAA in LCC 2016-01-20 14:35:00 +01:00
Maxime Gimeno 517ff8321a Fix for LCC_demo 
- The setSamples(16) was causing a segfault. I moved it in the createOpenGLContext(). If the other demos performances are affected by this, a new function will have to be created.
 2016-01-19 17:13:06 +01:00
Guillaume Damiand a9f2278c5b Better position for light. 2015-11-04 11:29:59 +01:00
Guillaume Damiand 3f206e9b60 Improve drawing. 2015-11-03 17:36:52 +01:00
Guillaume Damiand a21da00c9d Improve drawing 2015-11-02 15:14:50 +01:00
Guillaume Damiand 97f44c5749 Add smoth display mode in LCC demo. 2015-10-02 15:01:19 +02:00
Guillaume Damiand 43d4380537 Update drawing function to allow to draw faces with holes. 2015-10-01 19:21:47 +02:00
Guillaume Damiand 9b4b3ee846 More cleanup plus do not recenter the scene at each modification. 2015-09-03 12:32:20 +02:00
Guillaume Damiand 98b36b260e Update light parameters 2015-08-31 08:18:04 +02:00
Guillaume Damiand 24840dbd5c Improve drawing code in LCC demo. 2015-08-29 14:43:52 +02:00
Guillaume Damiand 921416603f Reintegrate LCC demo save/load in the new qt5 version ok. 2015-08-28 14:43:07 +02:00
Guillaume Damiand 600e7b1b30 Start to merge with the new qt5 version of the LCC demo (nyf). 2015-08-28 11:51:48 +02:00
Maxime Gimeno 95f87a3ac5 Depth test problem fix 
- Calling glEnable(GL_DEPTH_TEST) in the beginning of every draw should solve this problem.
 2015-08-13 14:08:12 +02:00
Maxime Gimeno ee2b0b2011 Transparent facets fix 
- set the alpha value to 1 in the shaders to insure opaque color.
 2015-08-13 11:56:04 +02:00
Maxime Gimeno 52a35d4d8d Random displaying fix 
- The bounding box was set before being initialized.
 2015-08-13 08:55:10 +02:00
Maxime Gimeno 3a5d0a79fc Mesa Fix 
- Replaced the 3.3 context by a 2.1 context
- Set the shaders version to 120
 2015-08-10 10:11:29 +02:00
Maxime Gimeno e413b0c45a GLSL Version changed 
- Shaders specify version 140 (opengl 3.1) instead of 330. This should fix the "GLSL 3.30 is not supported" error.
 2015-08-06 15:19:36 +02:00
Laurent Rineau 508b467203 Merge branch 'CGAL-Qt5_support-GF' 2015-08-05 11:23:40 +02:00
Laurent Rineau cb0bdd3ad2 Remove warnings about unused moc files 
Should fix #194.
 2015-08-03 16:27:28 +02:00
Maxime Gimeno 1b14d447e5 SEGFAULT Fix 
- the iterator he_circ was looping wrong. I changed he_circ_end(he_circ) in
he_circ_end = lcc.darts_of_orbit<1>(dartIter).end();
 2015-08-03 12:57:45 +02:00
Sébastien Loriot 590106f5fc Changes in the other demos due to Polygon_mesh_processing package (PMP) 2015-07-16 17:27:17 +02:00
Andreas Fabri 6c46be1d01 static_casts 2015-07-09 13:17:41 +02:00
Maxime Gimeno 278e9d9829 Merge branch 'CGAL-Qt5_support-GF' of github.com:CGAL/cgal-public-dev into CGAL-Qt5_support-GF 
Conflicts:
	Circular_kernel_3/demo/Circular_kernel_3/Circular_kernel_3.cpp
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/MainWindow.h
 2015-07-08 12:40:14 +02:00
Maxime Gimeno f76bb19734 Windows fix 
- add an attribute at the application in the main() function
- add a custom context to the viewer
 2015-07-08 12:16:51 +02:00
Andreas Fabri 3c46e5262d less typenames 2015-07-07 16:45:26 +02:00