From 1c7d1a4e18b353f03e32175b23f6d70df87c8a95 Mon Sep 17 00:00:00 2001 From: 3drosalia Date: Wed, 16 Oct 2024 08:25:12 -0400 Subject: [PATCH] start overshell work --- Encore/Assets/noteredux/tom/base.obj | 137 +++-- Encore/Assets/noteredux/tom/color.obj | 301 +++++++--- Encore/Assets/noteredux/tom/sides.obj | 797 +++++++++++++------------ Encore/src/main.cpp | 14 +- Encore/src/menus/overshellRenderer.cpp | 333 ++++++++--- Encore/src/menus/overshellRenderer.h | 1 + Encore/src/song/song.h | 1 + Encore/src/users/player.cpp | 9 +- Encore/src/users/player.h | 28 +- 9 files changed, 1007 insertions(+), 614 deletions(-) diff --git a/Encore/Assets/noteredux/tom/base.obj b/Encore/Assets/noteredux/tom/base.obj index 56a1cd59..d4e378a6 100644 --- a/Encore/Assets/noteredux/tom/base.obj +++ b/Encore/Assets/noteredux/tom/base.obj @@ -1,47 +1,116 @@ # Blender 4.1.1 # www.blender.org -o Cube.025 -v -0.470000 0.000287 0.524761 -v 0.420000 0.000287 0.524760 -v 0.420000 0.005246 0.535536 -v -0.470000 0.005246 0.535537 -v 0.420000 0.017219 0.540000 -v -0.470000 0.017219 0.540000 -v -0.470000 0.017219 0.000000 -v 0.420000 0.017219 -0.000000 -v 0.420000 0.005246 0.004464 -v -0.470000 0.005246 0.004464 -v 0.420000 0.000287 0.015239 -v -0.470000 0.000287 0.015240 -v 0.420000 0.072366 0.540000 -v -0.470000 0.072366 0.540000 -v -0.470000 0.072207 0.000000 -v 0.420000 0.072207 -0.000000 -vn -0.0000 -0.9768 0.2140 +o Cube.001 +v -0.450000 0.000000 0.437301 +v 0.450000 0.000000 0.437300 +v 0.450000 0.004133 0.446280 +v -0.450000 0.004133 0.446280 +v 0.450000 0.014111 0.450000 +v -0.450000 0.014111 0.450000 +v -0.450000 0.014111 -0.000000 +v 0.450000 0.014111 -0.000000 +v 0.450000 0.004133 0.003720 +v -0.450000 0.004133 0.003720 +v 0.450000 0.000000 0.012700 +v -0.450000 0.000000 0.012700 +v 0.450000 0.060066 0.450000 +v -0.450000 0.060066 0.450000 +v -0.450000 0.059934 -0.000000 +v 0.450000 0.059934 -0.000000 +v -0.225000 0.000000 0.437301 +v 0.000000 0.000000 0.437301 +v 0.225000 0.000000 0.437300 +v 0.225000 0.004133 0.446280 +v 0.000000 0.004133 0.446280 +v -0.225000 0.004133 0.446280 +v -0.225000 0.014111 -0.000000 +v 0.000000 0.014111 -0.000000 +v 0.225000 0.014111 -0.000000 +v 0.225000 0.004133 0.003720 +v 0.000000 0.004133 0.003720 +v -0.225000 0.004133 0.003720 +v 0.225000 0.000000 0.012700 +v 0.000000 0.000000 0.012700 +v -0.225000 0.000000 0.012700 +v 0.225000 0.060066 0.450000 +v 0.000000 0.060066 0.450000 +v -0.225000 0.060066 0.450000 +v -0.225000 0.059934 -0.000000 +v 0.000000 0.059934 -0.000000 +v 0.225000 0.059934 -0.000000 +v 0.225000 0.014111 0.450000 +v 0.000000 0.014111 0.450000 +v -0.225000 0.014111 0.450000 +vn -0.0000 -0.6803 -0.7329 +vn -0.0000 -0.9768 -0.2140 +vn -0.0000 -0.1775 -0.9841 vn -0.0000 -0.6803 0.7329 vn -0.0000 -0.1775 0.9841 -vn -0.0000 -0.1775 -0.9841 -vn -0.0000 -0.6803 -0.7330 -vn -0.0000 -0.9768 -0.2140 +vn -0.0000 -0.9768 0.2140 vn -0.0000 -0.0000 1.0000 vn -0.0000 -0.0000 -1.0000 -vt 1.000000 0.068807 +vn -0.0000 -0.6803 0.7330 +vt 0.250000 0.068807 vt 0.000000 0.068807 vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.234921 +vt 0.250000 0.000000 +vt 0.250000 0.234921 vt 0.000000 0.234921 +vt 0.250000 0.068807 vt 0.000000 0.234918 -vt 1.000000 0.234918 -vt 0.000000 1.000000 +vt 0.250000 0.234918 +vt 0.250000 0.000000 +vt 0.750000 0.000000 +vt 1.000000 0.000000 +vt 0.750000 0.000000 +vt 0.750000 0.234918 +vt 0.750000 1.000000 vt 1.000000 1.000000 -vt 1.000000 0.997805 +vt 1.000000 0.234918 +vt 0.250000 0.997805 vt 0.000000 0.997805 +vt 1.000000 0.234921 +vt 1.000000 0.997805 +vt 0.750000 0.997805 +vt 0.750000 0.234921 +vt 0.500000 0.997805 +vt 0.500000 0.234921 +vt 0.000000 1.000000 +vt 0.250000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.234918 +vt 0.500000 0.000000 +vt 0.500000 0.000000 +vt 0.750000 0.068807 +vt 1.000000 0.068807 +vt 0.500000 0.068807 +vt 0.750000 0.068807 s 1 -f 10/1/5 9/2/5 11/3/6 12/4/6 -f 7/5/4 8/6/4 9/2/5 10/1/5 -f 4/1/2 3/2/2 5/7/3 6/8/3 -f 1/4/1 2/3/1 3/2/2 4/1/2 -f 2/3/1 1/4/1 12/4/6 11/3/6 -f 5/7/3 13/9/7 14/10/7 6/8/3 -f 7/5/4 15/11/8 16/12/8 8/6/4 +f 26/1/1 9/2/1 11/3/2 29/4/2 +f 25/5/3 8/6/3 9/2/1 26/1/1 +f 20/7/4 3/2/4 5/8/5 38/9/5 +f 19/10/6 2/3/6 3/2/4 20/7/4 +f 17/11/6 1/12/6 12/12/2 31/13/2 +f 40/14/5 34/15/7 14/16/7 6/17/5 +f 25/5/3 37/18/8 16/19/8 8/6/3 +f 7/20/3 15/21/8 35/22/8 23/23/3 +f 23/23/3 35/22/8 36/24/8 24/25/3 +f 24/25/3 36/24/8 37/18/8 25/5/3 +f 5/8/5 13/26/7 32/27/7 38/9/5 +f 38/9/5 32/27/7 33/28/7 39/29/5 +f 39/29/5 33/28/7 34/15/7 40/14/5 +f 2/3/6 19/10/6 29/4/2 11/3/2 +f 19/10/6 18/30/6 30/31/2 29/4/2 +f 18/30/6 17/11/6 31/13/2 30/31/2 +f 1/12/6 17/11/6 22/32/9 4/33/9 +f 17/11/6 18/30/6 21/34/9 22/32/9 +f 18/30/6 19/10/6 20/7/4 21/34/9 +f 4/33/9 22/32/9 40/14/5 6/17/5 +f 22/32/9 21/34/9 39/29/5 40/14/5 +f 21/34/9 20/7/4 38/9/5 39/29/5 +f 7/20/3 23/23/3 28/35/1 10/33/1 +f 23/23/3 24/25/3 27/34/1 28/35/1 +f 24/25/3 25/5/3 26/1/1 27/34/1 +f 10/33/1 28/35/1 31/13/2 12/12/2 +f 28/35/1 27/34/1 30/31/2 31/13/2 +f 27/34/1 26/1/1 29/4/2 30/31/2 diff --git a/Encore/Assets/noteredux/tom/color.obj b/Encore/Assets/noteredux/tom/color.obj index 7709058d..07f76dc1 100644 --- a/Encore/Assets/noteredux/tom/color.obj +++ b/Encore/Assets/noteredux/tom/color.obj @@ -1,99 +1,240 @@ # Blender 4.1.1 # www.blender.org -o Cube.024 -v 0.420000 0.187713 0.540000 -v -0.470000 0.187713 0.540000 -v -0.470000 0.187713 0.000000 -v 0.420000 0.187713 -0.000000 -v 0.420000 0.256042 0.531904 -v -0.470000 0.256042 0.531904 -v 0.420000 0.451713 0.302400 -v -0.470000 0.451713 0.302400 -v -0.470000 0.442718 0.363895 -v 0.420000 0.442718 0.363895 -v 0.420000 0.451713 0.237600 -v -0.470000 0.451713 0.237600 -v 0.420000 0.319713 0.508168 -v -0.470000 0.319713 0.508168 -v 0.420000 0.374390 0.470408 -v -0.470000 0.374390 0.470409 -v 0.420000 0.416344 0.421200 -v -0.470000 0.416344 0.421200 -v 0.420000 0.442718 0.176105 -v -0.470000 0.442718 0.176105 -v -0.470000 0.256042 0.008096 -v 0.420000 0.256042 0.008096 -v 0.420000 0.416344 0.118800 -v -0.470000 0.416344 0.118800 -v 0.420000 0.374390 0.069591 -v -0.470000 0.374390 0.069592 -v 0.420000 0.319713 0.031832 -v -0.470000 0.319713 0.031832 -v 0.420000 0.072366 0.540000 -v -0.470000 0.072366 0.540000 -v -0.470000 0.072207 0.000000 -v 0.420000 0.072207 -0.000000 -vn -0.0000 0.0589 0.9983 -vn -0.0000 0.0589 -0.9983 -vn -0.0000 0.2352 0.9720 +o Cube.003 +v 0.450000 0.156189 0.450000 +v -0.450000 0.156189 0.450000 +v -0.450000 0.156189 -0.000000 +v 0.450000 0.156189 -0.000000 +v 0.450000 0.213129 0.443253 +v -0.450000 0.213129 0.443253 +v 0.450000 0.376189 0.252000 +v -0.450000 0.376189 0.252000 +v -0.450000 0.368693 0.303246 +v 0.450000 0.368693 0.303246 +v 0.450000 0.376189 0.198000 +v -0.450000 0.376189 0.198000 +v 0.450000 0.266189 0.423473 +v -0.450000 0.266189 0.423473 +v 0.450000 0.311753 0.392007 +v -0.450000 0.311753 0.392007 +v 0.450000 0.346715 0.351000 +v -0.450000 0.346715 0.351000 +v 0.450000 0.368693 0.146754 +v -0.450000 0.368693 0.146754 +v -0.450000 0.213129 0.006747 +v 0.450000 0.213129 0.006747 +v 0.450000 0.346715 0.099000 +v -0.450000 0.346715 0.099000 +v 0.450000 0.311753 0.057993 +v -0.450000 0.311753 0.057993 +v 0.450000 0.266189 0.026527 +v -0.450000 0.266189 0.026527 +v 0.450000 0.060066 0.450000 +v -0.450000 0.060066 0.450000 +v -0.450000 0.059934 -0.000000 +v 0.450000 0.059934 -0.000000 +v -0.225000 0.346715 0.099000 +v 0.000000 0.346715 0.099000 +v 0.225000 0.346715 0.099000 +v -0.225000 0.156189 0.450000 +v 0.000000 0.156189 0.450000 +v 0.225000 0.156189 0.450000 +v 0.225000 0.156189 -0.000000 +v 0.000000 0.156189 -0.000000 +v -0.225000 0.156189 -0.000000 +v -0.225000 0.376189 0.252000 +v 0.000000 0.376189 0.252000 +v 0.225000 0.376189 0.252000 +v -0.225000 0.266189 0.423473 +v 0.000000 0.266189 0.423473 +v 0.225000 0.266189 0.423473 +v 0.225000 0.213129 0.006747 +v 0.000000 0.213129 0.006747 +v -0.225000 0.213129 0.006747 +v -0.225000 0.266189 0.026527 +v 0.000000 0.266189 0.026527 +v 0.225000 0.266189 0.026527 +v -0.225000 0.311753 0.057993 +v 0.000000 0.311753 0.057993 +v 0.225000 0.311753 0.057993 +v 0.225000 0.368693 0.303246 +v 0.000000 0.368693 0.303246 +v -0.225000 0.368693 0.303246 +v 0.225000 0.376189 0.198000 +v 0.000000 0.376189 0.198000 +v -0.225000 0.376189 0.198000 +v -0.225000 0.368693 0.146754 +v 0.000000 0.368693 0.146754 +v 0.225000 0.368693 0.146754 +v 0.225000 0.311753 0.392007 +v 0.000000 0.311753 0.392007 +v -0.225000 0.311753 0.392007 +v 0.225000 0.346715 0.351000 +v 0.000000 0.346715 0.351000 +v -0.225000 0.346715 0.351000 +v -0.225000 0.059934 -0.000000 +v 0.000000 0.059934 -0.000000 +v 0.225000 0.059934 -0.000000 +v -0.225000 0.213129 0.443253 +v 0.000000 0.213129 0.443253 +v 0.225000 0.213129 0.443253 +v 0.225000 0.060066 0.450000 +v 0.000000 0.060066 0.450000 +v -0.225000 0.060066 0.450000 +vn -0.0000 0.9974 -0.0726 vn -0.0000 0.9974 0.0726 +vn -0.0000 0.2352 -0.9720 +vn -0.0000 0.0589 -0.9983 vn -0.0000 0.9587 0.2843 -vn -0.0000 0.9974 -0.0726 -vn -0.0000 0.4623 0.8867 -vn -0.0000 0.6703 0.7421 -vn -0.0000 0.8426 0.5385 vn -0.0000 0.9587 -0.2843 -vn -0.0000 0.2352 -0.9720 -vn -0.0000 0.8426 -0.5385 -vn -0.0000 0.6703 -0.7421 vn -0.0000 0.4623 -0.8867 +vn -0.0000 0.6703 -0.7421 +vn -0.0000 0.8426 -0.5385 +vn -0.0000 0.8426 0.5385 +vn -0.0000 0.6703 0.7421 +vn -0.0000 0.2352 0.9720 +vn -0.0000 0.0589 0.9983 +vn -0.0000 0.4623 0.8867 vn -0.0000 -0.0000 1.0000 vn -0.0000 -0.0000 -1.0000 -vt 0.000086 0.999914 -vt 0.000086 0.897842 -vt 1.000000 0.897842 -vt 1.000000 0.999914 +vt 0.250064 0.468213 +vt 0.250064 0.531927 vt 0.000086 0.531927 +vt 0.000086 0.468213 +vt 0.250064 0.163284 +vt 0.000086 0.163284 +vt 0.000086 0.102298 +vt 0.250064 0.102298 +vt 0.750022 0.531927 vt 1.000000 0.531927 vt 1.000000 0.592912 +vt 0.750021 0.592912 +vt 0.000086 0.407228 +vt 0.250064 0.407228 +vt 0.750022 0.224270 +vt 1.000000 0.224270 +vt 1.000000 0.285256 +vt 0.750022 0.285256 +vt 0.750022 0.346242 +vt 1.000000 0.346242 +vt 1.000000 0.407227 +vt 0.750022 0.407227 +vt 0.250064 0.592912 +vt 0.250064 0.653898 +vt 0.000086 0.653898 vt 0.000086 0.592912 +vt 0.250064 0.714884 vt 0.000086 0.714884 -vt 1.000000 0.714884 +vt 0.750022 0.836856 +vt 1.000000 0.836856 +vt 1.000000 0.897842 +vt 0.750022 0.897842 +vt 0.750022 0.775870 vt 1.000000 0.775870 -vt 0.000086 0.775870 -vt 0.000086 0.653898 -vt 1.000000 0.653898 -vt 1.000000 0.468213 -vt 0.000086 0.468213 -vt 0.000086 0.407228 -vt 1.000000 0.407227 -vt 0.000086 0.346242 -vt 1.000000 0.346242 -vt 1.000000 0.224270 +vt 0.750021 0.714884 +vt 1.000000 0.714884 +vt 0.250064 0.224270 vt 0.000086 0.224270 -vt 0.000086 0.163284 +vt 1.000000 0.999914 +vt 0.750021 0.999914 +vt 0.000086 0.000086 +vt 0.250064 0.000086 +vt 1.000000 0.102298 +vt 0.750021 0.102298 +vt 0.750022 0.000086 +vt 1.000000 0.000086 +vt 0.500043 0.102298 +vt 0.500043 0.000086 +vt 0.000086 0.897842 +vt 0.250064 0.897842 +vt 0.250064 0.999914 +vt 0.000086 0.999914 +vt 0.500043 0.897842 +vt 0.500043 0.999914 vt 1.000000 0.163284 -vt 1.000000 0.285256 +vt 0.750021 0.163284 +vt 0.500043 0.224270 +vt 0.500043 0.163284 +vt 0.250064 0.775870 +vt 0.000086 0.775870 +vt 0.500043 0.714884 +vt 0.500043 0.775870 vt 0.000086 0.285256 -vt 0.000086 0.102298 -vt 1.000000 0.102298 -vt 1.000000 0.836856 +vt 0.250064 0.285256 +vt 0.250064 0.346242 +vt 0.000086 0.346242 +vt 0.500043 0.285256 +vt 0.500043 0.346242 +vt 0.250064 0.836856 vt 0.000086 0.836856 -vt 1.000000 0.000086 -vt 0.000086 0.000086 +vt 0.500043 0.836856 +vt 1.000000 0.653898 +vt 0.750022 0.653898 +vt 0.500043 0.653898 +vt 0.500043 0.592912 +vt 0.500043 0.407227 +vt 1.000000 0.468213 +vt 0.750021 0.468213 +vt 0.500043 0.468213 +vt 0.500043 0.531927 s 1 -f 29/1/15 1/2/1 2/3/1 30/4/15 -f 7/5/4 8/6/4 9/7/5 10/8/5 -f 15/9/8 16/10/8 14/11/7 13/12/7 -f 17/13/9 18/14/9 16/10/8 15/9/8 -f 10/8/5 9/7/5 18/14/9 17/13/9 -f 12/15/6 11/16/6 19/17/10 20/18/10 -f 8/6/4 7/5/4 11/16/6 12/15/6 -f 20/18/10 19/17/10 23/19/12 24/20/12 -f 28/21/14 27/22/14 22/23/11 21/24/11 -f 26/25/13 25/26/13 27/22/14 28/21/14 -f 24/20/12 23/19/12 25/26/13 26/25/13 -f 21/24/11 22/23/11 4/27/2 3/28/2 -f 13/12/7 14/11/7 6/29/3 5/30/3 -f 5/30/3 6/29/3 2/3/1 1/2/1 -f 31/31/16 3/28/2 4/27/2 32/32/16 +f 60/1/1 44/2/2 7/3/2 11/4/1 +f 48/5/3 22/6/3 4/7/4 39/8/4 +f 42/9/2 8/10/2 9/11/5 59/12/5 +f 60/1/1 11/4/1 19/13/6 65/14/6 +f 51/15/7 28/16/7 26/17/8 54/18/8 +f 33/19/9 24/20/9 20/21/6 63/22/6 +f 57/23/5 69/24/10 17/25/10 10/26/5 +f 69/24/10 66/27/11 15/28/11 17/25/10 +f 75/29/12 6/30/12 2/31/13 36/32/13 +f 45/33/14 14/34/14 6/30/12 75/29/12 +f 54/18/8 26/17/8 24/20/9 33/19/9 +f 68/35/11 16/36/11 14/34/14 45/33/14 +f 48/5/3 53/37/7 27/38/7 22/6/3 +f 36/32/13 2/31/13 30/39/15 80/40/15 +f 39/8/4 4/7/4 32/41/16 74/42/16 +f 3/43/4 41/44/4 72/45/16 31/46/16 +f 41/44/4 40/47/4 73/48/16 72/45/16 +f 40/47/4 39/8/4 74/42/16 73/48/16 +f 1/49/13 38/50/13 78/51/15 29/52/15 +f 38/50/13 37/53/13 79/54/15 78/51/15 +f 37/53/13 36/32/13 80/40/15 79/54/15 +f 21/55/3 28/16/7 51/15/7 50/56/3 +f 50/56/3 51/15/7 52/57/7 49/58/3 +f 49/58/3 52/57/7 53/37/7 48/5/3 +f 15/28/11 66/27/11 47/59/14 13/60/14 +f 66/27/11 67/61/11 46/62/14 47/59/14 +f 67/61/11 68/35/11 45/33/14 46/62/14 +f 25/63/8 56/64/8 35/65/9 23/66/9 +f 56/64/8 55/67/8 34/68/9 35/65/9 +f 55/67/8 54/18/8 33/19/9 34/68/9 +f 13/60/14 47/59/14 77/69/12 5/70/12 +f 47/59/14 46/62/14 76/71/12 77/69/12 +f 46/62/14 45/33/14 75/29/12 76/71/12 +f 5/70/12 77/69/12 38/50/13 1/49/13 +f 77/69/12 76/71/12 37/53/13 38/50/13 +f 76/71/12 75/29/12 36/32/13 37/53/13 +f 18/72/10 16/36/11 68/35/11 71/73/10 +f 71/73/10 68/35/11 67/61/11 70/74/10 +f 70/74/10 67/61/11 66/27/11 69/24/10 +f 9/11/5 18/72/10 71/73/10 59/12/5 +f 59/12/5 71/73/10 70/74/10 58/75/5 +f 58/75/5 70/74/10 69/24/10 57/23/5 +f 23/66/9 35/65/9 65/14/6 19/13/6 +f 35/65/9 34/68/9 64/76/6 65/14/6 +f 34/68/9 33/19/9 63/22/6 64/76/6 +f 27/38/7 53/37/7 56/64/8 25/63/8 +f 53/37/7 52/57/7 55/67/8 56/64/8 +f 52/57/7 51/15/7 54/18/8 55/67/8 +f 12/77/1 62/78/1 63/22/6 20/21/6 +f 62/78/1 61/79/1 64/76/6 63/22/6 +f 61/79/1 60/1/1 65/14/6 64/76/6 +f 7/3/2 44/2/2 57/23/5 10/26/5 +f 44/2/2 43/80/2 58/75/5 57/23/5 +f 43/80/2 42/9/2 59/12/5 58/75/5 +f 21/55/3 50/56/3 41/44/4 3/43/4 +f 50/56/3 49/58/3 40/47/4 41/44/4 +f 49/58/3 48/5/3 39/8/4 40/47/4 +f 12/77/1 8/10/2 42/9/2 62/78/1 +f 62/78/1 42/9/2 43/80/2 61/79/1 +f 61/79/1 43/80/2 44/2/2 60/1/1 diff --git a/Encore/Assets/noteredux/tom/sides.obj b/Encore/Assets/noteredux/tom/sides.obj index 0ea3fd64..7ef46c05 100644 --- a/Encore/Assets/noteredux/tom/sides.obj +++ b/Encore/Assets/noteredux/tom/sides.obj @@ -1,226 +1,226 @@ # Blender 4.1.1 # www.blender.org -o Cube.008 -v -0.650000 0.185747 0.513000 -v -0.620000 0.187713 0.540000 -v -0.641213 0.187138 0.532092 -v -0.650000 0.421713 0.300630 -v -0.620000 0.451713 0.302400 -v -0.641213 0.442927 0.301882 -v -0.650000 0.248210 0.505599 -v -0.620000 0.256042 0.531904 -v -0.641213 0.253748 0.524200 -v -0.650000 0.304584 0.484583 -v -0.620000 0.319713 0.508168 -v -0.641213 0.315282 0.501260 -v -0.650000 0.352993 0.451152 -v -0.620000 0.374390 0.470409 -v -0.641213 0.368123 0.464768 -v -0.650000 0.390139 0.407584 -v -0.620000 0.416344 0.421200 -v -0.641213 0.408669 0.417212 -v -0.650000 0.413490 0.356847 -v -0.620000 0.442718 0.363896 -v -0.641213 0.434157 0.361831 -v -0.650000 0.421713 0.239370 -v -0.620000 0.451713 0.237600 -v -0.641213 0.442927 0.238118 -v -0.650000 0.185747 0.027000 -v -0.620000 0.187713 -0.000000 -v -0.641213 0.187138 0.007908 -v -0.650000 0.413490 0.183153 -v -0.620000 0.442718 0.176105 -v -0.641213 0.434157 0.178169 -v -0.650000 0.390139 0.132417 -v -0.620000 0.416344 0.118800 -v -0.641213 0.408669 0.122788 -v -0.650000 0.352993 0.088848 -v -0.620000 0.374390 0.069592 -v -0.641213 0.368123 0.075232 -v -0.650000 0.304584 0.055417 -v -0.620000 0.319713 0.031832 -v -0.641213 0.315282 0.038740 -v -0.650000 0.248210 0.034401 -v -0.620000 0.256042 0.008096 -v -0.641213 0.253748 0.015801 -v 0.600000 0.421713 0.300630 -v 0.570000 0.451713 0.302400 -v 0.591213 0.442927 0.301882 -v 0.600000 0.185747 0.513000 -v 0.570000 0.187713 0.540000 -v 0.591213 0.187138 0.532092 -v 0.600000 0.413490 0.356847 -v 0.570000 0.442718 0.363895 -v 0.591213 0.434157 0.361831 -v 0.600000 0.390139 0.407583 -v 0.570000 0.416344 0.421200 -v 0.591213 0.408669 0.417212 -v 0.600000 0.352993 0.451152 -v 0.570000 0.374390 0.470408 -v 0.591213 0.368123 0.464768 -v 0.600000 0.304584 0.484583 -v 0.570000 0.319713 0.508168 -v 0.591213 0.315282 0.501260 -v 0.600000 0.248210 0.505599 -v 0.570000 0.256042 0.531904 -v 0.591213 0.253748 0.524199 -v 0.600000 0.185747 0.027000 -v 0.570000 0.187713 -0.000000 -v 0.591213 0.187138 0.007908 -v 0.600000 0.421713 0.239370 -v 0.570000 0.451713 0.237600 -v 0.591213 0.442927 0.238118 -v 0.600000 0.248210 0.034401 -v 0.570000 0.256042 0.008096 -v 0.591213 0.253748 0.015801 -v 0.600000 0.304584 0.055417 -v 0.570000 0.319713 0.031832 -v 0.591213 0.315282 0.038740 -v 0.600000 0.352993 0.088848 -v 0.570000 0.374390 0.069591 -v 0.591213 0.368123 0.075231 -v 0.600000 0.390139 0.132417 -v 0.570000 0.416344 0.118800 -v 0.591213 0.408669 0.122788 -v 0.600000 0.413490 0.183153 -v 0.570000 0.442718 0.176105 -v 0.591213 0.434157 0.178169 -v -0.650000 0.030287 0.497533 -v -0.650000 0.047472 0.513000 -v -0.650000 0.035320 0.508470 -v -0.620000 0.000287 0.524761 -v -0.620000 0.017219 0.540000 -v -0.620000 0.005246 0.535537 -v -0.641213 0.026130 0.532092 -v -0.641213 0.009073 0.516741 -v -0.641213 0.014069 0.527596 -v -0.650000 0.047472 0.027000 -v -0.650000 0.030287 0.042467 -v -0.650000 0.035320 0.031530 -v -0.620000 0.017219 -0.000000 -v -0.620000 0.000287 0.015240 -v -0.620000 0.005246 0.004464 -v -0.641213 0.009073 0.023259 -v -0.641213 0.026130 0.007908 -v -0.641213 0.014069 0.012404 -v 0.600000 0.047472 0.513000 -v 0.600000 0.030287 0.497533 -v 0.600000 0.035320 0.508470 -v 0.570000 0.017219 0.540000 -v 0.570000 0.000287 0.524760 -v 0.570000 0.005246 0.535536 -v 0.591213 0.009073 0.516741 -v 0.591213 0.026130 0.532092 -v 0.591213 0.014069 0.527596 -v 0.600000 0.030287 0.042467 -v 0.600000 0.047472 0.027000 -v 0.600000 0.035320 0.031530 -v 0.570000 0.000287 0.015239 -v 0.570000 0.017219 -0.000000 -v 0.570000 0.005246 0.004463 -v 0.591213 0.026130 0.007908 -v 0.591213 0.009073 0.023259 -v 0.591213 0.014069 0.012404 -v 0.420000 0.187713 0.540000 -v -0.470000 0.187713 0.540000 -v -0.470000 0.187713 -0.000000 -v 0.420000 0.187713 -0.000000 -v 0.420000 0.256042 0.531904 -v -0.470000 0.256042 0.531904 -v 0.420000 0.451713 0.302400 -v -0.470000 0.451713 0.302400 -v -0.470000 0.442718 0.363895 -v 0.420000 0.442718 0.363895 -v 0.420000 0.451713 0.237600 -v -0.470000 0.451713 0.237600 -v 0.420000 0.319713 0.508168 -v -0.470000 0.319713 0.508168 -v 0.420000 0.374390 0.470408 -v -0.470000 0.374390 0.470409 -v 0.420000 0.416344 0.421200 -v -0.470000 0.416344 0.421200 -v 0.420000 0.442718 0.176105 -v -0.470000 0.442718 0.176105 -v -0.470000 0.256042 0.008096 -v 0.420000 0.256042 0.008096 -v 0.420000 0.416344 0.118800 -v -0.470000 0.416344 0.118800 -v 0.420000 0.374390 0.069591 -v -0.470000 0.374390 0.069592 -v 0.420000 0.319713 0.031832 -v -0.470000 0.319713 0.031832 -v -0.470000 0.000287 0.524761 -v 0.420000 0.000287 0.524760 -v 0.420000 0.005246 0.535536 -v -0.470000 0.005246 0.535537 -v 0.420000 0.017219 0.540000 -v -0.470000 0.017219 0.540000 -v -0.470000 0.017219 -0.000000 -v 0.420000 0.017219 -0.000000 -v 0.420000 0.005246 0.004464 -v -0.470000 0.005246 0.004464 -v 0.420000 0.000287 0.015239 -v -0.470000 0.000287 0.015240 -v -0.650000 0.072121 0.513000 -v -0.641213 0.072294 0.532092 -v -0.620000 0.072366 0.540000 -v 0.570000 0.072366 0.540000 -v 0.600000 0.072121 0.513000 -v 0.591213 0.072294 0.532092 -v 0.420000 0.072366 0.540000 -v -0.470000 0.072366 0.540000 -v -0.650000 0.072452 0.027000 -v -0.641213 0.072279 0.007908 -v -0.620000 0.072207 -0.000000 -v 0.570000 0.072207 -0.000000 -v 0.600000 0.072452 0.027000 -v 0.591213 0.072279 0.007908 -v -0.470000 0.072207 -0.000000 -v 0.420000 0.072207 -0.000000 -v 0.495000 0.187713 -0.000000 -v 0.495000 0.442718 0.363895 -v 0.495000 0.256042 0.008096 -v 0.495000 0.000287 0.524760 -v 0.495000 0.017219 -0.000000 -v 0.495000 0.187713 0.540000 -v 0.495000 0.256042 0.531904 -v 0.495000 0.451713 0.302400 -v 0.495000 0.451713 0.237600 -v 0.495000 0.319713 0.508168 -v 0.495000 0.374390 0.470408 -v 0.495000 0.416344 0.421200 -v 0.495000 0.442718 0.176105 -v 0.495000 0.416344 0.118800 -v 0.495000 0.374390 0.069591 -v 0.495000 0.319713 0.031832 -v 0.495000 0.005246 0.535536 -v 0.495000 0.017219 0.540000 -v 0.495000 0.005246 0.004463 -v 0.495000 0.000287 0.015239 -v 0.495000 0.072366 0.540000 -v 0.495000 0.072207 -0.000000 -v -0.545000 0.187713 0.540000 -v -0.545000 0.256042 0.531904 -v -0.545000 0.451713 0.302400 -v -0.545000 0.451713 0.237600 -v -0.545000 0.319713 0.508168 -v -0.545000 0.374390 0.470409 -v -0.545000 0.416344 0.421200 -v -0.545000 0.442718 0.176105 -v -0.545000 0.416344 0.118800 -v -0.545000 0.374390 0.069592 -v -0.545000 0.319713 0.031832 -v -0.545000 0.005246 0.535537 -v -0.545000 0.017219 0.540000 -v -0.545000 0.005246 0.004464 -v -0.545000 0.000287 0.015240 -v -0.545000 0.187713 -0.000000 -v -0.545000 0.442718 0.363896 -v -0.545000 0.256042 0.008096 -v -0.545000 0.000287 0.524761 -v -0.545000 0.017219 -0.000000 -v -0.545000 0.072366 0.540000 -v -0.545000 0.072207 -0.000000 +o Cube.002 +v -0.600000 0.154551 0.427500 +v -0.575000 0.156189 0.450000 +v -0.592678 0.155709 0.443410 +v -0.600000 0.351189 0.250525 +v -0.575000 0.376189 0.252000 +v -0.592678 0.368867 0.251568 +v -0.600000 0.206603 0.421333 +v -0.575000 0.213129 0.443253 +v -0.592678 0.211218 0.436833 +v -0.600000 0.253581 0.403819 +v -0.575000 0.266189 0.423473 +v -0.592678 0.262496 0.417717 +v -0.600000 0.293922 0.375960 +v -0.575000 0.311753 0.392007 +v -0.592678 0.306530 0.387307 +v -0.600000 0.324877 0.339653 +v -0.575000 0.346715 0.351000 +v -0.592678 0.340319 0.347677 +v -0.600000 0.344336 0.297373 +v -0.575000 0.368693 0.303246 +v -0.592678 0.361559 0.301526 +v -0.600000 0.351189 0.199475 +v -0.575000 0.376189 0.198000 +v -0.592678 0.368867 0.198432 +v -0.600000 0.154550 0.022500 +v -0.575000 0.156189 -0.000000 +v -0.592678 0.155709 0.006590 +v -0.600000 0.344336 0.152628 +v -0.575000 0.368693 0.146754 +v -0.592678 0.361559 0.148474 +v -0.600000 0.324877 0.110347 +v -0.575000 0.346715 0.099000 +v -0.592678 0.340319 0.102324 +v -0.600000 0.293922 0.074040 +v -0.575000 0.311753 0.057993 +v -0.592678 0.306530 0.062693 +v -0.600000 0.253581 0.046181 +v -0.575000 0.266189 0.026527 +v -0.592678 0.262496 0.032284 +v -0.600000 0.206603 0.028668 +v -0.575000 0.213129 0.006747 +v -0.592678 0.211218 0.013167 +v 0.600000 0.351189 0.250525 +v 0.575000 0.376189 0.252000 +v 0.592678 0.368867 0.251568 +v 0.600000 0.154551 0.427500 +v 0.575000 0.156189 0.450000 +v 0.592678 0.155709 0.443410 +v 0.600000 0.344336 0.297372 +v 0.575000 0.368693 0.303246 +v 0.592678 0.361559 0.301526 +v 0.600000 0.324877 0.339653 +v 0.575000 0.346715 0.351000 +v 0.592678 0.340319 0.347676 +v 0.600000 0.293922 0.375960 +v 0.575000 0.311753 0.392007 +v 0.592678 0.306530 0.387307 +v 0.600000 0.253581 0.403819 +v 0.575000 0.266189 0.423473 +v 0.592678 0.262496 0.417717 +v 0.600000 0.206603 0.421332 +v 0.575000 0.213129 0.443253 +v 0.592678 0.211218 0.436833 +v 0.600000 0.154550 0.022500 +v 0.575000 0.156189 -0.000000 +v 0.592678 0.155709 0.006590 +v 0.600000 0.351189 0.199475 +v 0.575000 0.376189 0.198000 +v 0.592678 0.368867 0.198432 +v 0.600000 0.206603 0.028668 +v 0.575000 0.213129 0.006747 +v 0.592678 0.211218 0.013167 +v 0.600000 0.253581 0.046181 +v 0.575000 0.266189 0.026527 +v 0.592678 0.262496 0.032283 +v 0.600000 0.293922 0.074040 +v 0.575000 0.311753 0.057993 +v 0.592678 0.306530 0.062693 +v 0.600000 0.324877 0.110347 +v 0.575000 0.346715 0.099000 +v 0.592678 0.340319 0.102323 +v 0.600000 0.344336 0.152627 +v 0.575000 0.368693 0.146754 +v 0.592678 0.361559 0.148474 +v -0.600000 0.025000 0.414611 +v -0.600000 0.039321 0.427500 +v -0.600000 0.029195 0.423725 +v -0.575000 0.000000 0.437301 +v -0.575000 0.014111 0.450000 +v -0.575000 0.004133 0.446280 +v -0.592678 0.021536 0.443410 +v -0.592678 0.007322 0.430618 +v -0.592678 0.011485 0.439663 +v -0.600000 0.039321 0.022500 +v -0.600000 0.025000 0.035389 +v -0.600000 0.029195 0.026275 +v -0.575000 0.014111 -0.000000 +v -0.575000 0.000000 0.012700 +v -0.575000 0.004133 0.003720 +v -0.592678 0.007322 0.019382 +v -0.592678 0.021536 0.006590 +v -0.592678 0.011485 0.010337 +v 0.600000 0.039321 0.427500 +v 0.600000 0.025000 0.414611 +v 0.600000 0.029195 0.423725 +v 0.575000 0.014111 0.450000 +v 0.575000 0.000000 0.437300 +v 0.575000 0.004133 0.446280 +v 0.592678 0.007322 0.430618 +v 0.592678 0.021536 0.443410 +v 0.592678 0.011485 0.439663 +v 0.600000 0.025000 0.035389 +v 0.600000 0.039321 0.022500 +v 0.600000 0.029195 0.026275 +v 0.575000 0.000000 0.012700 +v 0.575000 0.014111 -0.000000 +v 0.575000 0.004133 0.003720 +v 0.592678 0.021536 0.006590 +v 0.592678 0.007322 0.019382 +v 0.592678 0.011485 0.010337 +v 0.450000 0.156189 0.450000 +v -0.450000 0.156189 0.450000 +v -0.450000 0.156189 -0.000000 +v 0.450000 0.156189 -0.000000 +v 0.450000 0.213129 0.443253 +v -0.450000 0.213129 0.443253 +v 0.450000 0.376189 0.252000 +v -0.450000 0.376189 0.252000 +v -0.450000 0.368693 0.303246 +v 0.450000 0.368693 0.303246 +v 0.450000 0.376189 0.198000 +v -0.450000 0.376189 0.198000 +v 0.450000 0.266189 0.423473 +v -0.450000 0.266189 0.423473 +v 0.450000 0.311753 0.392007 +v -0.450000 0.311753 0.392007 +v 0.450000 0.346715 0.351000 +v -0.450000 0.346715 0.351000 +v 0.450000 0.368693 0.146754 +v -0.450000 0.368693 0.146754 +v -0.450000 0.213129 0.006747 +v 0.450000 0.213129 0.006747 +v 0.450000 0.346715 0.099000 +v -0.450000 0.346715 0.099000 +v 0.450000 0.311753 0.057993 +v -0.450000 0.311753 0.057993 +v 0.450000 0.266189 0.026527 +v -0.450000 0.266189 0.026527 +v -0.450000 0.000000 0.437301 +v 0.450000 0.000000 0.437300 +v 0.450000 0.004133 0.446280 +v -0.450000 0.004133 0.446280 +v 0.450000 0.014111 0.450000 +v -0.450000 0.014111 0.450000 +v -0.450000 0.014111 -0.000000 +v 0.450000 0.014111 -0.000000 +v 0.450000 0.004133 0.003720 +v -0.450000 0.004133 0.003720 +v 0.450000 0.000000 0.012700 +v -0.450000 0.000000 0.012700 +v -0.600000 0.059862 0.427500 +v -0.592678 0.060006 0.443410 +v -0.575000 0.060066 0.450000 +v 0.575000 0.060066 0.450000 +v 0.600000 0.059862 0.427500 +v 0.592678 0.060006 0.443410 +v 0.450000 0.060066 0.450000 +v -0.450000 0.060066 0.450000 +v -0.600000 0.060138 0.022500 +v -0.592678 0.059994 0.006590 +v -0.575000 0.059934 -0.000000 +v 0.575000 0.059934 -0.000000 +v 0.600000 0.060138 0.022500 +v 0.592678 0.059994 0.006590 +v -0.450000 0.059934 -0.000000 +v 0.450000 0.059934 -0.000000 +v 0.512500 0.156189 -0.000000 +v 0.512500 0.368693 0.303246 +v 0.512500 0.213129 0.006747 +v 0.512500 0.000000 0.437300 +v 0.512500 0.014111 -0.000000 +v 0.512500 0.156189 0.450000 +v 0.512500 0.213129 0.443253 +v 0.512500 0.376189 0.252000 +v 0.512500 0.376189 0.198000 +v 0.512500 0.266189 0.423473 +v 0.512500 0.311753 0.392007 +v 0.512500 0.346715 0.351000 +v 0.512500 0.368693 0.146754 +v 0.512500 0.346715 0.099000 +v 0.512500 0.311753 0.057993 +v 0.512500 0.266189 0.026527 +v 0.512500 0.004133 0.446280 +v 0.512500 0.014111 0.450000 +v 0.512500 0.004133 0.003720 +v 0.512500 0.000000 0.012700 +v 0.512500 0.060066 0.450000 +v 0.512500 0.059934 -0.000000 +v -0.512500 0.156189 0.450000 +v -0.512500 0.213129 0.443253 +v -0.512500 0.376189 0.252000 +v -0.512500 0.376189 0.198000 +v -0.512500 0.266189 0.423473 +v -0.512500 0.311753 0.392007 +v -0.512500 0.346715 0.351000 +v -0.512500 0.368693 0.146754 +v -0.512500 0.346715 0.099000 +v -0.512500 0.311753 0.057993 +v -0.512500 0.266189 0.026527 +v -0.512500 0.004133 0.446280 +v -0.512500 0.014111 0.450000 +v -0.512500 0.004133 0.003720 +v -0.512500 0.000000 0.012700 +v -0.512500 0.156189 -0.000000 +v -0.512500 0.368693 0.303246 +v -0.512500 0.213129 0.006747 +v -0.512500 0.000000 0.437301 +v -0.512500 0.014111 -0.000000 +v -0.512500 0.060066 0.450000 +v -0.512500 0.059934 -0.000000 vn 0.6739 0.0435 0.7376 vn 0.1775 -0.0000 0.9841 vn 0.6803 -0.0000 0.7329 @@ -234,45 +234,45 @@ vn -0.1804 0.4557 0.8716 vn -0.0000 0.4623 0.8867 vn 0.9752 0.0129 0.2208 vn 0.9768 -0.0000 0.2140 -vn 0.1776 0.2320 -0.9564 +vn 0.1775 0.2320 -0.9564 vn -0.0000 0.0589 -0.9983 vn -0.0000 0.2352 -0.9720 -vn 0.1887 0.8282 -0.5277 +vn 0.1886 0.8282 -0.5277 vn -0.0000 0.6703 -0.7421 vn -0.0000 0.8426 -0.5385 vn 0.1844 0.6598 -0.7284 vn -0.0000 0.4623 -0.8867 -vn 0.1804 0.4557 -0.8716 +vn 0.1803 0.4557 -0.8716 vn 0.1919 0.9411 -0.2783 vn -0.0000 0.9587 -0.2843 -vn 0.1936 0.9785 0.0711 +vn 0.1937 0.9785 0.0711 vn -0.0000 0.9974 -0.0726 vn -0.0000 0.9974 0.0726 vn 0.1937 0.9785 -0.0711 -vn -0.1920 0.9411 0.2783 +vn -0.1919 0.9411 0.2783 vn -0.0000 0.8426 0.5385 vn -0.0000 0.9587 0.2843 -vn -0.1887 0.8282 0.5277 +vn -0.1886 0.8282 0.5277 vn -0.0000 0.6703 0.7421 vn -0.1844 0.6598 0.7284 vn -0.1937 0.9785 0.0711 -vn -0.6803 -0.0000 -0.7330 +vn -0.6803 -0.0000 -0.7329 vn -0.9760 -0.0207 -0.2169 vn -0.9768 -0.0000 -0.2140 vn 0.9773 0.2029 -0.0613 vn 0.9766 0.1804 0.1174 -vn -0.7027 -0.1173 0.7018 +vn -0.7027 -0.1174 0.7018 vn -0.1775 -0.0000 0.9841 vn -0.6803 -0.0000 0.7329 vn -0.9773 0.2029 0.0613 vn -0.9766 0.1804 -0.1174 vn -0.9752 0.0129 -0.2208 vn -0.9773 0.2029 -0.0613 -vn -0.6988 0.7135 -0.0519 +vn -0.6988 0.7134 -0.0519 vn -0.6904 0.6935 -0.2059 -vn -0.1936 0.9785 -0.0711 +vn -0.1937 0.9785 -0.0711 vn -0.1919 0.9411 -0.2783 -vn 0.6988 0.7135 -0.0519 +vn 0.6988 0.7134 -0.0519 vn 0.9791 0.2029 -0.0149 vn 0.6904 0.6935 -0.2059 vn -0.6859 0.6130 -0.3922 @@ -285,17 +285,17 @@ vn 0.9766 0.1804 -0.1174 vn 0.6799 0.4913 -0.5444 vn -0.6742 0.3413 -0.6550 vn -0.9747 0.1020 -0.1990 -vn -0.1804 0.4558 -0.8716 +vn -0.1804 0.4557 -0.8716 vn 0.9756 0.1457 -0.1642 vn 0.6742 0.3413 -0.6550 vn -0.6700 0.1745 -0.7215 -vn -0.9740 0.0524 -0.2204 -vn -0.1776 0.2320 -0.9564 -vn 0.9747 0.1020 -0.1990 +vn -0.9740 0.0524 -0.2203 +vn -0.1775 0.2320 -0.9564 +vn 0.9747 0.1019 -0.1990 vn 0.6700 0.1745 -0.7215 vn -0.6739 0.0435 -0.7376 vn -0.1767 0.0581 -0.9825 -vn 0.9740 0.0524 -0.2204 +vn 0.9740 0.0524 -0.2203 vn 0.6739 0.0435 -0.7376 vn 0.1767 0.0581 -0.9825 vn 0.9773 0.2029 0.0613 @@ -314,67 +314,68 @@ vn 0.1844 0.6598 0.7284 vn -0.9766 0.1804 0.1174 vn -0.6799 0.4913 0.5444 vn 0.6742 0.3413 0.6550 -vn 0.9747 0.1020 0.1990 -vn 0.1804 0.4558 0.8716 +vn 0.9747 0.1019 0.1990 +vn 0.1804 0.4557 0.8716 vn -0.9756 0.1457 0.1642 vn -0.6742 0.3413 0.6550 vn 0.6700 0.1745 0.7215 -vn 0.9740 0.0524 0.2204 -vn 0.1776 0.2320 0.9564 -vn -0.9747 0.1020 0.1990 +vn 0.9740 0.0524 0.2203 +vn 0.1775 0.2320 0.9564 +vn -0.9747 0.1019 0.1990 vn -0.6700 0.1745 0.7215 vn 0.1767 0.0581 0.9825 vn -0.9740 0.0524 0.2204 vn -0.6739 0.0435 0.7376 vn -0.1767 0.0581 0.9825 vn 0.7205 -0.6796 -0.1381 -vn 0.9796 -0.1991 0.0267 +vn 0.9796 -0.1990 0.0267 vn 0.7205 -0.6796 0.1381 +vn 0.2209 -0.9497 -0.2222 vn 0.2209 -0.9497 0.2222 -vn -0.9796 -0.1991 -0.0267 +vn -0.9796 -0.1990 -0.0267 vn -0.0000 -0.0000 1.0000 vn -0.9791 0.2029 -0.0149 vn 0.9760 -0.0207 -0.2169 -vn 0.6803 -0.0000 -0.7330 +vn 0.6803 -0.0000 -0.7329 vn 0.9768 -0.0000 -0.2140 vn 0.1775 -0.0000 -0.9841 vn -0.0000 -0.0000 -1.0000 vn 0.9791 0.2029 0.0149 vn -0.1775 -0.0000 -0.9841 -vn -0.7027 -0.1173 -0.7018 -vn -0.2209 -0.9497 0.2222 +vn -0.7027 -0.1174 -0.7018 +vn -0.2209 -0.9496 0.2223 vn -0.0000 -0.9768 -0.2140 vn -0.0000 -0.9768 0.2140 vn 0.2062 -0.1883 0.9602 vn 0.7341 -0.4583 0.5011 -vn 0.7027 -0.1173 0.7018 -vn 0.2062 -0.1882 -0.9602 +vn 0.7027 -0.1174 0.7018 +vn 0.2062 -0.1883 -0.9602 vn 0.7341 -0.4583 -0.5011 vn 0.2379 -0.6636 -0.7093 -vn 0.2209 -0.9497 -0.2222 vn 0.9826 -0.1218 0.1399 vn 0.9760 -0.0207 0.2169 -vn 0.7027 -0.1173 -0.7018 +vn 0.7027 -0.1174 -0.7018 vn 0.9826 -0.1218 -0.1399 vn -0.2062 -0.1883 -0.9602 vn -0.7341 -0.4583 -0.5011 -vn -0.2062 -0.1882 0.9602 +vn -0.2062 -0.1883 0.9602 vn -0.7341 -0.4583 0.5011 vn -0.2379 -0.6636 0.7093 vn -0.9826 -0.1218 -0.1399 vn -0.9826 -0.1218 0.1399 vn -0.0000 -0.6803 0.7329 -vn 0.2379 -0.6636 0.7092 +vn 0.2379 -0.6636 0.7093 vn -0.0000 -0.1775 0.9841 vn -0.0000 -0.6803 -0.7329 vn -0.0000 -0.1775 -0.9841 vn -0.9760 -0.0207 0.2169 vn -0.9768 -0.0000 0.2140 +vn -0.0000 -0.6803 0.7330 vn -0.9752 0.0129 0.2208 vn 0.9752 0.0129 -0.2208 -vn -0.2379 -0.6636 -0.7092 -vn 0.9796 -0.1991 -0.0267 -vn -0.9796 -0.1991 0.0267 +vn -0.2379 -0.6636 -0.7093 +vn 0.9796 -0.1990 -0.0267 +vn -0.9796 -0.1990 0.0267 vt 0.048815 0.413912 vt 0.166667 0.159669 vt 0.048815 0.159511 @@ -525,46 +526,46 @@ f 63/43/98 47/46/103 48/1/1 f 7/44/104 3/1/105 9/43/102 f 9/43/102 2/45/106 8/4/4 f 119/9/107 104/48/108 109/8/109 -f 107/49/110 119/9/107 109/8/109 -f 92/8/8 95/48/111 100/9/9 -f 199/5/5 163/34/42 219/50/112 +f 115/49/110 109/8/109 107/49/111 +f 92/8/8 95/48/112 100/9/9 +f 199/5/5 163/34/42 219/50/113 f 23/27/50 6/35/82 5/27/35 -f 6/35/82 22/37/113 4/37/83 -f 113/29/114 174/28/115 173/30/116 -f 177/5/15 172/51/117 198/52/118 -f 67/37/53 45/35/79 43/37/119 -f 69/35/52 44/22/25 45/35/79 -f 171/53/120 101/54/121 170/28/36 -f 88/7/122 213/55/123 217/55/124 -f 106/56/125 111/57/126 110/33/127 -f 111/57/126 107/49/110 109/8/109 -f 116/58/128 120/57/129 117/59/130 -f 120/57/129 115/49/131 117/59/130 -f 110/33/127 105/60/132 103/29/133 +f 6/35/82 22/37/114 4/37/83 +f 113/29/115 174/28/116 173/30/117 +f 177/5/15 172/51/118 198/52/119 +f 67/37/53 45/35/79 43/37/120 +f 45/35/79 68/22/28 44/22/25 +f 171/53/121 101/54/122 170/28/36 +f 88/7/123 213/55/124 217/55/125 +f 106/56/126 111/57/127 110/33/128 +f 111/57/127 107/49/111 109/8/109 +f 116/58/129 120/57/130 117/59/131 +f 120/57/130 115/49/110 117/59/131 +f 110/33/128 105/60/132 103/29/133 f 105/60/132 109/8/109 104/48/108 -f 118/54/134 114/61/135 120/57/129 -f 114/61/135 119/9/107 120/57/129 -f 97/62/136 102/57/137 101/54/121 +f 118/54/134 114/61/135 120/57/130 +f 114/61/135 119/9/107 120/57/130 +f 97/62/136 102/57/137 101/54/122 f 102/57/137 98/7/7 100/9/9 f 89/63/138 93/57/139 90/64/140 -f 93/57/139 88/7/122 90/64/140 -f 101/54/121 96/61/141 94/29/37 -f 96/61/141 100/9/9 95/48/111 +f 93/57/139 88/7/123 90/64/140 +f 101/54/122 96/61/141 94/29/37 +f 96/61/141 100/9/9 95/48/112 f 91/33/41 87/60/142 93/57/139 f 87/60/142 92/8/8 93/57/139 -f 107/49/110 193/65/143 180/55/124 +f 107/49/111 193/65/143 180/55/125 f 108/59/144 194/66/145 193/65/143 -f 116/58/128 195/65/146 181/67/147 -f 117/59/130 196/55/123 195/65/146 +f 116/58/129 195/65/146 181/67/147 +f 117/59/131 196/55/124 195/65/146 f 86/29/148 162/3/43 161/13/149 -f 158/68/146 213/55/123 212/65/146 +f 158/68/146 213/55/124 212/65/146 f 155/69/147 212/65/146 218/67/147 -f 152/68/143 211/66/145 210/65/143 -f 149/70/124 210/65/143 217/55/124 -f 150/70/124 196/55/123 180/55/124 -f 118/54/134 172/51/117 174/28/115 -f 214/5/15 175/71/118 220/52/118 -f 182/5/5 167/72/112 197/50/112 +f 152/68/150 211/66/145 210/65/150 +f 149/70/125 210/65/150 217/55/125 +f 150/70/125 196/55/124 180/55/125 +f 118/54/134 172/51/118 174/28/116 +f 214/5/15 175/71/119 220/52/119 +f 182/5/5 167/72/113 197/50/113 f 127/73/27 178/21/31 184/23/27 f 135/74/33 186/11/11 187/16/33 f 137/75/30 187/16/33 188/17/30 @@ -578,35 +579,35 @@ f 144/75/19 208/16/18 207/17/19 f 141/78/16 214/5/15 216/6/16 f 133/77/11 183/6/6 186/11/11 f 125/78/6 182/5/5 183/6/6 -f 197/50/112 153/79/145 194/66/145 -f 1/12/150 162/3/43 3/1/105 -f 219/50/112 89/63/138 211/66/145 +f 197/50/113 153/79/145 194/66/145 +f 1/12/151 162/3/43 3/1/105 +f 219/50/113 89/63/138 211/66/145 f 3/1/105 163/34/42 2/45/106 -f 103/29/133 166/3/3 110/33/127 -f 110/33/127 164/2/2 106/56/125 -f 220/52/118 155/69/147 218/67/147 -f 66/1/76 172/51/117 65/46/77 -f 171/53/120 27/1/73 26/45/74 -f 198/52/118 116/58/128 181/67/147 -f 64/12/151 174/28/115 66/1/76 +f 103/29/133 166/3/3 110/33/128 +f 110/33/128 164/2/2 106/56/126 +f 220/52/119 155/69/147 218/67/147 +f 66/1/76 172/51/118 65/46/77 +f 171/53/121 27/1/73 26/45/74 +f 198/52/119 116/58/129 181/67/147 +f 64/12/152 174/28/116 66/1/76 f 170/28/36 25/12/46 27/1/73 -f 161/13/149 94/29/37 95/48/111 -f 173/30/116 103/29/133 104/48/108 -f 176/71/118 181/67/147 156/69/147 -f 164/2/2 194/66/145 106/56/125 +f 161/13/149 94/29/37 95/48/112 +f 173/30/117 103/29/133 104/48/108 +f 176/71/119 181/67/147 156/69/147 +f 164/2/2 194/66/145 106/56/126 f 183/6/6 47/46/103 62/14/100 f 186/11/11 62/14/100 59/19/95 f 178/21/31 53/15/86 50/20/81 f 188/17/30 56/18/90 53/15/86 f 187/16/33 59/19/95 56/18/90 f 184/23/27 50/20/81 44/22/25 -f 47/46/103 197/50/112 164/2/2 -f 180/55/124 115/49/131 107/49/110 -f 157/68/146 196/55/123 159/70/123 -f 156/69/147 195/65/146 157/68/146 +f 47/46/103 197/50/113 164/2/2 +f 180/55/125 115/49/110 107/49/111 +f 195/65/146 159/70/124 157/68/146 +f 181/67/147 157/68/146 156/69/147 f 193/65/143 153/79/145 151/68/143 -f 180/55/124 151/68/143 150/70/124 -f 124/80/15 198/52/118 176/71/118 +f 180/55/125 151/68/143 150/70/125 +f 124/80/15 198/52/119 176/71/119 f 185/23/26 139/76/24 131/73/26 f 184/23/27 131/73/26 127/73/27 f 189/21/24 143/75/19 139/76/24 @@ -614,8 +615,8 @@ f 192/11/21 142/78/16 147/77/21 f 191/16/18 147/77/21 145/74/18 f 190/17/19 145/74/18 143/75/19 f 179/6/16 124/80/15 142/78/16 -f 171/53/120 218/67/147 97/62/136 -f 168/72/112 211/66/145 154/79/145 +f 171/53/121 218/67/147 97/62/136 +f 168/72/113 211/66/145 154/79/145 f 216/6/16 26/45/74 41/4/70 f 207/17/19 35/26/60 32/25/56 f 208/16/18 38/10/65 35/26/60 @@ -623,13 +624,13 @@ f 209/11/21 41/4/70 38/10/65 f 206/21/24 32/25/56 29/24/51 f 201/23/27 23/27/50 5/27/35 f 202/23/26 29/24/51 23/27/50 -f 26/45/74 220/52/118 171/53/120 -f 217/55/124 90/64/140 88/7/122 -f 210/65/143 89/63/138 90/64/140 -f 218/67/147 99/64/152 97/62/136 -f 212/65/146 98/7/7 99/64/152 -f 217/55/124 160/70/123 149/70/124 -f 122/80/5 219/50/112 168/72/112 +f 26/45/74 220/52/119 171/53/121 +f 217/55/125 90/64/140 88/7/123 +f 210/65/150 89/63/138 90/64/140 +f 218/67/147 99/64/153 97/62/136 +f 212/65/146 98/7/7 99/64/153 +f 217/55/125 160/70/124 149/70/125 +f 122/80/5 219/50/113 168/72/113 f 201/23/27 129/76/31 128/73/27 f 204/16/33 134/77/11 136/74/33 f 205/17/30 136/74/33 138/75/30 @@ -638,7 +639,7 @@ f 203/11/11 126/78/6 134/77/11 f 200/6/6 122/80/5 126/78/6 f 48/1/1 47/46/103 164/2/2 f 8/4/4 2/45/106 199/5/5 -f 98/7/7 88/7/122 92/8/8 +f 98/7/7 88/7/123 92/8/8 f 11/10/10 8/4/4 200/6/6 f 46/12/12 48/1/1 166/3/3 f 71/14/14 65/46/77 177/5/15 @@ -652,35 +653,35 @@ f 20/24/29 17/25/32 205/17/30 f 17/25/32 14/26/34 204/16/33 f 14/26/34 11/10/10 203/11/11 f 5/27/35 20/24/29 215/21/31 -f 170/28/36 101/54/121 94/29/37 -f 46/12/12 165/13/13 173/30/116 -f 173/30/116 64/12/151 70/44/75 +f 170/28/36 101/54/122 94/29/37 +f 46/12/12 165/13/13 173/30/117 +f 173/30/117 64/12/152 70/44/75 f 70/44/75 73/42/71 76/40/66 f 76/40/66 79/32/61 82/31/39 -f 82/31/39 67/37/53 43/37/119 -f 43/37/119 49/31/78 52/32/40 +f 82/31/39 67/37/53 43/37/120 +f 43/37/120 49/31/78 52/32/40 f 52/32/40 55/47/89 58/42/94 f 58/42/94 61/44/99 46/12/12 -f 46/12/12 173/30/116 70/44/75 +f 46/12/12 173/30/117 70/44/75 f 70/44/75 76/40/66 82/31/39 -f 82/31/39 43/37/119 52/32/40 +f 82/31/39 43/37/120 52/32/40 f 52/32/40 58/42/94 46/12/12 f 46/12/12 70/44/75 82/31/39 f 91/33/41 89/63/138 163/34/42 f 25/12/46 169/30/38 161/13/149 -f 161/13/149 1/12/150 7/44/104 +f 161/13/149 1/12/151 7/44/104 f 7/44/104 10/42/101 13/47/96 f 13/47/96 16/32/91 19/31/44 -f 19/31/44 4/37/83 22/37/113 -f 22/37/113 28/31/47 31/32/45 +f 19/31/44 4/37/83 22/37/114 +f 22/37/114 28/31/47 31/32/45 f 31/32/45 34/40/59 37/42/64 f 37/42/64 40/44/69 25/12/46 f 25/12/46 161/13/149 7/44/104 f 7/44/104 13/47/96 19/31/44 -f 19/31/44 22/37/113 31/32/45 +f 19/31/44 22/37/114 31/32/45 f 31/32/45 37/42/64 25/12/46 f 25/12/46 7/44/104 19/31/44 -f 28/31/47 22/37/113 24/35/48 +f 28/31/47 22/37/114 24/35/48 f 30/36/49 24/35/48 23/27/50 f 82/31/39 84/36/54 69/35/52 f 84/36/54 83/20/23 68/22/28 @@ -702,9 +703,9 @@ f 73/42/71 70/44/75 72/43/72 f 75/41/67 72/43/72 71/14/14 f 40/44/69 42/43/68 27/1/73 f 42/43/68 41/4/70 26/45/74 -f 70/44/75 64/12/151 66/1/76 +f 70/44/75 64/12/152 66/1/76 f 72/43/72 66/1/76 65/46/77 -f 49/31/78 43/37/119 45/35/79 +f 49/31/78 43/37/120 45/35/79 f 51/36/80 45/35/79 44/22/25 f 19/31/44 21/36/84 6/35/82 f 21/36/84 20/24/29 5/27/35 @@ -726,49 +727,49 @@ f 10/42/101 7/44/104 9/43/102 f 12/41/97 9/43/102 8/4/4 f 61/44/99 63/43/98 48/1/1 f 63/43/98 62/14/100 47/46/103 -f 7/44/104 1/12/150 3/1/105 +f 7/44/104 1/12/151 3/1/105 f 9/43/102 3/1/105 2/45/106 -f 119/9/107 112/48/153 104/48/108 -f 107/49/110 115/49/131 119/9/107 -f 92/8/8 85/48/154 95/48/111 +f 119/9/107 112/48/154 104/48/108 +f 115/49/110 119/9/107 109/8/109 +f 92/8/8 85/48/155 95/48/112 f 199/5/5 2/45/106 163/34/42 f 23/27/50 24/35/48 6/35/82 -f 6/35/82 24/35/48 22/37/113 -f 113/29/114 118/54/134 174/28/115 -f 177/5/15 65/46/77 172/51/117 +f 6/35/82 24/35/48 22/37/114 +f 113/29/115 118/54/134 174/28/116 +f 177/5/15 65/46/77 172/51/118 f 67/37/53 69/35/52 45/35/79 -f 69/35/52 68/22/28 44/22/25 -f 171/53/120 97/62/136 101/54/121 -f 88/7/122 98/7/7 213/55/123 -f 106/56/125 108/59/144 111/57/126 -f 111/57/126 108/59/144 107/49/110 -f 116/58/128 118/54/134 120/57/129 -f 120/57/129 119/9/107 115/49/131 -f 110/33/127 111/57/126 105/60/132 -f 105/60/132 111/57/126 109/8/109 -f 118/54/134 113/29/114 114/61/135 -f 114/61/135 112/48/153 119/9/107 -f 97/62/136 99/64/152 102/57/137 -f 102/57/137 99/64/152 98/7/7 +f 45/35/79 69/35/52 68/22/28 +f 171/53/121 97/62/136 101/54/122 +f 88/7/123 98/7/7 213/55/124 +f 106/56/126 108/59/144 111/57/127 +f 111/57/127 108/59/144 107/49/111 +f 116/58/129 118/54/134 120/57/130 +f 120/57/130 119/9/107 115/49/110 +f 110/33/128 111/57/127 105/60/132 +f 105/60/132 111/57/127 109/8/109 +f 118/54/134 113/29/115 114/61/135 +f 114/61/135 112/48/154 119/9/107 +f 97/62/136 99/64/153 102/57/137 +f 102/57/137 99/64/153 98/7/7 f 89/63/138 91/33/41 93/57/139 -f 93/57/139 92/8/8 88/7/122 -f 101/54/121 102/57/137 96/61/141 +f 93/57/139 92/8/8 88/7/123 +f 101/54/122 102/57/137 96/61/141 f 96/61/141 102/57/137 100/9/9 f 91/33/41 86/29/148 87/60/142 -f 87/60/142 85/48/154 92/8/8 -f 107/49/110 108/59/144 193/65/143 -f 108/59/144 106/56/125 194/66/145 -f 116/58/128 117/59/130 195/65/146 -f 117/59/130 115/49/131 196/55/123 +f 87/60/142 85/48/155 92/8/8 +f 107/49/111 108/59/144 193/65/143 +f 108/59/144 106/56/126 194/66/145 +f 116/58/129 117/59/131 195/65/146 +f 117/59/131 115/49/110 196/55/124 f 86/29/148 91/33/41 162/3/43 -f 158/68/146 160/70/123 213/55/123 +f 158/68/146 160/70/124 213/55/124 f 155/69/147 158/68/146 212/65/146 -f 152/68/143 154/79/145 211/66/145 -f 149/70/124 152/68/143 210/65/143 -f 150/70/124 159/70/123 196/55/123 -f 118/54/134 116/58/128 172/51/117 -f 214/5/15 123/80/15 175/71/118 -f 182/5/5 121/80/5 167/72/112 +f 152/68/150 154/79/145 211/66/145 +f 149/70/125 152/68/150 210/65/150 +f 150/70/125 159/70/124 196/55/124 +f 118/54/134 116/58/129 172/51/118 +f 214/5/15 123/80/15 175/71/119 +f 182/5/5 121/80/5 167/72/113 f 127/73/27 130/76/31 178/21/31 f 135/74/33 133/77/11 186/11/11 f 137/75/30 135/74/33 187/16/33 @@ -782,43 +783,43 @@ f 144/75/19 146/74/18 208/16/18 f 141/78/16 123/80/15 214/5/15 f 133/77/11 125/78/6 183/6/6 f 125/78/6 121/80/5 182/5/5 -f 197/50/112 167/72/112 153/79/145 -f 1/12/150 161/13/149 162/3/43 -f 219/50/112 163/34/42 89/63/138 +f 197/50/113 167/72/113 153/79/145 +f 1/12/151 161/13/149 162/3/43 +f 219/50/113 163/34/42 89/63/138 f 3/1/105 162/3/43 163/34/42 f 103/29/133 165/13/13 166/3/3 -f 110/33/127 166/3/3 164/2/2 -f 220/52/118 175/71/118 155/69/147 -f 66/1/76 174/28/115 172/51/117 -f 171/53/120 170/28/36 27/1/73 -f 198/52/118 172/51/117 116/58/128 -f 64/12/151 173/30/116 174/28/115 +f 110/33/128 166/3/3 164/2/2 +f 220/52/119 175/71/119 155/69/147 +f 66/1/76 174/28/116 172/51/118 +f 171/53/121 170/28/36 27/1/73 +f 198/52/119 172/51/118 116/58/129 +f 64/12/152 173/30/117 174/28/116 f 170/28/36 169/30/38 25/12/46 -f 95/48/111 85/48/154 87/60/142 +f 95/48/112 85/48/155 87/60/142 f 87/60/142 86/29/148 161/13/149 f 161/13/149 169/30/38 94/29/37 -f 94/29/37 96/61/141 95/48/111 -f 95/48/111 87/60/142 161/13/149 -f 104/48/108 112/48/153 114/61/135 -f 114/61/135 113/29/114 173/30/116 -f 173/30/116 165/13/13 103/29/133 +f 94/29/37 96/61/141 95/48/112 +f 95/48/112 87/60/142 161/13/149 +f 104/48/108 112/48/154 114/61/135 +f 114/61/135 113/29/115 173/30/117 +f 173/30/117 165/13/13 103/29/133 f 103/29/133 105/60/132 104/48/108 -f 104/48/108 114/61/135 173/30/116 -f 176/71/118 198/52/118 181/67/147 -f 164/2/2 197/50/112 194/66/145 +f 104/48/108 114/61/135 173/30/117 +f 176/71/119 198/52/119 181/67/147 +f 164/2/2 197/50/113 194/66/145 f 183/6/6 182/5/5 47/46/103 f 186/11/11 183/6/6 62/14/100 f 178/21/31 188/17/30 53/15/86 f 188/17/30 187/16/33 56/18/90 f 187/16/33 186/11/11 59/19/95 f 184/23/27 178/21/31 50/20/81 -f 47/46/103 182/5/5 197/50/112 -f 180/55/124 196/55/123 115/49/131 -f 157/68/146 195/65/146 196/55/123 -f 156/69/147 181/67/147 195/65/146 +f 47/46/103 182/5/5 197/50/113 +f 180/55/125 196/55/124 115/49/110 +f 195/65/146 196/55/124 159/70/124 +f 181/67/147 195/65/146 157/68/146 f 193/65/143 194/66/145 153/79/145 -f 180/55/124 193/65/143 151/68/143 -f 124/80/15 177/5/15 198/52/118 +f 180/55/125 193/65/143 151/68/143 +f 124/80/15 177/5/15 198/52/119 f 185/23/26 189/21/24 139/76/24 f 184/23/27 185/23/26 131/73/26 f 189/21/24 190/17/19 143/75/19 @@ -826,8 +827,8 @@ f 192/11/21 179/6/16 142/78/16 f 191/16/18 192/11/21 147/77/21 f 190/17/19 191/16/18 145/74/18 f 179/6/16 177/5/15 124/80/15 -f 171/53/120 220/52/118 218/67/147 -f 168/72/112 219/50/112 211/66/145 +f 171/53/121 220/52/119 218/67/147 +f 168/72/113 219/50/113 211/66/145 f 216/6/16 214/5/15 26/45/74 f 207/17/19 208/16/18 35/26/60 f 208/16/18 209/11/21 38/10/65 @@ -835,13 +836,13 @@ f 209/11/21 216/6/16 41/4/70 f 206/21/24 207/17/19 32/25/56 f 201/23/27 202/23/26 23/27/50 f 202/23/26 206/21/24 29/24/51 -f 26/45/74 214/5/15 220/52/118 -f 217/55/124 210/65/143 90/64/140 -f 210/65/143 211/66/145 89/63/138 -f 218/67/147 212/65/146 99/64/152 -f 212/65/146 213/55/123 98/7/7 -f 217/55/124 213/55/123 160/70/123 -f 122/80/5 199/5/5 219/50/112 +f 26/45/74 214/5/15 220/52/119 +f 217/55/125 210/65/150 90/64/140 +f 210/65/150 211/66/145 89/63/138 +f 218/67/147 212/65/146 99/64/153 +f 212/65/146 213/55/124 98/7/7 +f 217/55/125 213/55/124 160/70/124 +f 122/80/5 199/5/5 219/50/113 f 201/23/27 215/21/31 129/76/31 f 204/16/33 203/11/11 134/77/11 f 205/17/30 204/16/33 136/74/33 diff --git a/Encore/src/main.cpp b/Encore/src/main.cpp index 9189b914..a120776b 100644 --- a/Encore/src/main.cpp +++ b/Encore/src/main.cpp @@ -597,7 +597,8 @@ void IsPartValid(smf::MidiEventList track, SongParts songPart, int trackNumber) StopSearching = true; } } - + if ((songPart > PartVocals && songPart < PartKeys) || songPart == PlasticKeys) + songList.curSong->parts[songPart]->plastic = true; if (songPart < PitchedVocals) songList.curSong->parts[(int)songPart]->charts.push_back(newChart); } @@ -2230,7 +2231,7 @@ int main(int argc, char *argv[]) { (u.RightSide - u.winpct(0.25f)), songEntryHeight }, "" - )) { + ) && overshellRenderer.CanMouseClick) { // curPlayingSong = songID; selSong = true; albumArtSelectedAndLoaded = false; @@ -2584,7 +2585,7 @@ int main(int argc, char *argv[]) { u.winpct(0.2f), u.hinpct(0.05f) }, "Play Song" - )) { + ) && overshellRenderer.CanMouseClick) { // curPlayingSong = menu.ChosenSongInt; if (!songList.curSong->ini) { songList.curSong->LoadSong(songList.curSong->songInfoPath); @@ -2602,7 +2603,7 @@ int main(int argc, char *argv[]) { u.winpct(0.2f), u.hinpct(0.05f) }, "Sort" - )) { + ) && overshellRenderer.CanMouseClick) { currentSortValue = NextSortType(currentSortValue); songList.sortList(currentSortValue, songList.curSong->songListPos); } @@ -2612,7 +2613,7 @@ int main(int argc, char *argv[]) { u.winpct(0.2f), u.hinpct(0.05f) }, "Back" - )) { + ) && overshellRenderer.CanMouseClick) { for (Song &songi : songList.songs) { songi.titleXOffset = 0; songi.artistXOffset = 0; @@ -2750,7 +2751,8 @@ int main(int argc, char *argv[]) { // songList.curSong->artist.c_str()), 70,7, WHITE); for (int i = 0; i < songList.curSong->parts.size(); i++) { - if (songList.curSong->parts[i]->hasPart) { + bool CanClassic = playerManager.GetActivePlayer(playerInt)->ClassicMode == songList.curSong->parts[i]->plastic; + if (songList.curSong->parts[i]->hasPart && CanClassic) { GuiSetStyle( BUTTON, BASE_COLOR_NORMAL, diff --git a/Encore/src/menus/overshellRenderer.cpp b/Encore/src/menus/overshellRenderer.cpp index 56b205cb..65da83b2 100644 --- a/Encore/src/menus/overshellRenderer.cpp +++ b/Encore/src/menus/overshellRenderer.cpp @@ -9,7 +9,19 @@ #include "assets.h" #include "gameMenu.h" -std::vector SlotSelectingState = { false, false, false, false }; +/// std::vector SlotSelectingState = { false, false, false, false }; +/// std::vector OpenState = { false, false, false, false }; +/// std::vector InstrumentTypeState = { false, false, false, false }; + +enum OSState { + OS_ATTRACT, + OS_PLAYER_SELECTION, + OS_OPTIONS, + OS_INSTRUMENT_SELECTIONS +}; + +int OvershellState[4] { OS_ATTRACT, OS_ATTRACT, OS_ATTRACT, OS_ATTRACT }; + void DrawBeacon(int slot, float x, float y, float width, float height, bool top) { PlayerManager &playerManager = PlayerManager::getInstance(); Color overshellBeacon = @@ -18,48 +30,40 @@ void DrawBeacon(int slot, float x, float y, float width, float height, bool top) float HalfWidth = width / 2; BeginBlendMode(BLEND_ALPHA_PREMULTIPLY); for (int g = 0; g < 4; g++) { - DrawRectangleGradientH(x, y, HalfWidth, height, { 0,0,0,0}, thanksraylib); + DrawRectangleGradientH(x, y, HalfWidth, height, { 0, 0, 0, 0 }, thanksraylib); DrawRectangleGradientH( - x + HalfWidth - 1, y, HalfWidth, height, thanksraylib, {0,0,0,0} + x + HalfWidth - 1, y, HalfWidth, height, thanksraylib, { 0, 0, 0, 0 } ); } EndBlendMode(); Color BaseWitAllAlpha = ColorBrightness(GetColor(0x181827FF), -0.25f); - Color BaseWitNoAlpha = {BaseWitAllAlpha.r, BaseWitAllAlpha.g, BaseWitAllAlpha.b, 0}; + Color BaseWitNoAlpha = { BaseWitAllAlpha.r, BaseWitAllAlpha.g, BaseWitAllAlpha.b, 0 }; if (top) { - DrawRectangleGradientV(x,y,width,height,BaseWitAllAlpha,BaseWitNoAlpha); + DrawRectangleGradientV(x, y, width, height, BaseWitAllAlpha, BaseWitNoAlpha); } } -void DrawOvershellRectangleHeader(float x, float y, float width, float height, std::string username, Color accentColor) { +void DrawOvershellRectangleHeader( + float x, float y, float width, float height, std::string username, Color accentColor +) { Assets &assets = Assets::getInstance(); Units &unit = Units::getInstance(); - Rectangle RectPos = { - x, y, width, height*2 - }; + Rectangle RectPos = { x, y, width, height * 2 }; BeginScissorMode(x, y, width, height); - DrawRectangleRounded( - RectPos, - 0.40f, - 5, - ColorBrightness(accentColor, -0.25f) - ); - float Inset = unit.winpct(0.001f); - float InsetDouble = Inset * 2; - DrawRectangleRounded( - {RectPos.x + Inset, RectPos.y + Inset, RectPos.width - InsetDouble, RectPos.height - InsetDouble}, - 0.40f, - 5, - ColorBrightness(accentColor, -0.75f) - ); + DrawRectangleRounded(RectPos, 0.40f, 8, ColorBrightness(accentColor, -0.75f)); + // float Inset = unit.winpct(0.001f); + // float InsetDouble = Inset * 2; + // DrawRectangleRounded( + // {RectPos.x + Inset, RectPos.y + Inset, RectPos.width - (InsetDouble*1.25f), + // RectPos.height - InsetDouble}, 0.40f, 5, ColorBrightness(accentColor, -0.75f) + //); EndScissorMode(); - float centerPos = x + (width /2); + float centerPos = x + (width / 2); GameMenu::mhDrawText( assets.redHatDisplayBlack, username.c_str(), - { centerPos, - y + unit.winpct(0.01f) }, + { centerPos, y + unit.winpct(0.01f) }, unit.winpct(0.03f), WHITE, assets.sdfShader, @@ -95,11 +99,75 @@ void OvershellRenderer::DrawTopOvershell(double height) { float OvershellCenterLoc = (unit.wpct(0.125) + (unit.winpct(0.25) * i)); float HalfWidth = OvershellCenterLoc - OvershellLeftLoc; if (playerManager.ActivePlayers[i] != -1) { - DrawBeacon(i, OvershellLeftLoc, 0, HalfWidth*2, unit.hpct(height) - unit.hinpct(0.005f), true); + DrawBeacon( + i, + OvershellLeftLoc, + 0, + HalfWidth * 2, + unit.hpct(height) - unit.hinpct(0.005f), + true + ); } } } +/* + *this is code for the fuckin uh. it the shape of the menu. +if (GuiButton( + { OvershellLeftLoc, + unit.hpct(1.0f) - (unit.winpct(0.03f) * (x + 2)), + unit.winpct(0.2f), + unit.winpct(0.03f) }, + playerManager.PlayerList[x].Name.c_str() + )) { + playerManager.AddActivePlayer(x, i); + CanMouseClick = true; + SlotSelectingState[i] = false; + gameMenu.shouldBreak = true; + } +*/ +bool MenuButton(int slot, int x, std::string string) { + Units &unit = Units::getInstance(); + float OvershellLeftLoc = + (unit.wpct(0.125) + (unit.winpct(0.25) * slot)) - unit.winpct(0.1); + return GuiButton( + { OvershellLeftLoc, + unit.hpct(1.0f) - (unit.winpct(0.03f) * (x + 1)), + unit.winpct(0.2f), + unit.winpct(0.03f) }, + string.c_str() + ); +} +bool OvershellSlider( + int slot, int x, std::string string, float *value, float step, float min, float max +) { + Units &unit = Units::getInstance(); + float OvershellLeftLoc = + (unit.wpct(0.125) + (unit.winpct(0.25) * slot)) - unit.winpct(0.1); + float height = unit.winpct(0.03f); + float widthNoHeight = unit.winpct(0.2f) - height; + Rectangle bounds = { OvershellLeftLoc + height, + unit.hpct(1.0f) - (unit.winpct(0.03f) * (x + 1)), + unit.winpct(0.2f) - height - height, + height }; + Rectangle confirmBounds = { OvershellLeftLoc + widthNoHeight, + unit.hpct(1.0f) - (unit.winpct(0.03f) * (x + 1)), + height, + height }; + Assets &assets = Assets::getInstance(); + + GuiSlider(bounds, "", "", value, min, max); + GuiButton( + { OvershellLeftLoc, + unit.hpct(1.0f) - (unit.winpct(0.03f) * (x + 1)), + height, + height }, + TextFormat("%1.1f", *value) + ); + return GuiButton(confirmBounds, "<"); +} + +bool BNSetting = false; void OvershellRenderer::DrawBottomOvershell() { Assets &assets = Assets::getInstance(); Units &unit = Units::getInstance(); @@ -107,11 +175,7 @@ void OvershellRenderer::DrawBottomOvershell() { float BottomBottomOvershell = GetScreenHeight() - unit.hpct(0.1f); float InnerBottom = BottomBottomOvershell + unit.hinpct(0.005f); DrawRectangle( - 0, - BottomBottomOvershell, - (float)GetScreenWidth(), - (float)GetScreenHeight(), - WHITE + 0, BottomBottomOvershell, (float)GetScreenWidth(), (float)GetScreenHeight(), WHITE ); DrawRectangle( 0, @@ -132,8 +196,9 @@ void OvershellRenderer::DrawBottomOvershell() { (unit.wpct(0.125) + (unit.winpct(0.25) * i)) - unit.winpct(0.1); float OvershellCenterLoc = (unit.wpct(0.125) + (unit.winpct(0.25) * i)); float HalfWidth = OvershellCenterLoc - OvershellLeftLoc; - if (SlotSelectingState[i]) { - + switch (OvershellState[i]) { + case OS_PLAYER_SELECTION: { + // for selecting players if (GuiButton( { OvershellLeftLoc, unit.hpct(1.0f) - (unit.winpct(0.03f)), @@ -141,7 +206,8 @@ void OvershellRenderer::DrawBottomOvershell() { unit.winpct(0.03f) }, "Cancel" )) { - SlotSelectingState[i] = false; + CanMouseClick = true; + OvershellState[i] = OS_ATTRACT; gameMenu.shouldBreak = true; } BeginBlendMode(BLEND_MULTIPLIED); @@ -155,16 +221,11 @@ void OvershellRenderer::DrawBottomOvershell() { EndBlendMode(); for (int x = 0; x < playerManager.PlayerList.size(); x++) { if (playerManager.ActivePlayers[i] == -1) { - if (GuiButton( - { OvershellLeftLoc, - unit.hpct(1.0f) - (unit.winpct(0.03f) * (x + 2)), - unit.winpct(0.2f), - unit.winpct(0.03f) }, - playerManager.PlayerList[x].Name.c_str() - )) { + if (MenuButton(i, x + 1, playerManager.PlayerList[x].Name.c_str())) { playerManager.AddActivePlayer(x, i); - SlotSelectingState[i] = false; - gameMenu.shouldBreak = true; + CanMouseClick = true; + OvershellState[i] = OS_ATTRACT; + continue; } } } @@ -191,63 +252,173 @@ void OvershellRenderer::DrawBottomOvershell() { 0, WHITE ); - + break; } - else if (playerManager.ActivePlayers[i] != -1) { // player active - DrawBeacon(i, OvershellLeftLoc, InnerBottom, HalfWidth*2, GetScreenHeight(), false); + case OS_OPTIONS: { + int ButtonHeight = unit.winpct(0.03f); if (GuiButton( { OvershellLeftLoc, - OvershellTopLoc + unit.winpct(0.01f), + OvershellTopLoc - (ButtonHeight * 5), unit.winpct(0.2f), - unit.winpct(0.04f) }, + unit.winpct(0.05f) }, "" )) { - playerManager.RemoveActivePlayer(i); + OvershellState[i] = OS_ATTRACT; + CanMouseClick = true; + continue; + // playerManager.RemoveActivePlayer(i); gameMenu.shouldBreak = true; } else { DrawOvershellRectangleHeader( OvershellLeftLoc, - OvershellTopLoc, + OvershellTopLoc - (ButtonHeight * 5), unit.winpct(0.2f), unit.winpct(0.05f), playerManager.GetActivePlayer(i)->Name, playerManager.GetActivePlayer(i)->AccentColor ); - } + if (!BNSetting) { + if (MenuButton(i, 3, "Breakneck Speed")) { + BNSetting = true; + continue; + } + } + if (BNSetting) { + if (OvershellSlider( + i, + 3, + "Breakneck Speed", + &playerManager.GetActivePlayer(i)->NoteSpeed, + 1, + 0.25, + 3 + )) { + BNSetting = false; + continue; + }; + } + if (MenuButton(i, 4, "Instrument Type")) { + OvershellState[i] = OS_INSTRUMENT_SELECTIONS; + break; + } + if (MenuButton(i, 2, "Toggle Bot")) { + playerManager.GetActivePlayer(i)->Bot = + !playerManager.GetActivePlayer(i)->Bot; + } + if (MenuButton(i, 1, "Drop Out")) { + playerManager.RemoveActivePlayer(i); + OvershellState[i] = OS_ATTRACT; + CanMouseClick = true; + continue; + } + if (MenuButton(i, 0, "Cancel")) { + OvershellState[i] = OS_ATTRACT; + CanMouseClick = true; + continue; + } + break; } - else { // no active players - if (GuiButton( - { OvershellLeftLoc, - OvershellTopLoc + unit.winpct(0.01f), - unit.winpct(0.2f), - unit.winpct(0.04f) }, - "" - )) { - SlotSelectingState[i] = true; - gameMenu.shouldBreak = true; - // playerManager.AddActivePlayer(i, i); - } else { - float playerNameSize = - MeasureTextEx(assets.redHatDisplayBlack, "JOIN", unit.winpct(0.02f), 0) - .x; - DrawRectangle( + case OS_ATTRACT: { + if (playerManager.ActivePlayers[i] != -1) { + // player active + DrawBeacon( + i, OvershellLeftLoc, - OvershellTopLoc + unit.winpct(0.01f), - unit.winpct(0.2f), - unit.winpct(0.04f), - DARKGRAY - ); - DrawTextEx( - assets.redHatDisplayBlack, - "JOIN", - { OvershellCenterLoc - (playerNameSize / 2), - OvershellTopLoc + unit.winpct(0.02f) }, - unit.winpct(0.02f), - 0, - WHITE + InnerBottom, + HalfWidth * 2, + GetScreenHeight(), + false ); + if (GuiButton( + { OvershellLeftLoc, + OvershellTopLoc + unit.winpct(0.01f), + unit.winpct(0.2f), + unit.winpct(0.04f) }, + "" + )) { + OvershellState[i] = OS_OPTIONS; + CanMouseClick = false; + continue; + // playerManager.RemoveActivePlayer(i); + gameMenu.shouldBreak = true; + } else { + DrawOvershellRectangleHeader( + OvershellLeftLoc, + OvershellTopLoc, + unit.winpct(0.2f), + unit.winpct(0.05f), + playerManager.GetActivePlayer(i)->Name, + playerManager.GetActivePlayer(i)->AccentColor + ); + } + } else { // no active players + if (GuiButton( + { OvershellLeftLoc, + OvershellTopLoc + unit.winpct(0.01f), + unit.winpct(0.2f), + unit.winpct(0.04f) }, + "" + )) { + CanMouseClick = false; + OvershellState[i] = OS_PLAYER_SELECTION; + gameMenu.shouldBreak = true; + continue; + // playerManager.AddActivePlayer(i, i); + } else { + float playerNameSize = + MeasureTextEx( + assets.redHatDisplayBlack, "JOIN", unit.winpct(0.02f), 0 + ) + .x; + DrawRectangle( + OvershellLeftLoc, + OvershellTopLoc + unit.winpct(0.01f), + unit.winpct(0.2f), + unit.winpct(0.04f), + DARKGRAY + ); + DrawTextEx( + assets.redHatDisplayBlack, + "JOIN", + { OvershellCenterLoc - (playerNameSize / 2), + OvershellTopLoc + unit.winpct(0.02f) }, + unit.winpct(0.02f), + 0, + WHITE + ); + } + } + break; + } + case OS_INSTRUMENT_SELECTIONS: { + int ButtonHeight = unit.winpct(0.03f); + + DrawOvershellRectangleHeader( + OvershellLeftLoc, + OvershellTopLoc - (ButtonHeight * 5), + unit.winpct(0.2f), + unit.winpct(0.05f), + playerManager.GetActivePlayer(i)->Name, + playerManager.GetActivePlayer(i)->AccentColor + ); + + if (MenuButton(i, 2, "Classic")) { + playerManager.GetActivePlayer(i)->ClassicMode = true; + OvershellState[i] = OS_OPTIONS; + continue; } + if (MenuButton(i, 1, "Pad")) { + playerManager.GetActivePlayer(i)->ClassicMode = false; + OvershellState[i] = OS_OPTIONS; + continue; + } + if (MenuButton(i, 0, "Back")) { + OvershellState[i] = OS_OPTIONS; + continue; + } + break; + } } } }; diff --git a/Encore/src/menus/overshellRenderer.h b/Encore/src/menus/overshellRenderer.h index f16d6008..0986be6c 100644 --- a/Encore/src/menus/overshellRenderer.h +++ b/Encore/src/menus/overshellRenderer.h @@ -11,6 +11,7 @@ class OvershellRenderer { int AvailableControllers = 0; // keyb is always available void DrawTopOvershell(double height); void DrawBottomOvershell(); + bool CanMouseClick = true; }; #endif // OVERSHELLRENDERER_H diff --git a/Encore/src/song/song.h b/Encore/src/song/song.h index 19da5014..79ea26ac 100644 --- a/Encore/src/song/song.h +++ b/Encore/src/song/song.h @@ -51,6 +51,7 @@ enum Difficulty { struct SongPart { int diff = -1; bool hasPart = false; + bool plastic = false; std::vector charts; }; diff --git a/Encore/src/users/player.cpp b/Encore/src/users/player.cpp index 7623e9a6..36bb5631 100644 --- a/Encore/src/users/player.cpp +++ b/Encore/src/users/player.cpp @@ -239,10 +239,7 @@ void PlayerManager::LoadPlayerList(std::filesystem::path PlayerListSaveFile) { 255 }; } else newPlayer.AccentColor = { 255, 0, 255, 255 }; - if (newPlayer.Name == "3drosalia") - newPlayer.joypadID = 0; - if (newPlayer.Name == "cameron44252") - newPlayer.joypadID = 1; + TraceLog(LOG_INFO, ("Successfully loaded player " + newPlayer.Name).c_str()); PlayerList.push_back(std::move(newPlayer)); }; @@ -250,7 +247,9 @@ void PlayerManager::LoadPlayerList(std::filesystem::path PlayerListSaveFile) { void PlayerManager::SavePlayerList(std::filesystem::path PlayerListSaveFile) { json PlayerListJson; - + for (auto &player : PlayerList) { + PlayerListJson; + } }; // ough this is gonna be complicated void PlayerManager::CreatePlayer(Player player) { diff --git a/Encore/src/users/player.h b/Encore/src/users/player.h index e79cb9a4..8d8ae867 100644 --- a/Encore/src/users/player.h +++ b/Encore/src/users/player.h @@ -394,6 +394,17 @@ class PlayerGameplayStats { } }; +#define PLAYER_CONFIG_LIST \ + SETTING_ACTION(int, Difficulty) \ + SETTING_ACTION(int, Instrument) \ + SETTING_ACTION(float, InputCalibration) \ + SETTING_ACTION(float, NoteSpeed) \ + SETTING_ACTION(bool, ProDrums) \ + SETTING_ACTION(bool, Bot) \ + SETTING_ACTION(float, HighwayLength) \ + SETTING_ACTION(bool, ClassicMode) \ + SETTING_ACTION(bool, LeftyFlip) + class Player { public: Player(); @@ -402,20 +413,16 @@ class Player { std::string PlayerID; // UUID // std::filesystem::path SettingsFile; PlayerGameplayStats *stats; - int Difficulty; - int Instrument; - float InputCalibration = 0.0f; - float NoteSpeed = 1.0f; - bool ClassicMode; - bool ProDrums; - bool ReadiedUpBefore; - bool Bot; + +#define SETTING_ACTION(type, name) type name; + PLAYER_CONFIG_LIST; +#undef SETTING_ACTION + int SongsPlayed; int joypadID; - bool LeftyFlip; + bool ReadiedUpBefore; bool Online; int ActiveSlot; - float HighwayLength; void ResetGameplayStats(); @@ -429,6 +436,7 @@ class Player { // not actually shared information. i was thinking of a UUID system for online }; + class BandGameplayStats : public PlayerGameplayStats { public: BandGameplayStats();