- raw-assets and asset building (skin-packing)

maps-basic/src/com/mobidevelop/maps/basic/BasicMap.java

@@ -1,6 +1,7 @@
 package com.mobidevelop.maps.basic;
 
 import com.mobidevelop.maps.Map;
+import com.mobidevelop.maps.MapLayer;
 import com.mobidevelop.maps.MapLayers;
 import com.mobidevelop.maps.MapProperties;
 import com.mobidevelop.maps.MapResources;
@@ -110,5 +111,12 @@ public BasicMap(float x, float y, float width, float height) {
 	public void dispose() {
 		resources.dispose();
 	}
-
+
+	@Override
+	public MapLayer createLayer( String name ) {
+
+		BasicMapLayer layer = new BasicMapLayer( this );
+		layer.setName( name );
+		return layer;
+	}
 }

maps-basic/src/com/mobidevelop/maps/brush/ImageBrushMapObject.java

@@ -0,0 +1,22 @@
+package com.mobidevelop.maps.brush;
+
+import com.mobidevelop.maps.MapLayer;
+import com.mobidevelop.maps.basic.BasicMapObject;
+
+
+public class ImageBrushMapObject extends BasicMapObject {
+
+	private String imageName;
+
+	public ImageBrushMapObject( MapLayer layer, float x, float y, String imageName ) {
+
+		super( layer, x, y );
+
+		this.imageName = imageName;
+	}
+
+	public String getImageName() {
+
+		return imageName;
+	}
+}

maps-editor-android/assets/data/uiskin.atlas

@@ -3,58 +3,80 @@ uiskin.png
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
+check-off
+  rotate: false
+  xy: 11, 5
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+textfield
+  rotate: false
+  xy: 11, 5
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+check-on
+  rotate: false
+  xy: 125, 35
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+cursor
+  rotate: false
+  xy: 23, 1
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
+  offset: 0, 0
+  index: -1
 default
   rotate: false
   xy: 1, 50
   size: 254, 77
   orig: 254, 77
   offset: 0, 0
   index: -1
-default-window
-  rotate: false
-  xy: 1, 20
-  size: 27, 29
-  split: 4, 3, 20, 3
-  orig: 27, 29
-  offset: 0, 0
-  index: -1
-default-select
+default-pane
   rotate: false
-  xy: 29, 29
-  size: 27, 20
-  split: 4, 14, 4, 4
-  orig: 27, 20
+  xy: 11, 1
+  size: 5, 3
+  split: 1, 1, 1, 1
+  orig: 5, 3
   offset: 0, 0
   index: -1
-default-round-large
+default-rect-pad
   rotate: false
-  xy: 57, 29
-  size: 20, 20
-  split: 5, 5, 5, 4
-  orig: 20, 20
+  xy: 11, 1
+  size: 5, 3
+  split: 1, 1, 1, 1
+  orig: 5, 3
   offset: 0, 0
   index: -1
-default-scroll
+default-pane-noborder
   rotate: false
-  xy: 78, 29
-  size: 20, 20
-  split: 2, 2, 2, 2
-  orig: 20, 20
+  xy: 129, 33
+  size: 1, 1
+  split: 0, 0, 0, 0
+  orig: 1, 1
   offset: 0, 0
   index: -1
-default-slider-knob
+default-rect
   rotate: false
-  xy: 1, 1
-  size: 9, 18
-  orig: 9, 18
+  xy: 38, 25
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
   offset: 0, 0
   index: -1
-default-round-down
+default-rect-down
   rotate: false
-  xy: 99, 29
-  size: 12, 20
-  split: 5, 5, 5, 4
-  orig: 12, 20
+  xy: 170, 46
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
   offset: 0, 0
   index: -1
 default-round
@@ -66,40 +88,44 @@ default-round
   orig: 12, 20
   offset: 0, 0
   index: -1
-check-off
+default-round-down
   rotate: false
-  xy: 11, 5
-  size: 14, 14
-  orig: 14, 14
+  xy: 99, 29
+  size: 12, 20
+  split: 5, 5, 5, 4
+  orig: 12, 20
   offset: 0, 0
   index: -1
-textfield
+default-round-large
   rotate: false
-  xy: 11, 5
-  size: 14, 14
-  split: 3, 3, 3, 3
-  orig: 14, 14
+  xy: 57, 29
+  size: 20, 20
+  split: 5, 5, 5, 4
+  orig: 20, 20
   offset: 0, 0
   index: -1
-check-on
+default-scroll
   rotate: false
