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

114 Commits

Author SHA1 Message Date
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
Laurent Rineau 4032eade9a Massive removale of "QUIET" in find_package calls (except for 
FindVTK.cmake, which has a bug). Let's see if that can help us to find out
why we still have problems with demos on MacOS and Windows.
 2008-11-19 13:58:43 +00:00
Laurent Rineau fa912f218c Add NOTICE: where needed, so that the test results scripts can generate a "r". 2008-11-10 11:09:21 +00:00
Fernando Cacciola 547bffecd9 Put CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS in the right place for cmake 2.4 2008-11-06 13:03:41 +00:00
Fernando Cacciola 70fa9503fd Added CMP0003 policy 2008-11-04 12:30:29 +00:00
Laurent Rineau 229375aa23 (Leftover of previous commit 46381.) 
Rename demo_circle to Circular_kernel_3.
 2008-10-21 09:08:02 +00:00
Laurent Rineau 72a97de554 Rename demo_circle to Circular_kernel_3. 2008-10-21 09:04:56 +00:00
Laurent Rineau 0cff54f298 Fix <GL/glu.h> -> <CGAL/glu.h> 2008-10-08 11:32:17 +00:00
Laurent Rineau 58ad57d058 First pass to remove CGAL_USE_QT: remove "#ifdef CGAL_USE_QT"/"#endif // CGAL_USE_QT" 2008-09-09 21:35:22 +00:00
Pedro Machado Manhaes de Castro 5e78e5b3f1 Fix License for examples and demo 2008-07-24 10:43:12 +00:00
Pedro Machado Manhaes de Castro e3a9115e66 License CK3 2008-07-24 09:26:28 +00:00
Pedro Machado Manhaes de Castro 590884f915 Changing Licenses from QPL to LGPL (remaining ones) 2008-07-17 12:17:17 +00:00
Fernando Cacciola f93437ca22 Removed *unmodified* auto-generated CMakeLists.txt (now created by create_internal_release) 2008-05-05 14:01:55 +00:00
Fernando Cacciola b704509dcf Examples/Demos/Test CMake scripts updated 2008-03-05 21:14:02 +00:00
Fernando Cacciola a659cd852a Added project() and conditional test for CGAL_DIR 2008-02-14 15:42:36 +00:00
Fernando Cacciola 14043c43a0 Replaced CGALROOT by CGAL_DIR (the latters is used by CMake automatically) 2008-02-08 17:47:21 +00:00
Fernando Cacciola afddfc4fca CMake scripts for demos/examples/test added 2008-02-06 19:06:24 +00:00
Sylvain Pion 50ed4bb632 Use <cstdlib> and <cstdio> consistently instead of <stdio.h> and <stdlib.h>. 2008-01-18 20:33:57 +00:00
Monique Teillaud 50956ab796 include AK 2007-08-23 07:55:52 +00:00
Sylvain Pion b16cc956c8 comment out unused argument 2007-03-23 19:17:15 +00:00
Laurent Rineau d3adb75df6 Include <CGAL/basic.h> before "#ifdef CGAL_USE_QT". 2007-03-12 10:46:23 +00:00
Joachim Reichel d08f6bea45 replace obsolete variable CGAL_QT_LDFLAGS by CGAL_LDFLAGS 2007-03-11 09:54:17 +00:00
Sylvain Pion b2630cd7e1 Apply trailing whites-spaces and leadgin+trailing empty-lines cleanups 
to demo/**/*.h and .cpp.
 2007-03-10 16:55:12 +00:00
Sylvain Pion 55bc1b1056 an easy one... 2007-03-08 07:24:33 +00:00
Andreas Fabri b32b7f28db protected with #ifdef CGAL_USE_QT 2007-03-05 09:04:37 +00:00
Monique Teillaud 01da42b192 trying to repair the demo 
(in a blind way, since it seems I cannot compile at home today, strange...)
 2007-02-18 09:21:22 +00:00
Andreas Fabri c0e326b9da simplify GL related stuff 2007-02-16 09:30:57 +00:00
Sylvain Pion d06d30ba06 constification 2007-02-15 07:58:15 +00:00
Andreas Fabri 66f1b2bfd5 Change order of inclusion to avoid VC++ ICE 2007-02-02 16:45:14 +00:00
Monique Teillaud cc58117307 renaming 2007-01-06 11:59:37 +00:00
Monique Teillaud a6737c27a6 cleaning 2006-12-13 12:18:42 +00:00
Laurent Rineau ace2e2973f Remove the only single .moc file that is submitted to SVN. .moc files are to be ignored by SVN. 2006-12-07 16:49:09 +00:00
Pedro Machado Manhaes de Castro 3e1bafddac To link spec. 2006-08-23 14:40:11 +00:00
Pedro Machado Manhaes de Castro cb5a038c73 To link 2006-08-23 14:39:39 +00:00
Pedro Machado Manhaes de Castro 50f787377d Small "how to compile" 2006-08-23 13:32:28 +00:00
Pedro Machado Manhaes de Castro 0702feb39c Header 2006-08-23 12:43:48 +00:00
Pedro Machado Manhaes de Castro ef652a24fe Header 2006-08-23 12:43:33 +00:00
Pedro Machado Manhaes de Castro 9e0f730bb9 makefile 2006-08-22 15:27:34 +00:00
Pedro Machado Manhaes de Castro 23fed63c52 Changing the name of the Demo from ProjetDamienJulien to Demo Circle 3D. 
(I put in comments that Damien Julien is the author of this demo)
 2006-08-22 08:28:02 +00:00
Pedro Machado Manhaes de Castro d4ab2972a2 Demo that shows some Circle_3 2006-08-21 15:10:08 +00:00