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

2309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
T.J. Corona
9e9e32ace7 Merge topic 'field-coordsystem-invoke' 
927387b1 Add vtkm::cont::Field,CoordinateSystem as Invokable parameters.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !494
 2016-08-03 17:24:13 -04:00
Robert Maynard
801eec76b5 Merge topic 'fix-vectorization-configs' 
746d6fc7 Fix configuration of vectorization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !495
 2016-08-03 17:09:49 -04:00
Samuel Li
0164d38e91 use a worklet to perform array extension 2016-08-03 16:34:02 -04:00
Sujin Philip
746d6fc7b2 Fix configuration of vectorization 
1. Re-enable vectorization setup in cmake
2. Set vectorization flags to empty when "none" is specified.
 2016-08-03 16:07:21 -04:00
T.J. Corona
927387b1a2 Add vtkm::cont::Field,CoordinateSystem as Invokable parameters. 
Originally, only array handles could be passed to the dispatcher.
This update extends the list to Field and CoordinateSystem as
dynamic objects.
 2016-08-03 15:46:30 -04:00
Robert Maynard
a6609311fa Silence auto_ptr deprecation warnings with older boosts ( < 1.61 ) 2016-08-03 15:38:38 -04:00
Robert Maynard
6d38f44d6c Update ListTag and DispatcherBase to leverage C++11 features. 2016-08-03 15:38:38 -04:00
Robert Maynard
ea0d84a810 Remove VTK-m Variadic defines and replace them with a single CXX11 define 2016-08-03 15:38:38 -04:00
Robert Maynard
77121d1871 Add support to VTK-m to build with C++11 2016-08-03 15:38:38 -04:00
Robert Maynard
5837864c52 Merge topic 'master' 
a9ccdf57 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m
447295e7 Switch from OSMesa to ray tracer for demo because OSMesa is not working atm.
df0e6457 Demo.cxx compiles, at least. But, the background isn't even correct.
293ba569 Demo.cxx has not been updated in a while (pre-ResultDataSet change).
e8b17eb9 OSMesa, not OSMESA.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !492
 2016-08-03 12:58:00 -04:00
Samuel Li
433f89ae12 add worklet to copy a portion of array 2016-08-03 11:34:04 -04:00
Dave Pugmire
a91e570f73 Merge branch 'glut-unittest' into 'glut-unittest' 
merge latest changes with fix

Merged latest clean-up changes with fix.

See merge request !2
 2016-08-03 10:52:03 -04:00
Mark Kim
5535751a17 Merge branch 'glut-unittest' of gitlab.kitware.com:dpugmire/vtk-m into glut-unittest 
Merge of Dave's clean-up with some of my fixes.
 2016-08-03 10:40:53 -04:00
Robert Maynard
2b011c621c Merge topic 'add-device-to-filter-policy' 
e177e5a9 Add device list to filter policy.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !491
 2016-08-03 10:34:47 -04:00
T.J. Corona
e177e5a9ff Add device list to filter policy. 2016-08-03 10:17:20 -04:00
Dave Pugmire
f5de22b919 Add VBO rendering for MapperGL 2016-08-03 09:45:41 -04:00
Mark Kim
a9ccdf579a Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2016-08-03 09:40:25 -04:00
Kenneth Moreland
dcb032fc00 Merge branch 'expose-storage' into 'master' 
Expose storage in ArrayHandle, and Expose data array in StorageBasic.



See merge request !487
 2016-08-03 08:51:12 -04:00
Robert Maynard
b50e18b374 Merge topic 'cellsetexplicit-addcell-indexable-type' 
62fa852e In CellSetExplicit::AddCell, change vtkm::Vec to template parameter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !490
 2016-08-03 08:21:49 -04:00
Samuel Li
b96d65550f extend1D returns ArrayHandlePermut 2016-08-02 23:41:46 -04:00
Mark Kim
447295e79b Switch from OSMesa to ray tracer for demo because OSMesa is not working atm. 2016-08-02 18:29:30 -04:00
Samuel Li
a4461e0e9e IDWT worklet uses WholeArrayOut now 2016-08-02 18:14:03 -04:00
Samuel Li
2114f557e6 another memcpy is avoided 2016-08-02 16:35:00 -04:00
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