Commit Graph

332 Commits

Author SHA1 Message Date
Matt Larsen
ac78433085 Merge remote-tracking branch 'upstream/master' into x_ray_add_emmission 2017-08-15 07:27:17 -07:00
Matt Larsen
7ca8d1bd3a Merge topic 'mapper_fixes'
df185a67 removing background colors from tracers. Background color is now the responsiblitiy of the canvas.
28b1e6b1 initializing ray color buffer to 0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !881
2017-08-12 22:29:12 -04:00
Matt Larsen
df185a67aa removing background colors from tracers. Background color is now the responsiblitiy of the canvas. 2017-08-12 17:22:47 -07:00
Matt Larsen
28b1e6b13b initializing ray color buffer to 0 2017-08-12 15:42:26 -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
35877cd923 Adding missing file 2017-08-05 19:14:31 -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
6b53a01c03 Removing print. 2017-08-02 12:35:30 -04:00
James
1eb585121c Adding ability to modify axis color as well as legend label color. 2017-08-02 12:32:19 -04:00
Matt Larsen
8e5f309e5e adding support in rendering triangulator for cell set permutation 2017-08-02 08:46:33 -07:00
Matt Larsen
521e445b62 emission now functioning 2017-08-02 08:27:06 -07:00
Matt Larsen
92fde35bb4 fixing depth 2017-08-01 10:06:37 -07:00
Matt Larsen
52959d910d testing emission 2017-07-31 07:17:43 -07: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
James
7674d2cc26 Adding color to mesa test. 2017-07-28 16:08:14 -04:00
James
686f982333 Updating rendering unit tests for 1D plots. 2017-07-28 16:01:06 -04:00
James
3b79e4d7c4 Updating way 1D test plots are made, adding title. 2017-07-28 15:45:36 -04:00
James
6106e24026 Fix CMake line. 2017-07-28 13:48:48 -04:00
James
c7ef96601b Commenting in rendering CMakeLists. 2017-07-28 13:40:39 -04:00
James
6b59b01e14 Adding color lines, view annotations, line color labels. 2017-07-28 13:31:19 -04:00
Dave Pugmire
90d0e0e966 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2017-07-28 10:08:58 -04:00
Dave Pugmire
3759887aed Merge branch 'master' of gitlab.kitware.com:dpugmire/vtk-m 2017-07-28 10:07:37 -04:00
Manish Mathai
dd4efb511f Uses Color in the unit tests for basic sanity check
This commits acts as a basic sanity check for `Color` class and to
ensure the symbol visility fix.
2017-07-27 14:10:34 -07:00
Kenneth Moreland
dd2fec58e0 Fix conversion warning in GLFW unit test 2017-07-25 12:43:31 -06:00
Manish Mathai
812f11d362 Moves class-wide visibility macro to just the static class members.
`Color` class uses `VTKM_EXEC`* visibility macros on some member functions
and  VC++ raises an error if that is mixed with the class wide visibility
macro. This commit adds the macro to each individual static member instead.
2017-07-24 14:51:46 -07:00
Manish Mathai
68648863bc Exports Color class, adding visibility to static members
Color class contains predefined colors as static members and needs to be
exported for them to be accessible outside the library.
2017-07-24 11:59:19 -07:00
Matt Larsen
5fc8051712 initial version on absorption and emission integration 2017-07-20 07:30:42 -07:00
James
58deb3eb42 Fixing View1d and View2d x scaling. 2017-07-17 09:58:15 -04:00
Matt Larsen
c9ce558497 Merge topic 'fix_for_rt_lib'
adced368 Adding private targert link library to fix undefined symbols in ubuntu

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !830
2017-07-10 10:36:19 -04:00
Matt Larsen
adced36814 Adding private targert link library to fix undefined symbols in ubuntu 2017-07-10 07:34:51 -07:00
Matt Larsen
e783487f98 Adding ArrayHandleCast header 2017-07-08 14:03:33 -07:00
Matt Larsen
a2b3f80356 Cleaning up rendering headers and moving structured volume renderer into cxx file 2017-07-08 13:48:38 -07:00
David C. Lonie
fb2d36be1e Refactor VecRectilinearPointCoordinates.
See #163.
2017-07-07 13:49:35 -04:00
Mark Kim
8c5129fa68 Saving pnms with VS2015 converts LF into CRLF unless the file is opened as binary. 2017-07-06 18:56:16 -04:00
Matt Larsen
33ebf0aaa1 simpler method of scaling epsilon based on primitive AABB 2017-07-04 16:43:31 -07:00