Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e7505795
Commit
e7505795
authored
May 29, 2013
by
ozantonkal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix linux compilation errors
parent
0e7d4a57
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
common.h
modules/viz/src/q/common.h
+1
-1
viz3d_impl.cpp
modules/viz/src/viz3d_impl.cpp
+6
-6
No files found.
modules/viz/src/q/common.h
View file @
e7505795
...
...
@@ -108,7 +108,7 @@ namespace temp_viz
* the projection matrix * the view matrix. However, additional
* matrices like a camera disortion matrix can also be added.
*/
void
cvtWindowCoordinates
(
const
Point3f
&
pt
,
Matx44d
&
composite_mat
,
Vec4d
&
window_cord
)
const
void
cvtWindowCoordinates
(
const
Point3f
&
pt
,
const
Matx44d
&
composite_mat
,
Vec4d
&
window_cord
)
const
{
Vec4d
pte
(
pt
.
x
,
pt
.
y
,
pt
.
z
,
1
);
window_cord
=
composite_mat
*
pte
;
...
...
modules/viz/src/viz3d_impl.cpp
View file @
e7505795
...
...
@@ -409,7 +409,7 @@ bool temp_viz::Viz3d::VizImpl::addLine (const cv::Point3f &pt1, const cv::Point3
inline
bool
temp_viz
::
Viz3d
::
VizImpl
::
addPolygonMesh
(
const
Mesh3d
&
mesh
,
const
Mat
&
mask
,
const
std
::
string
&
id
)
bool
temp_viz
::
Viz3d
::
VizImpl
::
addPolygonMesh
(
const
Mesh3d
&
mesh
,
const
Mat
&
mask
,
const
std
::
string
&
id
)
{
CV_Assert
(
mesh
.
cloud
.
type
()
==
CV_32FC3
&&
mesh
.
cloud
.
rows
==
1
&&
!
mesh
.
polygons
.
empty
());
CV_Assert
(
mesh
.
colors
.
empty
()
||
(
!
mesh
.
colors
.
empty
()
&&
mesh
.
colors
.
size
()
==
mesh
.
cloud
.
size
()
&&
mesh
.
colors
.
type
()
==
CV_8UC3
));
...
...
@@ -596,7 +596,7 @@ inline bool temp_viz::Viz3d::VizImpl::addPolygonMesh (const Mesh3d& mesh, const
}
inline
bool
temp_viz
::
Viz3d
::
VizImpl
::
updatePolygonMesh
(
const
Mesh3d
&
mesh
,
const
cv
::
Mat
&
mask
,
const
std
::
string
&
id
)
bool
temp_viz
::
Viz3d
::
VizImpl
::
updatePolygonMesh
(
const
Mesh3d
&
mesh
,
const
cv
::
Mat
&
mask
,
const
std
::
string
&
id
)
{
CV_Assert
(
mesh
.
cloud
.
type
()
==
CV_32FC3
&&
mesh
.
cloud
.
rows
==
1
&&
!
mesh
.
polygons
.
empty
());
CV_Assert
(
mesh
.
colors
.
empty
()
||
(
!
mesh
.
colors
.
empty
()
&&
mesh
.
colors
.
size
()
==
mesh
.
cloud
.
size
()
&&
mesh
.
colors
.
type
()
==
CV_8UC3
));
...
...
@@ -776,7 +776,7 @@ bool temp_viz::Viz3d::VizImpl::addArrow (const cv::Point3f &p1, const cv::Point3
#include <vtkSphereSource.h>
////////////////////////////////////////////////////////////////////////////////////////////
inline
bool
temp_viz
::
Viz3d
::
VizImpl
::
addSphere
(
const
cv
::
Point3f
&
center
,
float
radius
,
const
Color
&
color
,
const
std
::
string
&
id
)
bool
temp_viz
::
Viz3d
::
VizImpl
::
addSphere
(
const
cv
::
Point3f
&
center
,
float
radius
,
const
Color
&
color
,
const
std
::
string
&
id
)
{
// Check to see if this ID entry already exists (has it been already added to the visualizer?)
ShapeActorMap
::
iterator
am_it
=
shape_actor_map_
->
find
(
id
);
...
...
@@ -817,7 +817,7 @@ inline bool temp_viz::Viz3d::VizImpl::addSphere (const cv::Point3f& center, floa
}
////////////////////////////////////////////////////////////////////////////////////////////
inline
bool
temp_viz
::
Viz3d
::
VizImpl
::
updateSphere
(
const
cv
::
Point3f
&
center
,
float
radius
,
const
Color
&
color
,
const
std
::
string
&
id
)
bool
temp_viz
::
Viz3d
::
VizImpl
::
updateSphere
(
const
cv
::
Point3f
&
center
,
float
radius
,
const
Color
&
color
,
const
std
::
string
&
id
)
{
// Check to see if this ID entry already exists (has it been already added to the visualizer?)
ShapeActorMap
::
iterator
am_it
=
shape_actor_map_
->
find
(
id
);
...
...
@@ -841,7 +841,7 @@ inline bool temp_viz::Viz3d::VizImpl::updateSphere (const cv::Point3f ¢er, f
}
//////////////////////////////////////////////////
inline
bool
temp_viz
::
Viz3d
::
VizImpl
::
addText3D
(
const
std
::
string
&
text
,
const
cv
::
Point3f
&
position
,
const
Color
&
color
,
double
textScale
,
const
std
::
string
&
id
)
bool
temp_viz
::
Viz3d
::
VizImpl
::
addText3D
(
const
std
::
string
&
text
,
const
cv
::
Point3f
&
position
,
const
Color
&
color
,
double
textScale
,
const
std
::
string
&
id
)
{
std
::
string
tid
;
if
(
id
.
empty
())
...
...
@@ -884,7 +884,7 @@ inline bool temp_viz::Viz3d::VizImpl::addText3D (const std::string &text, const
return
(
true
);
}
inline
bool
temp_viz
::
Viz3d
::
VizImpl
::
addPolygon
(
const
cv
::
Mat
&
cloud
,
const
Color
&
color
,
const
std
::
string
&
id
)
bool
temp_viz
::
Viz3d
::
VizImpl
::
addPolygon
(
const
cv
::
Mat
&
cloud
,
const
Color
&
color
,
const
std
::
string
&
id
)
{
CV_Assert
(
cloud
.
type
()
==
CV_32FC3
&&
cloud
.
rows
==
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment