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

89 Commits

Author SHA1 Message Date
Maxime Gimeno 660ebe9e81 Add missing highp and remove unwanted highp 2019-08-05 14:16:02 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01: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
Maxime Gimeno 8ae27f4c9c Fix Circular_kernel and PCA demo 2018-07-13 13:56:46 +02:00
Andreas Fabri 990a682798 Fix Circular_kernel_3 demo (CGAL_PI) 2018-05-23 16:21:57 +02:00
Maxime Gimeno f22c2864a0 Put qglviewer in the namespace CGAL 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 6ec4c12031 Do not use OpenGL directly, but only using Qt5 OpenGL classes 2017-11-28 17:58:12 +01:00
Laurent Rineau 891a83840e Merge branch 'CMake-parse_CTest_XML_output-lrineau' into CGAL-new_cmake-GF 2017-11-17 15:03:57 +01:00
Laurent Rineau 25dffa1710 Modern usage of Qt5 CMake scripts, to allow CMAKE_WARN_DEPRECATED 2017-11-17 12:54:13 +01:00
Laurent Rineau 21dabf1b1b Add compilation tests for demos 2017-11-16 18:45:33 +01:00
Laurent Rineau bbee705221 Add compilation tests for demos 2017-11-16 18:38:15 +01:00
Laurent Rineau 62c70d41ca Renew the handle of policies, for CMake-3.10 
Now that we require CMake>=3.1, we can forget a lot of old CMake policies.

`CMP0053` `OLD` behavior is still needed, because of a bug in Qt5 CMake files, but it will
not be set with CMake>=3.10. Let's assume that a recent CMake version means
a recent Qt5 version.
 2017-11-06 14:58:36 +01:00
Maxime Gimeno 5bd60dfa1e Fix kernel demo for QGLViewer 2.7.0 2017-07-03 09:35:14 +02:00
Maxime Gimeno 5ae96fc2aa Explicitely set the policy of CMP0053 to OLD to silent the warning when it is not found. 2017-05-23 16:12:56 +02:00
Sébastien Loriot e78bef8a9c update project name of demos 2016-09-08 00:13:34 +02:00
Guillaume Damiand 8ac37cc7df Add missing link with glu in demo. 2016-06-02 12:25:39 +02:00
Guillaume Damiand 10469f9c4e Update with master 2016-05-25 10:58:55 +02:00
Maxime Gimeno 524a8da107 Remove glu from all the CMakeLists 2016-04-14 09:29:50 +02:00
Clement Jamin f2c68b25cd Update CMakeLists.txt of all demos for header-only mode 2016-03-09 17:23:20 +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
Laurent Rineau c9f16f8984 Define the OpenGL functions typedefs 
- PFNGLDRAWARRAYSINSTANCEDARBPROC
   - PFNGLVERTEXATTRIBDIVISORARBPROC

Definitions found in glext.h from Mesa.
 2015-08-18 18:46:02 +02:00
Maxime Gimeno a3addbfd9b Fix 
- Polyhedron : spaces in a shader made it invalid
- Circular Kernel : green intersection spheres are back : wrong attribute in the draw function
- Alpha Shapes : "in" remained in the shaders.
 2015-08-14 13:56:43 +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 8680431afc Mesa Fix 
- Replaced the 3.3 context by a 2.1 context.
- Added the extension search for instanced rendering.
- Added an alternate rendering with points instead of spheres for the case the extensions cannot be found.
 2015-08-10 10:02:30 +02:00
Laurent Rineau 55c30d0808 Qt::AA_UseDesktopOpenGL is usable from Qt-5.3 only 2015-08-04 10:55:26 +02:00
Laurent Rineau 04db43556f Do not warn when Qt5 is not found. 2015-07-13 15:55:41 +02:00
Laurent Rineau 15c1469a54 CGAL requires CMake>=2.8.11. 2015-07-10 17:01:42 +02:00
Laurent Rineau 3ec0c69f8f We want 2.8.10 for all demos 
Previous versions are not tested by the CGAL daily test suite.
 2015-07-09 17:50:22 +02:00
Andreas Fabri 2289e5a2af static_ccasts 2015-07-09 13:05:22 +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
Sébastien Loriot e199f546d4 remove QT4 specific code 2015-07-07 19:36:04 +02:00
Andreas Fabri 3c46e5262d less typenames 2015-07-07 16:45:26 +02:00
Sébastien Loriot 84dfabf3b4 remove REQUIRED keyword for CGAL_Qt5 in demos 
The handling should be with a status message
 2015-07-07 11:23:46 +02:00
Laurent Rineau e5bcdc5f3e Update all CMakeLists.txt 
- CMake 2.8.11 or later is now required
- GLEW is no longer used by demo/Polyhedron/
 2015-07-06 18:14:34 +02:00
Maxime Gimeno ba4ede5f50 Clean-up 
- removed the unused functions and dependencies
- Replaced QGLBuffer by QOpenGLBuffer
 2015-04-24 12:54:05 +02:00
Maxime Gimeno 7ba2835c1f Upgrade to OpenGL 3.3 with Qt wrappers 
- no more glu dependency
- smooth spheres
- less light but gestion of the light on the circles
 2015-04-09 15:31:54 +02:00
