Major changes

assets/galaxy_ptree.json

@@ -43,7 +43,10 @@
 							"name": "level3"
 						},
 						{
-							"name": "level3"
+							"name": "level4"
+						},
+						{
+							"name": "level5"
 						}
 					]
 				},
@@ -61,6 +64,15 @@
 						},
 						{
 							"name": "level7"
+						},
+						{
+							"name": "level3"
+						},
+						{
+							"name": "level4"
+						},
+						{
+							"name": "level5"
 						}
 					]
 				},

assets/gui_main_menu.json

@@ -6,11 +6,12 @@
 		"width": "match_parent",
 		"height": "match_parent",
 		"visible" : 0,
+		"touchTransparency": 0,
 		"horizontalAlignment": "HA_CENTER",
 		"verticalAlignment": "VA_CENTER",
 		"children": [{
 					"type": "VerticalScrollLayout",
-					"name": "leftSidePanel",
+					"name": "panel",
 					"background": "#faf0ffFF",
 					"borderType": "line",
 					"borderColor": "#808080FF",
@@ -18,17 +19,16 @@
 					"height": "match_parent",
 					"touchTransparency": 0,
 					"zLevel": 10,
-					"marginTop" : 40,
-					"marginBottom" : 40,
-					"paddingTop": 60,
+					"marginTop" : 0,
+					"marginBottom" : 0,
+					"paddingTop": 10,
 					"paddingBottom": 10,
 					"paddingLeft": 10,
 					"paddingRight": 10,
 					"itemSpacing": 20,
 					"children" : [{
 							"type": "HorizontalLinearLayout",
-							"name": "embroiderySettings",
-							"itemSpacing": 30,
+							"name": "row1",
 							"paddingBottom": 15,
 							"paddingTop": 15,
 							"paddingLeft": 15,
@@ -36,43 +36,43 @@
 							"background": "#faf0ffFF",
 							"borderType": "line",
 							"borderColor": "#808080FF",
-							"width": "wrap_content",
+							"width": 454,
 							"height": "wrap_content",
 							"touchTransparency": 0,
 							"itemSpacing": 20,
 							"visible": 1,
 							"children": [{
 						"type": "Button",
-						"name": "button6",
+						"name": "button0",
 						"width": 128,
 						"height": 80,
-						"background": "level1_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
 					{
 						"type": "Button",
-						"name": "button7",
+						"name": "button1",
 						"width": 128,
 						"height": 80,
-						"background": "level2_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
 					{
 						"type": "Button",
-						"name": "button8",
+						"name": "button2",
 						"width": 128,
 						"height": 80,
-						"background": "level3_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					}]
 				},
 				{
 							"type": "HorizontalLinearLayout",
-							"name": "embroiderySettings",
-							"itemSpacing": 30,
+							"name": "row2",
+							"itemSpacing": 20,
 							"paddingBottom": 15,
 							"paddingTop": 15,
 							"paddingLeft": 15,
@@ -80,42 +80,42 @@
 							"background": "#faf0ffFF",
 							"borderType": "line",
 							"borderColor": "#808080FF",
-							"width": "wrap_content",
+							"width": 454,
 							"height": "wrap_content",
 							"touchTransparency": 0,
 							"visible": 1,
 							"children": [{
 						"type": "Button",
-						"name": "button6",
+						"name": "button3",
 						"width": 128,
 						"height": 80,
-						"background": "level4_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
 					{
 						"type": "Button",
-						"name": "button7",
+						"name": "button4",
 						"width": 128,
 						"height": 80,
-						"background": "level5_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
 					{
 						"type": "Button",
-						"name": "button8",
+						"name": "button5",
 						"width": 128,
 						"height": 80,
-						"background": "level6_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					}]
 				},
 				{
 							"type": "HorizontalLinearLayout",
-							"name": "embroiderySettings",
-							"itemSpacing": 30,
+							"name": "row3",
+							"itemSpacing": 20,
 							"paddingBottom": 15,
 							"paddingTop": 15,
 							"paddingLeft": 15,
@@ -123,7 +123,7 @@
 							"background": "#faf0ffFF",
 							"borderType": "line",
 							"borderColor": "#808080FF",
-							"width": "wrap_content",
+							"width": 454,
 							"height": "wrap_content",
 							"touchTransparency": 1,
 							"visible": 1,
@@ -132,7 +132,7 @@
 						"name": "button6",
 						"width": 128,
 						"height": 80,
-						"background": "level7_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
@@ -141,7 +141,7 @@
 						"name": "button7",
 						"width": 128,
 						"height": 80,
-						"background": "level8_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
@@ -150,15 +150,15 @@
 						"name": "button8",
 						"width": 128,
 						"height": 80,
-						"background": "level9_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					}]
 				},
 				{
 							"type": "HorizontalLinearLayout",
-							"name": "embroiderySettings",
-							"itemSpacing": 30,
+							"name": "row4",
+							"itemSpacing": 20,
 							"paddingBottom": 15,
 							"paddingTop": 15,
 							"paddingLeft": 15,
@@ -166,34 +166,34 @@
 							"background": "#faf0ffFF",
 							"borderType": "line",
 							"borderColor": "#808080FF",
-							"width": "wrap_content",
+							"width": 454,
 							"height": "wrap_content",
 							"touchTransparency": 0,
 							"visible": 1,
 							"children": [{
 						"type": "Button",
-						"name": "button6",
+						"name": "button9",
 						"width": 128,
 						"height": 80,
-						"background": "level10_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
 					{
 						"type": "Button",
-						"name": "button7",
+						"name": "button10",
 						"width": 128,
 						"height": 80,
-						"background": "level11_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					},
 					{
 						"type": "Button",
-						"name": "button8",
+						"name": "button11",
 						"width": 128,
 						"height": 80,
-						"background": "level12_prerender",
+						"background": "#00000000",
 						"pressedDrawable": "#60606060",
 						"hoverDrawable": "#60606060"
 					}]

assets/level1.txt

@@ -1,3 +1,4 @@
+022259762-alien-world.jpg
 0, 255, 255, 255
 0, 0, 0, 255
 255, 0, 0, 255
@@ -18,14 +19,14 @@ Colormap
 000000000000
 000000000000
 Brickmap
-111111111111
-111111111111
-111111111111
 000000000000
-111111111111
-111111111111
 000000000000
-111111111111
+000000000000
+000000000000
+000000000000
+000000000000
+000000000000
+000000000000
 111111111111
 000000000000
 000000000000

assets/level10.txt

@@ -1,3 +1,4 @@
+shutterstock10.png
 0, 255, 255, 255
 0, 0, 0, 255
 255, 0, 190, 255

assets/level11.txt

@@ -1,3 +1,4 @@
+shutterstock11.png
 255, 255, 255, 255
 0, 0, 0, 255
 0, 237, 255, 255

assets/level12.txt

@@ -1,3 +1,4 @@
+shutterstock12.png
 255, 128, 128, 255
 0, 0, 0, 255
 159, 240, 255, 255

assets/level2.txt

@@ -1,3 +1,4 @@
+shutterstock2.png
 255, 0, 0, 255
 0, 0, 0, 255
 0, 255, 255, 255

assets/level3.txt

@@ -1,3 +1,4 @@
+shutterstock3.png
 0, 255, 255, 255
 0, 0, 0, 255
 0, 151, 113, 255

assets/level4.txt

@@ -1,3 +1,4 @@
+shutterstock4.png
 255, 0, 0, 255
 0, 0, 0, 255
 101, 97, 255, 255

assets/level5.txt

@@ -1,3 +1,4 @@
+shutterstock5.png
 255, 0, 255, 255
 0, 0, 0, 255
 163, 255, 198, 255

assets/level6.txt

@@ -1,3 +1,4 @@
+shutterstock6.png
 255, 255, 255, 255
 0, 0, 0, 255
 255, 200, 5, 255

assets/level7.txt

@@ -1,3 +1,4 @@
+shutterstock7.png
 255, 255, 0, 255
 0, 0, 0, 255
 230, 230, 230, 255

assets/level8.txt

@@ -1,3 +1,4 @@
+shutterstock8.png
 0, 255, 255, 255
 0, 0, 0, 255
 217, 56, 62, 255

assets/level9.txt

@@ -1,3 +1,4 @@
+shutterstock9.png
 0, 255, 0, 255
 0, 0, 0, 255
 255, 221, 0, 255

assets/shaders/gui_transparent_blackandwhite.fragment

@@ -0,0 +1,19 @@
+precision highp float;
+
+uniform sampler2D Texture;
+varying vec2 texCoord;
+varying vec4 color;
+
+void main() 
+{
+	vec4 texColor = texture2D(Texture,texCoord).rgba;
+	
+	
+
+	vec4 resultColor = color * texColor.rgba;
+	
+	float c = (resultColor.r * 0.3 + resultColor.g * 0.59 + resultColor.b * 0.11);
+	
+	
+	gl_FragColor =  vec4(c,c,c,resultColor.a);
+}

assets/shaders/gui_transparent_blackandwhite.vertex

@@ -0,0 +1,14 @@
+attribute vec3 vPosition;
+attribute vec2 vTexCoord;
+attribute vec4 vColor;
+varying vec2 texCoord;
+varying vec4 color;
+uniform mat4 ProjectionMatrix;
+
+void main() 
+{
+	//480x320
+	gl_Position = ProjectionMatrix * vec4(vPosition.xyz, 1.0);
+	texCoord = vTexCoord;
+	color = vColor;
+}