Fixed some texture smearing issues

Author: Sander van Rossen

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Control/Helpers/GeometryUtility.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
 using InternalRealtimeCSG;
@@ -921,7 +921,7 @@ public static bool ContinueTexGenFromSurfaceToSurface(CSGBrush brush, int srcSur
             var dstModelPoint2 = modelFromWorld.MultiplyPoint(dstWorldPoint2);
 
             var result = SurfaceUtility.AlignTextureSpaces(localFromModel,     texGens[srcTexGenIndex], texGenFlags[srcTexGenIndex], ref surfaces[srcSurfaceIndex], srcModelPoint1, srcModelPoint2,
-                                                           localFromModel, ref texGens[dstTexGenIndex], texGenFlags[dstTexGenIndex], ref surfaces[dstSurfaceIndex], dstModelPoint1, dstModelPoint2, false);
+                                                           localFromModel, ref texGens[dstTexGenIndex], texGenFlags[dstTexGenIndex], ref surfaces[dstSurfaceIndex], dstModelPoint1, dstModelPoint2, false, Vector3.one);
 
 //          if (src_is_world_space) SurfaceUtility.SetTextureLock(brush, srcSurfaceIndex, false);
 //          if (dst_is_world_space) SurfaceUtility.SetTextureLock(brush, dstSurfaceIndex, false);

RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Control/Helpers/SurfaceUtility.cs

@@ -1,4 +1,4 @@
-using InternalRealtimeCSG;
+using InternalRealtimeCSG;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
@@ -695,6 +695,11 @@ static void CopyLastMaterialInternal(CSGBrush dstBrush, int dstSurfaceIndex, boo
             var dstTexGenIndex  = dstShape.Surfaces[dstSurfaceIndex].TexGenIndex;
             var srcTexGenIndex  = srcShape.Surfaces[srcSurfaceIndex].TexGenIndex;
 
+            var srcBrushScale   = srcBrush.transform.lossyScale;
+            var dstBrushScale   = dstBrush.transform.lossyScale;
+
+            var srcBrushFromLocal = srcBrush.transform.localToWorldMatrix;
+            var dstBrushFromLocal = dstBrush.transform.localToWorldMatrix;
             var srcBrushFromWorld = srcBrush.transform.worldToLocalMatrix;
             var dstBrushFromWorld = dstBrush.transform.worldToLocalMatrix;
 
@@ -729,9 +734,10 @@ static void CopyLastMaterialInternal(CSGBrush dstBrush, int dstSurfaceIndex, boo
             var det             = edgeDirection.sqrMagnitude;
             if (det < MathConstants.AlignmentTestEpsilon)
             {
+                var tangent = GeometryUtility.CalculateTangent(srcNormal);
                 // Find 2 pairs of points on each plane, assumes planes are perfectly aligned
                 srcWorldPoint1 = srcWorldPlane.pointOnPlane;
-                srcWorldPoint2 = GeometryUtility.ProjectPointOnPlane(srcWorldPlane, srcWorldPoint1 + MathConstants.oneVector3);
+                srcWorldPoint2 = GeometryUtility.ProjectPointOnPlane(srcWorldPlane, srcWorldPoint1 + tangent);
 
                 dstWorldPoint1 = GeometryUtility.ProjectPointOnPlane(dstWorldPlane, srcWorldPoint1);
                 dstWorldPoint2 = GeometryUtility.ProjectPointOnPlane(dstWorldPlane, srcWorldPoint2);
@@ -754,8 +760,13 @@ static void CopyLastMaterialInternal(CSGBrush dstBrush, int dstSurfaceIndex, boo
             var dstModelPoint1 = dstModelFromWorld.MultiplyPoint(dstWorldPoint1);
             var dstModelPoint2 = dstModelFromWorld.MultiplyPoint(dstWorldPoint2);
 
+            var scale = dstBrushScale;
+            scale.x /= srcBrushScale.x; if (float.IsNaN(scale.x) || float.IsInfinity(scale.x)) scale.x = 1;
+            scale.y /= srcBrushScale.y; if (float.IsNaN(scale.y) || float.IsInfinity(scale.y)) scale.y = 1;
+            scale.z /= srcBrushScale.z; if (float.IsNaN(scale.z) || float.IsInfinity(scale.z)) scale.z = 1;
+
             if (AlignTextureSpaces(srcBrushFromModel,     srcTexGens[srcTexGenIndex], srcTexGenFlags[srcTexGenIndex], ref srcSurfaces[srcSurfaceIndex], srcModelPoint1, srcModelPoint2,
-                                   dstBrushFromModel, ref dstTexGens[dstTexGenIndex], dstTexGenFlags[dstTexGenIndex], ref dstSurfaces[dstSurfaceIndex], dstModelPoint1, dstModelPoint2, flipX))
+                                   dstBrushFromModel, ref dstTexGens[dstTexGenIndex], dstTexGenFlags[dstTexGenIndex], ref dstSurfaces[dstSurfaceIndex], dstModelPoint1, dstModelPoint2, flipX, scale))
             {
                 if (dstTexGens.Length != dstTexGenFlags.Length)
                 {
@@ -1264,7 +1275,7 @@ public static bool TranslateTextureCoordInLocalSpace(ref TexGen texGen, TexGenFl
         }
 
         public static bool AlignTextureSpaces(Matrix4x4 src_Brush_From_Model,     TexGen srcTexGen, TexGenFlags srcTexGenFlags, ref Surface srcSurface, Vector3 srcModelPoint1, Vector3 srcModelPoint2, 
-                                              Matrix4x4 dst_Brush_From_Model, ref TexGen dstTexGen, TexGenFlags dstTexGenFlags, ref Surface dstSurface, Vector3 dstModelPoint1, Vector3 dstModelPoint2, bool flipX)
+                                              Matrix4x4 dst_Brush_From_Model, ref TexGen dstTexGen, TexGenFlags dstTexGenFlags, ref Surface dstSurface, Vector3 dstModelPoint1, Vector3 dstModelPoint2, bool flipX, Vector3 scale)
         {
             var src_Plane_From_Model    = GenerateModelSpaceToPlaneSpaceMatrix(srcSurface, srcTexGenFlags, src_Brush_From_Model);
             var dst_Plane_From_Model    = GenerateModelSpaceToPlaneSpaceMatrix(dstSurface, dstTexGenFlags, dst_Brush_From_Model);
@@ -1311,6 +1322,12 @@ public static bool AlignTextureSpaces(Matrix4x4 src_Brush_From_Model,     TexGen
                 dstTexGen.RotationAngle = angle;
             }
 
+            if (scale != Vector3.one)
+            {
+                var dst_Texture_From_Plane = dstTexGen.GeneratePlaneSpaceToTextureSpaceMatrix();
+                dstTexGen.Scale = dst_Texture_From_Plane.MultiplyVector(scale);
+            }
+
             // Re-align dstTexcoord1 with srcTexcoord1 on dstTexGen
             {
                 dstTexGen.Translation = Vector2.zero;