Skip to content

Commit

Permalink
Remove leftover whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Chazoshtare committed Oct 24, 2021
1 parent 06ebf63 commit 3269df9
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
4 changes: 2 additions & 2 deletions src/bms/player/beatoraja/BMSResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public boolean setBMSFile(BMSModel model, final Path f, final Config config, BMS
while(!bgaloaders.isEmpty() && !bgaloaders.getFirst().isAlive()) {
bgaloaders.removeFirst();
}

if(MainLoader.getIllegalSongCount() == 0) {
// Audio, BGAともキャッシュがあるため、何があっても全リロードする
BGALoaderThread bgaloader = new BGALoaderThread(
Expand All @@ -108,7 +108,7 @@ public boolean setBMSFile(BMSModel model, final Path f, final Config config, BMS
bgaloader.start();
AudioLoaderThread audioloader = new AudioLoaderThread(model);
audioloaders.addLast(audioloader);
audioloader.start();
audioloader.start();
}
return true;
}
Expand Down
4 changes: 1 addition & 3 deletions src/bms/player/beatoraja/MainLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@ public static void main(String[] args) {
}
}



if (Files.exists(MainController.configpath) && (bmsPath != null || auto != null)) {
if(Files.exists(MainController.configpath) && (bmsPath != null || auto != null)) {
IRConnectionManager.getAllAvailableIRConnectionName();
play(bmsPath, auto, true, null, null, bmsPath != null);
} else {
Expand Down
28 changes: 13 additions & 15 deletions src/bms/player/beatoraja/select/BarRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public BarRenderer(MusicSelector select) {

TableData[] unsortedtables = tdaccessor.readAll();
Array<TableData> sortedtables = new Array<TableData>(unsortedtables.length);

for(String url : select.main.getConfig().getTableURL()) {
for(int i = 0;i < unsortedtables.length;i++) {
final TableData td = unsortedtables[i];
Expand All @@ -122,13 +122,13 @@ public BarRenderer(MusicSelector select) {
}
}
}

for(TableData td : unsortedtables) {
if(td != null) {
sortedtables.add(td);
}
}

BMSSearchAccessor bmssearcha = new BMSSearchAccessor(main.getConfig().getTablepath());

Array<TableBar> table = new Array<TableBar>();
Expand Down Expand Up @@ -169,7 +169,7 @@ public BarRenderer(MusicSelector select) {
song.setUrl(chart.url);
song.setAppendurl(chart.appendurl);
if(chart.mode != null) {
song.setMode(chart.mode.id);
song.setMode(chart.mode.id);
}
songs[j] = song;
}
Expand All @@ -193,7 +193,7 @@ public BarRenderer(MusicSelector select) {
song.setUrl(chart.url);
song.setAppendurl(chart.appendurl);
if(chart.mode != null) {
song.setMode(chart.mode.id);
song.setMode(chart.mode.id);
}
songs[j] = song;
}
Expand All @@ -214,7 +214,7 @@ public BarRenderer(MusicSelector select) {
}
td.setCourse(course);
if(td.validate()) {
table.add(new TableBar(select, td, new TableDataAccessor.DifficultyTableAccessor(main.getConfig().getTablepath(), td.getUrl())));
table.add(new TableBar(select, td, new TableDataAccessor.DifficultyTableAccessor(main.getConfig().getTablepath(), td.getUrl())));
}
}
} else {
Expand Down Expand Up @@ -434,17 +434,15 @@ public boolean mousePressed(SkinBar baro, int button, int x, int y) {
}

private long time;

public void prepare(MusicSelectSkin skin, SkinBar baro, long time) {
this.time = time;
final long timeMillis = System.currentTimeMillis();
this.time = time;final long timeMillis = System.currentTimeMillis();
boolean applyMovement = duration != 0 && duration > timeMillis;
float angleLerp = 0;
if (applyMovement) {
angleLerp = angle < 0 ? ((float) (timeMillis - duration)) / angle
: ((float) (duration - timeMillis)) / angle;
}

for (int i = 0; i < barlength; i++) {
// calcurate song bar position
final BarArea ba = bararea[i];
Expand Down Expand Up @@ -547,11 +545,11 @@ public void render(SkinObjectRenderer sprite, MusicSelectSkin skin, SkinBar baro
for (char c : charset) {
chars[i++] = c;
}

for(int index = 0;index < SkinBar.BARTEXT_COUNT;index++) {
if(baro.getText(index) != null) {
baro.getText(index).prepareFont(String.valueOf(chars));
}
baro.getText(index).prepareFont(String.valueOf(chars));
}
}
}

Expand Down Expand Up @@ -603,7 +601,7 @@ public void render(SkinObjectRenderer sprite, MusicSelectSkin skin, SkinBar baro
final SkinText text = baro.getText(ba.text);
if(text != null) {
text.setText(ba.sd.getTitle());
text.draw(sprite, ba.x, ba.y);
text.draw(sprite, ba.x, ba.y);
}
}

Expand All @@ -620,7 +618,7 @@ public void render(SkinObjectRenderer sprite, MusicSelectSkin skin, SkinBar baro
if (TROPHY[j].equals(trophy.getName())) {
final SkinImage trophyImage = baro.getTrophy(j);
if(trophyImage != null) {
trophyImage.draw(sprite, ba.x, ba.y);
trophyImage.draw(sprite, ba.x, ba.y);
}
break;
}
Expand Down

0 comments on commit 3269df9

Please sign in to comment.