Skip to content

Commit 7220e6a

Browse files
mult numbers, stars, scroll bar
1 parent d0c0e47 commit 7220e6a

21 files changed

+76
-74
lines changed

Encore/Assets/highway/emh.obj

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib emh.mtl
43
o HIGHWAY_EMH
54
v 2.000000 -0.000000 0.000000
65
v 2.000000 -0.000000 20.000000
@@ -48,12 +47,10 @@ vt 0.044482 1.000000
4847
vt 0.955518 1.000000
4948
vt 0.955518 0.000000
5049
s 0
51-
usemtl Highway_Background
5250
f 1/1/1 12/2/1 5/3/1 2/4/1
5351
f 12/2/1 11/5/1 6/6/1 5/3/1
5452
f 11/5/1 10/7/1 7/8/1 6/6/1
5553
f 10/7/1 9/9/1 8/10/1 7/8/1
56-
usemtl Highway_Sides
5754
f 20/11/2 19/12/2 13/13/2 14/14/2
5855
f 18/15/3 17/16/3 16/17/3 15/18/3
5956
f 1/19/2 2/20/2 17/16/2 18/15/2

Encore/Assets/highway/expert.obj

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib expert.mtl
43
o Expert_Highway
54
v 2.500000 -0.000000 0.000000
65
v 2.500000 -0.000000 20.000000
@@ -46,13 +45,11 @@ vt 0.022241 1.000000
4645
vt 0.000000 1.000000
4746
vt -0.000000 0.000000
4847
s 0
49-
usemtl Highway_Background
5048
f 9/1/1 3/2/1 4/3/1 8/4/1
5149
f 1/5/1 12/6/1 5/7/1 2/8/1
5250
f 12/6/1 11/9/1 6/10/1 5/7/1
5351
f 11/9/1 10/11/1 7/12/1 6/10/1
5452
f 10/11/1 9/1/1 8/4/1 7/12/1
55-
usemtl Highway_Sides
5653
f 20/13/2 19/14/2 13/15/2 14/16/2
5754
f 18/17/3 17/18/3 16/19/3 15/20/3
5855
f 1/5/2 2/8/2 17/18/2 18/17/2

Encore/Assets/highway/smasher.obj

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib smasher.mtl
43
o Smashers
54
v 1.708885 0.010000 2.476520
65
v 1.708885 0.010000 2.723480
@@ -140,7 +139,6 @@ vt 0.010299 0.308657
140139
vt 0.939869 0.915735
141140
vt 0.864701 0.000001
142141
s 1
143-
usemtl Smasher_Outer
144142
f 29/1/1 63/2/1 64/3/1
145143
f 17/7/1 16/8/1 49/4/1
146144
f 3/9/1 35/5/1 37/10/1
@@ -209,7 +207,6 @@ f 14/64/1 48/65/1 15/67/1
209207
f 28/66/1 63/2/1 29/1/1
210208
f 16/8/1 48/65/1 49/4/1
211209
f 2/68/1 35/5/1 3/9/1
212-
usemtl Smasher_Inner
213210
f 49/4/1 35/5/1 50/6/1
214211
f 50/6/1 35/5/1 51/35/1
215212
f 51/35/1 36/41/1 53/19/1

Encore/Assets/notes/lift.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib lift.mtl
43
o Energy_Lifts.001
54
v 0.000000 0.170000 0.150000
65
v 0.000000 0.170000 -0.150000
@@ -27,7 +26,6 @@ vt 0.750000 0.490000
2726
vt 0.957846 0.130000
2827
vt 0.542154 0.130000
2928
s 0
30-
usemtl Lift_Note
3129
f 1/1/1 2/2/1 4/3/1 3/4/1
3230
f 3/1/2 4/2/2 6/3/2 5/4/2
3331
f 4/4/3 2/5/3 6/6/3

Encore/Assets/notes/note.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib note.mtl
43
o Notes
54
v -0.000000 0.188537 -0.021310
65
v -0.000000 0.181467 -0.057049
@@ -594,7 +593,6 @@ vt 0.696785 0.772360
594593
vt 0.692602 0.761928
595594
vt 0.684209 0.618760
596595
s 1
597-
usemtl Note_Color
598596
f 52/1/1 49/2/2 9/3/1 10/4/1
599597
f 16/5/3 17/6/4 2/7/5 1/8/6
600598
f 5/9/7 29/10/8 42/11/9 6/12/10

Encore/Assets/ui/mult_number.png

441 KB
Loading
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Blender 4.0.2
2+
# www.blender.org
3+
o Plane
4+
v -0.300000 0.132365 0.270995
5+
v 0.300000 0.132365 0.270995
6+
v -0.300000 -0.074226 -0.292317
7+
v 0.300000 -0.074226 -0.292317
8+
vn -0.0000 0.9389 -0.3443
9+
vt 0.250000 1.000000
10+
vt 0.000000 1.000000
11+
vt 0.000000 0.750000
12+
vt 0.250000 0.750000
13+
s 0
14+
f 1/1/1 2/2/1 4/3/1 3/4/1

