Cache node extended rect instead of calculating it all the time during draw.

kovacsv · kovacsv · commit be84e51e7b80 · 2020-12-31T09:17:10.000+01:00
diff --git a/Sources/NodeUIEngine/NUIE_NodeDrawingImage.cpp b/Sources/NodeUIEngine/NUIE_NodeDrawingImage.cpp
@@ -4,7 +4,14 @@
 namespace NUIE
 {
 
-NodeDrawingImage::NodeDrawingImage ()
+NodeDrawingImage::NodeDrawingImage () :
+	nodeRect (),
+	extendedNodeRect (),
+	inputSlotConnPositions (),
+	outputSlotConnPositions (),
+	inputSlotRects (),
+	outputSlotRects (),
+	specialRects ()
 {
 
 }
@@ -35,6 +42,16 @@ const Rect& NodeDrawingImage::GetNodeRect () const
 	return nodeRect;
 }
 
+void NodeDrawingImage::SetExtendedNodeRect (const Rect& rect)
+{
+	extendedNodeRect = rect;
+}
+
+const NUIE::Rect& NodeDrawingImage::GetExtendedNodeRect () const
+{
+	return extendedNodeRect;
+}
+
 void NodeDrawingImage::AddInputSlotConnPosition (const NE::SlotId& slotId, const Point& position)
 {
 	DBGASSERT (inputSlotConnPositions.find (slotId) == inputSlotConnPositions.end ());
diff --git a/Sources/NodeUIEngine/NUIE_NodeDrawingImage.hpp b/Sources/NodeUIEngine/NUIE_NodeDrawingImage.hpp
@@ -22,6 +22,9 @@ class NodeDrawingImage : public DrawingImage
 	void				SetNodeRect (const Rect& rect);
 	const Rect&			GetNodeRect () const;
 
+	void				SetExtendedNodeRect (const Rect& rect);
+	const Rect&			GetExtendedNodeRect () const;
+
 	void				AddInputSlotConnPosition (const NE::SlotId& slotId, const Point& position);
 	const Point&		GetInputSlotConnPosition (const NE::SlotId& slotId) const;
 
@@ -42,6 +45,7 @@ class NodeDrawingImage : public DrawingImage
 
 private:
 	Rect									nodeRect;
+	Rect									extendedNodeRect;
 	std::unordered_map<NE::SlotId, Point>	inputSlotConnPositions;
 	std::unordered_map<NE::SlotId, Point>	outputSlotConnPositions;
 	std::unordered_map<NE::SlotId, Rect>	inputSlotRects;
diff --git a/Sources/NodeUIEngine/NUIE_NodePanelDrawer.cpp b/Sources/NodeUIEngine/NUIE_NodePanelDrawer.cpp
@@ -7,6 +7,18 @@
 namespace NUIE
 {
 
+static Rect ExtendNodeRect (const Rect& originalRect, const SkinParams& skinParams)
+{
+	const Size& slotMarkerSize = skinParams.GetSlotMarkerSize ();
+	double extendSize = 0.0;
+	if (skinParams.GetHiddenSlotMarker () != SkinParams::HiddenSlotMarker::None) {
+		extendSize = slotMarkerSize.GetWidth () + slotMarkerSize.GetWidth () / 2.0;
+	} else if (skinParams.GetSlotMarker () != SkinParams::SlotMarker::None) {
+		extendSize = slotMarkerSize.GetWidth () / 2.0;
+	}
+	return originalRect.ExpandHorizontally (extendSize, extendSize);
+}
+
 NodePanelDrawer::NodePanelDrawer ()
 {
 
@@ -50,6 +62,9 @@ void NodePanelDrawer::Draw (NodeUIDrawingEnvironment& env, NodeDrawingImage& dra
 
 	drawingImage.AddItem (DrawingItemConstPtr (new DrawingRect (nodeRect, skinParams.GetNodeBorderPen ())));
 	drawingImage.SetNodeRect (nodeRect);
+
+	Rect extendedNodeRect = ExtendNodeRect (nodeRect, skinParams);
+	drawingImage.SetExtendedNodeRect (extendedNodeRect);
 }
 
 }
diff --git a/Sources/NodeUIEngine/NUIE_NodeUIManager.cpp b/Sources/NodeUIEngine/NUIE_NodeUIManager.cpp
@@ -571,7 +571,7 @@ bool NodeUIManager::GetBoundingRect (NodeUIDrawingEnvironment& drawingEnv, Rect&
 {
 	BoundingRect boundingRect;
 	EnumerateNodes ([&] (UINodeConstPtr uiNode) {
-		Rect nodeRect = GetNodeExtendedRect (drawingEnv, uiNode);
+		Rect nodeRect = uiNode->GetExtendedRect (drawingEnv);
 		boundingRect.AddRect (nodeRect);
 		return true;
 	});
diff --git a/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.cpp b/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.cpp
@@ -249,8 +249,7 @@ bool NodeUIManagerDrawer::IsConnectionVisible (NodeUIDrawingEnvironment& drawing
 
 bool NodeUIManagerDrawer::IsNodeVisible (NodeUIDrawingEnvironment& drawingEnv, const NodeUIScaleIndependentData& scaleIndependentData, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const
 {
-	Rect boundingRect = GetNodeRect (drawingEnv, drawModifier, uiNode);
-	boundingRect = ExtendNodeRect (drawingEnv, boundingRect);
+	Rect boundingRect = GetExtendedNodeRect (drawingEnv, drawModifier, uiNode);
 
 	double selectionThickness = scaleIndependentData.GetSelectionThickness ();
 	boundingRect = boundingRect.Expand (Size (selectionThickness * 2.0, selectionThickness * 2.0));
@@ -271,6 +270,12 @@ Rect NodeUIManagerDrawer::GetNodeRect (NodeUIDrawingEnvironment& drawingEnv, con
 	return nodeRect.Offset (drawModifier->GetNodeOffset (uiNode->GetId ()));
 }
 
+Rect NodeUIManagerDrawer::GetExtendedNodeRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const
+{
+	Rect nodeRect = uiNode->GetExtendedRect (drawingEnv);
+	return nodeRect.Offset (drawModifier->GetNodeOffset (uiNode->GetId ()));
+}
+
 Point NodeUIManagerDrawer::GetOutputSlotConnPosition (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode, const NE::SlotId& slotId) const
 {
 	Point position = uiNode->GetOutputSlotConnPosition (drawingEnv, slotId);
@@ -283,23 +288,4 @@ Point NodeUIManagerDrawer::GetInputSlotConnPosition (NodeUIDrawingEnvironment& d
 	return position + drawModifier->GetNodeOffset (uiNode->GetId ());
 }
 
-Rect ExtendNodeRect (NodeUIDrawingEnvironment& drawingEnv, const Rect& originalRect)
-{
-	const SkinParams& skinParams = drawingEnv.GetSkinParams ();
-	const Size& slotMarkerSize = skinParams.GetSlotMarkerSize ();
-	double extendSize = 0.0;
-	if (skinParams.GetHiddenSlotMarker () != SkinParams::HiddenSlotMarker::None) {
-		extendSize = slotMarkerSize.GetWidth () + slotMarkerSize.GetWidth () / 2.0;
-	} else if (skinParams.GetSlotMarker () != SkinParams::SlotMarker::None) {
-		extendSize = slotMarkerSize.GetWidth () / 2.0;
-	}
-	return originalRect.ExpandHorizontally (extendSize, extendSize);
-}
-
-Rect GetNodeExtendedRect (NodeUIDrawingEnvironment& drawingEnv, const UINodeConstPtr& uiNode)
-{
-	Rect nodeRect = uiNode->GetRect (drawingEnv);
-	return ExtendNodeRect (drawingEnv, nodeRect);
-}
-
 }
diff --git a/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.hpp b/Sources/NodeUIEngine/NUIE_NodeUIManagerDrawer.hpp
@@ -47,15 +47,13 @@ class NodeUIManagerDrawer
 	bool					IsRectVisible (NodeUIDrawingEnvironment& drawingEnv, const Rect& rect) const;
 
 	Rect					GetNodeRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
+	Rect					GetExtendedNodeRect (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode) const;
 	Point					GetOutputSlotConnPosition (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode, const NE::SlotId& slotId) const;
 	Point					GetInputSlotConnPosition (NodeUIDrawingEnvironment& drawingEnv, const NodeDrawingModifier* drawModifier, const UINodeConstPtr& uiNode, const NE::SlotId& slotId) const;
 
 	const NodeUIManager&	uiManager;
 };
 
-Rect ExtendNodeRect (NodeUIDrawingEnvironment& drawingEnv, const Rect& originalRect);
-Rect GetNodeExtendedRect (NodeUIDrawingEnvironment& drawingEnv, const UINodeConstPtr& uiNode);
-
 }
 
 #endif
diff --git a/Sources/NodeUIEngine/NUIE_UINode.cpp b/Sources/NodeUIEngine/NUIE_UINode.cpp
@@ -80,6 +80,13 @@ Rect UINode::GetRect (NodeUIDrawingEnvironment& env) const
 	return nodeRect.Offset (nodePosition);
 }
 
+Rect UINode::GetExtendedRect (NodeUIDrawingEnvironment& env) const
+{
+	const NodeDrawingImage& drawingImage = GetDrawingImage (env);
+	Rect nodeRect = drawingImage.GetExtendedNodeRect ();
+	return nodeRect.Offset (nodePosition);
+}
+
 void UINode::InvalidateDrawing () const
 {
 	nodeDrawingImage.Reset ();
diff --git a/Sources/NodeUIEngine/NUIE_UINode.hpp b/Sources/NodeUIEngine/NUIE_UINode.hpp
@@ -44,6 +44,7 @@ class UINode : public NE::Node
 	void						Draw (NodeUIDrawingEnvironment& env) const;
 
 	Rect						GetRect (NodeUIDrawingEnvironment& env) const;
+	Rect						GetExtendedRect (NodeUIDrawingEnvironment& env) const;
 	void						InvalidateDrawing () const;
 
 	Point						GetInputSlotConnPosition (NodeUIDrawingEnvironment& env, const NE::SlotId& slotId) const;

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,14 @@`
`4`	`4`	`namespace NUIE`
`5`	`5`	`{`
`6`	`6`
`7`		`-NodeDrawingImage::NodeDrawingImage ()`
	`7`	`+NodeDrawingImage::NodeDrawingImage () :`
	`8`	`+ nodeRect (),`
	`9`	`+ extendedNodeRect (),`
	`10`	`+ inputSlotConnPositions (),`
	`11`	`+ outputSlotConnPositions (),`
	`12`	`+ inputSlotRects (),`
	`13`	`+ outputSlotRects (),`
	`14`	`+ specialRects ()`
`8`	`15`	`{`
`9`	`16`
`10`	`17`	`}`
`@@ -35,6 +42,16 @@ const Rect& NodeDrawingImage::GetNodeRect () const`
`35`	`42`	`return nodeRect;`
`36`	`43`	`}`
`37`	`44`
	`45`	`+void NodeDrawingImage::SetExtendedNodeRect (const Rect& rect)`
	`46`	`+{`
	`47`	`+ extendedNodeRect = rect;`
	`48`	`+}`
	`49`	`+`
	`50`	`+const NUIE::Rect& NodeDrawingImage::GetExtendedNodeRect () const`
	`51`	`+{`
	`52`	`+ return extendedNodeRect;`
	`53`	`+}`
	`54`	`+`
`38`	`55`	`void NodeDrawingImage::AddInputSlotConnPosition (const NE::SlotId& slotId, const Point& position)`
`39`	`56`	`{`
`40`	`57`	`DBGASSERT (inputSlotConnPositions.find (slotId) == inputSlotConnPositions.end ());`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,18 @@`
`7`	`7`	`namespace NUIE`
`8`	`8`	`{`
`9`	`9`
	`10`	`+static Rect ExtendNodeRect (const Rect& originalRect, const SkinParams& skinParams)`
	`11`	`+{`
	`12`	`+ const Size& slotMarkerSize = skinParams.GetSlotMarkerSize ();`
	`13`	`+ double extendSize = 0.0;`
	`14`	`+ if (skinParams.GetHiddenSlotMarker () != SkinParams::HiddenSlotMarker::None) {`
	`15`	`+ extendSize = slotMarkerSize.GetWidth () + slotMarkerSize.GetWidth () / 2.0;`
	`16`	`+ } else if (skinParams.GetSlotMarker () != SkinParams::SlotMarker::None) {`
	`17`	`+ extendSize = slotMarkerSize.GetWidth () / 2.0;`
	`18`	`+ }`
	`19`	`+ return originalRect.ExpandHorizontally (extendSize, extendSize);`
	`20`	`+}`
	`21`	`+`
`10`	`22`	`NodePanelDrawer::NodePanelDrawer ()`
`11`	`23`	`{`
`12`	`24`
`@@ -50,6 +62,9 @@ void NodePanelDrawer::Draw (NodeUIDrawingEnvironment& env, NodeDrawingImage& dra`
`50`	`62`
`51`	`63`	`drawingImage.AddItem (DrawingItemConstPtr (new DrawingRect (nodeRect, skinParams.GetNodeBorderPen ())));`
`52`	`64`	`drawingImage.SetNodeRect (nodeRect);`
	`65`	`+`
	`66`	`+ Rect extendedNodeRect = ExtendNodeRect (nodeRect, skinParams);`
	`67`	`+ drawingImage.SetExtendedNodeRect (extendedNodeRect);`
`53`	`68`	`}`
`54`	`69`
`55`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ bool NodeUIManager::GetBoundingRect (NodeUIDrawingEnvironment& drawingEnv, Rect&`
`571`	`571`	`{`
`572`	`572`	`BoundingRect boundingRect;`
`573`	`573`	`EnumerateNodes ([&] (UINodeConstPtr uiNode) {`
`574`		`- Rect nodeRect = GetNodeExtendedRect (drawingEnv, uiNode);`
	`574`	`+ Rect nodeRect = uiNode->GetExtendedRect (drawingEnv);`
`575`	`575`	`boundingRect.AddRect (nodeRect);`
`576`	`576`	`return true;`
`577`	`577`	`});`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,13 @@ Rect UINode::GetRect (NodeUIDrawingEnvironment& env) const`
`80`	`80`	`return nodeRect.Offset (nodePosition);`
`81`	`81`	`}`
`82`	`82`
	`83`	`+Rect UINode::GetExtendedRect (NodeUIDrawingEnvironment& env) const`
	`84`	`+{`
	`85`	`+ const NodeDrawingImage& drawingImage = GetDrawingImage (env);`
	`86`	`+ Rect nodeRect = drawingImage.GetExtendedNodeRect ();`
	`87`	`+ return nodeRect.Offset (nodePosition);`
	`88`	`+}`
	`89`	`+`
`83`	`90`	`void UINode::InvalidateDrawing () const`
`84`	`91`	`{`
`85`	`92`	`nodeDrawingImage.Reset ();`