Commit Graph

82 Commits

Author SHA1 Message Date
Thai Pangsakulyanont 687affa1e5 merge.
I seem to get an EXC_BAD_ACCESS error about libpng on app starting, so I don't know if the merge succeeded at all :<
2011-06-04 19:18:55 +07:00
Thai Pangsakulyanont 49042c4878 try to improve performance with scroll segments:
- optimize GetDisplayedBeat (seems to be a bottleneck here).
- make sure that fFirstBeatToDraw <= fBeat <= fLastBeatToDraw in IS_ON_SCREEN.
2011-06-04 19:02:45 +07:00
Jason Felds 90ab6dfca8 Add hack to stop random crashes on editor leave.
I'm sure there is a better way, but this works right now.
2011-06-01 14:32:59 -04:00
Jason Felds b36f172462 Added the HasScrollChanges lua binding. 2011-06-01 10:12:10 -04:00
Jason Felds e0f36181be More accurate for CMod checking. 2011-06-01 10:08:40 -04:00
Jason Felds df6a00b53e Stops (and Delays) now templated.
This is all of them at this present time.

At some point in the future, we should make
DelaySegments separate from StopSegments.
2011-06-01 09:50:34 -04:00
Jason Felds 50e93045cc Scroll Segments Satisfied.
Just the Stops and Delays...in one segment.
Yeah, maybe those should be split up at some point.
2011-06-01 08:44:09 -04:00
Jason Felds f9eb6fb387 Speed Segments Satisfied. 2011-05-31 15:27:27 -04:00
Jason Felds b1eab10594 Time Signatures, the other big one. :D 2011-05-31 14:27:55 -04:00
Jason Felds 642ec5ac81 Minor cleanup before I dive back into segments. 2011-05-31 14:04:35 -04:00
Thai Pangsakulyanont 1d2dd19ab1 Yeah, BPM segments, big one :D 2011-05-31 23:41:39 +07:00
Jason Felds 714427f154 ComboSegments brought in.
Five to go I believe.
2011-05-31 11:45:25 -04:00
Jason Felds da73396895 Labels templated.
Six more to go.
2011-05-31 11:22:21 -04:00
Jason Felds 1fcf290571 Warps are properly templated.
Seven more to go I believe.
2011-05-31 10:59:18 -04:00
Jason Felds 8a315634dc Bring TickcountSegments to refactored level.
I wonder how many of the 8 will be claimed upon wakeup.
2011-05-31 01:20:22 -04:00
Jason Felds 1d3000e520 FakeSegments refactored.
Few things of note:

1) Slowly going away from hungarian notation.
2) Trying to respect public/private members.
2a) Yes, structs can work like this.
3) Trying to not require horizontal scrolling.

