songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed traits class of demo to Projection_sphere_traits_3

This commit is contained in:
Claudia Werner 2012-11-29 16:00:58 +01:00
parent 4bf8999d8d
commit a70de22126
2 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt
View File

@ -1,53 +1,33 @@
# Created by the script cgal_create_cmake_script
# This is the CMake script for compiling a CGAL application.
project (simpleViewer)
cmake_minimum_required(VERSION 2.4.5)
project( Triangulation_on_sphere_2_ )
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
if ( COMMAND cmake_policy )
cmake_policy( SET CMP0003 NEW )
cmake_minimum_required(VERSION 2.6.2)
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
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()
endif()
find_package(CGAL COMPONENTS Qt4)
include(${CGAL_USE_FILE})
find_package(CGAL QUIET COMPONENTS Core )
set( QT_USE_QTXML TRUE )
set( QT_USE_QTMAIN TRUE )
set( QT_USE_QTSCRIPT TRUE )
set( QT_USE_QTOPENGL TRUE )
find_package(Qt4)
if ( CGAL_FOUND )
find_package(OpenGL)
find_package(QGLViewer)
include( ${CGAL_USE_FILE} )
if ( CGAL_FOUND AND CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND )
include( CGAL_CreateSingleSourceCGALProgram )
include(${QT_USE_FILE})
include_directories (BEFORE "../../include")
include_directories (${QGLVIEWER_INCLUDE_DIR})
include_directories (BEFORE ../../include ./ )
# ui file, created wih Qt Designer
qt4_wrap_ui( uis Mainwindow.ui )
# qrc files (resources files, that contain icons, at least)
#qt4_add_resources ( RESOURCE_FILES ./Alpha_shape_3.qrc )
qt4_generate_moc( main.cpp Mainwindow.moc)
add_executable ( simpleViewer Mainwindow.moc main.cpp ${uis} ${RESOURCE_FILES} )
add_to_cached_list( CGAL_EXECUTABLE_TARGETS simpleViewer )
target_link_libraries( simpleViewer ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
target_link_libraries( simpleViewer ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} )
target_link_libraries( simpleViewer ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} )
create_single_source_cgal_program( "main.cpp" )
else()
message(STATUS "NOTICE: This demo requires CGAL, the QGLViewer, OpenGL and Qt4, and will not be compiled.")
message(STATUS "This program requires the CGAL library, and will not be compiled.")
endif()

10
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/main.cpp
View File

@ -1,8 +1,9 @@
//Author: Sebastien Loriot sebastien.loriot@sophia.inria.fr
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Exact_spherical_kernel_3.h>
#include <CGAL/Regular_triangulation_sphere_traits_2.h>
#include <CGAL/Regular_triangulation_on_sphere_2.h>
//#include <CGAL/Delaunay_triangulation_sphere_traits_2.h>
#include <CGAL/Projection_sphere_traits_3.h>
#include <CGAL/Delaunay_triangulation_sphere_2.h>
#include <CGAL/utility.h>
#include <CGAL/Qt/DemosMainWindow.h>
#include <QMainWindow>
@ -17,8 +18,9 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
#include "simpleViewer.h"
#include "ui_Mainwindow.h"
typedef CGAL::Regular_triangulation_sphere_traits_2<Kernel> Gt;
typedef CGAL::Regular_triangulation_on_sphere_2<Gt> RTOS;
//typedef CGAL::Regular_triangulation_sphere_traits_2<Kernel> Gt;
typedef CGAL::Projection_sphere_traits_3<Kernel> Gt;
typedef CGAL::Delaunay_triangulation_sphere_2<Gt> RTOS;
struct Cell_info{