[Jrisk-cvs] SF.net SVN: domination-code:[2531] Domination/src/net/yura/domination/ engine

[<yu...@us...>]

Revision: 2531
          http://sourceforge.net/p/domination/code/2531
Author:   yuranet
Date:     2024-05-08 09:23:20 +0000 (Wed, 08 May 2024)
Log Message:
-----------
move method

Modified Paths:
--------------
    Domination/src/net/yura/domination/engine/ColorUtil.java
    Domination/src/net/yura/domination/engine/core/RiskGame.java

Modified: Domination/src/net/yura/domination/engine/ColorUtil.java
===================================================================
--- Domination/src/net/yura/domination/engine/ColorUtil.java	2024-05-07 21:31:08 UTC (rev 2530)
+++ Domination/src/net/yura/domination/engine/ColorUtil.java	2024-05-08 09:23:20 UTC (rev 2531)
@@ -173,4 +173,56 @@
         public static String getHexForColor(int c) {
                 return "#" + Integer.toHexString((  c & 0xffffff) | 0x1000000).substring(1);
         }
+
+    /**
+     * copy and paste from
+     * @see java.awt.Color#HSBtoRGB(float, float, float)
+     */
+    public static int HSBtoRGB(float hue, float saturation, float brightness) {
+        int r = 0;
+        int g = 0;
+        int b = 0;
+        if (saturation == 0) {
+            r = g = b = (int) (brightness * 255.0F + 0.5F);
+        } else {
+            float h = (hue - (float) Math.floor(hue)) * 6.0F;
+            float f = h - (float) Math.floor(h);
+            float p = brightness * (1.0F - saturation);
+            float q = brightness * (1.0F - saturation * f);
+            float t = brightness * (1.0F - (saturation * (1.0F - f)));
+            switch ((int) h) {
+                case 0:
+                    r = (int) (brightness * 255.0F + 0.5F);
+                    g = (int) (t * 255.0F + 0.5F);
+                    b = (int) (p * 255.0F + 0.5F);
+                    break;
+                case 1:
+                    r = (int) (q * 255.0F + 0.5F);
+                    g = (int) (brightness * 255.0F + 0.5F);
+                    b = (int) (p * 255.0F + 0.5F);
+                    break;
+                case 2:
+                    r = (int) (p * 255.0F + 0.5F);
+                    g = (int) (brightness * 255.0F + 0.5F);
+                    b = (int) (t * 255.0F + 0.5F);
+                    break;
+                case 3:
+                    r = (int) (p * 255.0F + 0.5F);
+                    g = (int) (q * 255.0F + 0.5F);
+                    b = (int) (brightness * 255.0F + 0.5F);
+                    break;
+                case 4:
+                    r = (int) (t * 255.0F + 0.5F);
+                    g = (int) (p * 255.0F + 0.5F);
+                    b = (int) (brightness * 255.0F + 0.5F);
+                    break;
+                case 5:
+                    r = (int) (brightness * 255.0F + 0.5F);
+                    g = (int) (p * 255.0F + 0.5F);
+                    b = (int) (q * 255.0F + 0.5F);
+                    break;
+            }
+        }
+        return -16777216 | (r << 16) | (g << 8) | (b << 0);
+    }
 }

Modified: Domination/src/net/yura/domination/engine/core/RiskGame.java
===================================================================
--- Domination/src/net/yura/domination/engine/core/RiskGame.java	2024-05-07 21:31:08 UTC (rev 2530)
+++ Domination/src/net/yura/domination/engine/core/RiskGame.java	2024-05-08 09:23:20 UTC (rev 2531)
@@ -2715,59 +2715,9 @@
 	}
 
 	public static int getRandomColor() {
-		return HSBtoRGB( (float)Math.random(), 0.5F, 1.0F );
+		return ColorUtil.HSBtoRGB( (float)Math.random(), 0.5F, 1.0F );
 	}
 
-     /**
-      * copy and paste from
-      * @see java.awt.Color#HSBtoRGB(float, float, float)
-      */
-    public static int HSBtoRGB(float hue, float saturation, float brightness) {
-	int r = 0, g = 0, b = 0;
-    	if (saturation == 0) {
-	    r = g = b = (int) (brightness * 255.0f + 0.5f);
-	} else {
-	    float h = (hue - (float)Math.floor(hue)) * 6.0f;
-	    float f = h - (float)java.lang.Math.floor(h);
-	    float p = brightness * (1.0f - saturation);
-	    float q = brightness * (1.0f - saturation * f);
-	    float t = brightness * (1.0f - (saturation * (1.0f - f)));
-	    switch ((int) h) {
-	    case 0:
-		r = (int) (brightness * 255.0f + 0.5f);
-		g = (int) (t * 255.0f + 0.5f);
-		b = (int) (p * 255.0f + 0.5f);
-		break;
-	    case 1:
-		r = (int) (q * 255.0f + 0.5f);
-		g = (int) (brightness * 255.0f + 0.5f);
-		b = (int) (p * 255.0f + 0.5f);
-		break;
-	    case 2:
-		r = (int) (p * 255.0f + 0.5f);
-		g = (int) (brightness * 255.0f + 0.5f);
-		b = (int) (t * 255.0f + 0.5f);
-		break;
-	    case 3:
-		r = (int) (p * 255.0f + 0.5f);
-		g = (int) (q * 255.0f + 0.5f);
-		b = (int) (brightness * 255.0f + 0.5f);
-		break;
-	    case 4:
-		r = (int) (t * 255.0f + 0.5f);
-		g = (int) (p * 255.0f + 0.5f);
-		b = (int) (brightness * 255.0f + 0.5f);
-		break;
-	    case 5:
-		r = (int) (brightness * 255.0f + 0.5f);
-		g = (int) (p * 255.0f + 0.5f);
-		b = (int) (q * 255.0f + 0.5f);
-		break;
-	    }
-	}
-	return 0xff000000 | (r << 16) | (g << 8) | (b << 0);
-    }
-
     public int getNoAttackDice() {
         if ( attacker.getArmies() > 4 ) { return 3; }
         else { return attacker.getArmies()-1; }