Encore/Assets/ui/multbar_3.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib multbar_3.mtl
43
o Multiplier_3bar
54
v 0.278893 -0.097661 -0.266293
65
v 0.000000 -0.136845 -0.373136
@@ -102,7 +101,6 @@ vt 0.100207 0.815253
102101
vt 0.999770 0.815253
103102
vt 0.999770 0.916759
104103
s 1
105-
usemtl Multiplier_Fill
106104
f 43/1/1 39/2/1 29/3/1 33/4/1
107105
f 13/5/1 14/6/1 24/7/1
108106
f 24/7/1 23/8/1 15/9/1

Encore/Assets/ui/multbar_5.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib multbar_5.mtl
43
o Multiplier_5bar
54
v 0.278893 -0.097661 -0.266293
65
v 0.000000 -0.136845 -0.373136
@@ -102,7 +101,6 @@ vt 0.100437 0.665057
102101
vt 1.000000 0.665057
103102
vt 1.000000 0.766562
104103
s 1
105-
usemtl Multiplier_Fill
106104
f 43/1/1 39/2/1 29/3/1 33/4/1
107105
f 13/5/1 14/6/1 24/7/1
108106
f 24/7/1 23/8/1 15/9/1

Encore/Assets/ui/multcircle_fill.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib multcircle_fill.mtl
43
o Multiplier.001
54
v -0.071852 -0.124376 -0.339137
65
v 0.000000 -0.126812 -0.345781
@@ -166,7 +165,6 @@ vt 0.533045 0.518079
166165
vt 0.500000 0.644056
167166
vt 0.500000 0.518079
168167
s 1
169-
usemtl Multiplier_Fill
170168
f 1/1/1 3/2/1 35/3/2 33/4/3
171169
f 3/2/1 4/5/1 36/6/4 35/3/2
172170
f 4/5/1 5/7/1 37/8/5 36/6/4

Encore/Assets/ui/multcircle_frame.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib multcircle_frame.mtl
43
o Multiplier
54
v -0.278886 -0.097664 -0.266301
65
v -0.333919 -0.075660 -0.206302
@@ -1126,7 +1125,6 @@ vt 0.610003 0.286083
11261125
vt 0.602931 0.290331
11271126
vt 0.583198 0.260337
11281127
s 1
1129-
usemtl Multiplier_Background
11301128
f 138/1/1 140/2/1 29/3/1 27/4/1
11311129
f 140/2/1 141/5/1 30/6/1 29/3/1
11321130
f 141/5/1 1/7/1 31/8/1 30/6/1

Encore/Assets/ui/multnumber.fs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#version 330
2+
3+
in vec2 fragTexCoord;
4+
in vec4 fragColor;
5+
6+
uniform sampler2D texture0;
7+
uniform float uvOffsetX;
8+
uniform float uvOffsetY;
9+
// Output fragment color
10+
out vec4 finalColor;
11+
12+
13+
void main()
14+
{
15+
// Texel color fetching from texture sampler
16+
vec4 baseColor = texture(texture0, fragTexCoord+vec2(uvOffsetX,uvOffsetY));
17+
finalColor = baseColor;
18+
}

Encore/Assets/ui/od_fill.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib od_fill.mtl
43
o Overdrive_Background.001
54
v -2.100395 0.082072 0.582621
65
v 2.100395 0.082072 0.582621
@@ -64,7 +63,6 @@ vt 0.000354 0.982751
6463
vt 0.000000 0.985630
6564
vt 0.001404 0.979982
6665
s 1
67-
usemtl Energy_Meter_Empty
6866
f 29/1/1 30/2/1 18/3/1
6967
f 30/2/1 1/4/1 17/5/1
7068
f 1/4/1 2/6/1 16/7/1

Encore/Assets/ui/od_frame.obj

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Blender 4.0.2
22
# www.blender.org
3-
mtllib od_frame.mtl
43
o Overdrive_Background
54
v -2.106329 0.082072 0.632384
65
v -2.128840 0.082072 0.626266
@@ -155,7 +154,6 @@ vt 0.642490 0.102537
155154
vt 0.658156 0.028269
156155
vt 0.748745 0.242391
157156
s 1
158-
usemtl Energy_Meter_Background
159157
f 30/1/1 31/2/1 1/3/1
160158
f 29/4/1 32/5/1 30/1/1
161159
f 28/6/1 33/7/1 29/4/1

Encore/Assets/ui/testplane.obj

-17
This file was deleted.

Encore/include/game/player.h

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
//look this is the first header file ive ever created
22

33

4+
#include <iostream>
45
int notesHit = 0;
56
int notesMissed = 0;
67
int perfectHit = 0;
@@ -25,41 +26,43 @@ float overdriveFill = 0.0f;
2526
float overdriveActiveFill=0.0f;
2627
double overdriveActiveTime = 0.0;
2728

