Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
OpenRoadEd
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
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
mobile_robotics
ADC
libraries
OpenRoadEd
Commits
72002496
Commit
72002496
authored
4 years ago
by
Sergi Hernandez
Browse files
Options
Downloads
Patches
Plain Diff
Solved the problem with the paramPoly3 heading.
parent
89090d26
No related branches found
No related tags found
1 merge request
!1
Param poly3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
OpenRoadEd/OpenDrive/RoadGeometry.cpp
+1
-26
1 addition, 26 deletions
OpenRoadEd/OpenDrive/RoadGeometry.cpp
OpenRoadEd/Osg/OSGRoad.cpp
+0
-1
0 additions, 1 deletion
OpenRoadEd/Osg/OSGRoad.cpp
with
1 addition
and
27 deletions
OpenRoadEd/OpenDrive/RoadGeometry.cpp
+
1
−
26
View file @
72002496
#include
"RoadGeometry.h"
#define _USE_MATH_DEFINES
#include
<math.h>
#include
<iostream>
//#define PI 3.14159265358979323846264338327950288
extern
int
fresnl
(
double
,
double
*
,
double
*
);
...
...
@@ -595,36 +594,12 @@ void GeometryParamPoly3::GetCoords(double s_check, double &retX, double &retY, d
{
double
param
=
s_check
/
mLength
;
double
diff_sX
,
diff_sY
;
double
s1X
,
s1Y
,
s2X
,
s2Y
;
GetCoords
(
s_check
,
retX
,
retY
);
diff_sX
=
mBu
+
2.0
*
mCu
*
param
+
3
*
mDu
*
pow
(
param
,
2.0
);
diff_sY
=
mBv
+
2.0
*
mCv
*
param
+
3
*
mDv
*
pow
(
param
,
2.0
);
if
(
s_check
==
0
)
{
s1X
=
mAu
;
s1Y
=
mAv
;
s2X
=
mAu
+
mBu
*
(
param
+
0.02
)
+
mCu
*
pow
(
param
+
0.02
,
2.0
)
+
mDu
*
pow
(
param
+
0.02
,
3.0
);
s2Y
=
mAv
+
mBv
*
(
param
+
0.02
)
+
mCv
*
pow
(
param
+
0.02
,
2.0
)
+
mDv
*
pow
(
param
+
0.02
,
3.0
);
}
else
if
(
s_check
==
mLength
)
{
s1X
=
mAu
+
mBu
*
(
param
-
0.02
)
+
mCu
*
pow
(
param
-
0.02
,
2.0
)
+
mDu
*
pow
(
param
-
0.02
,
3.0
);
s1Y
=
mAv
+
mBv
*
(
param
-
0.02
)
+
mCv
*
pow
(
param
-
0.02
,
2.0
)
+
mDv
*
pow
(
param
-
0.02
,
3.0
);
s2X
=
mAu
+
mBu
*
param
+
mCu
*
pow
(
param
,
2.0
)
+
mDu
*
pow
(
param
,
3.0
);
s2Y
=
mAv
+
mBv
*
param
+
mCv
*
pow
(
param
,
2.0
)
+
mDv
*
pow
(
param
,
3.0
);
}
else
{
s1X
=
mAu
+
mBu
*
(
param
-
0.01
)
+
mCu
*
pow
(
param
-
0.01
,
2.0
)
+
mDu
*
pow
(
param
-
0.01
,
3.0
);
s1Y
=
mAv
+
mBv
*
(
param
-
0.01
)
+
mCv
*
pow
(
param
-
0.01
,
2.0
)
+
mDv
*
pow
(
param
-
0.01
,
3.0
);
s2X
=
mAu
+
mBu
*
(
param
+
0.01
)
+
mCu
*
pow
(
param
+
0.01
,
2.0
)
+
mDu
*
pow
(
param
+
0.01
,
3.0
);
s2Y
=
mAv
+
mBv
*
(
param
+
0.01
)
+
mCv
*
pow
(
param
+
0.01
,
2.0
)
+
mDv
*
pow
(
param
+
0.01
,
3.0
);
}
retHDG
=
mHdg
+
(
s2Y
-
s1Y
)
/
(
s2X
-
s1X
);
std
::
cout
<<
"param: "
<<
param
<<
" heading: "
<<
retHDG
<<
std
::
endl
;
retHDG
=
mHdg
+
atan2
(
diff_sY
,
diff_sX
);
}
...
...
This diff is collapsed.
Click to expand it.
OpenRoadEd/Osg/OSGRoad.cpp
+
0
−
1
View file @
72002496
...
...
@@ -334,7 +334,6 @@ void OSGRoad::CreateRoadGeometry (vector<osg::ref_ptr<osg::Geometry>> &geometrie
short
int
alphaDepthState
)
{
std
::
cout
<<
"road ID: "
<<
road
->
GetRoadId
()
<<
std
::
endl
;
//================================================================
//Check if everything needed for the road generation exists
//================================================================
...
...
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