Roman Donchenko
|
40a740ff88
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
|
2014-03-17 14:14:07 +04:00 |
|
Anatoly Baksheev
|
fde0185a77
|
iteractor work
|
2014-03-06 03:26:21 +04:00 |
|
Anatoly Baksheev
|
fb7e74c511
|
iteractor work
|
2014-03-02 23:15:53 +04:00 |
|
Anatoly Baksheev
|
5dc17f5d58
|
Fixed all OpenGL issues for Macos (via objective-C++ layer)
|
2014-02-10 15:45:46 +04:00 |
|
Anatoly Baksheev
|
17fea0dd0a
|
fixed size_t/int conversion warnings
|
2014-02-10 15:45:45 +04:00 |
|
Anatoly Baksheev
|
eb8728d727
|
Updated cloud io functionality - removed dependency from VTK legacy
|
2014-02-10 15:45:44 +04:00 |
|
Anatoly Baksheev
|
02ebc4368c
|
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
|
2014-01-20 22:51:33 +04:00 |
|
Anatoly Baksheev
|
4e18007066
|
fixed white spaces
|
2014-01-19 18:39:01 +04:00 |
|
Anatoly Baksheev
|
7410593d55
|
fixed warnigns and compiler errors for Ubuntu
|
2014-01-19 18:39:00 +04:00 |
|
Anatoly Baksheev
|
e472d45d99
|
updated mesh reading (texture support)
|
2014-01-19 18:38:58 +04:00 |
|
Anatoly Baksheev
|
625c35a9f9
|
added support of texture for mesh
|
2014-01-19 18:38:58 +04:00 |
|
Anatoly Baksheev
|
cad9a786c4
|
optimized Mat to vtkImageData conversion
|
2014-01-19 18:38:54 +04:00 |
|
Anatoly Baksheev
|
e3ff28dacc
|
refactored WImage3D
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
f37c31742a
|
created tests for images, created vtk/vtkImageMatSource, and switched all images to that class
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
25b417e8b2
|
added test for trajectories and fixed bug with float type
|
2014-01-19 18:38:51 +04:00 |
|
Anatoly Baksheev
|
a8556134ae
|
refactored simple trajectory to use TensorGlyph
|
2014-01-19 18:38:49 +04:00 |
|
Anatoly Baksheev
|
cd57c4e189
|
refactored CloudNormals and added test for it
|
2014-01-19 18:38:47 +04:00 |
|
Anatoly Baksheev
|
baee8c3aa5
|
refactored Mesh, added tests, added failing "twice spin()" test
|
2014-01-19 18:38:46 +04:00 |
|
Anatoly Baksheev
|
1615527426
|
switched source to InputArrays
|
2014-01-19 18:38:45 +04:00 |
|
Anatoly Baksheev
|
c1b41caa7c
|
added vtkCloudMatSink, reworked cloud IO functions, added normals support
|
2014-01-19 18:38:44 +04:00 |
|
Anatoly Baksheev
|
1c4cfd8eaf
|
normals support for CloudMatSource
|
2014-01-19 18:38:43 +04:00 |
|
Anatoly Baksheev
|
84d6fe397d
|
reading/writing clouds functionality
|
2014-01-19 18:38:42 +04:00 |
|
Anatoly Baksheev
|
7dbf6bc8df
|
rewrote cloud widget in vtk filters style
Conflicts:
modules/viz/src/clouds.cpp
|
2014-01-19 18:38:42 +04:00 |
|