Merge pull request #54 from creyc/development

Added labels to fallback model

resources/models/fallback.js

@@ -5,12 +5,12 @@
 		"license"       : "Copyright Corey Schiller 2014.  All rights reserved.  Used with permission for Baseflight Configurator",
 		"formatVersion" : 3.1,
 		"generatedBy"   : "Blender 2.7 Exporter",
-		"vertices"      : 8,
+		"vertices"      : 26,
-		"faces"         : 6,
+		"faces"         : 24,
-		"normals"       : 8,
+		"normals"       : 26,
 		"colors"        : 0,
-		"uvs"           : [],
+		"uvs"           : [54],
-		"materials"     : 6,
+		"materials"     : 1,
 		"morphTargets"  : 0,
 		"bones"         : 0
 	},
@@ -20,122 +20,21 @@
 	"materials" : [	{
 		"DbgColor" : 15658734,
 		"DbgIndex" : 0,
-		"DbgName" : "Right",
+		"DbgName" : "default",
-		"blending" : "NormalBlending",
-		"colorAmbient" : [0.800000011920929, 0.026483822263536183, 0.026483822263536183],
-		"colorDiffuse" : [0.800000011920929, 0.026483822263536183, 0.026483822263536183],
-		"colorEmissive" : [0.46399999356269817, 0.015360616470854517, 0.015360616470854517],
-		"colorSpecular" : [0.5, 0.5, 0.5],
-		"depthTest" : true,
-		"depthWrite" : true,
-		"shading" : "Lambert",
-		"specularCoef" : 50,
-		"transparency" : 1.0,
-		"transparent" : false,
-		"vertexColors" : false
-	},
-
-	{
-		"DbgColor" : 15597568,
-		"DbgIndex" : 1,
-		"DbgName" : "Left",
-		"blending" : "NormalBlending",
-		"colorAmbient" : [0.800000011920929, 0.19696111972572083, 0.0],
-		"colorDiffuse" : [0.800000011920929, 0.19696111972572083, 0.0],
-		"colorEmissive" : [0.46399999356269817, 0.11423744615377476, 0.0],
-		"colorSpecular" : [0.5, 0.5, 0.5],
-		"depthTest" : true,
-		"depthWrite" : true,
-		"shading" : "Lambert",
-		"specularCoef" : 50,
-		"transparency" : 1.0,
-		"transparent" : false,
-		"vertexColors" : false
-	},
-
-	{
-		"DbgColor" : 60928,
-		"DbgIndex" : 2,
-		"DbgName" : "Top",
-		"blending" : "NormalBlending",
-		"colorAmbient" : [0.800000011920929, 0.800000011920929, 0.026483822263536183],
-		"colorDiffuse" : [0.800000011920929, 0.800000011920929, 0.026483822263536183],
-		"colorEmissive" : [0.46399999356269817, 0.46399999356269817, 0.015360616470854517],
-		"colorSpecular" : [0.5, 0.5, 0.5],
-		"depthTest" : true,
-		"depthWrite" : true,
-		"shading" : "Lambert",
-		"specularCoef" : 50,
-		"transparency" : 1.0,
-		"transparent" : false,
-		"vertexColors" : false
-	},
-
-	{
-		"DbgColor" : 238,
-		"DbgIndex" : 3,
-		"DbgName" : "Bottom",
-		"blending" : "NormalBlending",
-		"colorAmbient" : [0.026483822263536183, 0.800000011920929, 0.026483822263536183],
-		"colorDiffuse" : [0.026483822263536183, 0.800000011920929, 0.026483822263536183],
-		"colorEmissive" : [0.015360616470854517, 0.46399999356269817, 0.015360616470854517],
-		"colorSpecular" : [0.5, 0.5, 0.5],
-		"depthTest" : true,
-		"depthWrite" : true,
-		"shading" : "Lambert",
-		"specularCoef" : 50,
-		"transparency" : 1.0,
-		"transparent" : false,
-		"vertexColors" : false
-	},
-
-	{
-		"DbgColor" : 15658496,
-		"DbgIndex" : 4,
-		"DbgName" : "Back",
-		"blending" : "NormalBlending",
-		"colorAmbient" : [0.026483822263536183, 0.026483822263536183, 0.800000011920929],
-		"colorDiffuse" : [0.026483822263536183, 0.026483822263536183, 0.800000011920929],
-		"colorEmissive" : [0.015360616470854517, 0.015360616470854517, 0.46399999356269817],
-		"colorSpecular" : [0.5, 0.5, 0.5],
-		"depthTest" : true,
-		"depthWrite" : true,
-		"shading" : "Lambert",
-		"specularCoef" : 50,
-		"transparency" : 1.0,
-		"transparent" : false,
-		"vertexColors" : false
-	},
-
-	{
-		"DbgColor" : 61166,
-		"DbgIndex" : 5,
-		"DbgName" : "Front",
-		"blending" : "NormalBlending",
-		"colorAmbient" : [0.19696111972572083, 0.026483822263536183, 0.800000011920929],
-		"colorDiffuse" : [0.19696111972572083, 0.026483822263536183, 0.800000011920929],
-		"colorEmissive" : [0.11423744615377476, 0.015360616470854517, 0.46399999356269817],
-		"colorSpecular" : [0.5, 0.5, 0.5],
-		"depthTest" : true,
-		"depthWrite" : true,
-		"shading" : "Lambert",
-		"specularCoef" : 50,
-		"transparency" : 1.0,
-		"transparent" : false,
 		"vertexColors" : false
 	}],
 
