Merge pull request #34 from X-Plane/wed_260_mroe_patches

Wed 260 mroe patches

Author: mauer

src/DSFTools/DSF2Text.cpp

@@ -416,9 +416,9 @@ static bool Text2DSFWithWriterAny(const char * inFileName, const char * inDSF, D
 
 	DSFRasterHeader_t	rheader;
 
-	char	buf[512];
-	char	prop_id[512];
-	char	prop_value[512];
+	char	buf[4096];
+	char	prop_id[4096];
+	char	prop_value[4096];
 
 	DSFCallbacks_t	cbs;
 	void * writer;

src/Interfaces/IControlHandles.h

@@ -81,7 +81,8 @@ enum LinkType_t {
 	link_Solid,			// Draw solid line...
 	link_BezierCtrl,	// Thin line for bezier handles
 	link_Ghost,			// implicit ghost line
-	link_Marquee
+	link_Marquee,
+	link_Handle			// link can be virtual a handle
 };
 
 class	IControlHandles : public virtual IBase {

src/WEDEntities/WED_GISChain.cpp

@@ -24,6 +24,8 @@
 #include "WED_GISChain.h"
 #include "WED_AirportNode.h"
 #include "WED_FacadeNode.h"
+#include "WED_FacadeRing.h"
+#include "WED_FacadePlacement.h"
 
 TRIVIAL_COPY(WED_GISChain, WED_Entity)
 
@@ -178,7 +180,7 @@ IGISPoint *	WED_GISChain::SplitSide   (const Point2& p, double dist)
 		WED_Thing * np = dynamic_cast<WED_Thing*>(GetNthChild(best)->Clone());
 		IGISPoint * npp = dynamic_cast<IGISPoint *>(np);
 		IGISPoint_Bezier * nppb = dynamic_cast<IGISPoint_Bezier*>(np);
-		
+
 		if(is_b)
 		{
 			DebugAssert(nppb);
@@ -205,7 +207,7 @@ IGISPoint *	WED_GISChain::SplitSide   (const Point2& p, double dist)
 		}
 		// Why wait?  Cuz...Getside on old side will USE this as soon as we are its parent!
 		np->SetParent(this, best+1);
-		
+
 		return npp;
 	}
 	return NULL;
@@ -291,7 +293,7 @@ void WED_GISChain::RebuildCache(int flags) const
 		mCachePts.reserve(nc);
 		mCachePtsBezier.reserve(nc);
 		mHasUV = nc > 0;
-		
+
 		int n;
 		for (n = 0; n < nc; ++n)
 		{
@@ -322,7 +324,7 @@ void WED_GISChain::RebuildCache(int flags) const
 		//
 		// What would be better would be to have the cache flags SPECIFIC to certain operations so
 		// that it was unambiguous that GetBounds() is the right call to address a particular flag.
-		
+
 		int m = GetNumPoints();
 		for(int mm = 0; mm < m; ++mm)
 		{
@@ -332,11 +334,11 @@ void WED_GISChain::RebuildCache(int flags) const
 			if(p)
 				p->GetBounds(gis_Geo, temp);
 		}
-		
+
 		int n = GetNumSides();			// We MUST ensure that this only builds topo cache or we are dead dead dead!!
 		mCacheBounds = Bbox2();
 		mCacheBoundsUV = Bbox2();
-		
+
 		for (int i = 0; i < n; ++i)
 		{
 			Bezier2 b;
@@ -353,28 +355,28 @@ void WED_GISChain::RebuildCache(int flags) const
 				mCacheBoundsUV += bb;
 			}
 		}
-	
+
 	}
 }
 
 void WED_GISChain::Reverse(GISLayer_t l)
 {
 	RebuildCache(CacheBuild(cache_Topological));
 	int n,t,np = GetNumPoints();
-	
+
 	// Sanity checking: our point count, and our cache really should
 	// be in size sync.  Then make sure that we are CONSISTENT in our
 	// having or not having beziers.  Heterogeneous _types_ of points
 	// are not what we want!
 	DebugAssert(mCachePtsBezier.size() == mCachePts.size());
 	DebugAssert(mCachePtsBezier.size() == np);
-	
+
 	bool has_bezier = mCachePtsBezier[0] != NULL;
 	for(n = 1; n < np; ++n)
 	{
 		Assert(has_bezier == (mCachePtsBezier[n] != NULL));
 	}
-	
+
 	vector<Point2>	p(np);
 	vector<Point2>	p_l(np);
 	vector<Point2>	p_h(np);
@@ -397,7 +399,7 @@ void WED_GISChain::Reverse(GISLayer_t l)
 	{
 		t = np - n - 1;
 		mCachePts[t]->SetLocation(l, p[n]);
-		
+
 		if(has_bezier)
 		{
 			mCachePtsBezier[t]->SetSplit(split[n]);
@@ -409,10 +411,10 @@ void WED_GISChain::Reverse(GISLayer_t l)
 			else			mCachePtsBezier[t]->DeleteHandleLo();
 		}
 	}
-	
+
     // On Airport Lines and Taxiways, we want to preserve the line/light properties of each segment, effectivly ONLY reversing the node sequence.
     // Very usefull when reversing airport lines with differently tagged segments. It effectively brings the blue taxiway edge lights to the other side ONLY.
-    
+
 	if (dynamic_cast <WED_AirportNode *> (GetNthChild(0)))
 	{
 		for(n = 0; n < np/2; ++n)    // directly swap the attributes of the nodes. No need to first build a local copy and then write it back in reverse order.
@@ -421,7 +423,7 @@ void WED_GISChain::Reverse(GISLayer_t l)
 			WED_AirportNode * a_n = dynamic_cast <WED_AirportNode *> (GetNthChild(n));  // note to self: mCache would yield no speedup here, as we dynamic_cast every point only once
 			WED_AirportNode * a_t = dynamic_cast <WED_AirportNode *> (GetNthChild(t));  // thus we get away with NOT expanding RebuildCache to work for 'gis_Apt" layers :)
 			set<int>	tmp1, tmp2;
-			
+
 			a_n->GetAttributes(tmp1);
 			a_t->GetAttributes(tmp2);
 			a_n->SetAttributes(tmp2);
@@ -436,30 +438,30 @@ void WED_GISChain::Reverse(GISLayer_t l)
 			WED_FacadeNode * a_n = dynamic_cast <WED_FacadeNode *> (GetNthChild(n));  // note to self: mCache would yield no speedup here, as we dynamic_cast every point only once
 			WED_FacadeNode * a_t = dynamic_cast <WED_FacadeNode *> (GetNthChild(t));  // thus we get away with NOT expanding RebuildCache to work for 'gis_Apt" layers :)
 			int	tmp1, tmp2;
-			
+
 			tmp1 = a_n->GetWallType();
 			tmp2 = a_t->GetWallType();
 			a_n->SetWallType(tmp2);
 			a_t->SetWallType(tmp1);
 		}
 	}
