Commit Graph

151 Commits

Author SHA1 Message Date
Allison Vacanti
93506d25e2 Change function signatures to use 'using' aliases.
Also cleaned up some lingering type typedefs.
2018-05-25 17:18:41 -04:00
Robert Maynard
8808b41fbd Merge branch 'master' into vtk-m-cmake_refactor 2018-03-29 22:51:26 -04:00
Robert Maynard
944bc3c0d6 Introduce vtkm::cont::ColorTable replacing vtkm::rendering::ColorTable
The new and improved vtkm::cont::ColorTable provides a more feature complete
color table implementation that is modeled after
vtkDiscretizableColorTransferFunction. This class therefore supports different
color spaces ( rgb, lab, hsv, diverging ) and supports execution across all
device adapters.
2018-03-28 16:11:23 -04:00
Robert Maynard
e35eec4a92 Merge topic 'virtual_coordinate_system_workarounds'
cbadd3e6 Make CoordinateSystem not fail on CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !1108
2018-03-13 08:31:53 -04:00
Robert Maynard
cbadd3e67e Make CoordinateSystem not fail on CUDA 2018-03-10 16:38:41 -05:00
Robert Maynard
7c54125b66 Switch over from static const to static constexpr where possible. 2018-03-10 11:39:58 -05:00
Robert Maynard
37a2359c70 Refactor the rendering context flags to not be a combo box.
This way in the future it is easier to make currently mutually exclusive
compile options be all enabled at the same time.
2018-01-08 14:00:57 -05:00
Robert Maynard
24e57556e6 Merge branch 'master' into vtk-m-cmake_refactor
Includes updating to cleanup benchmark code and handle the new MPI option
2017-12-28 14:23:21 -05:00
Sujin Philip
334262db16 Fix Field constructors
1. Add option to copy user supplied array in make_ArrayHandle.
2. Replace Field constructors that take user supplied arrays with make_Field.
3. Replace CoordinateSystem constructors that take user supplied arrays with
   make_CoordinateSystem.
