#5746: All textool::INodes are implementing Bounded, to return their …

…bounds in UV space.

Un-hook the old selection traversal code in the TexTool, use the Texture Tool SceneGraph.

include/itexturetoolmodel.h

@@ -2,12 +2,36 @@
 
 #include "imodule.h"
 #include "inode.h"
+#include "Bounded.h"
+
+class Matrix3;
 
 namespace textool
 {
 
+/**
+ * A transformable node in the texture tool scene. This is usually
+ * implemented by Faces and Patches. They will accept a given transformation
+ * and apply it to their selected child elements.
+ * For faces, this could mean that three selected vertices (out of four)
+ * will be transformed by the given matrix. It's possible that unselected
+ * winding vertices will be affected by this transformation, due to the nature
+ * of the texture projection. 
+ * Patch vertices can be transformed independently.
+ */
+class ITransformable
+{
+public:
+    /**
+     * Applies the given transform to all selected components of this node.
+     */
+    virtual void applyTransformToSelected(const Matrix3& transform) = 0;
+};
+
 // The base element of every node in the ITextureToolSceneGraph
-class INode
+class INode :
+    public ITransformable,
+    public Bounded
 {
 public:
     virtual ~INode() {}

radiant/textool/TexTool.cpp

@@ -2,6 +2,7 @@
 
 #include "i18n.h"
 #include "ieventmanager.h"
+#include "itexturetoolmodel.h"
 #include "imainframe.h"
 #include "igl.h"
 #include "iundo.h"
@@ -229,6 +230,7 @@ void TexTool::update()
 	std::string selectedShader = selection::getShaderFromSelection();
 	_shader = GlobalMaterialManager().getMaterial(selectedShader);
 
+#if 0
 	// Clear the list to remove all the previously allocated items
 	_items.clear();
 
@@ -259,7 +261,7 @@ void TexTool::update()
 			});
 		}
 	}
-
+#endif
 	recalculateVisibleTexSpace();
 }
 
@@ -541,11 +543,12 @@ AABB& TexTool::getExtents()
 {
 	_selAABB = AABB();
 
-	for (const auto& item : _items)
+    GlobalTextureToolSceneGraph().foreachNode([&](const textool::INode::Ptr& node)
     {
-		// Expand the selection AABB by the extents of the item
-		_selAABB.includeAABB(item->getExtents());
-	}
+        // Expand the selection AABB by the extents of the item
+        _selAABB.includeAABB(node->localAABB());
+        return true;
+    });
 
 	return _selAABB;
 }

radiantcore/selection/textool/FaceNode.h

@@ -11,11 +11,29 @@ class FaceNode :
 {
 private:
     IFace& _face;
+    mutable AABB _bounds;
 
 public:
     FaceNode(IFace& face) :
         _face(face)
     {}
+
+    void applyTransformToSelected(const Matrix3& transform) override
+    {
+        // TODO
+    }
+
+    const AABB& localAABB() const
+    {
+        _bounds = AABB();
+
+        for (const auto& vertex : _face.getWinding())
+        {
+            _bounds.includePoint({ vertex.texcoord.x(), vertex.texcoord.y(), 0 });
+        }
+
+        return _bounds;
+    }
 };
 
 }

radiantcore/selection/textool/PatchNode.h

@@ -11,11 +11,33 @@ class PatchNode :
 {
 private:
     IPatch& _patch;
+    mutable AABB _bounds;
 
 public:
     PatchNode(IPatch& patch) :
         _patch(patch)
     {}
+
+    void applyTransformToSelected(const Matrix3& transform) override
+    {
+        // TODO
+    }
+
+    const AABB& localAABB() const
+    {
+        _bounds = AABB();
+
+        for (std::size_t col = 0; col < _patch.getWidth(); ++col)
+        {
+            for (std::size_t row = 0; row < _patch.getHeight(); ++row)
+            {
+                const auto& ctrl = _patch.ctrlAt(row, col);
+                _bounds.includePoint({ ctrl.texcoord.x(), ctrl.texcoord.y(), 0 });
+            }
+        }
+
+        return _bounds;
+    }
 };
 
 }