-	
+
 }
 
 void WED_GISChain::Shuffle(GISLayer_t l)
 {
 	RebuildCache(CacheBuild(cache_Topological));
 	int n,t,np = GetNumPoints();
-	
+
 	DebugAssert(mCachePtsBezier.size() == mCachePts.size());
 	DebugAssert(mCachePtsBezier.size() == np);
-	
+
 	bool has_bezier = mCachePtsBezier[0] != NULL;
 	for(n = 1; n < np; ++n)
 	{
 		Assert(has_bezier == (mCachePtsBezier[n] != NULL));
 	}
-	
+
 	vector<Point2>	p(np);
 	vector<Point2>	p_l(np);
 	vector<Point2>	p_h(np);
@@ -477,7 +479,7 @@ void WED_GISChain::Shuffle(GISLayer_t l)
 			split[n] = mCachePtsBezier[n]->IsSplit();
 		}
 	}
-	
+
 	for(n = 0; n < np; ++n)
 	{
 		t = (n + 1) % np;
@@ -491,10 +493,30 @@ void WED_GISChain::Shuffle(GISLayer_t l)
 
 			if (has_hi[n])	mCachePtsBezier[t]->SetControlHandleHi(l, p_h[n]);
 			else			mCachePtsBezier[t]->DeleteHandleHi();
-		}	
+		}
 	}