2017-12-21 12:48:15 -05:00
Matthew Letter
4b058229ce Merge branch 'master' into cmake_refactor 2017-12-08 09:51:48 -07:00
Matt Larsen
39abcb99c3 fixing compile errors 2017-12-05 13:26:45 -08:00
Matt Larsen
655412fca3 adding support for log plots with the wireframer 2017-12-05 10:00:27 -08:00
Matt Larsen
6d61630928 let there be foreground color 2017-12-04 20:46:38 -08:00
Robert Maynard
3ded554831 Extend the CMake rewrite to include vtkm_rendering 2017-10-27 15:29:58 -04:00
mclarsen
f473974310 Fixing error with uninitialized variable 2017-10-26 14:17:49 -07:00
Matt Larsen
46f58dffc6 fixing various warnings 2017-10-26 08:36:27 -07:00
Matt Larsen
7325508093 removing debug statements 2017-10-26 08:01:00 -07:00
Matt Larsen
035814a4a7 adding 2d ortho support to ray tracing and updating WireFramer to support 2d lines and 1D line plots 2017-10-26 07:58:02 -07:00
Kenneth Moreland
2625ae7866 Update VTK-m source to use new ArrayCopy functionality 2017-09-25 16:54:46 -06:00
Manish Mathai
b5bfa1edff More copyright header fixes 2017-09-22 16:10:33 -07:00
Manish Mathai
495adacc38 Merge branch 'master' into concrete-canvas 2017-09-22 09:32:21 -07:00
Kenneth Moreland
c3a3184d51 Update copyright for Sandia
Sandia National Laboratories recently changed management from the
Sandia Corporation to the National Technology & Engineering Solutions
of Sandia, LLC (NTESS). The copyright statements need to be updated
accordingly.
2017-09-20 15:33:44 -06:00
Manish Mathai
6a3229779f Move the Canvas state to an internals class
This is to maintain compability with future minor releases
2017-09-17 20:40:24 -07:00
Manish Mathai
8b88a043e4 Adds text rendering and line rendering to WorldAnnotator 2017-09-17 15:10:40 -07:00
Manish Mathai
3051d88de0 Adds text rendering to Canvas. 2017-09-13 13:42:11 -07:00
Manish Mathai
7f18d17d24 Converts Canvas to a concrete implementation.
This commit converts `Canvas` from an abstract class to a concrete
class by converting the pure virtual methods to empty/default
implementations. It provides an implementation for `Canvas::AddLine`
using Bresenham's line drawing algorithm.
2017-08-31 10:40:30 -07:00
Manish Mathai
3210e50209 Adds an small Z offset to the wireframe edges to solve z-fights
This commit solved z-fighting issues with two changes:
- A small offset, proportional to distance between near and far planes, is
applied in camera space to the edges.
- The minimum screenspace offset is increased as well for the same reason.
A new test case is added for uniform grids.
Additionally, the line plotting algorithm is changed to round off the
edge endpoints to fill in empty pixels seen on uniform grids.
2017-08-29 14:55:24 -07:00
Manish Mathai
b727377fd5 Refactoring 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
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
Dave Pugmire
b23564a526 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into pics_unittests 2017-08-10 16:18:18 -04:00
James Kress
23a56dd771 Merge topic 'Create-YAxis-Log-Scaling'
f3e455eb Adding 2D, 3D annotations, fixing GL color mapper.
7c0b15a5 Adding ability to have y-axis log scaling in 1D.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !863
2017-08-10 13:48:41 -04:00
James
f3e455ebf6 Adding 2D, 3D annotations, fixing GL color mapper. 2017-08-10 09:26:16 -04:00
Kenneth Moreland
2e875d4dfa Fix signed/unsigned conversion warnings in GLFW test 2017-08-08 16:14:55 -06:00
James
7c0b15a555 Adding ability to have y-axis log scaling in 1D. 2017-08-07 10:45:03 -04:00
Matt Larsen
dba99744ce Merge topic 'rendering_pipeline'
2b5e8e9f Removing debug statements
0459913a Multi canvas rendering
35877cd9 Adding missing file
b1e3688b multi-canvas working for ray tracer + volume renderer
33af0fec composing ray tracer and volume renderer is successful. Still need a strategy for the background color.
8e5f309e adding support in rendering triangulator for cell set permutation
92fde35b fixing depth

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !862
2017-08-06 17:02:51 -04:00
Matt Larsen
2b5e8e9f52 Removing debug statements 2017-08-06 12:18:30 -07:00
Matt Larsen
0459913aeb Multi canvas rendering 2017-08-06 11:59:19 -07:00
Matt Larsen
b1e3688bfd multi-canvas working for ray tracer + volume renderer 2017-08-05 19:11:28 -07:00
Matt Larsen
33af0fec65 composing ray tracer and volume renderer is successful. Still need a strategy for the background color. 2017-08-04 09:24:05 -07:00
Kenneth Moreland
5b03e87fdf Merge topic 'glfw-test-fixes'
faa7815a Fix buffer overrun error
14b81a65 Fix compiler errors for UnitTestMapperGLFW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !859
2017-08-02 17:59:01 -04:00
James Kress
f1077fe601 Merge topic 'Adding-1DView-Line-Color'
6b53a01c Removing print.
1eb58512 Adding ability to modify axis color as well as legend label color.
bd561b1e Trying to fix color for mesa.
c9bd71f9 Trying to fix color in mesa.
14c69183 Adding color to RenderTest.
7674d2cc Adding color to mesa test.
686f9823 Updating rendering unit tests for 1D plots.
3b79e4d7 Updating way 1D test plots are made, adding title.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !854
2017-08-02 16:07:16 -04:00
Matt Larsen
77a9e53066 Merge topic 'export_color'
dd4efb51 Uses `Color` in the unit tests for basic sanity check
812f11d3 Moves class-wide visibility macro to just the static class members.
68648863 Exports Color class, adding visibility to static members

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !850
2017-08-02 15:59:08 -04:00
Kenneth Moreland
faa7815ac5 Fix buffer overrun error 2017-08-02 10:45:23 -06:00
Kenneth Moreland
14b81a65a6 Fix compiler errors for UnitTestMapperGLFW
This file was creating a C array using the size of an array handle.
Generally, you cannot create a C array of a static size with a
variable created at runtime. Apparently some compilers were able
to trace back to fact that the array handle was a given size and
used that, but not all compilers can do this. To get around the
problem, just use a std::vector, which allows the data to be
dynamically allocated.
2017-08-02 10:35:45 -06:00
James
bd561b1e50 Trying to fix color for mesa. 2017-07-28 16:38:38 -04:00
James
c9bd71f90f Trying to fix color in mesa. 2017-07-28 16:34:57 -04:00
James
14c69183af Adding color to RenderTest. 2017-07-28 16:16:03 -04:00