From a205d7f1703be8b7ab05636a90efd48b79a0d5ad Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 26 Oct 2024 15:51:30 +0300 Subject: [PATCH] replace obj models with vec3 --- res/content/base/models/block.obj | 48 ---------- res/content/base/models/block.vec3 | Bin 0 -> 903 bytes res/content/base/models/drop-block.obj | 48 ---------- res/content/base/models/drop-block.vec3 | Bin 0 -> 908 bytes res/content/base/models/drop-item.obj | 113 ----------------------- res/content/base/models/drop-item.vec3 | Bin 0 -> 1277 bytes res/content/base/models/player-body.obj | 47 ---------- res/content/base/models/player-body.vec3 | Bin 0 -> 536 bytes res/content/base/models/player-hand.obj | 42 --------- res/content/base/models/player-hand.vec3 | Bin 0 -> 496 bytes res/content/base/models/player-head.obj | 48 ---------- res/content/base/models/player-head.vec3 | Bin 0 -> 544 bytes test/coders/vec3.cpp | 2 +- 13 files changed, 1 insertion(+), 347 deletions(-) delete mode 100644 res/content/base/models/block.obj create mode 100644 res/content/base/models/block.vec3 delete mode 100644 res/content/base/models/drop-block.obj create mode 100644 res/content/base/models/drop-block.vec3 delete mode 100644 res/content/base/models/drop-item.obj create mode 100644 res/content/base/models/drop-item.vec3 delete mode 100644 res/content/base/models/player-body.obj create mode 100644 res/content/base/models/player-body.vec3 delete mode 100644 res/content/base/models/player-hand.obj create mode 100644 res/content/base/models/player-hand.vec3 delete mode 100644 res/content/base/models/player-head.obj create mode 100644 res/content/base/models/player-head.vec3 diff --git a/res/content/base/models/block.obj b/res/content/base/models/block.obj deleted file mode 100644 index 2e307e52..00000000 --- a/res/content/base/models/block.obj +++ /dev/null @@ -1,48 +0,0 @@ -o Cube -v 0.5 -0.5 -0.5 -v 0.5 -0.5 0.5 -v -0.5 -0.5 0.5 -v -0.5 -0.5 -0.5 -v 0.5 0.5 -0.5 -v 0.5 0.5 0.5 -v -0.5 0.5 0.5 -v -0.5 0.5 -0.5 -vt 0.0 0.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 0.0 1.0 -vt 0.0 0.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 0.0 1.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 0.0 0.0 -vt 1.0 0.0 -vt 0.0 1.0 -vt 0.0 0.0 -vt 0.0 1.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 1.0 1.0 -vt 0.0 1.0 -vt 0.0 0.0 -vn 0.0 -1.0 0.0 -vn 0.0 1.0 0.0 -vn 1.0 -0.0 0.0 -vn -1.0 -0.0 -0.0 -vn 0.0 0.0 -1.0 -vn -0.0 -0.0 1.0 -usemtl $2 -s off -f 1/1/1 2/2/1 3/3/1 4/4/1 -usemtl $3 -f 5/5/2 8/6/2 7/7/2 6/8/2 -usemtl $0 -f 1/9/3 5/10/3 6/8/3 2/11/3 -usemtl $1 -f 3/12/4 7/7/4 8/13/4 4/14/4 -usemtl $4 -f 5/15/5 1/1/5 4/16/5 8/17/5 -usemtl $5 -f 2/2/6 6/18/6 7/19/6 3/20/6 diff --git a/res/content/base/models/block.vec3 b/res/content/base/models/block.vec3 new file mode 100644 index 0000000000000000000000000000000000000000..0b274e755ad2b6928c312a66b90a0d33883e0e4e GIT binary patch literal 903 zcmbV~y$u2}427LLpkfFL2H>~80)JCC^vi$YHD4i4_9pDmBJb*u k@IP)yxRaB-`x>>bjf4|vX>!#`6_Us;X;({ff4v{i53vPCBme*a literal 0 HcmV?d00001 diff --git a/res/content/base/models/drop-block.obj b/res/content/base/models/drop-block.obj deleted file mode 100644 index be4cf551..00000000 --- a/res/content/base/models/drop-block.obj +++ /dev/null @@ -1,48 +0,0 @@ -o Cube -v 0.125 -0.125 -0.125 -v 0.125 -0.125 0.125 -v -0.125 -0.125 0.125 -v -0.125 -0.125 -0.125 -v 0.125 0.125 -0.125 -v 0.125 0.125 0.125 -v -0.125 0.125 0.125 -v -0.125 0.125 -0.125 -vt 0.0 0.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 0.0 1.0 -vt 0.0 0.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 0.0 1.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 0.0 0.0 -vt 1.0 0.0 -vt 0.0 1.0 -vt 0.0 0.0 -vt 0.0 1.0 -vt 1.0 0.0 -vt 1.0 1.0 -vt 1.0 1.0 -vt 0.0 1.0 -vt 0.0 0.0 -vn 0.0 -1.0 0.0 -vn 0.0 1.0 0.0 -vn 1.0 -0.0 0.0 -vn -1.0 -0.0 -0.0 -vn 0.0 0.0 -1.0 -vn -0.0 -0.0 1.0 -usemtl $2 -s off -f 1/1/1 2/2/1 3/3/1 4/4/1 -usemtl $3 -f 5/5/2 8/6/2 7/7/2 6/8/2 -usemtl $0 -f 1/9/3 5/10/3 6/8/3 2/11/3 -usemtl $1 -f 3/12/4 7/7/4 8/13/4 4/14/4 -usemtl $4 -f 5/15/5 1/1/5 4/16/5 8/17/5 -usemtl $5 -f 2/2/6 6/18/6 7/19/6 3/20/6 diff --git a/res/content/base/models/drop-block.vec3 b/res/content/base/models/drop-block.vec3 new file mode 100644 index 0000000000000000000000000000000000000000..b9c3a10c221c772fb690914b6c700af9875954ee GIT binary patch literal 908 zcmbVKI}XAy40TdqKpcXB6^ZW(1L6uC0N6k(;siNaxf*_MoR}yBVCmT}cG~xvhUj!W ztce^EjU;=Tt%x{tm-9mMQu0RfcFcQojF|ekY`F3Rh#jMgP_7ky%R5I?ZsiF3o}*^& zX_B^tSESC77kSQ2BTn!wg%hh*a;y{na1y;z#R-fRPC9M@s%ZH~Po3oNw`aj`kkB)c zT_H9rPT;~gfvPHNg}QRogdd&Y&xDAIlL3#66Q}}E(+XZfX6l6J>0Vgg-xoa-Ob~Kc lDo%zxE1W$82#&-eCndjqDaN5cRB literal 0 HcmV?d00001 diff --git a/res/content/base/models/drop-item.obj b/res/content/base/models/drop-item.obj deleted file mode 100644 index a12cca01..00000000 --- a/res/content/base/models/drop-item.obj +++ /dev/null @@ -1,113 +0,0 @@ -o Cube -v 0.282501 -0.000054 -0.282500 -v -0.282501 -0.000054 -0.282501 -v -0.282501 -0.000054 0.282500 -v 0.282500 -0.000054 0.282501 -v 0.282501 0.012502 -0.282500 -v -0.282501 0.012502 -0.282501 -v -0.282501 0.012502 0.282500 -v 0.282500 0.012502 0.282501 -v 0.282501 0.012502 -0.282500 -v 0.282500 0.012502 0.282501 -v -0.282501 0.012502 0.282500 -v -0.282501 0.012502 -0.282501 -v 0.282501 -0.000054 -0.282500 -v 0.282500 -0.000054 0.282501 -v -0.282501 -0.000054 0.282500 -v -0.282501 -0.000054 -0.282501 -v 0.282501 0.012502 -0.282500 -v -0.282501 0.012502 -0.282501 -v -0.282501 0.012502 0.282500 -v 0.282500 0.012502 0.282501 -v 0.282501 0.012502 -0.282500 -v 0.282500 0.012502 0.282501 -v -0.282501 0.012502 0.282500 -v -0.282501 0.012502 -0.282501 -v 0.282501 -0.015821 -0.282500 -v -0.282501 -0.015821 -0.282501 -v -0.282501 -0.015821 0.282500 -v 0.282500 -0.015821 0.282501 -v 0.282501 0.027439 -0.282500 -v -0.282501 0.027439 -0.282501 -v -0.282501 0.027439 0.282500 -v 0.282500 0.027439 0.282501 -v 0.282501 0.027439 -0.282500 -v 0.282500 0.027439 0.282501 -v -0.282501 0.027439 0.282500 -v -0.282501 0.027439 -0.282501 -v 0.282501 -0.015821 -0.282500 -v 0.282500 -0.015821 0.282501 -v -0.282501 -0.015821 0.282500 -v -0.282501 -0.015821 -0.282501 -v 0.282501 0.027439 -0.282500 -v -0.282501 0.027439 -0.282501 -v -0.282501 0.027439 0.282500 -v 0.282500 0.027439 0.282501 -v 0.282501 0.027439 -0.282500 -v 0.282500 0.027439 0.282501 -v -0.282501 0.027439 0.282500 -v -0.282501 0.027439 -0.282501 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vt 0.000000 1.000000 -vt 1.000000 1.000000 -vt 1.000000 0.000000 -vn -0.0000 1.0000 0.0000 -vn 0.0000 -1.0000 -0.0000 -usemtl $0 -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 5/5/1 6/6/1 7/7/1 8/8/1 -f 9/9/2 10/10/2 11/11/2 12/12/2 -f 13/13/2 14/14/2 15/15/2 16/16/2 -f 17/17/1 18/18/1 19/19/1 20/20/1 -f 21/21/2 22/22/2 23/23/2 24/24/2 -f 25/25/1 26/26/1 27/27/1 28/28/1 -f 29/29/1 30/30/1 31/31/1 32/32/1 -f 33/33/2 34/34/2 35/35/2 36/36/2 -f 37/37/2 38/38/2 39/39/2 40/40/2 -f 41/41/1 42/42/1 43/43/1 44/44/1 -f 45/45/2 46/46/2 47/47/2 48/48/2 diff --git a/res/content/base/models/drop-item.vec3 b/res/content/base/models/drop-item.vec3 new file mode 100644 index 0000000000000000000000000000000000000000..e8af688fab53a8b2d7eb67d1f235fe7d624da85c GIT binary patch literal 1277 zcmcJPxlY4C5Qb-*`@Zk{z7r%`WRMUYH4lKGpg*<=f|ddHryn53}TzZ|9Z2mFKf*z9o5{uYCLY$bLAlt!v4CIIny=ulg|S zeVqQTbxp~;d?&B>L0Ix@ONGGF@rJl~M-dbxS(_RMEe@&FMG`r7GV!2pj3yk7A6!0%@u4Fn(< z#83#sVI&}pL@*k~SPbKF2GT?VlSxRWAe{yR(o6=jSv~%e zMcMs8dM^^&7Q}~&BeTJ3wuwvti-FW&VT0ssq2jiT3=KeA)>nDhUt23@6WCe}r_Fl$8lU{6s{3|p`upv)h40x-5G}B8_q%WRS~kmm^Na^}wdbbVz18|-*CCK?|F-#$ z-Auu0b_%oq*tN+O+UtD%V`q4--;RmF1Lz6}XxI;9F)%dP1KAA-8Y~0k!^Du)g5^L` zApMMt3`|TQ5g^IT%)r9J$jZvd#>NO_07-UsMg|Th7EUI1E+!xYNHTH*5i>g%GaC;x vkO3r_c!7w8jfaJmj|Ip8lFa-pES#(i9IVXztUv~kWaVRp#G`ITVqOXW91wOy literal 0 HcmV?d00001 diff --git a/res/content/base/models/player-head.obj b/res/content/base/models/player-head.obj deleted file mode 100644 index c8baf870..00000000 --- a/res/content/base/models/player-head.obj +++ /dev/null @@ -1,48 +0,0 @@ -# Blender v2.79 (sub 0) OBJ File: 'player.blend' -# www.blender.org -mtllib player-head.mtl -o Cube.002_Cube.003 -v -0.206512 0.031837 0.206512 -v -0.206512 0.444861 0.206512 -v -0.206512 0.444861 -0.206512 -v -0.206512 0.031837 -0.206512 -v 0.206512 0.444861 -0.206512 -v 0.206512 0.031837 -0.206512 -v 0.206512 0.444861 0.206512 -v 0.206512 0.031837 0.206512 -vt 0.783122 0.009685 -vt 0.982503 0.009685 -vt 0.982503 0.209065 -vt 0.783122 0.209065 -vt 0.735873 0.213345 -vt 0.735873 0.739780 -vt 0.209439 0.739780 -vt 0.209439 0.213345 -vt 0.783122 0.009685 -vt 0.982503 0.009685 -vt 0.982503 0.209065 -vt 0.783122 0.209065 -vt 0.783122 0.009685 -vt 0.982503 0.009685 -vt 0.982503 0.209065 -vt 0.783122 0.209065 -vt 0.783122 0.009685 -vt 0.982503 0.009685 -vt 0.982503 0.209065 -vt 0.783122 0.009685 -vt 0.982503 0.009685 -vt 0.783122 0.209065 -vn -1.0000 -0.0000 -0.0000 -vn 0.0000 0.0000 -1.0000 -vn 1.0000 0.0000 0.0000 -vn -0.0000 -0.0000 1.0000 -vn 0.0000 -1.0000 -0.0000 -vn -0.0000 1.0000 0.0000 -usemtl entities/player -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -f 4/5/2 3/6/2 5/7/2 6/8/2 -f 6/9/3 5/10/3 7/11/3 8/12/3 -f 8/13/4 7/14/4 2/15/4 1/16/4 -f 4/17/5 6/18/5 8/19/5 1/16/5 -f 5/20/6 3/21/6 2/15/6 7/22/6 diff --git a/res/content/base/models/player-head.vec3 b/res/content/base/models/player-head.vec3 new file mode 100644 index 0000000000000000000000000000000000000000..71f47c102aad6aa4e2033f41d14b0cf5cae6616e GIT binary patch literal 544 zcmZQz2y=BdW?*1s0AUcx&ybo|l39|OTC87?lUSKr#0?Zg0FV+MD3=*XCjjxI^5A_f z=}fjj+786NbmTFJMrQ9rQUhY!LDhiSP`$|Fb|5t{GZ`5+0Bu=c@Jvlm>4{Ou4Z6p*bgG07)XHt zNUXsg!iETd1QBA$df@6985x+EK&pWxGcyA-3nLRNBMTcNkO3rF*%?_mm{>TO*tnR0 z3?RwQ&BV^b%*M;i$j1z107(XZW@Z5vRzVhaAr>G5NHXxVun4mu)Dl1-Eq L67RYhsfj57OEihc literal 0 HcmV?d00001 diff --git a/test/coders/vec3.cpp b/test/coders/vec3.cpp index e4643921..a29e22b0 100644 --- a/test/coders/vec3.cpp +++ b/test/coders/vec3.cpp @@ -5,7 +5,7 @@ TEST(VEC3, Decode) { auto file = std::filesystem::u8path( - "../res/content/base/models/demo.vec3" + "../res/content/base/models/block.vec3" ); auto bytes = files::read_bytes_buffer(file); auto model = vec3::load(file.u8string(), bytes);