Merge branch 'dev' of http://prod3.imt.hig.no/overkill-studios/imt2531-assignment2 into extramodels

assets/models/_default.yml

+vertices: 28
+
+v: -0.5 -0.5  0.5  -0.577 -0.577  0.577  0 0   150 150  150 255
+v:  0.5 -0.5  0.5   0.577 -0.577  0.577  1 0   150 150  150 255
+v:  0.5  0.5  0.5   0.577  0.577  0.577  1 1   150 150  150 255
+v: -0.5  0.5  0.5  -0.577  0.577  0.577  0 1   150 150  150 255
+
+v: -0.5 -0.5 -0.5  -0.577 -0.577  -0.577  1 0   150 150  150 255
+v: -0.5  0.5 -0.5  -0.577  0.577  -0.577  1 1   150 150  150 255
+
+v:  0.5 -0.5 -0.5  0.577 -0.577 -0.577    0 0   150 150  150 255
+v:  0.5  0.5 -0.5  0.577  0.577 -0.577    0 1   150 150  150 255
+
+v: -0.5 -0.5 -0.5  -0.577 -0.577  -0.577  0 1   150 150  150 255
+v:  0.5 -0.5 -0.5   0.577 -0.577  -0.577  1 1   150 150  150 255
+
+v: -0.5  0.5 -0.5  -0.577  0.577 -0.577  0 0   150 150  150 255
+v:  0.5  0.5 -0.5   0.577  0.577 -0.577  1 0   150 150  150 255
+
+v: -0.5  0.5  0.5  -0.577  0.577  0.577  0 1   150 150  150 255
+v:  0.5  0.5  0.5   0.577  0.577  0.577  1 1   150 150  150 255
+
+
+v: -1.0 -1.0  1.0  -0.577 -0.577  0.577  0 0  255 255 255 80
+v:  1.0 -1.0  1.0   0.577 -0.577  0.577   1 0  255 255 255 80
+v:  1.0  1.0  1.0   0.577  0.577  0.577   1 1  255 255 255 80
+v: -1.0  1.0  1.0  -0.577  0.577  0.577  0 1  255 255 255 80
+
+v: -1.0 -1.0 -1.0  -0.577 -0.577 -0.577  1 0  255 255 255 80
+v: -1.0  1.0 -1.0  -0.577  0.577 -0.577  1 1  255 255 255 80
+
+v:  1.0 -1.0 -1.0   0.577 -0.577 -0.577  0 0  255 255 255 80
+v:  1.0  1.0 -1.0   0.577  0.577 -0.577  0 1  255 255 255 80
+
+v: -1.0 -1.0 -1.0  -0.577 -0.577 -0.577  0 1  255 255 255 80
+v:  1.0 -1.0 -1.0   0.577 -0.577 -0.577  1 1  255 255 255 80
+
+v: -1.0  1.0 -1.0  -0.577  0.577 -0.577  0 0  255 255 255 80
+v:  1.0  1.0 -1.0   0.577  0.577 -0.577  1 0  255 255 255 80
+
+v: -1.0  1.0  1.0  -0.577  0.577  0.577  0 1  255 255 255 80
+v:  1.0  1.0  1.0   0.577  0.577  0.577   1 1  255 255 255 80
+
+meshes: 2
+
+mesh: innercube
+    material: brick
+    shader: base
+    triangles: 12
+    t: 0 1 2
+    t: 2 3 0
+
+    t: 4 0 3
+    t: 3 5 4
+
+    t: 1 6 7
+    t: 7 2 1
+
+    t: 8 9 1
+    t: 1 0 8
+
+    t: 10 11 9
+    t: 9  8  10
+
+    t: 12 13 11
+    t: 11 10 12
+
+mesh: outercube
+    material: brick
+    shader: base
+    triangles: 12
+    t: 14 15 16
+    t: 16 17 14
+
+    t: 18 14 17
+    t: 17 19 18
+
+    t: 15 20 21
+    t: 21 16 15
+
+    t: 22 23 15
+    t: 15 14 22
+
+    t: 24 25 23
+    t: 23  22 24
+
+    t: 26 27 25
+    t: 25 24 26