Commit Graph

1838 Commits

Author SHA1 Message Date
Kenneth Moreland
68c18b2e38 Fix multiple warnings about unused params and precision loss 2016-05-19 17:15:06 -06:00
Kenneth Moreland
ee73ab96a8 Fix warning about initialization out of order in RenderSurface.h
C++ standard states that all class member variables are initialized in
the order they are declared in the class. Thus, it is considered good
C++ style to have their initialization listing in the constructor to
match the actual order they are initialized. The compiler could give a
warning otherwise.

While I am at it, rename the member variables to be more aligned with
VTK-m coding style (i.e. start with capital letter and be descriptive).
2016-05-19 16:59:39 -06:00
Kenneth Moreland
732a45ff3b Fix shadowed variable warnings and style for View.h
Several of the methods in View.h were giving me warnings about shadowed
variables because the name of the arguments were the same as some class
member variables. I fixed this by changing the variable names to match
the VTK-m coding convention of using capitalized words for class member
variables and starting lower case letter for method arguments and local
variables.

Since this ended up changing over half of the lines of View.h and
Camera.h anyway, I also made some other modifications to the style to put
it in alignment with VTK-m coding conventions including 2-space
indentation and more descriptive variable names.
2016-05-19 16:37:37 -06:00
Dave Pugmire
5be7ef945c convert float/double to vtkm::Float32/vtkm::Float64 2016-05-19 12:49:45 -04:00
Jeremy Meredith
d221166235 fixing warning about type conversion 2016-05-19 10:18:18 -04:00
Dave Pugmire
9f05b128ec refactor window2D, window3D
push a lot of common code up into a base class.
2016-05-19 10:13:04 -04:00
Dave Pugmire
88864f8453 fix compiler warning. 2016-05-19 10:10:44 -04:00
Dave Pugmire
6322ff2d86 fix compiler warning. 2016-05-19 09:58:39 -04:00
Dave Pugmire
ff2e5885f3 fix compiler warnings. 2016-05-19 09:57:54 -04:00
Dave Pugmire
fedb41b6c9 fix compiler warning. 2016-05-19 09:56:42 -04:00
Dave Pugmire
2dd0c89c08 Fix compiler warning. 2016-05-19 09:56:18 -04:00
Dave Pugmire
75ce0657fc Fix compiler warning. 2016-05-19 09:55:50 -04:00
Matt Larsen
f01b66dc52 Merge topic 'volumeRenderingCleanup'
e6a4570b Added copyright statement to VolumeRendererStructured.h
d0c18e83 Fixing typo in CMakeLists
6ada07ea Added structured
cca9b3de merged volume renderers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !420
2016-05-18 21:27:40 -04:00
Matt Larsen
e6a4570b6d Added copyright statement to VolumeRendererStructured.h 2016-05-18 20:51:04 -04:00
mclarsen
d0c18e83a9 Fixing typo in CMakeLists 2016-05-18 16:38:15 -07:00
mclarsen
6ada07ea31 Added structured 2016-05-18 16:30:07 -07:00
Jeremy Meredith
93d06bc9f2 Merge branch 'annot4' into 'master'
adding color bar legend

Adding a color bar to 2D and 3D windows.  Some code cleanup as well.

See merge request !419
2016-05-18 16:44:05 -04:00
Jeremy Meredith
f443d0ad4a adding color bar legend 2016-05-18 15:29:50 -04:00
Dave Pugmire
cf4fa5f665 Merge branch 'annot3' into 'master'
Annot3

Example for rendering using GLUT.

See merge request !418
2016-05-18 14:44:08 -04:00
Jeremy Meredith
1608495f1c refactoring render surfaces to unify duplicate code. 2016-05-18 14:34:10 -04:00
mclarsen
cca9b3dea9 merged volume renderers 2016-05-18 10:25:05 -07:00
Dave Pugmire
389a4ca2f6 remove unused file. 2016-05-18 10:48:07 -04:00
Dave Pugmire
5f9403b881 Add trackball rotation, translate and zoom ot examples/rendering, and to the view classes. 2016-05-18 10:32:02 -04:00
Matt Larsen
abf0090af7 Merge topic 'feature/raytracing'
ed98f6dc Ray Tracer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !417
2016-05-18 10:20:32 -04:00
mclarsen
ed98f6dc24 Ray Tracer 2016-05-17 22:13:36 -07:00
Robert Maynard
8dfe8cd385 Rename ControlSignature tag TopologyIn to CellSetIn. 2016-05-17 15:07:08 -04:00
Robert Maynard
194b9385df Merge topic 'simplify_maxwell_rbk_fix'
ba0a0b09 Simplify the fix for maxwell reduce by key bug.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !415
2016-05-17 14:25:26 -04:00
Jeremy Meredith
6c9a7adaa7 Merge branch 'annot2' into 'master'
annotations

Additional rendering support including 2D, 3D axes and GLUT.