29+
float uvOffsetX = 0;
30+
float uvOffsetY = 0;
31+
2832
int stars() {
29-
int baseScore = notes * 30;
33+
int baseScore = 1080+720+360+((notes-30) * 144);
3034

3135
float starPercent = (float)score/(float)baseScore;
32-
3336
if (starPercent < xStarThreshold[0]) {return 0;}
34-
else if (starPercent < xStarThreshold[1]) {return 1;}
37+
else if (starPercent < xStarThreshold[1]) { return 1; }
3538
else if (starPercent < xStarThreshold[2]) {return 2;}
3639
else if (starPercent < xStarThreshold[3]) {return 3;}
3740
else if (starPercent < xStarThreshold[4]) {return 4;}
3841
else if (starPercent < xStarThreshold[5]) {return 5;}
39-
else if (starPercent > xStarThreshold[5]) {goldStars = true;}
42+
else if (starPercent >= xStarThreshold[5]) { goldStars = true; return 5; }
4043
else return 5;
4144

4245
return 0;
4346
}
4447

4548
int multiplier(int instrument) {
4649
int od = overdrive ? 2 : 1;
47-
50+
4851
if (instrument == 1 || instrument == 3){
4952

50-
if (combo < 10) { return 1 * od; }
51-
else if (combo < 20) { return 2 * od; }
52-
else if (combo < 30) { return 3 * od; }
53-
else if (combo < 40) { return 4 * od; }
54-
else if (combo < 50) { return 5 * od; }
55-
else if (combo >= 50) { return 6 * od; }
53+
if (combo < 10) { uvOffsetX = 0; uvOffsetY = 0 + (overdrive ? 0.5f:0); return 1 * od; }
54+
else if (combo < 20) { uvOffsetX = 0.25f; uvOffsetY = 0 + (overdrive ? 0.5f : 0); return 2 * od; }
55+
else if (combo < 30) { uvOffsetX = 0.5f; uvOffsetY = 0 + (overdrive ? 0.5f : 0); return 3 * od; }
56+
else if (combo < 40) { uvOffsetX = 0.75f; uvOffsetY = 0 + (overdrive ? 0.5f : 0); return 4 * od; }
57+
else if (combo < 50) { uvOffsetX = 0; uvOffsetY = 0.25f + (overdrive ? 0.5f : 0); return 5 * od; }
58+
else if (combo >= 50) { uvOffsetX = 0.25f; uvOffsetY = 0.25f + (overdrive ? 0.5f : 0); return 6 * od; }
5659
else { return 1 * od; };
5760
}
5861
else {
59-
if (combo < 10) { return 1 * od; }
60-
else if (combo < 20) { return 2 * od; }
61-
else if (combo < 30) { return 3 * od; }
62-
else if (combo >= 30) { return 4 * od; }
62+
if (combo < 10) { uvOffsetX = 0; uvOffsetY = 0 + (overdrive ? 0.5 : 0); return 1 * od; }
63+
else if (combo < 20) { uvOffsetX = 0.25f; uvOffsetY = 0 + (overdrive ? 0.5 : 0); return 2 * od; }
64+
else if (combo < 30) { uvOffsetX = 0.5f; uvOffsetY = 0 + (overdrive ? 0.5 : 0); return 3 * od; }
65+
else if (combo >= 30) { uvOffsetX = 0.75f; uvOffsetY = 0 + (overdrive ? 0.5 : 0); return 4 * od; }
6366
else { return 1 * od; }
6467
};
6568
}
@@ -73,12 +76,9 @@ int maxMultForMeter(int instrument) {
7376

7477
float comboFillCalc(int instrument) {
7578
if (instrument == 0 || instrument == 2) {
76-
// conversation mbr
77-
// shouldve been 0 and 2 :sob:
78-
// also also it stops at the max combo, it doesnt do it one more time
79-
// For instruments 2 and 4, limit the float value to 0.0 to 0.4
79+
// For instruments 0 and 2, limit the float value to 0.0 to 0.4
8080
if (combo >= 30) {
81-
return 1.0f; // If combo is 40 or more, set float value to 1.0
81+
return 1.0f; // If combo is 30 or more, set float value to 1.0
8282
}
8383
else {
8484
return static_cast<float>(combo % 10) / 10.0f; // Float value from 0.0 to 0.9 every 10 notes
@@ -87,7 +87,7 @@ float comboFillCalc(int instrument) {
8787
else {
8888
// For instruments 1 and 3, limit the float value to 0.0 to 0.6
8989
if (combo >= 50) {
90-
return 1.0f; // If combo is 60 or more, set float value to 1.0
90+
return 1.0f; // If combo is 50 or more, set float value to 1.0
9191
}
9292
else {
9393
return static_cast<float>(combo % 10) / 10.0f; // Float value from 0.0 to 0.9 every 10 notes

0 commit comments

Comments
 (0)