Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Continuation of 53c79c5 - HitObject name changes.

Browse Source 
Attempts to eliminate any confusion between OsuHitObject (raw, parsed hit objects) and HitObject (interface for game object types).
- Renamed "HitObject" interface to "GameObject", since these objects are specific to gameplay.
- Renamed "OsuHitObject" to "HitObject", since these objects are primarily containers for parsed data.

Sorry if the name-swapping is confusing; these should be better names in the long run.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-05-16 21:42:03 -04:00
parent 53c79c5d85
commit 250f7acc93
18 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/itdelatrisu/opsu/beatmap/Beatmap.java
View File

@@ -188,7 +188,7 @@ public class Beatmap implements Comparable<Beatmap> {
*/
/** All hit objects. */
public OsuHitObject[] objects;
public HitObject[] objects;
/** Number of individual objects. */
public int

12
src/itdelatrisu/opsu/beatmap/OsuHitObject.java → src/itdelatrisu/opsu/beatmap/HitObject.java
View File

@@ -26,7 +26,7 @@ import java.text.NumberFormat;
/**
* Data type representing a parsed hit object.
*/
public class OsuHitObject {
public class HitObject {
/** Hit object types (bits). */
public static final int
TYPE_CIRCLE = 1,
@@ -135,7 +135,7 @@ public class OsuHitObject {
private int stack;
/**
* Initializes the OsuHitObject data type with container dimensions.
* Initializes the HitObject data type with container dimensions.
* @param width the container width
* @param height the container height
*/
@@ -177,7 +177,7 @@ public class OsuHitObject {
* Constructor.
* @param line the line to be parsed
*/
public OsuHitObject(String line) {
public HitObject(String line) {
/**
* [OBJECT FORMATS]
* Circles:
@@ -205,9 +205,9 @@ public class OsuHitObject {
// type-specific fields
int additionIndex;
if ((type & OsuHitObject.TYPE_CIRCLE) > 0)
if ((type & HitObject.TYPE_CIRCLE) > 0)
additionIndex = 5;
else if ((type & OsuHitObject.TYPE_SLIDER) > 0) {
else if ((type & HitObject.TYPE_SLIDER) > 0) {
additionIndex = 10;
// slider curve type and coordinates
@@ -237,7 +237,7 @@ public class OsuHitObject {
edgeAddition[j][1] = Byte.parseByte(tedgeAddition[1]);
}
}
} else { //if ((type & OsuHitObject.TYPE_SPINNER) > 0) {
} else { //if ((type & HitObject.TYPE_SPINNER) > 0) {
additionIndex = 6;
// some 'endTime' fields contain a ':' character (?)