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
mclarsen
cca9b3dea9
merged volume renderers
2016-05-18 10:25:05 -07: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
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
Jeremy Meredith
9f7525ae03
removing header files
2016-05-13 14:24:06 -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
Dave Pugmire
72673ed952
Add glut-based rendering example.
...
Added a GL-based render surface.
2016-05-05 13:26:39 -04:00
Jeremy Meredith
7603b638d9
adding 3d axes
2016-04-19 17:04:00 -04:00
Dave Pugmire
a28c22e031
remove some unused code.
2016-04-19 09:42:12 -04:00
Dave Pugmire
e409255c61
Merge branch 'annot2' of gitlab.kitware.com:jsmeredith/vtk-m into annot2
2016-04-19 09:16:10 -04:00
Dave Pugmire
1af37d0102
Support for 2D rendering. And some general clean up.
2016-04-18 16:42:59 -04:00
Jeremy Meredith
4593ceb408
adding world annotation capability and 3d bounding box.
2016-04-15 15:24:23 -04:00
Jeremy Meredith
1cd0cde51f
fixing minor compiler warnings
2016-04-15 12:50:25 -04:00
Dave Pugmire
d40f1b8bf9
Add support for 2D structured cells.
2016-04-14 17:04:58 -04:00
Dave Pugmire
ad0a290051
compile warning.
2016-04-14 17:04:20 -04:00
Dave Pugmire
fa981fde72
indent.
2016-04-14 16:49:34 -04:00
Dave Pugmire
965e36b10f
fix compile warning.
2016-04-14 16:48:57 -04:00
Dave Pugmire
62ab59db25
Separate the renderers.
...
Fix a bug with depth not turned on.
2016-04-13 15:31:13 -04:00
Jeremy Meredith
449f8ceadb
fixing compile error and untabifying
2016-04-13 15:10:34 -04:00
Matt Larsen
80b011542e
removing unused file
2016-04-11 12:12:44 -07:00
Robert Maynard
27f23480b3
Correct more warnings and formatting issues with vtkm::rendering.
2016-04-07 20:07:22 -04:00
Robert Maynard
daf419feb7
Correct unused and casting warnings in Scene.h
2016-04-07 20:07:22 -04:00
Robert Maynard
12ffd536fd
Suppress false positive warnings from nvcc about host/device.
2016-04-01 15:50:52 -04:00
Robert Maynard
7543bfe159
Fixed warning about unused variables in RenderSurface.
2016-04-01 15:50:52 -04:00
Robert Maynard
af2ae8e6e2
Correct issue in matrix mult in View.
2016-03-30 11:35:01 -04:00
Robert Maynard
660ee99752
vtkm::rendering::Triangluator now support CellSetSingleType of triangles.
2016-03-30 10:14:21 -04:00
Robert Maynard
76b6179abf
Add missing copyright headers.
2016-03-28 11:16:35 -04:00
Dave Pugmire
d7c295f46e
added rectilinear to test.
2016-03-28 08:51:36 -04:00
Dave Pugmire
a8c7f92d58
Move mesa package to right place.
...
Also, add in code for rectlinear mesh.
2016-03-28 08:51:36 -04:00
Dave Pugmire
294b73e00e
Make the rendering part of the build optional.
...
Add the mesa libs to the link line.
2016-03-28 08:51:36 -04:00
Dave Pugmire
719b715b59
Support for explicit cell sets.
2016-03-28 08:51:36 -04:00
Matt Larsen
9883773557
Corrected error in projection matrix that was causing mismatches with ray tracing image and depth buffers.
2016-03-28 08:51:36 -04:00
Dave Pugmire
f9c6f9cde7
cleanup of code.
2016-03-28 08:51:36 -04:00
mclarsen
693b98b92a
Merging
2016-03-28 08:51:36 -04:00
mclarsen
39cffd7baa
Triangulator fix
2016-03-28 08:51:36 -04:00
Dave Pugmire
aa90c06c09
Allow the renderSurface to get passed to the Plot::Render()
2016-03-28 08:51:36 -04:00
Dave Pugmire
b36091f7f4
Clean up the rendersurface code.
2016-03-28 08:51:35 -04:00
Dave Pugmire
f84401243a
Initial checkin for rendering infrastructure.
...
This largely follows things from EAVL. This is going to change going forward.
Most of the stuff is inside Window.h right now for convenience.
2016-03-28 08:51:35 -04:00
mclarsen
03a95c44b1
adding rendering from other branch
2016-03-28 08:50:04 -04:00
