Commit Graph

1823 Commits

Author SHA1 Message Date
Jeremy Meredith
501f34c27a cleanup and style 2016-06-01 13:37:03 -04:00
Jeremy Meredith
dd27e32cfc Merge branch 'master' into annot6
Conflicts:
	vtkm/rendering/RenderSurfaceGL.h
	vtkm/rendering/Window.h
2016-05-31 15:32:56 -04:00
Robert Maynard
86efb75c67 Merge topic 'use_PointCount_over_FromCount'
317a48d4 Prefer using PointCount instead of FromCount in cell based worklets.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !431
2016-05-31 11:53:19 -04:00
Kenneth Moreland
13e574b0f4 Merge branch 'bounds-helper' into 'master'
Create Range and Bounds helper classes



See merge request !429
2016-05-31 11:34:49 -04:00
Robert Maynard
317a48d42f Prefer using PointCount instead of FromCount in cell based worklets.
The PointCount name is far more descriptive and helps readers understand
what the content of the variable is.
2016-05-31 10:42:39 -04:00
Kenneth Moreland
507222c489 Change rendering classes to use Range and Bounds
In addition to this being necessary to be compatible with recent
changes, it makes for cleaner declaration of these values.
2016-05-29 18:49:37 -06:00
Kenneth Moreland
b5415169e2 Change Field and related methods to use Range and Bounds
First, be more explicit when we mean a range of values in a field or a
spacial bounds. Use the Range and Bounds structs in Field and
CoordinateSystem to make all of this more clear (and reduce a bit of
code as well).
2016-05-29 18:49:36 -06:00
Kenneth Moreland
d75857d0bc Add Bounds struct
This is a simple struct that defines min and max values over X, Y, and Z
to define an axis-aligned bounding box.
2016-05-29 18:49:36 -06:00
Kenneth Moreland
b358fcb19f Add Range struct
This is a simple struct that has a min and max scalar value to represent
a range of scalar values. It also comes with several helper methods.
2016-05-29 18:49:36 -06:00
Kenneth Moreland
a338ac52a2 Merge branch 'missing-export' into 'master'
Add missing export macro to VecTraits

The VTKM_EXEC_CONT_EXPORT macro was missing from the
GetNumberOfComponents method in the VecTraits class for base C types.

See merge request !430
2016-05-29 20:48:26 -04:00
Kenneth Moreland
bcc5987858 Add missing export macro to VecTraits.
The VTKM_EXEC_CONT_EXPORT macro was missing from the
GetNumberOfComponents method in the VecTraits class for base C types.
2016-05-29 10:22:30 -06:00
Robert Maynard
f1146f7474 Merge topic 'simplify_bounds_computation'
06a06b52 Simplify the bounds computation code to reduce library size.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !426
2016-05-26 15:51:21 -04:00
Robert Maynard
5c7adbd208 Merge topic 'add_policies_to_convert_to_certain_cell_types'
5e200528 Allow filters to have finer control on what cell sets they support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !428
2016-05-26 15:49:14 -04:00
Robert Maynard
0908a91fc9 Merge topic 'support_explicit_instantiation'
6da2dc0c ArrayPortalFromIterators now can be explicitly instantiated.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !427
2016-05-26 14:28:26 -04:00
Robert Maynard
06a06b529d Simplify the bounds computation code to reduce library size.
The previous version of the bounds code required once less pass across
the data, but significantly increase the size of the resulting library:

Data for VTK-VTK-m interop:
  - 7k more symbol table entries
  - 1.5MB larger library

Because of the significant savings we need to use a less efficient
implementation that minimized the code size.
2016-05-26 13:48:30 -04:00
Robert Maynard
5e200528ee Allow filters to have finer control on what cell sets they support
Certain algorithms like VertexClustering only work on certain cellset types.
It is pointless to generate the code paths for structured data cell sets,
when the algorithm can't operate on those dataset types.
2016-05-26 11:32:35 -04:00
Kenneth Moreland
4d3af52a8c Merge branch 'mac-gl' into 'master'
Support OpenGL on Mac OSX

More fixes I needed to compile the OpenGL rendering examples on my OS X system.

