Skip to content

Fix wed_add_edges #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IlyassBa wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Fix wed_add_edges #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
53b59fa
add function bodies for soft edge creation
meikelm Jul 21, 2022
6ee64ce
initial core functionality of soft edge creation
meikelm Jul 29, 2022
356766f
Special casing: bezier2 is special cased to provide correct semantics…
Jun 13, 2025
408aeb5
basic prototype of code to add edges to airport pavement.
Jun 16, 2025
9879b6f
algo revision two. We track the ownership of end-points too and check
Jun 16, 2025
04d91ac
This implements Petr's draft pavement FX schema.
Jun 17, 2025
dd7a88d
bug fix: removed double for loop that was making eleventy billion
Jun 18, 2025
5b951d3
added contour joining to edging to get better corners
Jun 18, 2025
d58a081
changed schema for Petr to include cracked polygons
Jun 20, 2025
05fbc6c
Skip edge generation when there's an implicit .lin feature on the
Jun 20, 2025
025af19
WED_ADD_EDGES is now building
IlyassBa Dec 28, 2025
86d5061
Delete the return for rng if create is nullptr because it was alread…
IlyassBa Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 66 additions & 6 deletions src/Utils/CompGeomDefs2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,16 @@ struct Bezier2 {
bool intersect(const Bezier2& rhs, int d, Point2& p) const; // True if curves intersect except at end-points , provides crossing point
bool is_near(const Point2& p, double distance) const;

// By convention, we represent a zero-control point bezier by making c1 and c2 colocate (bit-wise) with p1 and p2. This isn't great; a better design would
// have been to have a variable number of control points, at which point lines are simply zero-control point beziers and everythign Just Works(tm).
// But since the entire scenery ecosystem is based on cubics, we use "degenerate" control points as a hack because we can bit-wise determine that this really
// is a line segment.
//
// A more mathematically correct solution of having c1 and c2 be colinear with p1->p2 would have the benefit of just working always, but we can't detect the
// special case due to colinear tests being imprecise for non-purely-vertical/horizontal lines.
//
// Instead, we check for this case, and special case it basically eveywhere. This is a little icky but it gives us some nice properties: the subdivision of
// a linear bezier is another linear bezier (no information lost), parametric intersections are exact, etc.
bool is_segment(void) const { return p1 == c1 && p2 == c2; }
Segment2 as_segment(void) const { return Segment2(p1,p2); }

Expand Down Expand Up @@ -1213,6 +1223,11 @@ inline Bezier2::Bezier2(const Point2& ip1, const Point2& ic, const Point2& ip2)

inline Point2 Bezier2::midpoint(double t) const
{
// If we are a segment, use line-segment interpolation; otherwise
// fractional T's aren't linearly spaced, which is probably NOT what we want.
if(is_segment())
return as_segment().midpoint(t);

// A bezier curve is just a cubic interpolation
// between four points weighted via a cub equation,
// hence A(1-t)^3 + 3B(1-t)^2t + 3C(1-t)t^2 + Dt^3
Expand All @@ -1228,6 +1243,11 @@ inline Point2 Bezier2::midpoint(double t) const

inline Vector2 Bezier2::derivative(double t) const
{
// If we are segment, our derivative over T is constant and is just a vector from p1 to p2
// (since we get the ein 1.0 T's)
if(is_segment())
return Vector2(p1,p2);

// Derivative taking by putting the formula in Ax^3+Bx^2+Cx+D form and taking 1st derivative.
if(t == 0.0)
return Vector2(-3.0 * p1.x_ + 3.0 * c1.x_,
Expand Down Expand Up @@ -1277,16 +1297,37 @@ inline void Bezier2::partition(Bezier2& lhs, Bezier2& rhs, double t) const
rhs.p2 = p2;

Point2 m = Segment2(c1,c2).midpoint(t);

lhs.c1 = Segment2(p1,c1).midpoint(t);
rhs.c2 = Segment2(c2,p2).midpoint(t);
lhs.c2 = Segment2(lhs.c1,m).midpoint(t);
rhs.c1 = Segment2(m,rhs.c2).midpoint(t);
lhs.p2 = rhs.p1 = Segment2(lhs.c2,rhs.c1).midpoint(t);

if(is_segment())
{
// Special case for segment: keep the control points attached to p1/m/p2 so that
// our subsegments...are also segments.
lhs.c1 = p1;
lhs.c2 = lhs.p2 = m;
rhs.c1 = rhs.p1 = m;
rhs.c2 = p2;
}
else
{
lhs.c1 = Segment2(p1,c1).midpoint(t);
rhs.c2 = Segment2(c2,p2).midpoint(t);
lhs.c2 = Segment2(lhs.c1,m).midpoint(t);
rhs.c1 = Segment2(m,rhs.c2).midpoint(t);
lhs.p2 = rhs.p1 = Segment2(lhs.c2,rhs.c1).midpoint(t);
}
}

inline void Bezier2::partition(Bezier2& lhs, Bezier2& rhs) const
{
if(is_segment())
{
// Special case for segment: keep the control points attached to p1/m/p2 so that
// our subsegments...are also segments.
lhs.p1 = lhs.c1 = p1;
lhs.p2 = lhs.c2 = rhs.p1 = rhs.c1 = Segment2(p1,p2).midpoint();
rhs.p2 = rhs.c2 = p2;
return;
}
// specialization for t=0.5 - uses faster midpoint() implementation
lhs.p1 = p1;
rhs.p2 = p2;
Expand Down Expand Up @@ -1330,6 +1371,8 @@ inline void Bezier2::bounds_fast(Bbox2& bounds) const

inline int Bezier2::x_monotone(void) const
{
if(is_segment())
return 1;
// The weighting of the control points is for (1-t) and t...
// this gives us an explicit equation in terms of x = At^3 + Bt^2 + Ct + D.
double A = -p1.x_ + 3.0 * c1.x_ - 3.0 * c2.x_ + p2.x_;
Expand All @@ -1351,6 +1394,8 @@ inline int Bezier2::x_monotone(void) const

inline int Bezier2::y_monotone(void) const
{
if(is_segment())
return 1;
// The weighting of the control points is for (1-t) and t...
// this gives us an explicit equation in terms of x = At^3 + Bt^2 + Ct + D.
double A = -p1.y_ + 3 * c1.y_ - 3 * c2.y_ + p2.y_;
Expand Down Expand Up @@ -1518,6 +1563,9 @@ inline bool Bezier2::self_intersect(int d) const

inline int Bezier2::monotone_regions(double times[4]) const
{
if(is_segment())
return 0;

// Basic idea: we do two derivatives - one of the X cubic and one of the Y.
// These are quadratic and have up to 2 roots each. This gives us any
// point the curve changes directions.
Expand Down Expand Up @@ -1551,6 +1599,9 @@ inline int Bezier2::monotone_regions(double times[4]) const

inline int Bezier2::x_monotone_regions(double times[2]) const
{
if(is_segment())
return 0;

double Ax = -p1.x_ + 3.0 * c1.x_ - 3.0 * c2.x_ + p2.x_;
double Bx = 3.0 * p1.x_ - 6.0 * c1.x_ + 3.0 * c2.x_;
double Cx = -3.0 * p1.x_ + 3.0 * c1.x_;
Expand All @@ -1568,6 +1619,9 @@ inline int Bezier2::x_monotone_regions(double times[2]) const

inline int Bezier2::y_monotone_regions(double times[2]) const
{
if(is_segment())
return 0;

double Ay = -p1.y_ + 3.0 * c1.y_ - 3.0 * c2.y_ + p2.y_;
double By = 3.0 * p1.y_ - 6.0 * c1.y_ + 3.0 * c2.y_;
double Cy = -3.0 * p1.y_ + 3.0 * c1.y_;
Expand Down Expand Up @@ -1596,6 +1650,9 @@ inline void Bezier2::bounds(Bbox2& bounds) const

inline double Bezier2::y_at_x(double x) const
{
if(is_segment())
return as_segment().y_at_x(x);

double Ax = -p1.x_ + 3.0 * c1.x_ - 3.0 * c2.x_ + p2.x_;
double Bx = 3.0 * p1.x_ - 6.0 * c1.x_ + 3.0 * c2.x_;
double Cx = -3.0 * p1.x_ + 3.0 * c1.x_;
Expand All @@ -1621,6 +1678,9 @@ inline double Bezier2::y_at_x(double x) const

inline double Bezier2::x_at_y(double y) const
{
if(is_segment())
return as_segment().x_at_y(y);

// These are the cubic equation coefficients for X and Y in terms of T, as in
// x = At^3 + Bt^2 + C^t + D.
// In other words, we've taken the control points and merged them into coefficients so we can use
Expand Down
2 changes: 2 additions & 0 deletions src/WEDCore/WED_Orthophoto.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ WED_Ring * WED_RingfromImage(char * path, WED_Archive * arch, WED_MapZoomerNew *
coords[3] = zoomer->PixelToLL(center + Vector2(-pix_w, +pix_h));
}


WED_Ring * rng = WED_Ring::CreateTyped(arch);
rng->SetName("Image Boundary");

for (int i=0; i<4; ++i)
{
char s[12];
Expand Down
35 changes: 35 additions & 0 deletions src/WEDEntities/WED_AirportNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,38 @@ void WED_AirportNode::GetAttributes(set<int>& out_attrs) const
{
out_attrs = attrs.value;
}



void WED_AirportNode::GetLocation (GISLayer_t l, Point2& p) const
{
if(l == gis_Param) p = Point2(GetExportedAttributeProxy(),0.0);
else WED_GISPoint_Bezier::GetLocation(l, p);
}

bool WED_AirportNode::GetControlHandleLo (GISLayer_t l, Point2& p) const
{
GISLayer_t rl = (l == gis_Param) ? gis_Geo : l;
if(!WED_GISPoint_Bezier::GetControlHandleLo(rl,p)) return false;
if (l == gis_Param) p = Point2(GetExportedAttributeProxy(),0.0);
return true;
}

bool WED_AirportNode::GetControlHandleHi (GISLayer_t l, Point2& p) const
{
GISLayer_t rl = (l == gis_Param) ? gis_Geo : l;
if(!WED_GISPoint_Bezier::GetControlHandleHi(rl,p)) return false;
if (l == gis_Param) p = Point2(GetExportedAttributeProxy(),0.0);
return true;
}

int WED_AirportNode::GetExportedAttributeProxy() const
{
for(const auto& a : attrs.value)
{
int e = ENUM_Export(a);
if(e < 101)
return e;
}
return 0;
}
6 changes: 6 additions & 0 deletions src/WEDEntities/WED_AirportNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,16 @@ DECLARE_PERSISTENT(WED_AirportNode)

virtual void GetResource(string& r) const;

virtual void GetLocation (GISLayer_t l, Point2& p) const;
virtual bool GetControlHandleLo (GISLayer_t l, Point2& p) const;
virtual bool GetControlHandleHi (GISLayer_t l, Point2& p) const;

virtual const char * HumanReadableType(void) const { return "Airport Line Node"; }

private:

int GetExportedAttributeProxy() const;

WED_PropIntEnumSet attrs;
WED_PropIntEnumSetFilterVal lines;
WED_PropIntEnumSetFilterVal lights;
Expand Down
2 changes: 1 addition & 1 deletion src/WEDImportExport/WED_SceneryPackExport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ static void DoHueristicAnalysisAndAutoUpgrade(IResolver* resolver)
sel->Clear();
sel->Insert(vector<ISelectable*>(tree_objs.begin(), tree_objs.end()));
// wrl->CommitCommand();
WED_DoConvertToForest(resolver, false);
WED_DoConvertToForest(resolver);
// wrl->StartCommand("Restart after Forest");
LOG_MSG("Converted Trees into Forests at %s\n", ICAO_code.c_str());
}
Expand Down
Loading