Skip to content

Commit fa5eb45

Browse files
NSGolovaNSGolova
authored
Fixed processing V3 sliders (#84)
1 parent bf3b703 commit fa5eb45

File tree

2 files changed

+176
-0
lines changed

2 files changed

+176
-0
lines changed

‎include/Constants.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ inline static constexpr const std::string_view LINK = "link";
4848
inline static constexpr const std::string_view TARGET = "target";
4949

5050
inline static constexpr const std::string_view INTERNAL_STARTNOTELINELAYER = "NE_startNoteLineLayer";
51+
inline static constexpr const std::string_view INTERNAL_TAILSTARTNOTELINELAYER = "NE_tailStartNoteLineLayer";
5152
inline static constexpr const std::string_view INTERNAL_FLIPYSIDE = "NE_flipYSide";
5253
inline static constexpr const std::string_view INTERNAL_FLIPLINEINDEX = "NE_flipLineIndex";
5354
inline static constexpr const std::string_view INTERNAL_FAKE_NOTE = "NE_fake";

‎src/Hooks/BeatmapObjectsInTimeRowProcessor.cpp

+175
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@
1616
using namespace GlobalNamespace;
1717
using namespace CustomJSONData;
1818

19+
#include <cmath>
20+
// Port of MathF.Approximately
21+
bool Approximately(float a, float b) {
22+
float const epsilon = 1.17549435E-38f * 8.0f;
23+
float const maxAbs = std::max(std::fabs(a), std::fabs(b));
24+
return std::fabs(b - a) < std::max(1E-06f * maxAbs, epsilon);
25+
}
26+
1927
void BeatmapObjectsInTimeRowProcessor_HandleCurrentTimeSliceAllNotesAndSlidersDidFinishTimeSliceTranspile(
2028
BeatmapObjectsInTimeRowProcessor* self,
2129
GlobalNamespace::BeatmapObjectsInTimeRowProcessor::TimeSliceContainer_1<::GlobalNamespace::BeatmapDataItem*>*
@@ -164,6 +172,173 @@ MAKE_HOOK_MATCH(
164172
}
165173
}
166174

175+
auto customSliders = NoodleExtensions::of_type<CustomSliderData*>(ListW<GlobalNamespace::BeatmapDataItem*>(items));
176+
auto customTails = NoodleExtensions::of_type<BeatmapObjectsInTimeRowProcessor::SliderTailData*>(
177+
ListW<GlobalNamespace::BeatmapDataItem*>(items));
178+
for (auto slider : customSliders) {
179+
NEJSON::OptPair headPos = NEJSON::OptPair(std::nullopt, std::nullopt);
180+
181+
if (slider->customData->value) {
182+
rapidjson::Value const& sliderCustomData = *slider->customData->value;
183+
headPos = NEJSON::ReadOptionalPair(sliderCustomData, NoodleExtensions::Constants::NOTE_OFFSET.data());
184+
}
185+
186+
float headX = headPos.first.value_or(slider->headLineIndex - offset) + offset;
187+
float headY = headPos.second.value_or(slider->headLineLayer.value__);
188+
189+
for (auto note : customNotes) {
190+
NEJSON::OptPair notePos = NEJSON::OptPair(std::nullopt, std::nullopt);
191+
192+
if (note->customData->value) {
193+
rapidjson::Value const& noteCustomData = *note->customData->value;
194+
195+
notePos = NEJSON::ReadOptionalPair(noteCustomData, NoodleExtensions::Constants::V2_POSITION.data());
196+
if (!notePos.first) {
197+
notePos = NEJSON::ReadOptionalPair(noteCustomData, NoodleExtensions::Constants::NOTE_OFFSET.data());
198+
}
199+
}
200+
201+
float noteX = notePos.first.value_or(note->lineIndex - offset) + offset;
202+
float noteY = notePos.second.value_or(note->noteLineLayer.value__);
203+
204+
if (Approximately(headX, noteX) && Approximately(headY, noteY)) {
205+
slider->SetHasHeadNote(true);
206+
207+
float startNoteLineLayer = note->beforeJumpNoteLineLayer.value__;
208+
if (note->customData->value) {
209+
startNoteLineLayer = getAD(note->customData).startNoteLineLayer;
210+
}
211+
if (slider->customData->value) {
212+
BeatmapObjectAssociatedData& ad = getAD(slider->customData);
213+
ad.startNoteLineLayer = startNoteLineLayer;
214+
} else {
215+
slider->SetHeadBeforeJumpLineLayer(startNoteLineLayer);
216+
}
217+
218+
if (slider->sliderType == CustomSliderData::Type::Burst) {
219+
note->ChangeToBurstSliderHead();
220+
221+
// PC logic, I've no idea why it's there
222+
223+
// if (noteData.cutDirection != sliderData.tailCutDirection)
224+
// {
225+
// continue;
226+
// }
227+
228+
// Vector2 line = SpawnDataManager.Get2DNoteOffset(noteX, ____numberOfLines, noteY) -
229+
// SpawnDataManager.Get2DNoteOffset(tailX, ____numberOfLines, tailY);
230+
// float num = noteData.cutDirection.Direction().SignedAngleToLine(line);
231+
// if (!(Mathf.Abs(num) <= 40f))
232+
// {
233+
// continue;
234+
// }
235+
236+
// noteData.SetCutDirectionAngleOffset(num);
237+
// sliderData.SetCutDirectionAngleOffset(num, num);
238+
} else {
239+
note->MarkAsSliderHead();
240+
}
241+
}
242+
}
243+
244+
for (auto tailSlider : customSliders) {
245+
if (slider == tailSlider || slider->sliderType != CustomSliderData::Type::Normal ||
246+
tailSlider->sliderType != CustomSliderData::Type::Burst)
247+
continue;
248+
249+
NEJSON::OptPair tailPos = NEJSON::OptPair(std::nullopt, std::nullopt);
250+
251+
if (tailSlider->customData->value) {
252+
rapidjson::Value const& tailSliderCustomData = *tailSlider->customData->value;
253+
254+
tailPos = NEJSON::ReadOptionalPair(tailSliderCustomData, NoodleExtensions::Constants::TAIL_NOTE_OFFSET.data());
255+
}
256+
float tailX = tailPos.first.value_or(tailSlider->tailLineIndex - offset) + offset;
257+
float tailY = tailPos.second.value_or(tailSlider->tailLineLayer.value__);
258+
259+
if (Approximately(tailX, headX) && Approximately(tailY, headY)) {
260+
slider->SetHasHeadNote(true);
261+
float startNoteLineLayer = tailSlider->tailBeforeJumpLineLayer.value__;
262+
if (slider->customData->value) {
263+
BeatmapObjectAssociatedData& ad = getAD(slider->customData);
264+
ad.tailStartNoteLineLayer = startNoteLineLayer;
265+
} else {
266+
slider->SetTailBeforeJumpLineLayer(startNoteLineLayer);
267+
}
268+
}
269+
}
270+
271+
for (auto tailSliderData : customTails) {
272+
auto tailSlider = reinterpret_cast<CustomSliderData*>(tailSliderData->slider);
273+
if (!tailSlider || slider->sliderType != CustomSliderData::Type::Normal ||
274+
tailSlider->sliderType != CustomSliderData::Type::Burst)
275+
continue;
276+
277+
NEJSON::OptPair tailPos = NEJSON::OptPair(std::nullopt, std::nullopt);
278+
279+
if (tailSlider->customData->value) {
280+
rapidjson::Value const& tailSliderCustomData = *tailSlider->customData->value;
281+
282+
tailPos = NEJSON::ReadOptionalPair(tailSliderCustomData, NoodleExtensions::Constants::TAIL_NOTE_OFFSET.data());
283+
}
284+
float tailX = tailPos.first.value_or(tailSlider->tailLineIndex - offset) + offset;
285+
float tailY = tailPos.second.value_or(tailSlider->tailLineLayer.value__);
286+
287+
if (Approximately(tailX, headX) && Approximately(tailY, headY)) {
288+
slider->SetHasHeadNote(true);
289+
float startNoteLineLayer = tailSlider->tailBeforeJumpLineLayer.value__;
290+
if (slider->customData->value) {
291+
BeatmapObjectAssociatedData& ad = getAD(slider->customData);
292+
ad.tailStartNoteLineLayer = startNoteLineLayer;
293+
} else {
294+
slider->SetTailBeforeJumpLineLayer(startNoteLineLayer);
295+
}
296+
}
297+
}
298+
}
299+
300+
for (auto customTail : customTails) {
301+
auto slider = reinterpret_cast<CustomSliderData*>(customTail->slider);
302+
303+
if (!slider) continue;
304+
305+
NEJSON::OptPair tailPos = NEJSON::OptPair(std::nullopt, std::nullopt);
306+
if (slider->customData->value) {
307+
rapidjson::Value const& sliderCustomData = *slider->customData->value;
308+
309+
tailPos = NEJSON::ReadOptionalPair(sliderCustomData, NoodleExtensions::Constants::TAIL_NOTE_OFFSET.data());
310+
}
311+
float tailX = tailPos.first.value_or(slider->tailLineIndex - offset) + offset;
312+
float tailY = tailPos.second.value_or(slider->tailLineLayer.value__);
313+
314+
for (auto note : customNotes) {
315+
NEJSON::OptPair notePos = NEJSON::OptPair(std::nullopt, std::nullopt);
316+
317+
if (note->customData->value) {
318+
rapidjson::Value const& noteCustomData = *note->customData->value;
319+
320+
notePos = NEJSON::ReadOptionalPair(noteCustomData, NoodleExtensions::Constants::V2_POSITION.data());
321+
if (!notePos.first)
322+
notePos = NEJSON::ReadOptionalPair(noteCustomData, NoodleExtensions::Constants::NOTE_OFFSET.data());
323+
}
324+
325+
float noteX = notePos.first.value_or(note->lineIndex - offset) + offset;
326+
float noteY = notePos.second.value_or(note->noteLineLayer.value__);
327+
328+
if (Approximately(tailX, noteX) && Approximately(tailY, noteY)) {
329+
slider->SetHasTailNote(true);
330+
note->MarkAsSliderTail();
331+
float startNoteLineLayer = note->beforeJumpNoteLineLayer.value__;
332+
if (slider->customData->value) {
333+
BeatmapObjectAssociatedData& ad = getAD(slider->customData);
334+
ad.tailStartNoteLineLayer = startNoteLineLayer;
335+
} else {
336+
slider->SetTailBeforeJumpLineLayer(startNoteLineLayer);
337+
}
338+
}
339+
}
340+
}
341+
167342
return BeatmapObjectsInTimeRowProcessor_HandleCurrentTimeSliceAllNotesAndSlidersDidFinishTimeSliceTranspile(
168343
self, allObjectsTimeSlice, nextTimeSliceTime);
169344
}

0 commit comments

Comments
 (0)