Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,286 Commits 8 Branches 22 Tags 30 MiB
f293c5a0bc
Commit Graph

2286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Kim
df0e64572a Demo.cxx compiles, at least. But, the background isn't even correct. 2016-08-02 16:27:55 -04:00
Mark Kim
54b463c363 Don't need glBindAttributeLocation if layout(attribute) is given in shader. 2016-08-02 16:23:41 -04:00
Mark Kim
e966eb6b94 Merge branch 'glut-unittest' of https://gitlab.kitware.com/dpugmire/vtk-m into glut-unittest 2016-08-02 16:23:32 -04:00
Mark Kim
4928a4706d Row vs Column order for the view and projection matrix. 
Rudimentary error checking on shader compilation.
layout location swapped for vertex_position and vertex_color.
 2016-08-02 16:16:32 -04:00
Samuel Li
b8c09693a3 saves another memcpy operation 2016-08-02 16:09:29 -04:00
Dave Pugmire
6c5834ed94 fix mtx copy 2016-08-02 15:32:39 -04:00
Samuel Li
fc609eddd2 fix IDWT worklet... An error was introduced in previous commit 2016-08-02 15:06:20 -04:00
Dave Pugmire
35411b140f debugging mappergl 2016-08-02 14:59:44 -04:00
Samuel Li
1f2f88430c small fix on idwt worklet 2016-08-02 14:50:54 -04:00
T.J. Corona
3461f5c940 Merge topic 'division-op-for-vec' 
3463db3b Add division operator for Vec/scalar operations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brent Lessley <blessley@cs.uoregon.edu>
Merge-request: !489
 2016-08-02 14:44:43 -04:00
T.J. Corona
62fa852e12 In CellSetExplicit::AddCell, change vtkm::Vec to template parameter. 
This commit is in reference to Issue #40.
 2016-08-02 14:40:59 -04:00
T.J. Corona
ce1eeca93b Merge topic 'copyright-check' 
4f49a840 Update VTKmCheckCopyright.cmake to ignore build files.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !486
 2016-08-02 14:27:43 -04:00
T.J. Corona
e07e4aeda7 Merge topic 'expose-cellarray-api' 
8ad8eeda In DynamicCellSet, expose CellSet API.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !488
 2016-08-02 14:25:15 -04:00
T.J. Corona
3463db3b28 Add division operator for Vec/scalar operations. 2016-08-02 14:21:19 -04:00
Samuel Li
d88bdff94c DWT worklet uses WholeArrayOut to avoid a memory copy 2016-08-02 14:09:34 -04:00
T.J. Corona
2ade3ba8d8 Expose storage in ArrayHandle, and Expose data array in StorageBasic. 2016-08-02 14:05:05 -04:00
T.J. Corona
4f49a8407b Update VTKmCheckCopyright.cmake to ignore build files. 2016-08-02 13:50:33 -04:00
Dave Pugmire
469af887e8 Merge branch 'glut-unittest' of gitlab.kitware.com:dpugmire/vtk-m into glut-unittest 2016-08-02 13:44:20 -04:00
Robert Maynard
f527b8a0b2 Merge topic 'collapse-exec-cont-portals' 
2e33f883 Collapse exec and cont portals into one class.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !485
 2016-08-02 13:42:57 -04:00
Dave Pugmire
7d5934ea22 use the matricies from the camera for the VBO rendering. 2016-08-02 13:42:47 -04:00
T.J. Corona
8ad8eeda77 In DynamicCellSet, expose CellSet API. 
Also changes GetCellSet() to CastToBase().
 2016-08-02 13:39:25 -04:00
Mark Kim
293ba569e7 Demo.cxx has not been updated in a while (pre-ResultDataSet change). 2016-08-02 13:22:02 -04:00
Mark Kim
e8b17eb947 OSMesa, not OSMESA. 2016-08-02 13:10:32 -04:00
Dave Pugmire
9b81cd9ed2 Remove compiler warning. 2016-08-02 13:01:36 -04:00
Dave Pugmire
9ee497edb9 Add GLUT unit test. 2016-08-02 13:01:36 -04:00
Dave Pugmire
17e2a836f0 Adding GLUT unit test for rendering. 2016-08-02 13:01:36 -04:00
Matt Larsen
9659f35509 my changes 2016-08-02 09:56:26 -07:00
T.J. Corona
2e33f8830f Collapse exec and cont portals into one class. 2016-08-02 11:26:29 -04:00
Kenneth Moreland
8f406cf460 Merge branch 'fix-infinite-recursion' into 'master' 
Fix an infinite recursion where the wrong overload was called