-	"vertices" : [1.8,-0.96,-3.6,1.8,-0.96,3.6,-1.8,-0.96,3.6,-1.8,-0.96,-3.6,1.8,0.96,-3.6,1.8,0.96,3.6,-1.8,0.96,3.6,-1.8,0.96,-3.6],
+	"vertices" : [8.9407e-08,-0.96,-3.7527e-07,-2.08616e-07,0.96,6.73293e-07,1.8,4.42918e-14,1.01328e-06,-5.06639e-07,1.57361e-07,3.6,-1.8,-3.38702e-14,-7.7486e-07,4.17233e-07,-1.57361e-07,-3.6,1.8,-0.96,1.61172e-07,2.98023e-07,-0.96,-3.6,1.8,-1.57361e-07,-3.6,-1.19209e-07,-0.96,3.6,1.8,1.57361e-07,3.6,-1.8,-0.96,-9.11711e-07,-1.8,1.57361e-07,3.6,-1.8,-1.57361e-07,-3.6,1.8,0.96,1.98459e-06,4.76837e-07,0.96,-3.6,-8.9407e-07,0.96,3.6,-1.8,0.96,-6.38009e-07,1.8,-0.96,-3.6,1.8,-0.96,3.6,-1.8,-0.96,3.6,-1.8,-0.96,-3.6,1.8,0.96,-3.6,1.8,0.96,3.6,-1.8,0.96,3.6,-1.8,0.96,-3.6],
 
 	"morphTargets" : [],
 
-	"normals" : [0.577349,-0.577349,-0.577349,0.577349,-0.577349,0.577349,-0.577349,-0.577349,0.577349,-0.577349,-0.577349,-0.577349,0.577349,0.577349,-0.577349,-0.577349,0.577349,-0.577349,-0.577349,0.577349,0.577349,0.577349,0.577349,0.577349],
+	"normals" : [0,-1,0,0,-0.707083,-0.707083,0.577349,-0.577349,-0.577349,0.707083,-0.707083,0,0.577349,-0.577349,0.577349,0,-0.707083,0.707083,-0.577349,-0.577349,0.577349,-0.707083,-0.707083,0,-0.577349,-0.577349,-0.577349,0,1,0,0.707083,0.707083,0,0.577349,0.577349,-0.577349,0,0.707083,-0.707083,-0.577349,0.577349,-0.577349,-0.707083,0.707083,0,-0.577349,0.577349,0.577349,0,0.707083,0.707083,0.577349,0.577349,0.577349,1,0,0,0.707083,0,-0.707083,0.707083,0,0.707083,0,0,1,-0.707083,0,0.707083,-1,0,0,-0.707083,0,-0.707083,0,0,-1],
 
 	"colors" : [],
 
