Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
taglut
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jean-Marie Favreau
taglut
Commits
c8645e79
Commit
c8645e79
authored
12 years ago
by
Jean-Marie Favreau
Browse files
Options
Downloads
Patches
Plain Diff
Correct a bug
parent
82b2778a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/parameterization/cylinder/CylinderProjection.cpp
+3
-3
3 additions, 3 deletions
src/parameterization/cylinder/CylinderProjection.cpp
src/parameterization/cylinder/CylinderProjection.h
+1
-1
1 addition, 1 deletion
src/parameterization/cylinder/CylinderProjection.h
with
4 additions
and
4 deletions
src/parameterization/cylinder/CylinderProjection.cpp
+
3
−
3
View file @
c8645e79
...
...
@@ -140,13 +140,13 @@ bool CylinderProjection::compute2DLocation(VertexID vnew, VertexID vknown) {
// distance between the two projections plus the x coordinate of the known point gives the new x coordinate
const
double
x
=
mapping
[
vknown
].
get2DX
()
+
line
.
getCoords
(
cnew
)
-
line
.
getCoords
(
cknown
);
// projection of the known point in the base plane of the cylinder, and obtain the corresponding vector
const
Coord3D
pknown
=
plane
.
getOrthogonalProjection
(
cylinderProjection
[
vknown
])
-
center
;
const
Coord3D
pknown
=
plane
.
getOrthogonalProjection
(
cylinderProjection
[
vknown
]);
// projection of the new point in the base plane of the cylinder, and obtain the corresponding vector
const
Coord3D
pnew
=
plane
.
getOrthogonalProjection
(
cylinderProjection
[
vnew
])
-
center
;
const
Coord3D
pnew
=
plane
.
getOrthogonalProjection
(
cylinderProjection
[
vnew
]);
// the y coordinate corresponds to the one of y plus the angle difference in the base plane
const
bool
d
=
Coord3D
::
scalarProduct
(
axis
,
Coord3D
::
vectorialProduct
(
pnew
,
pknown
))
>
0
;
const
double
y
=
mapping
[
vknown
].
get2DY
()
+
Coord3D
::
angleVector
(
pnew
,
pknown
)
*
(
d
?
radius
:
-
radius
);
const
double
y
=
mapping
[
vknown
].
get2DY
()
+
Coord3D
::
angleVector
(
pnew
,
pknown
)
*
(
d
?
radius
:
(
-
radius
)
)
;
mapping
.
set2DCoords
(
vnew
,
x
,
y
);
mesh
.
point
(
vnew
).
setFlag
(
1
);
return
true
;
...
...
This diff is collapsed.
Click to expand it.
src/parameterization/cylinder/CylinderProjection.h
+
1
−
1
View file @
c8645e79
...
...
@@ -85,7 +85,7 @@ public:
/**
Compute 2D location
*/
void
compute2DLocation
(
const
Taglut
::
IndentManager
&
indentManager
,
bool
adjustMeanDistance
=
tru
e
);
void
compute2DLocation
(
const
Taglut
::
IndentManager
&
indentManager
,
bool
adjustMeanDistance
=
fals
e
);
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment