Brian Fiete 4 месяцев назад
Родитель
Сommit
11bc782835
2 измененных файлов с 9 добавлено и 3 удалено
  1. 7 1
      BeefLibs/Beefy2D/src/geom/Rect.bf
  2. 2 2
      BeefLibs/corlib/src/IRefCounted.bf

+ 7 - 1
BeefLibs/Beefy2D/src/geom/Rect.bf

@@ -212,6 +212,12 @@ namespace Beefy.geom
                     (y >= mY) && (y < mY + mHeight));
         }
 
+		public bool ContainsInclusive(T x, T y)
+		{
+		    return ((x >= mX) && (x <= mX + mWidth) &&
+		            (y >= mY) && (y <= mY + mHeight));
+		}
+
         public bool Contains(Point<T> pt)
         {
             return Contains(pt.x, pt.y);
@@ -219,7 +225,7 @@ namespace Beefy.geom
 
         public bool Contains(Self rect)
         {
-            return Contains(rect.mX, rect.mY) && Contains(rect.mX + rect.mWidth, rect.mY + rect.mHeight);
+            return Contains(rect.mX, rect.mY) && ContainsInclusive(rect.mX + rect.mWidth, rect.mY + rect.mHeight);
         }
 
         public void Offset(T x, T y) mut

+ 2 - 2
BeefLibs/corlib/src/IRefCounted.bf

@@ -82,7 +82,7 @@ namespace System
 		}	
 	}
 
-	class RefCounted<T> : IRefCounted where T : class, delete
+	class RefCounted<T> : IRefCounted where T : delete
 	{
 		public T mVal;
 		public int mRefCount = 1;
@@ -178,7 +178,7 @@ namespace System
 		public virtual T Detach()
 		{
 			var val = mVal;
-			mVal = null;
+			mVal = default;
 			return val;
 		}