See merge request !414
2016-05-17 11:02:46 -04:00
Robert Maynard
ba0a0b096b Simplify the fix for maxwell reduce by key bug. 2016-05-17 10:11:52 -04:00
Jeremy Meredith
9e53753c98 Merge branch 'master' into annot2 2016-05-16 16:54:45 -04:00
Jeremy Meredith
f5c8cbdfb6 Merge branch 'cellsetdim' into 'master'
remove cell set dimensionality

Removing cell set dimensionality.
Also splitting triangulate functionality from tetrahedralizer into its own worklet.


See merge request !413
2016-05-16 11:00:15 -04:00
Jeremy Meredith
d560cf1d85 Merge branch 'master' into cellsetdim 2016-05-13 14:53:08 -04:00
Jeremy Meredith
514d32107a Merge branch 'master' into annot2 2016-05-13 14:39:04 -04:00
Jeremy Meredith
0c18278028 removing cell set dimensionality and splitting tetrahedralizer. 2016-05-13 14:26:59 -04:00
Jeremy Meredith
9f7525ae03 removing header files 2016-05-13 14:24:06 -04:00
Robert Maynard
90d3ad0efa Merge topic 'resolve_dejagore_maxwell_issues'
780cef61 Bump up the CUDA timeout as some of our Maxwell machines are timing out.
e5c3f9c4 Solve reduce by key bugs with cuda 7.5 + maxwell hardware.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !411
2016-05-12 16:33:06 -04:00
Robert Maynard
780cef619c Bump up the CUDA timeout as some of our Maxwell machines are timing out. 2016-05-12 15:46:42 -04:00
Robert Maynard
e5c3f9c42d Solve reduce by key bugs with cuda 7.5 + maxwell hardware.
The concern is now all architectures are doing a hardware sync on reduce_by_key.
This isn't a super serious concern, but it is a downside.
2016-05-12 13:24:59 -04:00
Robert Maynard
60b78007c2 Merge topic 'style_fixes'
49ede2a5 Remove unneeded debugging message from VTKmMacros.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !412
2016-05-12 11:01:44 -04:00
Robert Maynard
49ede2a547 Remove unneeded debugging message from VTKmMacros. 2016-05-12 10:12:30 -04:00
Jeremy Meredith
9e3484dcde Merge branch 'annot2' of gitlab.kitware.com:jsmeredith/vtk-m into annot2 2016-05-09 16:32:44 -04:00
Jeremy Meredith
790844472d adding 2d annotations and fixing a viewport bug 2016-05-09 16:32:27 -04:00
Kenneth Moreland
c2dcd1df2f Merge branch 'filter-interface-changes' into 'master'
Filter interface changes

These changes make the filter classes more consistent with the VTK-m
coding standards as well as adding some simplification for users.

These changes fix issues #59, #60, #61, and #62.

See merge request !410
2016-05-08 14:23:52 -04:00
Kenneth Moreland
b446abba37 Update examples to filter interface changes. 2016-05-06 15:03:50 -06:00
Kenneth Moreland
eecbb30d96 Make sure all field filters specify a default name for their fields
If the user does not specify a name for the output field in a filter, that
filter should provide some default name. Having blank names for fields is
not a great idea. (In fact, an earlier commit added an assert to make
sure that a ResultField is given a non-empty name.)

This covers issue #61.
2016-05-05 15:27:32 -06:00
Kenneth Moreland
f4362a4902 Give result classes their own header file.
VTK-m style guidelines dictate that all classes part of the API should
be in their own header file. Thus, we have moved the result classes out
of the filter header files and into their own headers.

We have also renamed these clases to ResultField and ResultDataSet to
better match the class naming conventions of VTK-m.

Since we are moving around these result classes, we have also revamped
their structure. They are now in a hierarchy with a common ResultBase
class. Additionally, all result classes have a reference to a complete
DataSet that can be considered the output of the filter. This will make
it easier for users to consistently deal with filter results.

These changes cover issues #60 and #62.
2016-05-05 15:07:55 -06:00
Kenneth Moreland
82949e79cc List template sources in IDE
I like to have all the source files used in VTK-m to be explicitly
declared as source files in CMake so that when CMake builds a project file
for an IDE, all the source files are shown and monitored by the IDE. This
makes working with the files much easier.
2016-05-05 13:00:12 -06:00
Kenneth Moreland
e8d3eda84d Rename filter base classes to follow VTK-m naming convention
The base classes for all the filters are named with 'Filter' at the end.
Generally the convention in VTK-m is to place the most general
descriptor (in this case Filter) first, which makes it easier to find
items in ordered lists.

This commit resolves issue #59.
2016-05-05 12:43:28 -06:00
Dave Pugmire
72673ed952 Add glut-based rendering example.
Added a GL-based render surface.
2016-05-05 13:26:39 -04:00
Robert Maynard
5502db999b Merge topic 'faster_compile_times'
90099d1c Simplify ThreadIndicies so link time is reduced.
08b888f7 Improve the compile speed and binary output by tweaking FunctionInterface.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !400
2016-05-04 16:34:49 -04:00