-}
+	// For facades, it makes more sense to keep the wall type in its position and only move the segments so that the very first segment is in the right place.
+	// Users use this mainly to relocate the “ground contact point” of the facade.  w.r.t cache same as for Reverse function above
 
+	WED_FacadeNode * fn = dynamic_cast <WED_FacadeNode *> (GetNthChild(np-1));
+	if (fn)
+	{
+		WED_FacadeRing * fr 	= dynamic_cast <WED_FacadeRing *> (fn->GetParent());
+		WED_FacadePlacement * f = dynamic_cast <WED_FacadePlacement *> (fr->GetParent());
+
+		if(f->HasCustomWalls())
+		{
+			int tmp1,tmp2 = fn->GetWallType();
+			for(n = 0; n < np ; ++n)
+			{
+				fn = dynamic_cast <WED_FacadeNode *> (GetNthChild(n));
+				tmp1 = fn->GetWallType();
+				fn->SetWallType(tmp2);
+				tmp2 = tmp1;
+			}
+		}
+	}
+}
 
 
 int				WED_GISChain::GetNumEntities(void ) const

src/WEDMap/WED_HandleToolBase.cpp

@@ -505,7 +505,7 @@ void WED_HandleToolBase::ProcessSelection(
 				if( ((*i)->GetGISClass() ==  gis_Polygon || (*i)->GetGISClass() ==  gis_Composite) && (
 					strcmp((*i)->GetGISSubtype(), "WED_ForestPlacement") == 0 ||
 					strcmp((*i)->GetGISSubtype(), "WED_ExclusionPoly") == 0 ||              // take whole exclusion rather than outer ring
-					strcmp((*i)->GetGISSubtype(), "WED_FacadePlacement") == 0 ) ) 
+					strcmp((*i)->GetGISSubtype(), "WED_FacadePlacement") == 0 ) )
 				{ printf("Forest/Facade\n"); keeper = *i;  break; }
 			}
 		if(!keeper)
@@ -514,15 +514,15 @@ void WED_HandleToolBase::ProcessSelection(
 				if( (*i)->GetGISClass() ==  gis_Line ||
 					(*i)->GetGISClass() ==  gis_Edge ||
 					(*i)->GetGISClass() ==  gis_Ring ||                                      // APT Boundaries, but only the ring part, not the inner area
-					(*i)->GetGISClass() ==  gis_Chain   ) 				
+					(*i)->GetGISClass() ==  gis_Chain   )
 				{ printf("Line\n");  keeper = *i;  break; }
 			}
 		if(!keeper)
 			for(set<IGISEntity *> ::iterator i = result.begin(); i != result.end(); ++i)     // now the polygons, in similar order as typical LAYER_GROUP assignments
 			{
 				if( ((*i)->GetGISClass() ==  gis_Polygon || (*i)->GetGISClass() ==  gis_Composite) && (
 					strcmp((*i)->GetGISSubtype(),"WED_PolygonPlacement") == 0 ||                           // Textured Polys
-					strcmp((*i)->GetGISSubtype(),"WED_DrapedOrthophoto") == 0 ) ) 
+					strcmp((*i)->GetGISSubtype(),"WED_DrapedOrthophoto") == 0 ) )
 				{ printf("Polygon\n"); keeper = *i;  break; }                                // Draped Polys - also Ground Painted Signs
 			}
 		if(!keeper)