If anyone else wants a crack, go ahead:
we have 9 segments left. :)
2011-05-31 00:51:25 -04:00
Jason Felds 2d491fd0c0 Add ScrollSegment checks.
Also took care of scaling TimeSignatureSegments too.
2011-05-26 17:38:31 -04:00
Thai Pangsakulyanont d9f936190a [default -> scroll] merge 2011-05-25 22:56:26 +07:00
Thai Pangsakulyanont fe9573975c [scroll] 90% of scroll segments 2011-05-25 22:44:41 +07:00
Thai Pangsakulyanont ddbecd5de4 add a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warpsadd a comment about behavior of stops and delays in warps 2011-05-24 13:07:59 +07:00
Thai Pangsakulyanont 0533e742c5 a const is need on TimingData.cpp too 2011-05-24 12:29:55 +07:00
Thai Pangsakulyanont aa0eb7f5d7 GetSpeedMultiplier in ArrowEffects becomes TimingData::GetDisplayedSpeedPercent.
We might need to use it later in other parts (NoteField).
2011-05-24 11:43:08 +07:00
Jason Felds d039c5c2fb [splittiming] Carryover from old #WARPS code. 2011-05-16 16:17:34 -04:00
Thai Pangsakulyanont d064547985 [splittiming] fix TimingData.cpp 2011-05-16 22:05:23 +07:00
Jason Felds b3c16e3dee [splittiming] Warps and Fakes are relative timed.
theDtTvB, time to scrutinize my work. ;)
2011-05-16 10:24:59 -04:00
Jason Felds ba8791b4f9 [splittiming] Only care about the mod change.
Nothing wrong with the rest, but for editor purposes,
this kind of takes precedence before length and unit.
2011-05-16 09:44:07 -04:00
Jason Felds 60133353c1 [splittiming] Time for FakeSegments.
No, these won't replace Fake Notes.
2011-05-16 02:00:17 -04:00
Jason Felds e2766cf644 [splittiming] SpeedSegments run on Seconds now.
ScreenEdit's code probably needs to be redone.
At least, someone find a way to remove "Beats"
or "Seconds" from the text entry area.
2011-05-15 23:48:03 -04:00
Jason Felds 9ffe6166e2 [splittiming] Implement, add lua hook. 2011-05-15 13:48:10 -04:00
Thai Pangsakulyanont b634639e8e Write timing tags for SSC files.
WARN: This does not work with ScreenEdit, yet!
2011-05-10 16:00:47 +07:00
Jason Felds 1ea093cd5f [splittiming] Cleanup, more prepwork. 2011-05-09 23:16:56 -04:00
Jason Felds 279194713d [sm130futures] Scale the LabelSegments. 2011-05-03 12:58:08 -04:00
Jason Felds 6fb7d2a4e2 [default -> sm130futures] Bring up to date. 2011-05-01 21:35:20 -04:00
Jason Felds 8a902dd14d Remember to scale Tickcounts and Combos. 2011-05-01 17:28:36 -04:00
Jason Felds b4c76dae0f [default -> sm130futures] Bring up to date. 2011-04-05 14:31:41 -04:00
Jason Felds 79aa3939f0 We don't use negative stops anymore. 2011-04-05 14:28:08 -04:00
Jason Felds 5e61884941 [sm130labels] Do not allow duplicate label names. 2011-04-05 14:18:29 -04:00
Jason Felds f01e37854a [sm130labels] Fix keyboard function. 2011-04-05 01:28:06 -04:00
Jason Felds a6b5187856 [sm130labels] Code ready for testing.
If a mistake was made here,
let the cherry picking/blame game commence!
2011-04-05 00:35:45 -04:00
Jason Felds 53971e16e3 [sm130labels] Add the other definitions. 2011-04-04 23:03:10 -04:00
Jason Felds 315aaf774d New branch from [sm130futures]: [sm130labels]
Time to simulate the Rock Band/Guitar Hero
styled labeling of note sections.
2011-04-04 22:47:59 -04:00
Jason Felds 58724886d5 It's not delays that are the problem now. 2011-03-30 21:57:54 -04:00
Thai Pangsakulyanont c0acb4e336 fix: stops in warps are judged, but not delays 2011-03-27 15:56:40 +07:00
AJ Kelly c1f2cc2400 [br:warps] Fix compile by easing scope 2011-03-26 11:59:48 -05:00
Thai Pangsakulyanont ac336215bd [warps] allow stops inside warps and convert high bpm to warps
+ sometimes there are delays/stops in high BPM sections,
  they have to be handled inside a warp to be able to convert
  it easily.
+ on the stopped / delayed rows with warps, judging become
  enabled for that row.

Issues:

+ the bpm threshould is hardcoded (right now it's 400000.0).
  someone change it please.
+ slight off-sync from conversion. haven't figured out how to
  work around it yet.
2011-03-26 22:07:24 +07:00
Thai Pangsakulyanont eed0be6fe0 [warps] ScaleRegion, InsertRows, DeleteRows to make it point warps to the right place. 2011-03-26 14:21:06 +07:00
Jason Felds b94ff7785f [warps] Add comment for thing to fix. 2011-03-25 16:33:57 -04:00
Thai Pangsakulyanont f4ecfd08f9 [warps] Fix IsWarpAtRow. 2011-03-25 23:40:03 +07:00
Thai Pangsakulyanont 4316579e89 [warps] my attempt at making warps work. see commit message.
+ TimingData: rewrote GetBeatAndBPSFromElapsedTimeNoOffset and GetBeatFromElapsedTimeNoOffset
  to make it simpler and compute times correctly, by going through 3 arrays at the same time.
+ TimingData: added TimingData::IsWarpAtRow(int) just in case.
+ The skipping part is now handled by TimingData.

Current issues:

+ the rewritten function does not check if the vectors are sorted.
+ if you press the notes after the skip before the skip is reached, the notes in the warp
  range got hit instead because m_iWarpBeginRow was not set before the warp is reached.
+ the notes after the skipped part are not judged if hit before the warp is reached and
  the warp is big enough.
2011-03-25 23:19:31 +07:00
Jason Felds db429e11cc [warps] View the list.
1) Add functions similar to the other Segments.
2) Use a better named member variable.
3) TimingData cleanup.
2011-03-25 00:54:33 -04:00