Antonella Cascitelli
079ceea616
Added new functionalities to viz module
...
- load OBJ file
- set offscreen rendering
- set roll angle of the camera
- get Mat screenshot of the current scene
- remove all lights from the scene
- add a custom light in the scene
- modify the size of the WImage3D widget
- added ambient property for the widget
Changed Vec3d in cv::viz::Color
Renamed method getMatScreenshotin getScreenshot
Modified showWidget
Fixed on viz::Color and reverted fix on vtkProp3D
Removed cameraRoll method
Merged load mesh method (for ply and obj file)
Fixed doc
Fixed cv::viz::WImage3D::setSize for vtk5.8
Fixed enum for cv::viz::Mesh::load
2015-08-15 01:03:59 +02:00
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
1a5dfe421d
Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
2014-02-15 17:02:17 +04:00
Anatoly Baksheev
17fea0dd0a
fixed size_t/int conversion warnings
2014-02-10 15:45:45 +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
7410593d55
fixed warnigns and compiler errors for Ubuntu
2014-01-19 18:39:00 +04:00
Anatoly Baksheev
d7ca0bb757
merged background color with background gradient methods, updated tests to show description of scene
2014-01-19 18:38:59 +04:00
Anatoly Baksheev
8d327fa497
updated for compatibility with VTK6.0
2014-01-19 18:38:58 +04:00
Anatoly Baksheev
d7c30281a5
set background texture method
2014-01-19 18:38:57 +04:00
Anatoly Baksheev
e2ef558c8a
refactored WGrid
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
658f4a7d38
refactoed plane
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
53b8218652
addeed test for text 2d/3d
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
bb891f0570
added cone implementation
2014-01-19 18:38:56 +04:00
Anatoly Baksheev
08f50314cb
updated cylinder and cube
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
c0cc551228
refactored circle
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
dac27c9913
refactored arrow
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
1449823bcd
implemented showImage
2014-01-19 18:38:55 +04:00
Anatoly Baksheev
d90a068e0e
fixed bug with setImage
2014-01-19 18:38:54 +04:00
Anatoly Baksheev
e21f2a81ff
factored camera postions with image
2014-01-19 18:38:54 +04:00
Anatoly Baksheev
a23f1447a8
minor
2014-01-19 18:38:53 +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
462d516743
added test for camera positions, slightly refactored the widgets
2014-01-19 18:38:52 +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
0d702b83f4
updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts
2014-01-19 18:38:51 +04:00
Anatoly Baksheev
a3b1f29d23
refactored spheres trajectory
2014-01-19 18:38:51 +04:00
Anatoly Baksheev
38c9fa4a92
more refactoring
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
4833976a0c
refactored frustum trajectory to use glyphs
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
42dc90295d
refactored camera position - simplified frustum creation
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
45879fb9db
more refactoring
2014-01-19 18:38:50 +04:00
Anatoly Baksheev
a8556134ae
refactored simple trajectory to use TensorGlyph
2014-01-19 18:38:49 +04:00
Anatoly Baksheev
771d9509a8
polyline now uses scalars for color data (for reuse by other widgets)
2014-01-19 18:38:49 +04:00
Anatoly Baksheev
e94ee94be3
refactored WCoordinateSystem widget
2014-01-19 18:38:49 +04:00
Anatoly Baksheev
56819eaf19
switched completer API to doubles, updated docs
2014-01-19 18:38:48 +04:00
Anatoly Baksheev
406444037d
refactored polyline
2014-01-19 18:38:48 +04:00
Anatoly Baksheev
b100299644
code beatification
2014-01-19 18:38:48 +04:00
Anatoly Baksheev
e26b7e1e4f
ported some trajectories functionality to InputArray style
2014-01-19 18:38:47 +04:00
Anatoly Baksheev
b7cb3fe8e0
switched more to doubles
2014-01-19 18:38:47 +04:00
Anatoly Baksheev
186853a50f
mass switch from Affine3f to Affine3d
2014-01-19 18:38:45 +04:00
Anatoly Baksheev
f610c295f2
more tests
2014-01-19 18:38:44 +04:00
Anatoly Baksheev
80ab6e889f
refactoring
2014-01-19 18:38:42 +04:00
Anatoly Baksheev
cad2f98007
removed vizActor (since unnecessarily in new design concept with simplified widgets)
2014-01-19 18:38:41 +04:00
Anatoly Baksheev
45aeecb043
renaming
2014-01-19 18:38:41 +04:00