The intension was that if Camera::Zoom was called with a Float64, it
would call the Float32 version. However, I made a type where it called
itself. The latest version of XCode called me out on this infinite
recursion.

I think this is the equivalent of the compiler calling me a dumb-ass.

See merge request !483
 2016-07-31 18:09:41 -04:00
Kenneth Moreland
8863769ea7 Fix an infinite recursion where the wrong overload was called 
The intension was that if Camera::Zoom was called with a Float64, it
would call the Float32 version. However, I made a type where it called
itself. The latest version of XCode called me out on this infinite
recursion.

I think this is the equivalent of the compiler calling me a dumb-ass.
 2016-07-31 11:47:30 -06:00
Matt Larsen
d39ac17951 Merge topic 'fix/Triangulator' 
a4012c16 Rmoving throw from worklet that prevents rendering from compiling with CUDA

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Acked-by: Matt Larsen <mlarsen@cs.uoregon.edu>
Merge-request: !481
 2016-07-29 17:21:42 -04:00
Samuel Li
448e9be5a8 small tweaks, ready for pull request 2016-07-29 14:16:10 -07:00
Samuel Li
dd1ef8e47d include all objects in the cmake file 2016-07-29 13:19:28 -07:00
Samuel Li
3cc6385426 remove unnecessary files 2016-07-29 13:05:53 -07:00
Samuel Li
ec46fd58a0 fixed bugs, ready for Chris to review 2016-07-29 11:27:37 -07:00
Robert Maynard
1efbbdc19a Merge topic 'example_dispatcher_test_works_again' 
17966256 Cleanup the multiple dynamic array handle dispatch example.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !480
 2016-07-29 11:32:31 -04:00
Matt Larsen
a4012c1667 Rmoving throw from worklet that prevents rendering from compiling with CUDA 2016-07-29 07:50:14 -07:00
Robert Maynard
1796625616 Cleanup the multiple dynamic array handle dispatch example. 2016-07-29 09:48:13 -04:00
Samuel Li
ff620d0ab5 fixed a bug, identified another bug 2016-07-28 21:33:47 -07:00
Samuel Li
7f9fd0d66d finish all the statics 2016-07-28 21:07:05 -06:00
Samuel Li
fa1198bb85 summation algorithm function is ready 2016-07-28 19:12:57 -06:00
Samuel Li
1a7bae0335 with a hack on ArrayHandlePermutation.h, wavelet works on CUDA device as well 2016-07-28 17:55:38 -06:00
Samuel Li
60d2428100 finishing squash function 2016-07-28 16:40:37 -06:00
Samuel Li
951d9fce2c move device copy to a function of itself; other small changes 2016-07-28 14:55:10 -07:00
Robert Maynard
c739e02374 Merge topic 'vtkm_find_package_support_QUIET' 
063b349a Setup the examples to find vtkm components quietly.
e52f7628 VTKm config module now properly support the QUIET flag.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !479
 2016-07-28 16:35:44 -04:00
Robert Maynard
063a4248b3 Merge topic 'unify_contour' 
73440ccb vtkm::filter::MarchingCubes now uses vtkm::worklet
33d7ad8f Unify the contour MarchingCubes implementations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !476
 2016-07-28 11:45:38 -04:00
Robert Maynard
063b349a20 Setup the examples to find vtkm components quietly. 2016-07-28 10:47:43 -04:00
Robert Maynard
e52f7628a7 VTKm config module now properly support the QUIET flag. 
The QUIET flag will also be properly propagated to all modules
that VTKm finds.
 2016-07-28 10:46:59 -04:00
Robert Maynard
73440ccb4e vtkm::filter::MarchingCubes now uses vtkm::worklet 
Instead of having two separate implementations of MarchingCubes, we have
a single implementation in worklet, and filter uses that.

That does mean that the version in worklet has been updated to support
merging of duplicate point coordinates.
 2016-07-28 08:52:34 -04:00
Samuel Li
7dc59d80d7 trying to figure out how to use deviceAdapterAlgorithms 2016-07-27 16:23:26 -07:00