Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed button collors in song

Browse Source
This commit is contained in:
Remco
2015-06-05 12:45:09 +02:00
parent 76c288cfec
commit f9e6a90160
3 changed files with 66 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
audio/SongInstance.java
+21 -3
View File
@@ -43,16 +43,34 @@ public class SongInstance {
this.difficulty = difficulty;
}
public List<ObjectInstance> getBetween(long oldProgress, long progress) {
public List<ObjectInstance> getObjectsBetween(long oldProgress, long progress) {
List<ObjectInstance> b = new ArrayList<ObjectInstance>();
for(ObjectInstance i : objects)
{
if(i.getTime() > progress)
if(i.getTime() >= progress)
{
return b;
}
if(i.getTime() > oldProgress && i.getTime() <= progress)
if(i.getTime() >= oldProgress && i.getTime() < progress)
{
b.add(i);
}
}
return b;
}
public List<ButtonInstance> getButtonsBetween(long oldProgress, long progress) {
List<ButtonInstance> b = new ArrayList<ButtonInstance>();
for(ButtonInstance i : buttons)
{
if(i.getTime() >= progress)
{
return b;
}
if(i.getTime() >= oldProgress && i.getTime() < progress)
{
b.add(i);
}