@@ -824,6 +824,7 @@ void		WED_HandleToolBase::HandleClickUp			(int inX, int inY, int inButton, GUI_K
 				mDragType == drag_Ent)
 	{
 		mHandles->EndEdit();
+		mHandleIndex = -1;
 	} else if ( mDragType == drag_Create )
 		this->CreationUp(
 					GetZoomer()->PixelToLL(Point2(mDragX, mDragY)),
@@ -895,13 +896,21 @@ void		WED_HandleToolBase::DrawStructure			(bool inCurrent, GUI_GraphState * g)
 
 				LinkType_t lt;
 				mHandles->GetNthLinkInfo(eid,l,NULL, &lt);
+
+				if(lt == link_None && mDragType == drag_Links && eid == mHandleEntity && l == mHandleIndex)
+				{
+				   lt = link_Handle;
+				}
+
 				if (lt != link_None)
 				{
 					switch(lt) {
 					case link_Solid:		glColor4fv(WED_Color_RGBA(wed_Link));			break;
 					case link_BezierCtrl:	glColor4fv(WED_Color_RGBA(wed_ControlLink));	break;
 					case link_Ghost:		glColor4fv(WED_Color_RGBA(wed_GhostLink));		break;
 					case link_Marquee:		glColor4fv(WED_Color_RGBA(wed_Marquee));		break;
+					case link_Handle:		glColor4fv(WED_Color_RGBA(wed_ControlHandle));	break;
+
 					}
 					if (ControlLinkToCurve(mHandles,eid,l,b,s,GetZoomer()))
 					{

src/WEDMap/WED_StructureLayer.cpp

@@ -101,7 +101,7 @@ bool		WED_StructureLayer::DrawEntityStructure		(bool inCurrent, IGISEntity * ent
 
 	WED_Color struct_color = selected ? (locked ? wed_StructureLockedSelected : wed_StructureSelected) :
 										(locked ? wed_StructureLocked		 : wed_Structure);
-	
+
 	float * colorf = WED_Color_RGBA(struct_color);
 	glColor4fv(colorf);
 
@@ -682,6 +682,17 @@ bool		WED_StructureLayer::DrawEntityStructure		(bool inCurrent, IGISEntity * ent
 		break;
 
 	case gis_Composite:
+		if(sub_class == WED_FacadePlacement::sClass)
+		{
+			if(auto poly = dynamic_cast<IGISPolygon*>(entity))
+			{
+				this->DrawEntityStructure(inCurrent, poly->GetOuterRing(), g, selected, locked);
+				int n = poly->GetNumHoles();
+				for (int c = 0; c < n; ++c)
+					this->DrawEntityStructure(inCurrent, poly->GetNthHole(c), g, selected, locked);
+			}
+			return false;
+		}
 		if(sub_class != WED_AirportBoundary::sClass && sub_class != WED_ExclusionPoly::sClass)    // not down-clickable in interior, but still highlighted interior
 			break;
 	case gis_Polygon:
@@ -691,10 +702,18 @@ bool		WED_StructureLayer::DrawEntityStructure		(bool inCurrent, IGISEntity * ent
 		{
 			if(auto poly = dynamic_cast<IGISPolygon*>(entity))
 			{
-				this->DrawEntityStructure(inCurrent, poly->GetOuterRing(), g, selected, locked);
-				int n = poly->GetNumHoles();
-				for (int c = 0; c < n; ++c)
-					this->DrawEntityStructure(inCurrent, poly->GetNthHole(c), g, selected, locked);
+				if(sub_class != WED_ExclusionPoly::sClass)
+				{
+					ISelection * sel = SAFE_CAST(ISelection, WED_GetSelect(GetResolver()));
+					IGISPointSequence * ps = poly->GetOuterRing();
+					this->DrawEntityStructure(inCurrent, ps, g, selected || (sel && sel->IsSelected(ps)), locked);
+					int n = poly->GetNumHoles();
+					for (int c = 0; c < n; ++c)
+					{
+						ps = poly->GetNthHole(c);
+						this->DrawEntityStructure(inCurrent, ps, g, selected || (sel && sel->IsSelected(ps)), locked);
+					}
+				}
 
 				if(selected)
 				{
@@ -713,6 +732,9 @@ bool		WED_StructureLayer::DrawEntityStructure		(bool inCurrent, IGISEntity * ent
 					glPolygon2(pts, false, hole_starts, false);
 					glFrontFace(GL_CW);
 				}
+
+				if(sub_class == WED_AirportBoundary::sClass)
+					return false;
 			}
 		}
 		break;