See merge request !425
2016-05-26 09:41:25 -04:00
Robert Maynard
6da2dc0cda ArrayPortalFromIterators now can be explicitly instantiated.
Template instantiation is useful because when you are creating object files, as
uninstantiated template definitions are not are not added. Fully supporting
explicit instantiation like ITK does will require more code changes, but
this is a very minor step towards that goal.
2016-05-26 08:23:27 -04:00
Kenneth Moreland
32efc36c1c Update Rendering example to latest rendering module changes 2016-05-25 15:34:57 -06:00
Kenneth Moreland
db6d61cadb Modify build to handle non-X-based OpenGL
Specifically, I am trying to compile the code on OSX. OSX uses OpenGL
libraries in a different directory than most other installs (including
X11) and does not generally support GLX. These changes remove the files
that support GLX in systems that do not support it.

I also added several header files to the CMake lists that were not there
but should have been.
2016-05-25 15:34:14 -06:00
Kenneth Moreland
c028329222 Merge branch 'rendering-warnings-style' into 'master'
Fix warnings and style in rendering module

Fix some coding style issues and a few warnings in the rendering code.

See merge request !424
2016-05-25 16:31:00 -04:00
Robert Maynard
a3d27a644c Merge topic 'rename_topology_tag'
8dfe8cd3 Rename ControlSignature tag TopologyIn to CellSetIn.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !416
2016-05-25 14:08:09 -04:00
Kenneth Moreland
fcbfacb4f0 Better conform Plot.h to VTK-m style
Principally, the indentation style was changed to 2 spaces and the
member variables of classes were changed to start with a capitol.
2016-05-24 14:54:20 -06:00
Kenneth Moreland
3456fc1455 Better conform Scene.h to VTK-m style
Principally, the indentation style was changed to 2 spaces and the
member variables of classes were changed to start with a capitol.
2016-05-24 14:46:12 -06:00
Kenneth Moreland
73a617db59 Fix warning about member init order and conform to style in Window.h
Made several changes to Window.h that fix the following:

* Fix warning about the member functions being initialized out of order
* Conform indentation to be 2 spaces
* Conform member functions to be capitolized
* Conform the use of "this->" when referencing class members
* Conform using full namespace when using classes
* Be more descriptive in some variable names
* Alphabetize includes
2016-05-24 14:36:25 -06:00
Jeremy Meredith
0dab70990b adding mention of SIL Open Font License. 2016-05-24 11:45:23 -04:00
Jeremy Meredith
b158ac2c11 removing debug code 2016-05-23 14:02:11 -04:00
Jeremy Meredith
dbdd670ba8 adding billboard text support and cleaning up. 2016-05-23 13:52:47 -04:00
Jeremy Meredith
dddc74904b bugfix to font texturing issue.
also, warning fixes and removing debugging statements.
2016-05-23 10:56:52 -04:00
Jeremy Meredith
230650c02b text annotations almost working, pending one texture bug fix 2016-05-20 17:57:56 -04:00
Jeremy Meredith
854cbf5c7f text annotaion infrastructure added and working. 2016-05-20 17:25:50 -04:00
Jeremy Meredith
defab5cda9 Merge branch 'annot5' into 'master'
Annot5

Refactor Window2D and Window3D code.
Remove a bunch of compiler warnings.

See merge request !421
2016-05-20 12:53:16 -04:00
Dave Pugmire
dc31494b59 Merge branch 'master' into annot5 2016-05-20 10:04:37 -04:00
Dave Pugmire
704f2fe73e Merge branch 'rendering-warnings-style' into 'master'
Compiler warnings and C++ coding style of rendering package

This branch fixes several compiler warnings I encountered with the new
rendering package. It also fixes some cases where the code broke the
VTK-m coding style.

See merge request !422
2016-05-20 07:52:51 -04:00
Kenneth Moreland
1736a117ba Fix warnings about out of order member initialization
There are a lot of VTK-m coding style issues I would also like to clean
up (such as variable names and using "this->" before member variables),
but it is late and I want to go home.
2016-05-19 17:27:16 -06:00
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