[mapguide-commits] r9406 - sandbox/adsk/3.2o/Common/Stylization
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Aug 8 21:58:45 PDT 2018
Author: simonliu
Date: 2018-08-08 21:58:45 -0700 (Wed, 08 Aug 2018)
New Revision: 9406
Modified:
sandbox/adsk/3.2o/Common/Stylization/SE_RenderProxies.h
sandbox/adsk/3.2o/Common/Stylization/SE_SymbolDefProxies.cpp
Log:
Merged revision(s) 9399 from sandbox/adsk/3.2q:
We have a special case that we need to know if a SE_RenderPointStyle is cached. We made this ugly change that adds the parent SE_Style pointer to SE_RenderStyle. Will refine the code after a better solution is found.
Modified: sandbox/adsk/3.2o/Common/Stylization/SE_RenderProxies.h
===================================================================
--- sandbox/adsk/3.2o/Common/Stylization/SE_RenderProxies.h 2018-08-01 09:02:13 UTC (rev 9405)
+++ sandbox/adsk/3.2o/Common/Stylization/SE_RenderProxies.h 2018-08-09 04:58:45 UTC (rev 9406)
@@ -171,6 +171,7 @@
// SE_RenderStyles
//----------------------------------------------------------------------------
+struct SE_Style;
struct SE_RenderStyle
{
SE_INLINE SE_RenderStyle(SE_RenderStyleType stype)
@@ -178,7 +179,8 @@
renderPass(0),
drawLast(false),
checkExclusionRegion(false),
- addToExclusionRegion(false)
+ addToExclusionRegion(false),
+ seStyle(NULL)
{
bounds[0].x = bounds[3].x = +DBL_MAX;
bounds[1].x = bounds[2].x = -DBL_MAX;
@@ -225,6 +227,7 @@
bool drawLast;
bool checkExclusionRegion;
bool addToExclusionRegion;
+ SE_Style* seStyle; // parent SE_Style
};
Modified: sandbox/adsk/3.2o/Common/Stylization/SE_SymbolDefProxies.cpp
===================================================================
--- sandbox/adsk/3.2o/Common/Stylization/SE_SymbolDefProxies.cpp 2018-08-01 09:02:13 UTC (rev 9405)
+++ sandbox/adsk/3.2o/Common/Stylization/SE_SymbolDefProxies.cpp 2018-08-09 04:58:45 UTC (rev 9406)
@@ -791,6 +791,7 @@
SE_RenderPointStyle* style = new SE_RenderPointStyle();
delete rstyle;
rstyle = style;
+ rstyle->seStyle = this;
const wchar_t* sAngleControl = angleControl.evaluate(ctx->exec);
if (wcscmp(sAngleControl, L"FromGeometry") == 0)
More information about the mapguide-commits
mailing list