8ab112f5bd
Merge and new plugin fixes
2015-06-30 13:03:20 +02:00
a0e7a60973
Merge remote-tracking branch 'cgal/master' into CGAL-Qt5_support-GF
...
Conflicts:
Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
Alpha_shapes_3/demo/Alpha_shapes_3/MainWindow.cpp
Alpha_shapes_3/demo/Alpha_shapes_3/Viewer.h
GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
GraphicsView/demo/Bounding_volumes/CMakeLists.txt
GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
GraphicsView/demo/Generator/CMakeLists.txt
GraphicsView/demo/GraphicsView/CMakeLists.txt
GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
GraphicsView/demo/Stream_lines_2/CMakeLists.txt
GraphicsView/demo/Triangulation_2/CMakeLists.txt
Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt
Mesh_3/demo/Mesh_3/CMakeLists.txt
Mesh_3/demo/Mesh_3/include/CGAL_demo/Scene_item_with_display_list.h
Mesh_3/demo/Mesh_3/src/CGAL_demo/Scene.cpp
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/CMakeLists.txt
Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/Scene.cpp
Polyhedron/demo/Polyhedron/CMakeLists.txt
Polyhedron/demo/Polyhedron/Polyhedron_demo_join_and_split_polyhedra_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin.cpp
Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
Polyhedron/demo/Polyhedron/Scene.cpp
Polyhedron/demo/Polyhedron/Scene_combinatorial_map_item.h
Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
Polyhedron/demo/Polyhedron/Scene_plane_item.h
Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.h
Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
Polyhedron/demo/Polyhedron/Scene_polylines_item.h
Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
Surface_mesher/demo/Surface_mesher/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
Triangulation_3/demo/Triangulation_3/MainWindow.cpp
2015-06-30 09:17:26 +02:00
44ebc81721
Re-add C2t3_type.h
...
This reverts one error made in commit
ec54e1d42c
2015-06-22 11:42:23 +02:00
49b45a753d
vaos replacement
...
- The vao array has been relaced by a QMap and the buffer array by a vector, so that each item can have the right number of VAOs/VBOs.
2015-06-22 10:10:45 +02:00
f315b195cd
Merge remote-tracking branch 'refs/remotes/cgal-public-dev/CGAL-Qt5_support-GF' into CGAL-Qt5_support-GF
...
Conflicts:
Polyhedron/demo/Polyhedron/Scene_polyhedron_item.cpp
2015-06-18 15:11:59 +02:00
6a3bae29cd
clean up
2015-06-18 15:08:06 +02:00
0273dd2544
trivial_plugin refactored.
2015-06-18 14:55:13 +02:00
0484ba4e6c
mesh_3 plugin refactored
2015-06-18 14:45:13 +02:00
0fbea0f85c
cut_plugin refactored
2015-06-18 14:20:33 +02:00
ab568465c5
cene_edges_item in cut_plugin refactored.
2015-06-18 12:54:40 +02:00
980eb8fcf3
scene_aabb_item in cut plugin refactored.
2015-06-18 12:47:30 +02:00
5148c8d377
polyhedron_selection_item refactored.
2015-06-18 12:29:31 +02:00
f566e54ddb
transformed_item refactored and corrected some problems in other items.
2015-06-18 12:04:15 +02:00
c9272417b1
Points_with_normal_items refactored.
...
- No more splatting for now.
2015-06-18 11:39:48 +02:00
5172e2d6a5
nef_polyhedron_item refactored
2015-06-18 11:15:43 +02:00
8754e3a40f
edit_polyhedron_item refactored.
...
- needed a special program for the red bbox appearing when moving points.
2015-06-18 10:42:39 +02:00
7c23f13b3e
polygon_soup_item refactored + bug corrected
...
- wire mode wasn't working correctly because the filling of the edges data wasn't looping.
2015-06-17 14:37:17 +02:00
2e9ae070dd
Implicit function refactored
...
- Use the program library
- force some data like the manipulated frame matrix or the color and normals in the draw functions to be able to use an existing program
with existing shaders.
2015-06-17 13:00:28 +02:00
ec54e1d42c
Refactoring
...
- keeps shaders in resources files
- Uses a program vector doubled with a sort of singleton to create or return a program.
- currently implemented classes ; polyhedron_item, textured_polyhedron_item and polylines items
2015-06-17 11:39:07 +02:00
bf7412066d
Shader code clean-up
...
- Moved the programs and shaders of textured_polyhedron in Scene_item
2015-06-15 12:31:30 +02:00
cce0d3ec64
Merge pull request #100 from sloriot/gsoc2014-Polyhedron_shortest_path-skiazyk
...
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Polyhedron_shortest_path
This package provides methods to compute the surface-constrained shortest path on 3d models. It was written as a project during GSoC 2014.
2015-06-15 10:45:25 +02:00
71207cac07
Merge pull request #116 from sloriot/gsoc2014-VCM_3-jmeyron
...
GSoC 2014, VCM feature from Jocelyn Meyron, Sébastien Loriot, and Quentin Mérigot
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/vcm_computation_and_applications
2015-06-15 10:37:29 +02:00
3c9fbbb393
Merge pull request #110 from afabri/Polyhedron_iostream-Binary_STL_Readder-GF
...
Read binary STL files
2015-06-15 10:01:40 +02:00
84bc656508
Clean up
...
- Shaders and programs moved to scene_item
- Qt wrappers used.
2015-06-12 15:21:13 +02:00
74ff5ae85c
Clean-up
...
- Scene_item_with_display_list removed
- Program initializing functions being moved to scene_item to lighten-up the code of each object (Only polyhedron_item concerned at this stage)
2015-06-12 14:46:05 +02:00
940117422f
Merge pull request #109 from sloriot/Polyhedron_demo-color_each_cc-sloriot
...
add an action to assign a color per cc of a polyhedron
2015-06-10 13:39:31 +02:00
f5837dee87
Disable the normal estimation plugin with Boost-1.57 and C++11
...
Patch similar to
|--------------------------------------------------------------------
| commit bd43545717
2015-06-09 16:22:19 +02:00
cac397d073
remove extra const
2015-06-08 16:36:31 +02:00
ae5e0efa33
fix warning
2015-06-08 09:56:59 +02:00
eb4d746815
fix typos
2015-06-05 16:35:27 +02:00
04e4c1b702
open stream in binary mode
2015-06-05 16:07:54 +02:00
dfc9092c90
add an action to assign a color per cc of a polyhedron
2015-06-05 15:58:52 +02:00
fd696dd81c
fix warning
2015-06-05 15:37:40 +02:00
9bb488cd06
remove unused variable
2015-06-05 15:13:04 +02:00
56a171219c
remove unused variable
2015-06-05 15:10:40 +02:00
9e8727c593
Before trying to orient a soup, start by removing degenerate polygons
2015-06-05 07:23:34 +02:00
376760340e
add new plugins in the testsuite
2015-06-05 06:44:04 +02:00
0f48225bbe
accomodate changes in applicable
2015-06-04 11:40:31 +02:00
5ae3cb521b
accomodate changes in slots declaration
2015-06-04 11:28:48 +02:00
c2cd87865e
Merge branch 'old/gsoc2014-VCM_3-jmeyron' into gsoc2014-VCM_3-jmeyron
...
Conflicts:
Installation/changes.html
Point_set_processing_3/doc/Point_set_processing_3/PackageDescription.txt
Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt
Point_set_processing_3/doc/Point_set_processing_3/examples.txt
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-04 11:27:56 +02:00
92ee604a1c
Set off ouput precision to the maximum relevant
2015-06-04 10:55:13 +02:00
d123ce5a47
Merge branch 'old/gsoc2014-Polyhedron_shortest_path-skiazyk' into gsoc2014-Polyhedron_shortest_path-skiazyk
...
Conflicts:
Documentation/biblio/geom.bib
Documentation/doc/Documentation/Doxyfile.in
Documentation/doc/Documentation/dependencies
Documentation/doc/Documentation/packages.txt
Documentation/scripts/generate_how_to_cite.py
Polyhedron/demo/Polyhedron/CMakeLists.txt
2015-06-01 17:47:31 +02:00
03a85fdf95
remove exe flag
2015-06-01 14:26:16 +02:00
22ec2d5bfb
remove extra comma
2015-05-29 13:34:33 +02:00
c85cc1429b
remove extra typename
2015-05-28 10:54:24 +02:00
64deb875a6
more verbose output
2015-05-28 10:43:32 +02:00
d18d07ba2a
slots -> Q_SLOTS
2015-05-27 18:12:51 +02:00
ce051c74a2
slots -> Q_SLOTS
2015-05-27 08:55:42 +02:00
fae635d2fb
Merge pull request #73 from afabri/CGAL-Qt_no_keywords-GF
...
All Qt4-based demos now use `-DQT_NO_KEYWORDS`
2015-05-26 12:32:40 +02:00
17678e8c3d
fix compilation issue and MinIndex usage
2015-05-22 16:27:15 +02:00
Maxime Gimeno
Laurent Rineau
Sebastien Loriot
Sébastien Loriot
Andreas Fabri