Commit Graph

90 Commits

Author SHA1 Message Date
Kenneth Moreland
74f93807d9 Add OpenGL library to renering tests when applicable
It is necessary for the OSMesa test, and will probably be needed for
tests in the future.
2016-06-06 09:55:38 -06:00
Kenneth Moreland
7673c739d1 Link rendering tests to OSMesa library, not include dir
There was an error in the CMakeLists.txt in the rendering tests where
the include directory was linked in instead of the OSMesa library.
It was a simple mistake of typing the wrong CMake variable.
2016-06-06 09:48:37 -06:00
Robert Maynard
c792dd505c Merge topic 'build_rendering_without_mesa'
1d379db4 Allow people to build rendering without mesa.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !438
2016-06-03 14:19:11 -04:00
Robert Maynard
1d379db417 Allow people to build rendering without mesa. 2016-06-03 10:20:25 -04:00
Kenneth Moreland
fa3e43fbaa Change vtkm::rendering::RenderSurface to Canvas
The word surface is more often used for something like a polygonal mesh,
so this name is quite confusing. Canvas is consistent with a
conventional name in GUI widget APIs.
2016-06-02 16:04:13 -06:00
Kenneth Moreland
eb9288cb1a Change vtkm::rendering::Window to View
The rendering classes do not actually manage windows, and window was not
descriptive of what this class was doing. We decided that the class was
mostly analogous to what we call a "view" in ParaView.
2016-06-02 15:43:40 -06:00
Kenneth Moreland
f4bf723cdf Change vtkm::rendering::Plot to Actor
This name was chosen to reflect the analogous name in VTK.
2016-06-02 13:49:49 -06:00
Kenneth Moreland
9fc86890eb Change vtkm::rendering::SceneRenderer* to Mapper*
This name was chosen to reflect the analogous name in VTK.
2016-06-02 13:41:14 -06:00
Kenneth Moreland
1934049df9 Change vtkm::rendering::View to Camera 2016-06-02 13:04:01 -06:00
Kenneth Moreland
a28432d737 Fix some compile warnings
These compile warnings include implicit conversion from signed to
unsigned, a shadowed variable, and an unused static function.
2016-06-01 15:16:13 -06:00
Kenneth Moreland
bc979013e0 Use VTK-m's OpenGLHeaders.h instead of GL/gl.h
Not all systems put their OpenGL headers in a directory named GL. (In
particular, OSX decides to be different.) The vtkm/rendering/internal/
OpenGLHeaders.h header takes care of including the OpenGL header on all
platforms.
2016-06-01 15:16:13 -06:00
Kenneth Moreland
7154ba2968 Add new rendering files to CMakeLists.txt
This is required for installing the files. It is also useful for
developers because it adds the files to IDEs and creates test builds for
the header files. Those test builds highlighted some missing includes.
2016-06-01 15:15:18 -06:00
Jeremy Meredith
6c8045bdc3 unifying 2d and 3d scenes 2016-06-01 13:51:37 -04:00
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
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
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
Dave Pugmire
dc31494b59 Merge branch 'master' into annot5 2016-05-20 10:04:37 -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
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