Commit Graph

3615 Commits

Author SHA1 Message Date
Dave Pugmire
400981815f Remove warnings. 2017-08-29 09:58:25 -04:00
Dave Pugmire
7bbc1417d5 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-29 08:44:10 -04:00
Dave Pugmire
48b3f64cf2 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-29 08:35:59 -04:00
Dave Pugmire
b2de8045cb Cleanup. Add some additional tests for streamlines. 2017-08-29 08:35:29 -04:00
Dave Pugmire
408765c9ed Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 17:11:22 -04:00
Dave Pugmire
7e69b9606d Fix merges with master. 2017-08-28 16:58:44 -04:00
Dave Pugmire
1c0f721b96 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-08-28 15:27:04 -04:00
Dave Pugmire
7e348db5ac Remove duplicate definitions of GetIndices 2017-08-28 15:07:11 -04:00
Dave Pugmire
863c403f98 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 14:50:46 -04:00
Dave Pugmire
6714124b0c remove whitespace. 2017-08-28 14:44:56 -04:00
Dave Pugmire
c398654df9 Merge branch 'streamline_returntype' of gitlab.kitware.com:dpugmire/vtk-m into streamline_returntype 2017-08-28 14:43:04 -04:00
Dave Pugmire
611c5c43e5 Remove dead code. Remove compiler warnings. 2017-08-28 14:31:50 -04:00
Allison Vacanti
196aecd98f Merge topic 'interop_tryexecute'
4c29dc6b Ensure array's device is valid before interop.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !892
2017-08-25 09:17:30 -04:00
Kenneth Moreland
8312fe54ab Merge topic 'cononical-face-edge-ids'
1d5a4d47 Update ExternalFaces worklet to use hashes
fc7b90ac Add hash function
b1e6c1e3 Add method for getting a cononical edge id
8e72dc73 Add method for getting a cononical face id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !900
2017-08-24 19:00:21 -04:00
Sujin Philip
160c5f53c5 Merge topic 'result_is_valid'
e1219f76 Re-add IsValid to Result.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Sujin Philip <sujin.philip@kitware.com>
Merge-request: !901
2017-08-24 17:02:58 -04:00
Matt Larsen
93aa64109f Merge topic 'line_rendering'
8e0a0308 Handles the case when the passed canvas has rendered data.
b727377f Refactoring
44357d51 Apply external faces filter on cellset before wireframing
7e95269c Refactoring wireframing code
5738e895 Wireframe rendering
657b0b94 Applies `clang-format` and minor refactoring
af2acc57 Implements a simple line renderer using Xialin Wu's algorithm

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !895
2017-08-24 15:49:14 -04:00
Allison Vacanti
4c29dc6bc0 Ensure array's device is valid before interop. 2017-08-24 15:02:46 -04:00
Allison Vacanti
e1219f7667 Re-add IsValid to Result.
This method more clearly communicates "execution was successful" than
"IsDataSetValid". Changed some infrastructure code's use of these methods
to fix a bug in VTK.
2017-08-24 14:25:45 -04:00
Kenneth Moreland
1d5a4d470d Update ExternalFaces worklet to use hashes
Our experiments have shown using hashes and then resolving collisions to
be faster than trying to sort by Ids.
2017-08-24 12:11:45 -06:00
Robert Maynard
2e7d9e3c85 Merge topic 'introduce_neighborhood_worklet_type'
99f60c27 Add GameOfLife example to show off WorkletPointNeighborhood3x3x3.
ce803832 Adds WorkletPointNeighborhood and DispatcherPointNeighborhood types.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !864
2017-08-24 13:49:24 -04:00
Kenneth Moreland
fc7b90aca6 Add hash function
Based on the FNV-1a algorithm. Creates 32-bit hashes.
2017-08-24 10:02:18 -06:00
Manish Mathai
8e0a0308f0 Handles the case when the passed canvas has rendered data.
This change adds a option via `SetIsOverlay` which causes the
`MapperWireframer` to use the existing depth buffer instead of
generating a new one.
This change refactors the line color blending to
retain the alpha value separately instead of pre-multiplying it.
2017-08-23 14:51:05 -07:00
Robert Maynard
99f60c27cd Add GameOfLife example to show off WorkletPointNeighborhood3x3x3.
Conway's game of life is a very simple example of a point neighborhood worklet
that needs to access the 8 adjacent points of each point in a 2d structured grid
2017-08-23 16:42:00 -04:00
Robert Maynard
ce80383238 Adds WorkletPointNeighborhood and DispatcherPointNeighborhood types.
VTK-m is now able to run algorithms on structured points that require the
local point neighbors in a highly efficient manner.
2017-08-23 16:42:00 -04:00
Sujin Philip
85630cf72e Merge topic 'fix-clip-deviceadapter'
3a3665ee Fix missing DeviceAdapter in dispatchers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !897
2017-08-22 15:14:14 -04:00
Sujin Philip
3a3665ee5e Fix missing DeviceAdapter in dispatchers 2017-08-22 13:00:28 -04:00
Robert Maynard
0cbc3db016 Merge topic 'stolen_arrays_can_still_be_used_as_input'
c385b21a StorageBasic is now treated like users memory after being stolen.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !891
2017-08-22 09:09:58 -04:00
Manish Mathai
b727377fd5 Refactoring 2017-08-21 18:21:44 -07:00
Manish Mathai
44357d5113 Apply external faces filter on cellset before wireframing 2017-08-21 18:21:44 -07:00
Manish Mathai
7e95269ce0 Refactoring wireframing code 2017-08-21 18:21:44 -07:00
Manish Mathai
5738e895ce Wireframe rendering 2017-08-21 18:21:37 -07:00
Matt Larsen
5782152485 Merge topic 'x_ray_add_emmission'
5429f120 fixed energy error and fix for ray camera
ac784330 Merge remote-tracking branch 'upstream/master' into x_ray_add_emmission
521e445b emission now functioning
52959d91 testing emission
5fc80517 initial version on absorption and emission integration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !893
2017-08-20 00:09:13 -04:00
Matt Larsen
5429f1200e fixed energy error and fix for ray camera 2017-08-19 17:19:03 -07:00
Sujin Philip
a1abc4c211 Merge topic 'refactor-kdtree'
2141435a Refactor KDTree3D worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !890
2017-08-18 11:41:01 -04:00
Robert Maynard
c385b21acd StorageBasic is now treated like users memory after being stolen.
Previously once an ArrayHandle was stolen it was placed in an invalid state
where it could not used again by VTK-m. Now instead after being stolen it
is placed into a state where it is identical to memory allocated outside
of VTK-m and passed in.
2017-08-18 08:24:49 -04:00
Kenneth Moreland
b1e6c1e34b Add method for getting a cononical edge id
The cononical edge id is stored in a vtkm::Id2.
2017-08-17 16:07:41 -06:00
Kenneth Moreland
8e72dc738a Add method for getting a cononical face id
The cononical face id is stored in a vtkm::Id3 (independent of the
actual number of points in the face).
2017-08-17 15:48:47 -06:00
Robert Maynard
b9e69217ae Merge topic 'typedef_to_using_round_4'
f6863594 Convert VTK-m over to use 'using' instead of 'typedef'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !885
2017-08-17 16:38:49 -04:00
Sujin Philip
11fce76732 Merge topic 'cuda-streams'
72a6cf4a Change cuda calls to use the per-thread stream.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !887
2017-08-17 15:27:25 -04:00
Sujin Philip
2141435a19 Refactor KDTree3D worklet 2017-08-17 15:25:08 -04:00
Sujin Philip
72a6cf4a21 Change cuda calls to use the per-thread stream. 2017-08-17 11:03:02 -04:00
Robert Maynard
f68635941e Convert VTK-m over to use 'using' instead of 'typedef' 2017-08-17 10:47:25 -04:00
Robert Maynard
0c435d39f4 Merge topic 'remove_lines_with_only_semicolon'
a487017f Remove lines that only contain a semi-colon.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !886
2017-08-17 09:34:15 -04:00
Robert Maynard
eafacc6dc5 Merge topic 'device_adapter_general_use_auto_and_decltype'
89f43999 Reduce the amount of typedef statements in DeviceAdapters
e0958311 ArrayHandleReverse now supports shrink/allocate under all conditions.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !879
2017-08-16 16:15:52 -04:00
Robert Maynard
a487017fd1 Remove lines that only contain a semi-colon. 2017-08-16 14:31:17 -04:00
Robert Maynard
89f439999a Reduce the amount of typedef statements in DeviceAdapters
By using the auto keyword and decltype we can reduce the number of
complex typedefs that exist when writing device adapter algorithms.
The goal being that it is easier for developers to see the actual
algorithms being implemented, by reducing the amount of template
'noise'.
2017-08-16 14:23:21 -04:00
Robert Maynard
e095831199 ArrayHandleReverse now supports shrink/allocate under all conditions.
Previously ArrayHandleReverse would only work if it was provided an explicit
users array to map too. But this doesn't need to be so, if a user wants to
start by constructing an ArrayHandleReverse we should allow that.

The side effect of this, is that some very tricky code in the DeviceAdapters
can be removed, that explicitly was added to allow output to ArrayHandleReverse
2017-08-16 14:20:05 -04:00
Manish Mathai
657b0b9432 Applies clang-format and minor refactoring 2017-08-16 11:02:42 -07:00
Manish Mathai
af2acc5736 Implements a simple line renderer using Xialin Wu's algorithm
The algorithm is parallelized using a custom Mapper and Canvas class.
It is parallelized over the expected pixels that will be colored,
blending with any previous color value. This does not use the depth buffer
and hence will naively overrwite all pixels while drawing a line segment.
2017-08-16 11:02:42 -07:00
Robert Maynard
516db147a8 Merge topic 'rework_interop_to_not_use_CopyInto'
a185cd29 Refactor vtkm::interop::TransferToOpenGL for implicit ArrayHandles.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson <david.thompson@kitware.com>
Acked-by: Allison Vacanti <allison.vacanti@kitware.com>
Merge-request: !884
2017-08-16 13:46:49 -04:00