little bit of optimization and cleanup

Author: rbray89

ActiveTextureManagement/TextureConverter.cs

@@ -549,9 +549,9 @@ internal static bool WriteTo(Texture2D cacheTexture, string cacheFile)
                 compression = SquishFlags.kDxt1;
             }
 
-            for (int i = 0; i < 32; i++)
+            for (int i = 0; i < cacheTexture.mipmapCount; i++)
             {
-                int width = Math.Max(1, cacheTexture.width>>i);
+                int width = Math.Max(1, cacheTexture.width >> i);
                 int height = Math.Max(1, cacheTexture.height >> i);
                 if(i != 0)
                 {
@@ -560,19 +560,15 @@ internal static bool WriteTo(Texture2D cacheTexture, string cacheFile)
                 int size = squish.GetStorageRequirements(width, height, compression);
                 squish.CompressImage(img, width, height, imageBuffer, compression | SquishFlags.kColourIterativeClusterFit | SquishFlags.kWeightColourByAlpha);
                 imgStream.Write(imageBuffer, 0, size);
-                if(width == 1 || height == 1 || cacheTexture.mipmapCount == 1)
+                if(width == 1 || height == 1)
                 {
                     break;
                 }
             }
             imgStream.Close();
             return hasAlpha;
         }
-
-        static int index1(int v)
-        {
-            return (int)(sizeof(int)) * 8 - 1 - (32 - (Convert.ToString(v, 2).Length));
-        }
+        
 
         private static bool texHasAlpha(byte[] colors)
         {

LibSquishPort/clusterfit.cs

@@ -43,6 +43,8 @@ class ClusterFit : ColourFit
         Vector4 m_xsum_wsum;
         Vector4 m_metric;
         Vector4 m_besterror;
+        static Vector4 grid = new Vector4(31.0f, 63.0f, 31.0f, 0);
+        static Vector4 gridrcp = new Vector4(1.0f / 31.0f, 1.0f / 63.0f, 1.0f / 31.0f, 0.0f);
 
         private static void swap<T>(ref T a, ref T b)
 {
@@ -144,12 +146,8 @@ public unsafe override void Compress3( byte* block )
 	// declare variables
 	int count = m_colours.GetCount();
 	Vector4  two = Vector4.one*( 2.0f );
-	Vector4  one = Vector4.one*( 1.0f );
 	Vector4  half_half2 = new Vector4( 0.5f, 0.5f, 0.5f, 0.25f );
-	Vector4  zero = Vector4.zero;
 	Vector4  half = Vector4.one*( 0.5f );
-	Vector4  grid = new Vector4( 31.0f, 63.0f, 31.0f, 0.0f );
-	Vector4  gridrcp = new Vector4( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
 
 	// prepare an ordering using the principle axis
 	ructOrdering( m_principle, 0 );
@@ -192,8 +190,8 @@ public unsafe override void Compress3( byte* block )
 				Vector4 b = Vector4.Scale( alphax_sum.NegativeMultiplySubtract( alphabeta_sum, Vector4.Scale(betax_sum,alpha2_sum) ), factor);
 
 				// clamp to the grid
-				a = Vector4.Min( one, Vector4.Max( zero, a ) );
-				b = Vector4.Min( one, Vector4.Max( zero, b ) );
+                a = Vector4.Min(Vector4.one, Vector4.Max(Vector4.zero, a));
+                b = Vector4.Min(Vector4.one, Vector4.Max(Vector4.zero, b));
 				a = Vector4.Scale(( grid.MultiplyAdd( a, half ) ).Truncate(),gridrcp);
 				b = Vector4.Scale(( grid.MultiplyAdd( b, half ) ).Truncate(),gridrcp);
 
@@ -275,14 +273,10 @@ public unsafe override void Compress4( byte* block )
 	// declare variables
 	int  count = m_colours.GetCount();
 	Vector4  two = Vector4.one*( 2.0f );
-	Vector4  one = Vector4.one;
 	Vector4  onethird_onethird2 = new Vector4( 1.0f/3.0f, 1.0f/3.0f, 1.0f/3.0f, 1.0f/9.0f );
 	Vector4  twothirds_twothirds2 = new Vector4( 2.0f/3.0f, 2.0f/3.0f, 2.0f/3.0f, 4.0f/9.0f );
 	Vector4  twonineths = Vector4.one*( 2.0f/9.0f );
-	Vector4  zero = Vector4.zero;
 	Vector4  half = Vector4.one*( 0.5f );
-	Vector4  grid = new Vector4( 31.0f, 63.0f, 31.0f, 0.0f );
-	Vector4  gridrcp = new Vector4( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f, 0.0f );
 
 	// prepare an ordering using the principle axis
 	ructOrdering( m_principle, 0 );
@@ -329,8 +323,8 @@ public unsafe override void Compress4( byte* block )
 					Vector4 b = Vector4.Scale(alphax_sum.NegativeMultiplySubtract( alphabeta_sum, Vector4.Scale(betax_sum,alpha2_sum )),factor);
 
 					// clamp to the grid
-					a = Vector4.Min( one, Vector4.Max( zero, a ) );
-					b = Vector4.Min( one, Vector4.Max( zero, b ) );
+                    a = Vector4.Min(Vector4.one, Vector4.Max(Vector4.zero, a));
+                    b = Vector4.Min(Vector4.one, Vector4.Max(Vector4.zero, b));
 					a = Vector4.Scale(( grid.MultiplyAdd( a, half ) ).Truncate(),gridrcp);
 					b = Vector4.Scale(( grid.MultiplyAdd( b, half ) ).Truncate(),gridrcp);
 

LibSquishPort/rangefit.cs

@@ -36,6 +36,8 @@ class RangeFit : ColourFit
 	    Vector3 m_start;
 	    Vector3 m_end;
 	    float m_besterror;
+        static Vector3 grid = new Vector3(31.0f, 63.0f, 31.0f);
+        static Vector3 gridrcp = new Vector3(1.0f / 31.0f, 1.0f / 63.0f, 1.0f / 31.0f);
 
       public  RangeFit( ColourSet  colours, SquishFlags flags ) 
   : base( colours, flags )
@@ -92,8 +94,7 @@ public  RangeFit( ColourSet  colours, SquishFlags flags )
 	end = Vector3.Min( Vector3.one, Vector3.Max( Vector3.zero, end ) );
 
 	// clamp to the grid and save
-	Vector3  grid = new Vector3( 31.0f, 63.0f, 31.0f );
-	Vector3  gridrcp = new Vector3( 1.0f/31.0f, 1.0f/63.0f, 1.0f/31.0f );
+	
 	Vector3  half = Vector3.one*( 0.5f );
 	m_start = Vector3.Scale(math.Truncate( Vector3.Scale(grid,start) + half ),gridrcp);
 	m_end = Vector3.Scale(math.Truncate( Vector3.Scale(grid,end) + half ),gridrcp);