-	"uvs" : [],
+	"uvs" : [[0.141659,0.209166,0.141659,0.418225,0.071016,0.418225,0.071016,0.209166,0.071016,0.000108,0.141658,0.000108,0.212301,0.000108,0.212301,0.209166,0.212301,0.418224,0.929336,0.791362,0.858772,0.791362,0.858772,0.582741,0.929336,0.582741,0.999899,0.582741,0.999899,0.791362,0.999899,0.999983,0.929336,0.999983,0.858772,0.999983,0.535427,0.7908,0.535427,0.735249,0.677017,0.735249,0.677017,0.7908,0.677017,0.846351,0.535427,0.846351,0.393837,0.846351,0.393837,0.7908,0.393837,0.735249,0.929221,0.209323,0.929221,0.153864,0.999887,0.153864,0.999887,0.209323,0.999887,0.264782,0.929221,0.264782,0.858555,0.264782,0.858555,0.209323,0.858555,0.153864,0.141641,0.790803,0.141641,0.735254,0.28323,0.735254,0.28323,0.790803,0.28323,0.846351,0.141641,0.846351,5.2e-05,0.846351,5.2e-05,0.790803,5.2e-05,0.735254,0.535431,0.209376,0.535431,0.264723,0.464739,0.264723,0.464739,0.209376,0.464739,0.154029,0.535431,0.154029,0.606123,0.154029,0.606123,0.209376,0.606123,0.264723]],
 
-	"faces" : [35,0,1,2,3,3,0,1,2,3,35,4,7,6,5,2,4,5,6,7,35,0,4,5,1,1,0,4,7,1,35,1,5,6,2,5,1,7,6,2,35,2,6,7,3,0,2,6,5,3,35,4,0,3,7,4,4,0,3,5],
+	"faces" : [43,0,7,18,6,0,0,1,2,3,0,1,2,3,43,0,6,19,9,0,0,3,4,5,0,3,4,5,43,0,9,20,11,0,0,5,6,7,0,5,6,7,43,0,11,21,7,0,0,7,8,1,0,7,8,1,43,1,14,22,15,0,9,10,11,12,9,10,11,12,43,1,15,25,17,0,9,12,13,14,9,12,13,14,43,1,17,24,16,0,9,14,15,16,9,14,15,16,43,1,16,23,14,0,9,16,17,10,9,16,17,10,43,2,6,18,8,0,18,19,20,21,18,3,2,19,43,2,8,22,14,0,18,21,22,23,18,19,11,10,43,2,14,23,10,0,18,23,24,25,18,10,17,20,43,2,10,19,6,0,18,25,26,19,18,20,4,3,43,3,9,19,10,0,27,28,29,30,21,5,4,20,43,3,10,23,16,0,27,30,31,32,21,20,17,16,43,3,16,24,12,0,27,32,33,34,21,16,15,22,43,3,12,20,9,0,27,34,35,28,21,22,6,5,43,4,11,20,12,0,36,37,38,39,23,7,6,22,43,4,12,24,17,0,36,39,40,41,23,22,15,14,43,4,17,25,13,0,36,41,42,43,23,14,13,24,43,4,13,21,11,0,36,43,44,37,23,24,8,7,43,5,15,22,8,0,45,46,47,48,25,12,11,19,43,5,8,18,7,0,45,48,49,50,25,19,2,1,43,5,7,21,13,0,45,50,51,52,25,1,8,24,43,5,13,25,15,0,45,52,53,46,25,24,13,12],
 
 	"bones" : [],