-  xy: 125, 35
-  size: 14, 14
-  orig: 14, 14
+  xy: 78, 29
+  size: 20, 20
+  split: 2, 2, 2, 2
+  orig: 20, 20
   offset: 0, 0
   index: -1
-tree-minus
+default-select
   rotate: false
-  xy: 140, 35
-  size: 14, 14
-  orig: 14, 14
+  xy: 29, 29
+  size: 27, 20
+  split: 4, 14, 4, 4
+  orig: 27, 20
   offset: 0, 0
   index: -1
-tree-plus
+default-select-selection
   rotate: false
-  xy: 155, 35
-  size: 14, 14
-  orig: 14, 14
+  xy: 26, 16
+  size: 3, 3
+  split: 1, 1, 1, 1
+  orig: 3, 3
   offset: 0, 0
   index: -1
 default-slider
@@ -110,20 +136,11 @@ default-slider
   orig: 8, 8
   offset: 0, 0
   index: -1
-default-pane
-  rotate: false
-  xy: 11, 1
-  size: 5, 3
-  split: 1, 1, 1, 1
-  orig: 5, 3
-  offset: 0, 0
-  index: -1
-default-rect-pad
+default-slider-knob
   rotate: false
-  xy: 11, 1
-  size: 5, 3
-  split: 1, 1, 1, 1
-  orig: 5, 3
+  xy: 1, 1
+  size: 9, 18
+  orig: 9, 18
   offset: 0, 0
   index: -1
 default-splitpane
@@ -134,14 +151,6 @@ default-splitpane
   orig: 5, 3
   offset: 0, 0
   index: -1
-cursor
-  rotate: false
-  xy: 23, 1
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
 default-splitpane-vertical
   rotate: false
   xy: 125, 29
@@ -150,43 +159,33 @@ default-splitpane-vertical
   orig: 3, 5
   offset: 0, 0
   index: -1
-default-rect-down
-  rotate: false
-  xy: 170, 46
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
-  offset: 0, 0
-  index: -1
-default-rect
+default-window
   rotate: false
-  xy: 38, 25
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
+  xy: 1, 20
+  size: 27, 29
+  split: 4, 3, 20, 3
+  orig: 27, 29
   offset: 0, 0
   index: -1
-default-select-selection
+selection
   rotate: false
-  xy: 26, 16
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
+  xy: 170, 44
+  size: 1, 1
+  orig: 1, 1
   offset: 0, 0
   index: -1
-default-pane-noborder
+tree-minus
   rotate: false
-  xy: 129, 33
-  size: 1, 1
-  split: 0, 0, 0, 0
-  orig: 1, 1
+  xy: 140, 35
+  size: 14, 14
+  orig: 14, 14
   offset: 0, 0
   index: -1
-selection
+tree-plus
   rotate: false
-  xy: 170, 44
-  size: 1, 1
-  orig: 1, 1
+  xy: 155, 35
+  size: 14, 14
+  orig: 14, 14
   offset: 0, 0
   index: -1
 white

maps-editor-android/assets/data/uiskin.json

@@ -39,7 +39,8 @@ com.badlogic.gdx.scenes.scene2d.ui.Slider$SliderStyle: {
 	default-horizontal: { background: default-slider, knob: default-slider-knob }
 },
 com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle: {
-	default: { font: default-font, fontColor: white }
+	default: { font: default-font, fontColor: white },
+	selected: { background: selection, font: default-font, fontColor: white }
 },
 com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle: {
 	default: { selection: selection, background: textfield, font: default-font, fontColor: white, cursor: cursor }

maps-editor/.classpath

@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/maps-basic"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/maps"/>
-	<classpathentry kind="lib" path="libs/gdx.jar" sourcepath="libs/gdx-sources.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/maps-basic"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/maps"/>
+	<classpathentry kind="lib" path="libs/gdx.jar" sourcepath="libs/gdx-sources.jar"/>
+	<classpathentry kind="lib" path="libs/gdx-tools.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

maps-editor/assets-raw/skin/pack.json

@@ -0,0 +1,5 @@
+{
+duplicatePadding: false,
+paddingX: 1,
+paddingY: 1
+}

maps-editor/src/BuildAssets.java

@@ -0,0 +1,11 @@
+import com.badlogic.gdx.tools.imagepacker.TexturePacker2;
+
+
+public class BuildAssets {
+
+	public static void main( String[] args ) {
+
+//		Settings settings = new Settings();
+		TexturePacker2.process( "assets-raw/skin", "../maps-editor-android/assets/data", "uiskin.atlas" );
+	}
+}