Merge remote-tracking branch 'origin/release/v2.0.0'

lineCode · Jan 9, 2018 · fefeb49 · fefeb49
2 parents 1a81326 + 05e49a4
commit fefeb49
Show file tree

Hide file tree

Showing 45 changed files with 536 additions and 326 deletions.
diff --git a/app/resources/documentation/manual/index.md b/app/resources/documentation/manual/index.md
diff --git a/app/resources/documentation/manual/shortcuts.js b/app/resources/documentation/manual/shortcuts.js
@@ -581,15 +581,15 @@ keys["linux"]["+"] = "+";
 
 var menu = {};
 menu["Menu/File/New"] = { path: ["File", "New"], shortcut: { key:78, modifiers: [308] } };
-menu["Menu/File/Open..."] = { path: ["File", "Open..."], shortcut: { key:79, modifiers: [308] } };
+menu["Menu/File/Open"] = { path: ["File", "Open..."], shortcut: { key:79, modifiers: [308] } };
 menu["Menu/File/Save"] = { path: ["File", "Save"], shortcut: { key:83, modifiers: [308] } };
-menu["Menu/File/Save as..."] = { path: ["File", "Save as..."], shortcut: { key:83, modifiers: [306, 308] } };
-menu["Menu/File/Export/Wavefront OBJ..."] = { path: ["File", "Export", "Wavefront OBJ..."], shortcut: { key:0, modifiers: [] } };
-menu["Menu/File/Load Point File..."] = { path: ["File", "Load Point File..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/File/Save as"] = { path: ["File", "Save as..."], shortcut: { key:83, modifiers: [306, 308] } };
+menu["Menu/File/Export/Wavefront OBJ"] = { path: ["File", "Export", "Wavefront OBJ..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/File/Load Point File"] = { path: ["File", "Load Point File..."], shortcut: { key:0, modifiers: [] } };
 menu["Menu/File/Unload Point File"] = { path: ["File", "Unload Point File"], shortcut: { key:0, modifiers: [] } };
 menu["Menu/File/Close"] = { path: ["File", "Close"], shortcut: { key:87, modifiers: [308] } };
 menu["Menu/File/About TrenchBroom"] = { path: ["File", "About TrenchBroom"], shortcut: { key:0, modifiers: [] } };
-menu["Menu/File/Preferences..."] = { path: ["File", "Preferences..."], shortcut: { key:44, modifiers: [308] } };
+menu["Menu/File/Preferences"] = { path: ["File", "Preferences..."], shortcut: { key:44, modifiers: [308] } };
 menu["Menu/File/Exit"] = { path: ["File", "Exit"], shortcut: { key:0, modifiers: [] } };
 menu["Menu/Edit/Undo"] = { path: ["Edit", "Undo"], shortcut: { key:90, modifiers: [308] } };
 menu["Menu/Edit/Redo"] = { path: ["Edit", "Redo"], shortcut: { key:90, modifiers: [306, 308] } };
@@ -613,7 +613,6 @@ menu["Menu/Edit/Ungroup"] = { path: ["Edit", "Ungroup"], shortcut: { key:71, mod
 menu["Menu/Edit/Tools/Brush Tool"] = { path: ["Edit", "Tools", "Brush Tool"], shortcut: { key:66, modifiers: [] } };
 menu["Menu/Edit/Tools/Clip Tool"] = { path: ["Edit", "Tools", "Clip Tool"], shortcut: { key:67, modifiers: [] } };
 menu["Menu/Edit/Tools/Rotate Tool"] = { path: ["Edit", "Tools", "Rotate Tool"], shortcut: { key:82, modifiers: [] } };
-menu["Menu/Edit/Tools/Vertex Tool (old)"] = { path: ["Edit", "Tools", "Vertex Tool (old)"], shortcut: { key:79, modifiers: [] } };
 menu["Menu/Edit/Tools/Vertex Tool"] = { path: ["Edit", "Tools", "Vertex Tool"], shortcut: { key:86, modifiers: [] } };
 menu["Menu/Edit/Tools/Edge Tool"] = { path: ["Edit", "Tools", "Edge Tool"], shortcut: { key:69, modifiers: [] } };
 menu["Menu/Edit/Tools/Face Tool"] = { path: ["Edit", "Tools", "Face Tool"], shortcut: { key:70, modifiers: [] } };
@@ -623,7 +622,7 @@ menu["Menu/Edit/CSG/Intersect"] = { path: ["Edit", "CSG", "Intersect"], shortcut
 menu["Menu/Edit/Snap Vertices to Integer"] = { path: ["Edit", "Snap Vertices to Integer"], shortcut: { key:86, modifiers: [306, 308] } };
 menu["Menu/Edit/Snap Vertices to Grid"] = { path: ["Edit", "Snap Vertices to Grid"], shortcut: { key:86, modifiers: [307, 306, 308] } };
 menu["Menu/Edit/Texture Lock"] = { path: ["Edit", "Texture Lock"], shortcut: { key:0, modifiers: [] } };
-menu["Menu/Edit/Replace Texture..."] = { path: ["Edit", "Replace Texture..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/Edit/Replace Texture"] = { path: ["Edit", "Replace Texture..."], shortcut: { key:0, modifiers: [] } };
 menu["Menu/View/Grid/Show Grid"] = { path: ["View", "Grid", "Show Grid"], shortcut: { key:48, modifiers: [] } };
 menu["Menu/View/Grid/Snap to Grid"] = { path: ["View", "Grid", "Snap to Grid"], shortcut: { key:48, modifiers: [307] } };
 menu["Menu/View/Grid/Increase Grid Size"] = { path: ["View", "Grid", "Increase Grid Size"], shortcut: { key:43, modifiers: [] } };
@@ -640,7 +639,7 @@ menu["Menu/View/Grid/Set Grid Size 256"] = { path: ["View", "Grid", "Set Grid Si
 menu["Menu/View/Camera/Move to Next Point"] = { path: ["View", "Camera", "Move to Next Point"], shortcut: { key:46, modifiers: [] } };
 menu["Menu/View/Camera/Move to Previous Point"] = { path: ["View", "Camera", "Move to Previous Point"], shortcut: { key:44, modifiers: [] } };
 menu["Menu/View/Camera/Focus on Selection"] = { path: ["View", "Camera", "Focus on Selection"], shortcut: { key:85, modifiers: [308] } };
-menu["Menu/View/Camera/Move Camera to..."] = { path: ["View", "Camera", "Move Camera to..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/View/Camera/Move Camera to"] = { path: ["View", "Camera", "Move Camera to..."], shortcut: { key:0, modifiers: [] } };
 menu["Menu/View/Isolate"] = { path: ["View", "Isolate"], shortcut: { key:73, modifiers: [308] } };
 menu["Menu/View/Hide"] = { path: ["View", "Hide"], shortcut: { key:73, modifiers: [307, 308] } };
 menu["Menu/View/Show All"] = { path: ["View", "Show All"], shortcut: { key:73, modifiers: [306, 308] } };
@@ -650,14 +649,14 @@ menu["Menu/View/Switch to Face Inspector"] = { path: ["View", "Switch to Face In
 menu["Menu/View/Toggle Info Panel"] = { path: ["View", "Toggle Info Panel"], shortcut: { key:52, modifiers: [308] } };
 menu["Menu/View/Toggle Inspector"] = { path: ["View", "Toggle Inspector"], shortcut: { key:53, modifiers: [308] } };
 menu["Menu/View/Maximize Current View"] = { path: ["View", "Maximize Current View"], shortcut: { key:32, modifiers: [308] } };
-menu["Menu/Run/Compile..."] = { path: ["Run", "Compile..."], shortcut: { key:0, modifiers: [] } };
-menu["Menu/Run/Launch..."] = { path: ["Run", "Launch..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/Run/Compile"] = { path: ["Run", "Compile..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/Run/Launch"] = { path: ["Run", "Launch..."], shortcut: { key:0, modifiers: [] } };
 menu["Menu/Debug/Print Vertices"] = { path: ["Debug", "Print Vertices"], shortcut: { key:0, modifiers: [] } };
-menu["Menu/Debug/Create Brush..."] = { path: ["Debug", "Create Brush..."], shortcut: { key:0, modifiers: [] } };
-menu["Menu/Debug/Create Cube..."] = { path: ["Debug", "Create Cube..."], shortcut: { key:0, modifiers: [] } };
-menu["Menu/Debug/Clip Brush..."] = { path: ["Debug", "Clip Brush..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/Debug/Create Brush"] = { path: ["Debug", "Create Brush..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/Debug/Create Cube"] = { path: ["Debug", "Create Cube..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/Debug/Clip Brush"] = { path: ["Debug", "Clip Brush..."], shortcut: { key:0, modifiers: [] } };
 menu["Menu/Debug/Copy Javascript Shortcut Map"] = { path: ["Debug", "Copy Javascript Shortcut Map"], shortcut: { key:0, modifiers: [] } };
-menu["Menu/Debug/Crash..."] = { path: ["Debug", "Crash..."], shortcut: { key:0, modifiers: [] } };
+menu["Menu/Debug/Crash"] = { path: ["Debug", "Crash..."], shortcut: { key:0, modifiers: [] } };
 menu["Menu/Debug/Show Crash Report Dialog"] = { path: ["Debug", "Show Crash Report Dialog"], shortcut: { key:0, modifiers: [] } };
 menu["Menu/Help/TrenchBroom Manual"] = { path: ["Help", "TrenchBroom Manual"], shortcut: { key:0, modifiers: [] } };
 var actions = {};
@@ -668,21 +667,21 @@ actions["Controls/Map view/Move vertices up; Move vertices forward"] = { key:315
 actions["Controls/Map view/Move vertices down; Move vertices backward"] = { key:317, modifiers: [] };
 actions["Controls/Map view/Move vertices left"] = { key:314, modifiers: [] };
 actions["Controls/Map view/Move vertices right"] = { key:316, modifiers: [] };
-actions["Controls/Map view/Move vertices forward; Move vertices up"] = { key:366, modifiers: [] };
-actions["Controls/Map view/Move vertices backward; Move vertices down"] = { key:367, modifiers: [] };
+actions["Controls/Map view/Move vertices backward; Move vertices up"] = { key:366, modifiers: [] };
+actions["Controls/Map view/Move vertices forward; Move vertices down"] = { key:367, modifiers: [] };
 actions["Controls/Map view/Move rotation center up; Move rotation center forward"] = { key:315, modifiers: [] };
 actions["Controls/Map view/Move rotation center down; Move rotation center backward"] = { key:317, modifiers: [] };
 actions["Controls/Map view/Move rotation center left"] = { key:314, modifiers: [] };
 actions["Controls/Map view/Move rotation center right"] = { key:316, modifiers: [] };
-actions["Controls/Map view/Move rotation center forward; Move rotation center up"] = { key:366, modifiers: [] };
-actions["Controls/Map view/Move rotation center backward; Move rotation center down"] = { key:367, modifiers: [] };
-actions["Controls/Map view/Toggle fly mode"] = { key:70, modifiers: [] };
+actions["Controls/Map view/Move rotation center backward; Move rotation center up"] = { key:366, modifiers: [] };
+actions["Controls/Map view/Move rotation center forward; Move rotation center down"] = { key:367, modifiers: [] };
+actions["Controls/Map view/Toggle fly mode"] = { key:89, modifiers: [] };
 actions["Controls/Map view/Move objects up; Move objects forward"] = { key:315, modifiers: [] };
 actions["Controls/Map view/Move objects down; Move objects backward"] = { key:317, modifiers: [] };
 actions["Controls/Map view/Move objects left"] = { key:314, modifiers: [] };
 actions["Controls/Map view/Move objects right"] = { key:316, modifiers: [] };
-actions["Controls/Map view/Move objects forward; Move objects up"] = { key:366, modifiers: [] };
-actions["Controls/Map view/Move objects backward; Move objects down"] = { key:367, modifiers: [] };
+actions["Controls/Map view/Move objects backward; Move objects up"] = { key:366, modifiers: [] };
+actions["Controls/Map view/Move objects forward; Move objects down"] = { key:367, modifiers: [] };
 actions["Controls/Map view/Roll objects clockwise"] = { key:315, modifiers: [307] };
 actions["Controls/Map view/Roll objects counter-clockwise"] = { key:317, modifiers: [307] };
 actions["Controls/Map view/Yaw objects clockwise"] = { key:314, modifiers: [307] };
@@ -695,8 +694,8 @@ actions["Controls/Map view/Duplicate and move objects up; Duplicate and move obj
 actions["Controls/Map view/Duplicate and move objects down; Duplicate and move objects backward"] = { key:317, modifiers: [308] };
 actions["Controls/Map view/Duplicate and move objects left"] = { key:314, modifiers: [308] };
 actions["Controls/Map view/Duplicate and move objects right"] = { key:316, modifiers: [308] };
-actions["Controls/Map view/Duplicate and move objects forward; Duplicate and move objects up"] = { key:366, modifiers: [308] };
-actions["Controls/Map view/Duplicate and move objects backward; Duplicate and move objects down"] = { key:367, modifiers: [308] };
+actions["Controls/Map view/Duplicate and move objects backward; Duplicate and move objects up"] = { key:366, modifiers: [308] };
+actions["Controls/Map view/Duplicate and move objects forward; Duplicate and move objects down"] = { key:367, modifiers: [308] };
 actions["Controls/Map view/Move textures up"] = { key:315, modifiers: [] };
 actions["Controls/Map view/Move textures up (fine)"] = { key:315, modifiers: [308] };
 actions["Controls/Map view/Move textures up (coarse)"] = { key:315, modifiers: [306] };

diff --git a/cmake/GenerateManual.cmake b/cmake/GenerateManual.cmake
@@ -5,7 +5,8 @@ SET(DOC_MANUAL_TARGET_DIR "${CMAKE_CURRENT_BINARY_DIR}/gen-manual")
 
 SET(PANDOC_TEMPLATE_PATH "${DOC_MANUAL_SOURCE_DIR}/template.html")
 SET(PANDOC_INPUT_PATH    "${DOC_MANUAL_SOURCE_DIR}/index.md")
-SET(PANDOC_OUTPUT_PATH   "${DOC_MANUAL_TARGET_DIR}/index.html")
+SET(PANDOC_OUTPUT_PATH   "${DOC_MANUAL_TARGET_DIR}/index.html.tmp")
+SET(INDEX_OUTPUT_PATH    "${DOC_MANUAL_TARGET_DIR}/index.html")
 
 FIX_WIN32_PATH(PANDOC_TEMPLATE_PATH)
 FIX_WIN32_PATH(PANDOC_INPUT_PATH)
@@ -15,13 +16,14 @@ ADD_CUSTOM_COMMAND(OUTPUT "${DOC_MANUAL_TARGET_DIR}"
     COMMAND ${CMAKE_COMMAND} -E make_directory "${DOC_MANUAL_TARGET_DIR}"
 )
 
-ADD_CUSTOM_COMMAND(OUTPUT "${DOC_MANUAL_TARGET_DIR}/index.html"
-    COMMAND pandoc -s --toc --toc-depth=2 --template "${PANDOC_TEMPLATE_PATH}" -o "${PANDOC_OUTPUT_PATH}" "${PANDOC_INPUT_PATH}"
-    COMMAND ${CMAKE_COMMAND} -DINPUT="${DOC_MANUAL_TARGET_DIR}/index.html" -DOUTPUT="${DOC_MANUAL_TARGET_DIR}/index.html" -P "${CMAKE_SOURCE_DIR}/cmake/TransformKeyboardShortcuts.cmake"
+ADD_CUSTOM_COMMAND(OUTPUT "${INDEX_OUTPUT_PATH}"
+    COMMAND pandoc --standalone --toc --toc-depth=2 --template "${PANDOC_TEMPLATE_PATH}" --from=markdown --to=html5 -o "${PANDOC_OUTPUT_PATH}" "${PANDOC_INPUT_PATH}"
+    COMMAND ${CMAKE_COMMAND} -DINPUT="${PANDOC_OUTPUT_PATH}" -DOUTPUT="${INDEX_OUTPUT_PATH}" -P "${CMAKE_SOURCE_DIR}/cmake/TransformKeyboardShortcuts.cmake"
+    COMMAND ${CMAKE_COMMAND} -E remove "${PANDOC_OUTPUT_PATH}"
     DEPENDS "${DOC_MANUAL_TARGET_DIR}" "${PANDOC_TEMPLATE_PATH}" "${PANDOC_INPUT_PATH}" "${CMAKE_SOURCE_DIR}/cmake/TransformKeyboardShortcuts.cmake"
 )
 
-SET(DOC_MANUAL_TARGET_FILES "${DOC_MANUAL_TARGET_DIR}/index.html")
+SET(DOC_MANUAL_TARGET_FILES "${INDEX_OUTPUT_PATH}")
 
 FILE(GLOB_RECURSE DOC_MANUAL_SOURCE_FILES
     "${DOC_MANUAL_SOURCE_DIR}/images/*.png"

diff --git a/cmake/TransformKeyboardShortcuts.cmake b/cmake/TransformKeyboardShortcuts.cmake
@@ -1,6 +1,8 @@
-SET(HELP_MENU_PATTERN       "#menu\\('([^']+)'\\)")
+MESSAGE(STATUS "Transforming keyboard shortcuts ${INPUT} -> ${OUTPUT}")
+
+SET(HELP_MENU_PATTERN       "#menu\\(([^)]+)\\)")
 SET(HELP_MENU_REPLACEMENT   "<script>print_menu_item(\"\\1\");</script>")
-SET(HELP_ACTION_PATTERN     "#action\\('([^']+)'\\)")
+SET(HELP_ACTION_PATTERN     "#action\\(([^)]+)\\)")
 SET(HELP_ACTION_REPLACEMENT "<script>print_action(\"\\1\");</script>")
 SET(HELP_KEY_PATTERN 	    "#key\\(([0-9]+)\\)")
 SET(HELP_KEY_REPLACEMENT 	"<script>print_key(\\1);</script>")

diff --git a/common/src/Model/Brush.cpp b/common/src/Model/Brush.cpp
@@ -539,7 +539,7 @@ namespace TrenchBroom {
 
                     Model::TexCoordSystemSnapshot* snapshot = source->takeTexCoordSystemSnapshot();
                     if (snapshot != nullptr) {
-                        destination->copyTexCoordSystemFromFace(snapshot, source->attribs().takeSnapshot(), source->boundary());
+                        destination->copyTexCoordSystemFromFace(snapshot, source->attribs().takeSnapshot(), source->boundary(), WrapStyle::Projection);
                         delete snapshot;
                     }
                 }
@@ -560,7 +560,7 @@ namespace TrenchBroom {
 
                     Model::TexCoordSystemSnapshot* snapshot = source->takeTexCoordSystemSnapshot();
                     if (snapshot != nullptr) {
-                        destination->copyTexCoordSystemFromFace(snapshot, source->attribs().takeSnapshot(), destination->boundary());
+                        destination->copyTexCoordSystemFromFace(snapshot, source->attribs().takeSnapshot(), destination->boundary(), WrapStyle::Projection);
                         delete snapshot;
                     }
                 }

diff --git a/common/src/Model/BrushFace.cpp b/common/src/Model/BrushFace.cpp
@@ -132,7 +132,7 @@ namespace TrenchBroom {
             coordSystemSnapshot->restore(m_texCoordSystem);
         }
 
-        void BrushFace::copyTexCoordSystemFromFace(const TexCoordSystemSnapshot* coordSystemSnapshot, const BrushFaceAttributes& attribs, const Plane3& sourceFacePlane) {
+        void BrushFace::copyTexCoordSystemFromFace(const TexCoordSystemSnapshot* coordSystemSnapshot, const BrushFaceAttributes& attribs, const Plane3& sourceFacePlane, const WrapStyle wrapStyle) {
             // Get a line, and a reference point, that are on both the source face's plane and our plane
             const Line3 seam = sourceFacePlane.intersectWithPlane(m_boundary);
             const Vec3 refPoint = seam.pointOnLineClosestToPoint(center());
@@ -142,7 +142,7 @@ namespace TrenchBroom {
             // Get the texcoords at the refPoint using the source face's attribs and tex coord system
             const Vec2f desriedCoords = m_texCoordSystem->getTexCoords(refPoint, attribs) * attribs.textureSize();
 
-            m_texCoordSystem->updateNormal(sourceFacePlane.normal, m_boundary.normal, m_attribs);
+            m_texCoordSystem->updateNormal(sourceFacePlane.normal, m_boundary.normal, m_attribs, wrapStyle);
 
             // Adjust the offset on this face so that the texture coordinates at the refPoint stay the same
             if (!seam.direction.null()) {
@@ -444,7 +444,7 @@ namespace TrenchBroom {
             using std::swap;
 
             const Vec3 invariant = m_geometry != nullptr ? center() : m_boundary.anchor();
-            m_texCoordSystem->transform(m_boundary, transform, m_attribs, lockTexture, invariant);
+            const Plane3 oldBoundary = m_boundary;
 
             m_boundary.transform(transform);
             for (size_t i = 0; i < 3; ++i)
@@ -455,6 +455,8 @@ namespace TrenchBroom {
             }
 
             setPoints(m_points[0], m_points[1], m_points[2]);
+
+            m_texCoordSystem->transform(oldBoundary, m_boundary, transform, m_attribs, lockTexture, invariant);
         }
 
         void BrushFace::invert() {
@@ -483,7 +485,7 @@ namespace TrenchBroom {
                 // Get the texcoords at the refPoint using the old face's attribs and tex coord system
                 const Vec2f desriedCoords = m_texCoordSystem->getTexCoords(refPoint, m_attribs) * m_attribs.textureSize();
 
-                m_texCoordSystem->updateNormal(oldPlane.normal, m_boundary.normal, m_attribs);
+                m_texCoordSystem->updateNormal(oldPlane.normal, m_boundary.normal, m_attribs, WrapStyle::Projection);
 
                 // Adjust the offset on this face so that the texture coordinates at the refPoint stay the same
                 const Vec2f currentCoords = m_texCoordSystem->getTexCoords(refPoint, m_attribs) * m_attribs.textureSize();

diff --git a/common/src/Model/BrushFace.h b/common/src/Model/BrushFace.h
@@ -111,7 +111,7 @@ namespace TrenchBroom {
             BrushFaceSnapshot* takeSnapshot();
             TexCoordSystemSnapshot* takeTexCoordSystemSnapshot() const;
             void restoreTexCoordSystemSnapshot(const TexCoordSystemSnapshot* coordSystemSnapshot);
-            void copyTexCoordSystemFromFace(const TexCoordSystemSnapshot* coordSystemSnapshot, const BrushFaceAttributes& attribs, const Plane3& sourceFacePlane);
+            void copyTexCoordSystemFromFace(const TexCoordSystemSnapshot* coordSystemSnapshot, const BrushFaceAttributes& attribs, const Plane3& sourceFacePlane, const WrapStyle wrapStyle);
 
             Brush* brush() const;
             void setBrush(Brush* brush);

diff --git a/common/src/Model/ParallelTexCoordSystem.cpp b/common/src/Model/ParallelTexCoordSystem.cpp
@@ -121,7 +121,7 @@ namespace TrenchBroom {
             m_yAxis = rot * m_yAxis;
         }
 
-        void ParallelTexCoordSystem::doTransform(const Plane3& oldBoundary, const Mat4x4& transformation, BrushFaceAttributes& attribs, bool lockTexture, const Vec3& oldInvariant) {
+        void ParallelTexCoordSystem::doTransform(const Plane3& oldBoundary, const Plane3& newBoundary, const Mat4x4& transformation, BrushFaceAttributes& attribs, bool lockTexture, const Vec3& oldInvariant) {
 
             if (attribs.xScale() == 0.0f || attribs.yScale() == 0.0f)
                 return;

diff --git a/common/src/Model/ParallelTexCoordSystem.h b/common/src/Model/ParallelTexCoordSystem.h
@@ -71,7 +71,7 @@ namespace TrenchBroom {
             void doSetRotation(const Vec3& normal, float oldAngle, float newAngle);
             void applyRotation(const Vec3& normal, FloatType angle);
 
-            void doTransform(const Plane3& oldBoundary, const Mat4x4& transformation, BrushFaceAttributes& attribs, bool lockTexture, const Vec3& invariant);
+            void doTransform(const Plane3& oldBoundary, const Plane3& newBoundary, const Mat4x4& transformation, BrushFaceAttributes& attribs, bool lockTexture, const Vec3& invariant);
             float computeTextureAngle(const Plane3& oldBoundary, const Mat4x4& transformation) const;
             Mat4x4 computeNonTextureRotation(const Vec3& oldNormal, const Vec3& newNormal, const Mat4x4& rotation) const;