From c4494e4766c9cc21621c5e4c56a01c3b30483b65 Mon Sep 17 00:00:00 2001
From: Till <asuro@posteo.de>
Date: Fri, 26 Jun 2020 16:59:59 +0200
Subject: [PATCH] better box

---
 models/box.bin      | Bin 840 -> 0 bytes
 models/box.gltf     | 117 --------------------------------------------
 models/box.gltf.glb | Bin 0 -> 1668 bytes
 src/main.rs         |   2 +-
 4 files changed, 1 insertion(+), 118 deletions(-)
 delete mode 100644 models/box.bin
 delete mode 100644 models/box.gltf
 create mode 100644 models/box.gltf.glb

diff --git a/models/box.bin b/models/box.bin
deleted file mode 100644
index c013210c67b42f33acc79e92c5e2c50cc158e678..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 840
zcmZQzXxPud&|r^-L1G{b5{J<sHaZ5$fiO%Q#)i=#adb9_kBpJkfW*=HATbbziG$cM
z3=)H3kQj&!qhV}hK1>Xq2B|^DAbAkp&j1FX@BuRzAmK!a4U#8T4=DUW>Oq(oHe6i;
zhy{s120UzH-2pKTK@#H@kQxPh1_lRv28IK6kgx&qL3V=pAaM{MM1%MYP<0?aNF2n6
z(IEK-JBT?jaS$IY&j1mJ@j*05J;=3S+Ma=d0c5`&ga+vciG$Q7faL5M7(nKL_#hf2
z4-yCQ85x)u7#Nrt7#Ua?SQ*$DSQywDSQ$7NI2pJYI2gDYI2m{tcp3N@co_H@co_s3
a1Q~=F1Q>)F1Q|paL>a^wL>R;wL>T}I&VBI!

diff --git a/models/box.gltf b/models/box.gltf
deleted file mode 100644
index 76a8ff0..0000000
--- a/models/box.gltf
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-    "asset" : {
-        "generator" : "Khronos glTF Blender I/O v0.9.36",
-        "version" : "2.0"
-    },
-    "scene" : 0,
-    "scenes" : [
-        {
-            "name" : "Scene",
-            "nodes" : [
-                0
-            ]
-        }
-    ],
-    "nodes" : [
-        {
-            "mesh" : 0,
-            "name" : "Cube"
-        }
-    ],
-    "materials" : [
-        {
-            "doubleSided" : true,
-            "name" : "Material",
-            "pbrMetallicRoughness" : {
-                "baseColorFactor" : [
-                    0.800000011920929,
-                    0.800000011920929,
-                    0.800000011920929,
-                    1
-                ],
-                "metallicFactor" : 0,
-                "roughnessFactor" : 0.4000000059604645
-            }
-        }
-    ],
-    "meshes" : [
-        {
-            "name" : "Cube",
-            "primitives" : [
-                {
-                    "attributes" : {
-                        "POSITION" : 0,
-                        "NORMAL" : 1,
-                        "TEXCOORD_0" : 2
-                    },
-                    "indices" : 3,
-                    "material" : 0
-                }
-            ]
-        }
-    ],
-    "accessors" : [
-        {
-            "bufferView" : 0,
-            "componentType" : 5126,
-            "count" : 24,
-            "max" : [
-                1,
-                1,
-                1
-            ],
-            "min" : [
-                -1,
-                -1,
-                -1
-            ],
-            "type" : "VEC3"
-        },
-        {
-            "bufferView" : 1,
-            "componentType" : 5126,
-            "count" : 24,
-            "type" : "VEC3"
-        },
-        {
-            "bufferView" : 2,
-            "componentType" : 5126,
-            "count" : 24,
-            "type" : "VEC2"
-        },
-        {
-            "bufferView" : 3,
-            "componentType" : 5123,
-            "count" : 36,
-            "type" : "SCALAR"
-        }
-    ],
-    "bufferViews" : [
-        {
-            "buffer" : 0,
-            "byteLength" : 288,
-            "byteOffset" : 0
-        },
-        {
-            "buffer" : 0,
-            "byteLength" : 288,
-            "byteOffset" : 288
-        },
-        {
-            "buffer" : 0,
-            "byteLength" : 192,
-            "byteOffset" : 576
-        },
-        {
-            "buffer" : 0,
-            "byteLength" : 72,
-            "byteOffset" : 768
-        }
-    ],
-    "buffers" : [
-        {
-            "byteLength" : 840,
-            "uri" : "box.bin"
-        }
-    ]
-}
diff --git a/models/box.gltf.glb b/models/box.gltf.glb
new file mode 100644
index 0000000000000000000000000000000000000000..b1b1466b4d0bb0fd001050b9bf270548e90609ce
GIT binary patch
literal 1668
zcmYe#32|d$U|?urV_;BVW?=9N_V=q+N-Qo;Em5+nR!UFJOD#$)$uCl}Qu59y%FoL$
zRsd;HaLP%|OGzzK@YMHLC^OVE(la+z(orf)Eh^5;&r`BeGSV|ps?|{{PEO5BRkAXG
zvWk_gqN|ni5_40PtdxSmaym+R`6;O&34_?$SOl+HDL1t^1FRLQ-nld>RSBd7Bmvd|
zHwrAJqf}6onVVUXSq7C%EGa3<Oe!q_ajTUA{DVD1JpKK^M*8^&`8xV2SsCgmg}6pI
z`}+sE#2YAC8P)12W#*-1CWEvX*Mc3Cn4FwiT%2D7a$>boQfXRRYEf8bYB|`P<ow)%
z{Jhk>l90-RR3$4@LnAXCrR4n5yb>iVBNH8^+{6kct7t<VLmk6d9i`mNJSD4WT|*r(
ziq%mn0qar<b9FXWs?|X?-4J9De$(-3HzGy55r*x?*tCNM!G1F~gF8Oh+0n-_2plnp
zz(Ecya6lzhmZbWm=B1ZpC|Ma<Sm-E$1pL#|!0F5Y;djD{jVvtiC^xh;LN(je+zgL$
zb2QcFW)`3n2Jr~g6G$$%Ffpi&t@U7LU~uyEV_;xt*w4VwU=O81Y;+8h1JTGBqz=Rf
z(bzCd4n!kkkXjfY#0Ftf_%O9F8l)eDL3|Jm!^nIX8$@Hnxb%S3?q`4lP*}k@xY&f`
z(e;7C9<Ik8#)8BNjEAfSn;5b@Ha6JK28d3g*hIJkVo%hXixvzDmn_2XT(l_uS#J-*
zg+J@<L73seMGHdmAaw;W^$Rf76OxZObJ2nUst=?Vgkf#~iHE&G$mjm7w+CU6eE!dR
zdyxAW7#JBqbq5mzGXo0)D+3z?3j-SiI|By;Cj%D)2Ll%aHv<m?F9RO~4+9?qKZ5{+
aAcGKt0D};NFoOt#D1#V-2!j}dI0FE+PsITM

literal 0
HcmV?d00001

diff --git a/src/main.rs b/src/main.rs
index 76aa79a..18fa4dc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -83,7 +83,7 @@ impl Game for TestGame {
 
 impl TestGame {
     fn game_start(self: &mut Self, renderer: &mut VulkanRenderer) {
-        let (meshes, textures) = mesh::load_mesh("models/box.gltf", self.log_config.mesh_load_info).unwrap();
+        let (meshes, textures) = mesh::load_mesh("models/box.gltf.glb", self.log_config.mesh_load_info).unwrap();
         self.test_meshes = meshes.into_iter().map(|m| {
             let id = match m.texture_index {
                 Some(tex_id) => tex_id + 1,