Redraw skin Images, edit skin load method (#4080)

yairm210 · Jun 10, 2021 · 7e284f9 · 7e284f9
1 parent 91154ae
commit 7e284f9
Show file tree

Hide file tree

Showing 26 changed files with 737 additions and 832 deletions.
diff --git a/android/Skin/checkbox-pressed.png b/android/Skin/checkbox-pressed.png
diff --git a/android/Skin/checkbox.png b/android/Skin/checkbox.png
diff --git a/android/Skin/rectangleWithOutline.png b/android/Skin/rectangleWithOutline.png
diff --git a/...id/Images/OtherIcons/buttonBackground.png → android/Skin/roundedEdgeRectangle.png b/...id/Images/OtherIcons/buttonBackground.png → android/Skin/roundedEdgeRectangle.png
diff --git a/android/Skin/select-box-pressed.png b/android/Skin/select-box-pressed.png
diff --git a/android/Skin/select-box.png b/android/Skin/select-box.png
diff --git a/android/assets/BuildingIcons.atlas b/android/assets/BuildingIcons.atlas
@@ -2,7 +2,7 @@
 BuildingIcons.png
 size: 2048, 1024
 format: RGBA8888
-filter: MipMapLinearLinear, MipMapLinearLinear
+filter: Nearest, Nearest
 repeat: none
 Alhambra
   rotate: false

diff --git a/android/assets/FlagIcons.atlas b/android/assets/FlagIcons.atlas
@@ -2,7 +2,7 @@
 FlagIcons.png
 size: 2048, 512
 format: RGBA8888
-filter: MipMapLinearLinear, MipMapLinearLinear
+filter: Nearest, Nearest
 repeat: none
 Brazilian_Portuguese
   rotate: false

diff --git a/android/assets/Skin.atlas b/android/assets/Skin.atlas
@@ -0,0 +1,48 @@
+
+Skin.png
+size: 256, 64
+format: RGBA8888
+filter: Linear, Linear
+repeat: none
+checkbox
+  rotate: false
+  xy: 140, 26
+  size: 31, 31
+  orig: 31, 31
+  offset: 0, 0
+  index: -1
+checkbox-pressed
+  rotate: false
+  xy: 173, 26
+  size: 31, 31
+  orig: 31, 31
+  offset: 0, 0
+  index: -1
+rectangleWithOutline
+  rotate: false
+  xy: 2, 2
+  size: 3, 3
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
+roundedEdgeRectangle
+  rotate: false
+  xy: 2, 7
+  size: 52, 50
+  orig: 52, 50
+  offset: 0, 0
+  index: -1
+select-box
+  rotate: false
+  xy: 56, 27
+  size: 40, 30
+  orig: 40, 30
+  offset: 0, 0
+  index: -1
+select-box-pressed
+  rotate: false
+  xy: 98, 27
+  size: 40, 30
+  orig: 40, 30
+  offset: 0, 0
+  index: -1
diff --git a/android/assets/skin/flat-earth-ui.json → android/assets/Skin.json b/android/assets/skin/flat-earth-ui.json → android/assets/Skin.json
@@ -50,128 +50,88 @@ com.badlogic.gdx.graphics.Color: {
 }
 com.badlogic.gdx.scenes.scene2d.ui.Skin$TintedDrawable: {
 	button-c: {
-		name: "Button"
+		name: "RoundedEdgeRectangle"
 		color: color
 	}
-	button-pressed-c: {
-		name: "Button"
-		color: color
+	button-p: {
+		name: "RoundedEdgeRectangle"
+		color: pressed
 	}
 	button-h: {
-		name: "Button"
+		name: "RoundedEdgeRectangle"
 		color: highlight
 	}
 	checkbox-c: {
-		name: checkbox
+		name: "Checkbox"
 		color: color
 	}
 	checkbox-pressed-c: {
-		name: checkbox-pressed
+		name: "Checkbox-pressed"
 		color: color
 	}
 	list-c: {
-		name: list
+		name: "RectangleWithOutline"
 		color: color
 	}
 	scrollbar-c: {
-		name: scrollbar
+		name: "Scrollbar"
 		color: color
 	}
 	select-box-c: {
-		name: select-box
+		name: "Select-box"
 		color: color
 	}
 	select-box-pressed-c: {
-		name: select-box-pressed
+		name: "Select-box-pressed"
 		color: color
 	}
-	slider-horizontal-c: {
-		name: slider-horizontal
-		color: color
+	select-box-h: {
+		name: "Select-box"
+		color: highlight
 	}
 	slider-knob-c: {
-		name: slider-knob
-		color: color
-	}
-	slider-vertical-c: {
-		name: slider-vertical
-		color: color
-	}
-	splitpane-horizontal-c: {
-		name: splitpane-horizontal
-		color: color
-	}
-	splitpane-vertical-c: {
-		name: splitpane-vertical
-		color: color
-	}
-	textfield-c: {
-		name: "Button"
-		color: color
-	}
-	color: {
-		name: white
+		name: "Circle"
 		color: color
 	}
-	selection: {
-		name: white
-		color: selection
-	}
 	slider-horizontal-s: {
-		name: slider-horizontal
+		name: "Rectangle"
 		color: selection
 	}
 	slider-vertical-s: {
-		name: slider-vertical
+		name: "Rectangle"
 		color: selection
 	}
-	select-box-pressed-h: {
-		name: select-box-pressed
-		color: highlight
-	}
-	select-box-h: {
-		name: select-box
-		color: highlight
-	}
 	slider-knob-h: {
-		name: slider-knob
+		name: "Circle"
 		color: highlight
 	}
 	slider-horizontal-p: {
-		name: slider-horizontal
+		name: "Rectangle"
 		color: pressed
 	}
 	slider-vertical-p: {
-		name: slider-vertical
-		color: pressed
-	}
-	black: {
-		name: white
-		color: black
-	}
-	button-p: {
-		name: "Button"
+		name: "Rectangle"
 		color: pressed
 	}
-	slider-fancy-p: {
-		name: slider-fancy
-		color: pressed
+	splitpane-horizontal-c: {
+		name: "RectangleWithOutline"
+		color: color
 	}
-	checkbox-h: {
-		name: checkbox
-		color: highlight
+	splitpane-vertical-c: {
+		name: "RectangleWithOutline"
+		color: color
 	}
-	checkbox-pressed-h: {
-		name: checkbox-pressed
-		color: highlight
+	textfield-c: {
+		name: "RoundedEdgeRectangle"
+		color: color
 	}
-	checkbox-p: {
-		name: checkbox
-		color: pressed
+	selection: {
+		name: "Rectangle"
+		color: selection
 	}
-	checkbox-pressed-p: {
-		name: checkbox-pressed
-		color: pressed
+	white: {
+		name: "Rectangle"
+		color: white
 	}
 }
 com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle: {
@@ -238,13 +198,6 @@ com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
 		knob: slider-knob-c
 		knobBefore: slider-vertical-s
 	}
-	fancy: {
-		knobOver: slider-knob-h
-		knobDown: slider-knob-h
-		background: slider-fancy-p
-		knob: slider-knob-c
-		knobBefore: slider-fancy-knob
-	}
 }
 com.badlogic.gdx.scenes.scene2d.ui.SplitPane$SplitPaneStyle: {
 	default-horizontal: {

diff --git a/android/assets/Skin.png b/android/assets/Skin.png
diff --git a/android/assets/UnitIcons.atlas b/android/assets/UnitIcons.atlas
@@ -2,7 +2,7 @@
 UnitIcons.png
 size: 2048, 512
 format: RGBA8888
-filter: MipMapLinearLinear, MipMapLinearLinear
+filter: Nearest, Nearest
 repeat: none
 Anti-Aircraft Gun
   rotate: false