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

static_casts

This commit is contained in:
Andreas Fabri 2015-07-07 11:00:37 +02:00
parent 1aa3ca438e
commit c0149c727f
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AABB_tree/demo/AABB_tree/Scene.cpp
View File

@ -606,7 +606,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(0.0,0.0,0.0); color.setRgbF(0.0,0.0,0.0);
rendering_program.setUniformValue(colorLocation, color); rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix); rendering_program.setUniformValue(fLocation, fMatrix);
glDrawArrays(GL_LINES, 0, static_cast<Glsizei>(pos_poly.size()/3)); glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_poly.size()/3));
rendering_program.release(); rendering_program.release();
vao[2].release(); vao[2].release();
} }
@ -619,7 +619,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(0.7,0.0,0.0); color.setRgbF(0.7,0.0,0.0);
rendering_program.setUniformValue(colorLocation, color); rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix); rendering_program.setUniformValue(fLocation, fMatrix);
glDrawArrays(GL_POINTS, 0, static_cast<Glsizei>(pos_points.size()/3)); glDrawArrays(GL_POINTS, 0, static_cast<GLsizei>(pos_points.size()/3));
rendering_program.release(); rendering_program.release();
vao[0].release(); vao[0].release();
} }
@ -632,7 +632,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(0.0,0.7,0.0); color.setRgbF(0.0,0.7,0.0);
rendering_program.setUniformValue(colorLocation, color); rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix); rendering_program.setUniformValue(fLocation, fMatrix);
glDrawArrays(GL_LINES, 0, static_cast<Glsizei>(pos_lines.size()/3)); glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_lines.size()/3));
rendering_program.release(); rendering_program.release();
vao[1].release(); vao[1].release();
} }
@ -654,7 +654,7 @@ void Scene::draw(QGLViewer* viewer)
tex_rendering_program.bind(); tex_rendering_program.bind();
tex_rendering_program.setUniformValue(tex_fLocation, fMatrix); tex_rendering_program.setUniformValue(tex_fLocation, fMatrix);
glDrawArrays(GL_TRIANGLES, 0,static_cast<Glsizei>(pos_plane.size()/3)); glDrawArrays(GL_TRIANGLES, 0,static_cast<GLsizei>(pos_plane.size()/3));
tex_rendering_program.release(); tex_rendering_program.release();
vao[6].release(); vao[6].release();
break; break;
@ -670,7 +670,7 @@ void Scene::draw(QGLViewer* viewer)
color.setRgbF(1.0,0.0,0.0); color.setRgbF(1.0,0.0,0.0);
rendering_program.setUniformValue(colorLocation, color); rendering_program.setUniformValue(colorLocation, color);
rendering_program.setUniformValue(fLocation, fMatrix); rendering_program.setUniformValue(fLocation, fMatrix);
glDrawArrays(GL_LINES, 0, static_cast<Glsizei>(pos_cut_segments.size()/3)); glDrawArrays(GL_LINES, 0, static_cast<GLsizei>(pos_cut_segments.size()/3));
::glLineWidth(1.0f); ::glLineWidth(1.0f);
rendering_program.release(); rendering_program.release();
vao[3].release(); vao[3].release();

4
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
View File

@ -12,7 +12,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
include_directories (BEFORE ./include) include_directories (BEFORE ./include)
include_directories (BEFORE ../../../Matrix_search/include) include_directories (BEFORE ../../../Matrix_search/include)
@ -37,7 +37,7 @@ qt5_generate_moc( "Bounding_volumes.cpp" "${CMAKE_CURRENT_BINARY_DIR}/Bounding_v
# The executable itself. # The executable itself.
add_executable ( Bounding_volumes Bounding_volumes.cpp Bounding_volumes.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Bounding_volumes Bounding_volumes.cpp Bounding_volumes.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Bounding_volumes Xml Script OpenGL) qt5_use_modules(Bounding_volumes Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Bounding_volumes ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Bounding_volumes )

4
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
View File

@ -14,7 +14,7 @@ include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
@ -37,7 +37,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
# The executable itself. # The executable itself.
add_executable ( Circular_kernel_2 Circular_kernel_2.cpp Circular_kernel_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Circular_kernel_2 Circular_kernel_2.cpp Circular_kernel_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Circular_kernel_2 Xml Script OpenGL) qt5_use_modules(Circular_kernel_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Circular_kernel_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Circular_kernel_2 )

4
GraphicsView/demo/Generator/CMakeLists.txt
View File

@ -12,7 +12,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
@ -34,7 +34,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
# The executable itself. # The executable itself.
add_executable ( Generator_2 Generator_2.cpp Generator_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Generator_2 Generator_2.cpp Generator_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Generator_2 Xml Script OpenGL) qt5_use_modules(Generator_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Generator_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Generator_2 )

4
GraphicsView/demo/GraphicsView/CMakeLists.txt
View File

@ -11,7 +11,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND ) if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
@ -19,7 +19,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
add_executable ( min min.cpp ) add_executable ( min min.cpp )
qt5_use_modules(min Xml Script OpenGL) qt5_use_modules(min Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS min ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS min )

4
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
View File