Maxime Gimeno 60b47f0978 Succesfully upgraded to Qt5 2015-04-01 12:18:59 +02:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | Try to fix my last revision about cmake_policy, with CMake-2.6.x
  | 
  | CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
  | x.y.z is greater than the current CMake version.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Laurent Rineau c7ca93c07e Include <CGAL/glu.h> before any use of GLU 2011-11-09 14:24:17 +00:00
Laurent Rineau 3c02e07b23 Try to fix my last revision about cmake_policy, with CMake-2.6.x 
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
 2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part) 
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
 2011-04-28 10:55:56 +00:00
Laurent Rineau ca5c92e034 Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2 
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
 2011-04-27 17:58:27 +00:00
Laurent Rineau 8b83f2ef79 Merged revisions 54700-54703,54726,54827,54834,54861-54864 via svnmerge from 
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch

........
  r54700 | lrineau | 2010-03-11 15:13:25 +0100 (Thu, 11 Mar 2010) | 18 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r54614 | lrineau | 2010-03-09 16:25:12 +0100 (Tue, 09 Mar 2010) | 4 lines
    | Changed paths:
    |    M /trunk/Mesh_2/include/CGAL/IO/File_poly.h
    |    M /trunk/Mesh_2/include/CGAL/Mesh_2/Clusters.h
    |    M /trunk/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
    |    M /trunk/Mesh_2/test/Mesh_2/test_conforming.cpp
    |    M /trunk/Mesh_2/test/Mesh_2/test_meshing.cpp
    |    M /trunk/Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
    |    M /trunk/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
    | 
    | - Fix the Mesh_2 test suite: previously it was no longer testing anything!
    | - Fix the handling of the cdt with the triangulation plus_2.
    | - Add tests with CDT_plus_2.
    | 
    | ------------------------------------------------------------------------
........
  r54701 | lrineau | 2010-03-11 15:19:21 +0100 (Thu, 11 Mar 2010) | 26 lines
  
  Backport from trunk:
    | ------------------------------------------------------------------------
    | r54660 | lrineau | 2010-03-10 17:46:10 +0100 (Wed, 10 Mar 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Mesh_2/include/CGAL/Mesh_2/Refine_edges.h
    | 
    | Fix a bug of Mesh_2 that exists for years (since r23141, 2004-10-19)!
    | 
    | ------------------------------------------------------------------------
    | r54661 | lrineau | 2010-03-10 17:51:09 +0100 (Wed, 10 Mar 2010) | 2 lines
    | Changed paths:
    |    M /trunk/Mesh_2/test/Mesh_2/test_conforming.cpp
    | 
    | Add tests cdt.is_valid().
    | 
    | ------------------------------------------------------------------------
    | r54665 | lrineau | 2010-03-10 19:09:33 +0100 (Wed, 10 Mar 2010) | 4 lines
    | Changed paths:
    |    M /trunk/Mesh_2/test/Mesh_2/test_meshing.cpp
    | 
    | Add tests of is_valid() in test_meshing.cpp (previously Mesh_2 was creating
    | invalid triangulations! See revision 54660.)
    | .
    | 
    | ------------------------------------------------------------------------
........
  r54702 | lrineau | 2010-03-11 15:34:35 +0100 (Thu, 11 Mar 2010) | 2 lines
  
  Add a paragraph about Mesh_2 and CDT_plus_2.
........
  r54703 | lrineau | 2010-03-11 15:41:31 +0100 (Thu, 11 Mar 2010) | 2 lines
  
  Add a note about the other bug fix in Mesh_2.
........
  r54726 | reichel | 2010-03-12 19:30:43 +0100 (Fri, 12 Mar 2010) | 2 lines
  
  Add RS library to prerequisites section.
........
  r54827 | lrineau | 2010-03-19 15:27:55 +0100 (Fri, 19 Mar 2010) | 2 lines
  
  Two targets where not in "make demos".
........
  r54834 | reichel | 2010-03-20 15:36:01 +0100 (Sat, 20 Mar 2010) | 2 lines
  
  update date and version number
........
  r54861 | lrineau | 2010-03-22 22:44:31 +0100 (Mon, 22 Mar 2010) | 2 lines
  
  One must include <boost/version.hpp> before testing BOOST_VERSION!
........
  r54862 | lrineau | 2010-03-22 22:46:40 +0100 (Mon, 22 Mar 2010) | 3 lines
  
  <QtCore/qglobal.h> is one right path, unless <Qt/qglobal.h> (pb reported on
  MacOS X).
........
  r54863 | reichel | 2010-03-22 23:54:19 +0100 (Mon, 22 Mar 2010) | 2 lines
  
  update Debian stuff for 3.6-1
........
  r54864 | reichel | 2010-03-22 23:55:25 +0100 (Mon, 22 Mar 2010) | 2 lines
  
  fix typo
........
 2010-03-23 09:46:25 +00:00
Sébastien Loriot 2c90de93ed New demo for CK3 using libQGLviewer 2010-01-18 15:04:21 +00:00
Sébastien Loriot 74eb9279d8 remove unused makefile and correct example 2009-06-25 06:03:55 +00:00