Commit Graph

3310 Commits

Author SHA1 Message Date
Sujin Philip
10dc106fa8 Add option to skip facted normals normalization
This will allow us to generate faster but approximate point normals.
2017-06-29 12:26:35 -04:00
David C. Lonie
bc1b920741 Add macro to help pass commas into other macros.
VTKM_PASS_COMMAS(...) will pass it's arguments verbatim into another
macro, even if they contain commas. This is helpful when using templated
classes, e.g.

#define SOME_MACRO(arg) ...

SOME_MACRO(vtkm::cont::ArrayHandle<float, StorageTag>)

won't compile, because the comma in the template parameters is assumed
to be separating macro arguments. Adding extra parenthesis,

SOME_MACRO((vtkm::cont::ArrayHandle<float, StorageTag>))

helps in some cases, but not others (e.g. the macro declares a variable).

SOME_MACRO(VTKM_PASS_COMMAS(vtkm::cont::ArrayHandle<float, StorageTag>))

will always* work.
2017-06-29 09:51:07 -04:00
David C. Lonie
d4d7683f17 Initialize member variables of ArrayPortalFromIterators. 2017-06-29 09:51:06 -04:00
David C. Lonie
8ffaa83be1 Silence pointless warnings on TestBuilds.
The TestBuild_* targets were not getting the _SCL_SECURE_NO_WARNINGS
define set on MSVC.
2017-06-29 09:51:06 -04:00
David Lonie
4cad9b11df Merge topic 'examples_fix'
0564af0a Fix Clipping example compilation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brent Lessley <blessley@cs.uoregon.edu>
Merge-request: !814
2017-06-28 15:19:45 -04:00
David C. Lonie
0564af0a5f Fix Clipping example compilation.
Some functions were refactored and broke this example code.
2017-06-28 12:20:09 -04:00
Sujin Philip
67a95ee19a Merge topic 'fix-marchingcubes-normals'
08fb95d5 Options to compute fast normals in MarchingCubes
74f1a0bf Fix Marching Cubes normals
42ce2dcb Add ScatterPermutation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !811
2017-06-21 09:39:08 -04:00
David Lonie
462033699f Merge topic '157-threshold_field_refactor'
1cc855ab Refactor the Threshold worklet field mapping.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !808
2017-06-21 09:12:10 -04:00
David C. Lonie
1cc855abec Refactor the Threshold worklet field mapping.
Refs #157.
2017-06-21 09:09:46 -04:00
Sujin Philip
08fb95d5ee Options to compute fast normals in MarchingCubes
Adds ComputeFastNormalsForStructured and ComputeFastNormalsForUnstructured
flags to the marching cubes filter.
2017-06-20 16:56:24 -04:00
Sujin Philip
74f1a0bf8b Fix Marching Cubes normals 2017-06-20 16:25:49 -04:00
David Lonie
8c0d1d12d0 Merge topic '157-extract_geometry_refactor'
769c3c40 Extract geometry celldata refactor.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !803
2017-06-20 16:18:06 -04:00
David Lonie
572411c3dd Merge topic '157-triangulate_refactor'
5fb60c04 Refactor Triangulate worklet/filter for field mapping.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !810
2017-06-20 15:45:25 -04:00
David Lonie
1a4cdfb55a Merge topic '157-mask_filter_refactor'
63aecfa5 Refactor field processing for Mask worklet/filter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !805
2017-06-20 15:44:27 -04:00
Sujin Philip
42ce2dcb39 Add ScatterPermutation 2017-06-20 13:41:02 -04:00
David C. Lonie
5fb60c04ed Refactor Triangulate worklet/filter for field mapping.
Refs #157.
2017-06-19 14:50:06 -04:00
Matt Larsen
6c8b0e3e9d Merge topic 'refactor_ray_tracing'
630e871e refactoring ray tracing and adding new renderer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !802
2017-06-19 11:02:49 -04:00
Robert Maynard
9716344d88 Merge topic 'correct_ArrayManagerExecutionThrustDevice_warnings'
cfda0593 ArrayManagerExecutionThrustDevice stops generating casting warnings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: David Lonie <david.lonie@kitware.com>
Merge-request: !807
2017-06-19 10:33:33 -04:00
Matt Larsen
630e871ea7 refactoring ray tracing and adding new renderer 2017-06-17 14:28:45 -07:00
David C. Lonie
769c3c405e Extract geometry celldata refactor.
References #157.
2017-06-16 14:34:26 -04:00
caseywang777
bf11195da8 Resolve the code review issues 2017-06-16 09:18:14 -06:00
David Lonie
955a638fa4 Merge topic '157-tetrahedralize-refactor'
25da2165 Refactor tetrahedralize filter's field processing.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !806
2017-06-16 10:12:42 -04:00
Robert Maynard
cfda0593be ArrayManagerExecutionThrustDevice stops generating casting warnings. 2017-06-16 08:50:32 -04:00
caseywang777
75c794f6c0 Add 3D kd tree reconstruction and nearest neighbor searh 2017-06-15 17:55:30 -06:00
David C. Lonie
25da216514 Refactor tetrahedralize filter's field processing.
Refs #157.
2017-06-15 14:14:27 -04:00
David C. Lonie
63aecfa501 Refactor field processing for Mask worklet/filter. 2017-06-15 13:17:52 -04:00
Sujin Philip
2ea5f6972f Merge topic 'fix-surfacenormals-install'
5f78f679 Fix SurfaceNormals.hxx installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !804
2017-06-14 14:33:00 -04:00
Sujin Philip
5f78f67939 Fix SurfaceNormals.hxx installation 2017-06-14 14:12:20 -04:00
David Lonie
42a4bb5bb6 Merge topic '157-clip-refactor'
20eed197 Refactor the clip filters/worklet (See #157).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !799
2017-06-13 15:48:58 -04:00
David Lonie
f69ead4bb0 Merge topic 'full_arrayhandle_summary'
959db03c Add option to print full arrayhandle in summary.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !800
2017-06-13 12:49:25 -04:00
David C. Lonie
20eed197c1 Refactor the clip filters/worklet (See #157). 2017-06-13 10:24:07 -04:00
David C. Lonie
959db03ca0 Add option to print full arrayhandle in summary.
Useful for quickly debugging.
2017-06-13 10:21:41 -04:00
Sujin Philip
75f0957f8c Merge topic 'add-SmoothSurfaceNormals'
18d0f3e1 Add SmoothSurfaceNormals worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !798
2017-06-12 17:21:45 -04:00
Sujin Philip
18d0f3e143 Add SmoothSurfaceNormals worklet
Also updates SurfaceNormals filter to produce smooth normals.
2017-06-12 16:50:22 -04:00
David Lonie
8c64247707 Merge topic 'marching_cubes_celldata'
c9f38480 Release CellIdMap if no cell fields exist in MC filter.
44c1d4f6 Remove unused variable.
82ebdd5b Add MarchingCubes::ProcessCellField.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !793
2017-06-09 09:50:47 -04:00
Sujin Philip
d607c7f858 Merge topic 'simplify-arrayhandle-templates'
c4e31020 Simplify ArrayHandleImplicit template
6ce2a43d Simplify ArrayHandleTransform template

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !795
2017-06-09 09:14:50 -04:00
David C. Lonie
c9f38480d9 Release CellIdMap if no cell fields exist in MC filter. 2017-06-09 09:13:01 -04:00
David C. Lonie
44c1d4f641 Remove unused variable. 2017-06-08 16:50:27 -04:00
David C. Lonie
82ebdd5be7 Add MarchingCubes::ProcessCellField.
Allow cell data to be mapped through the MarchingCubes filter.
2017-06-08 16:50:27 -04:00
Sujin Philip
c4e3102084 Simplify ArrayHandleImplicit template 2017-06-08 16:46:45 -04:00
Sujin Philip
6ce2a43d41 Simplify ArrayHandleTransform template 2017-06-08 16:46:45 -04:00
Robert Maynard
ca44123992 Merge topic 'add_setup_for_development'
e91401ac Enable SetupForDevelopment in VTK-m
569655c4 Add autostash command flag to git-gitlab-sync
0f171de1 Add gitlab-sync command to ease updating local branches after reformats
c5d20ef7 Merge branch 'upstream-GitSetup' into add_setup_for_development
cc537c70 GitSetup 2016-12-13 (cd5ada6d)
7736f950 Add the update scripts needed to import GitSetup
793b5cf9 CONTRIBUTING guide now covers reformatting and revising commits

Acked-by: Brad King <brad.king@kitware.com>
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !792
2017-06-08 15:13:53 -04:00
Sujin Philip
06d67580a7 Merge topic 'add-FacetedSurfaceNormals'
749c0c89 Add Worklet and Filter for faceted surface normals

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !794
2017-06-08 12:18:49 -04:00
Sujin Philip
749c0c8920 Add Worklet and Filter for faceted surface normals 2017-06-08 09:37:12 -04:00
Robert Maynard
e91401ac0f Enable SetupForDevelopment in VTK-m 2017-06-07 10:02:38 -04:00
Robert Maynard
569655c454 Add autostash command flag to git-gitlab-sync 2017-06-07 10:02:38 -04:00
Robert Maynard
0f171de1c5 Add gitlab-sync command to ease updating local branches after reformats 2017-06-07 10:01:12 -04:00
Robert Maynard
c5d20ef7ba Merge branch 'upstream-GitSetup' into add_setup_for_development
* upstream-GitSetup:
  GitSetup 2016-12-13 (cd5ada6d)
2017-06-07 09:58:36 -04:00
GitSetup Upstream
cc537c7073 GitSetup 2016-12-13 (cd5ada6d)
Code extracted from:

    https://gitlab.kitware.com/utils/gitsetup.git

at commit cd5ada6d5626da409d3ff108c341b9afd615803f (setup).
2017-06-07 09:58:35 -04:00
Robert Maynard
7736f95050 Add the update scripts needed to import GitSetup 2017-06-07 09:43:50 -04:00