@ -12,7 +12,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
include_directories (BEFORE ./include) include_directories (BEFORE ./include)
@ -36,7 +36,7 @@ qt5_generate_moc( L1_voronoi_diagram_2.cpp L1_voronoi_diagram_2.moc )
# The executable itself. # The executable itself.
add_executable ( L1_voronoi_diagram_2 L1_voronoi_diagram_2.cpp L1_voronoi_diagram_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( L1_voronoi_diagram_2 L1_voronoi_diagram_2.cpp L1_voronoi_diagram_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(L1_voronoi_diagram_2 Xml Script OpenGL) qt5_use_modules(L1_voronoi_diagram_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS L1_voronoi_diagram_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS L1_voronoi_diagram_2 )

4
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
View File

@ -12,7 +12,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
@ -35,7 +35,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
# The executable itself. # The executable itself.
add_executable ( Largest_empty_rectangle_2 Largest_empty_rectangle_2.cpp Largest_empty_rectangle_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Largest_empty_rectangle_2 Largest_empty_rectangle_2.cpp Largest_empty_rectangle_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Largest_empty_rectangle_2 Xml Script OpenGL) qt5_use_modules(Largest_empty_rectangle_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Largest_empty_rectangle_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Largest_empty_rectangle_2 )

4
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
View File

@ -14,7 +14,7 @@ include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../../include) include_directories (BEFORE ../../../include)
include_directories (BEFORE ./include) include_directories (BEFORE ./include)
@ -49,7 +49,7 @@ add_executable ( Periodic_2_Delaunay_triangulation_2
${DT_UI_FILES} ${DT_RESOURCE_FILES} ${DT_UI_FILES} ${DT_RESOURCE_FILES}
${headers} ${QT_headers} ${P2T2_headers}) ${headers} ${QT_headers} ${P2T2_headers})
qt5_use_modules( Periodic_2_Delaunay_triangulation_2 Xml Script OpenGL) qt5_use_modules( Periodic_2_Delaunay_triangulation_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Periodic_2_Delaunay_triangulation_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Periodic_2_Delaunay_triangulation_2 )

4
GraphicsView/demo/Polygon/CMakeLists.txt
View File

@ -12,7 +12,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5 Core)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
@ -42,7 +42,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
# The executable itself. # The executable itself.
add_executable ( Polygon_2 Polygon_2.cpp Polygon_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Polygon_2 Polygon_2.cpp Polygon_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Polygon_2 Xml Script OpenGL) qt5_use_modules(Polygon_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Polygon_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Polygon_2 )

4
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
View File

@ -18,7 +18,7 @@ set( QT_USE_QTSCRIPT TRUE )
set( QT_USE_QTOPENGL TRUE ) set( QT_USE_QTOPENGL TRUE )
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
include_directories (BEFORE ./include) include_directories (BEFORE ./include)
@ -42,7 +42,7 @@ qt5_generate_moc( "Segment_voronoi_2.cpp" "${CMAKE_CURRENT_BINARY_DIR}/Segment_v
# The executable itself. # The executable itself.
add_executable ( Segment_voronoi_2 Segment_voronoi_2.cpp Segment_voronoi_2.moc ${CDT_UI_FILES} ${CDT_RESOURCE_FILES} ) add_executable ( Segment_voronoi_2 Segment_voronoi_2.cpp Segment_voronoi_2.moc ${CDT_UI_FILES} ${CDT_RESOURCE_FILES} )
qt5_use_modules(Segment_voronoi_2 Xml Script OpenGL) qt5_use_modules(Segment_voronoi_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Segment_voronoi_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Segment_voronoi_2 )

4
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
View File

@ -12,7 +12,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
include_directories (BEFORE ../../../Snap_rounding_2/include) include_directories (BEFORE ../../../Snap_rounding_2/include)
@ -34,7 +34,7 @@ qt5_generate_moc( Snap_rounding_2.cpp Snap_rounding_2.moc )
# The executable itself. # The executable itself.
add_executable ( Snap_rounding_2 Snap_rounding_2.cpp Snap_rounding_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Snap_rounding_2 Snap_rounding_2.cpp Snap_rounding_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Snap_rounding_2 Xml Script OpenGL) qt5_use_modules(Snap_rounding_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Snap_rounding_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Snap_rounding_2 )

4
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
View File

@ -12,7 +12,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
include_directories (BEFORE ../../../Spatial_searching/include) include_directories (BEFORE ../../../Spatial_searching/include)
@ -36,7 +36,7 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
# The executable itself. # The executable itself.
add_executable ( Spatial_searching_2 Spatial_searching_2.cpp Spatial_searching_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Spatial_searching_2 Spatial_searching_2.cpp Spatial_searching_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Spatial_searching_2 Xml Script OpenGL) qt5_use_modules(Spatial_searching_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Spatial_searching_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Spatial_searching_2 )

4
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
View File

@ -13,7 +13,7 @@ find_package(CGAL REQUIRED COMPONENTS Qt5)
include(${CGAL_USE_FILE}) include(${CGAL_USE_FILE})
find_package(Qt5 COMPONENTS Xml Script OpenGL) find_package(Qt5 COMPONENTS Xml Script OpenGL Svg)
include_directories (BEFORE ../../include) include_directories (BEFORE ../../include)
@ -35,7 +35,7 @@ qt5_generate_moc( Stream_lines_2.cpp Stream_lines_2.moc )
# The executable itself. # The executable itself.
add_executable ( Stream_lines_2 Stream_lines_2.cpp Stream_lines_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} ) add_executable ( Stream_lines_2 Stream_lines_2.cpp Stream_lines_2.moc ${DT_UI_FILES} ${DT_RESOURCE_FILES} )
qt5_use_modules(Stream_lines_2 Xml Script OpenGL) qt5_use_modules(Stream_lines_2 Xml Script OpenGL Svg)
add_to_cached_list( CGAL_EXECUTABLE_TARGETS Stream_lines_2 ) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Stream_lines_2 )