gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix some bugs events

Browse Source
This commit is contained in:
lunarcleint
2023-07-28 19:08:48 -07:00
parent 33e94be993
commit 2d65f6f6d2
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/charter/Charter.hx
+20 -8
View File
@@ -622,7 +622,7 @@ class Charter extends UIState {
}
}
if (gridActionType == NONE && mousePos.x < 0) {
if (gridActionType == NONE && mousePos.x < 0 && mousePos.x > -addEventSpr.bWidth) {
addEventSpr.incorporeal = false;
addEventSpr.sprAlpha = lerp(addEventSpr.sprAlpha, 0.75, 0.25);
var event = getHoveredEvent(mousePos.y);
@@ -678,9 +678,15 @@ class Charter extends UIState {
eventsGroup.add(e);
e.revive();
e.refreshEventIcons();
});
}, false);
sortNotes();
for (s in selection)
if (s is CharterEvent) {
Charter.instance.updateBPMEvents();
break;
}
if (addToUndo)
this.addToUndo(CCreateSelection(selection));
return [];
@@ -701,6 +707,12 @@ class Charter extends UIState {
}
sortNotes();
for (s in selection)
if (s is CharterEvent) {
Charter.instance.updateBPMEvents();
break;
}
if (addToUndo)
this.addToUndo(CDeleteSelection(selection));
return [];
@@ -1055,7 +1067,7 @@ class Charter extends UIState {
event.events = oldEvents.copy();
event.refreshEventIcons();
Charter.instance.updateBPMEvents(event);
Charter.instance.updateBPMEvents();
}
if (v != null)
redoList.insert(0, v);
@@ -1096,7 +1108,7 @@ class Charter extends UIState {
event.events = newEvents.copy();
event.refreshEventIcons();
Charter.instance.updateBPMEvents(event);
Charter.instance.updateBPMEvents();
}
if (v != null)
undoList.insert(0, v);
@@ -1242,7 +1254,7 @@ class Charter extends UIState {
}
}
public function updateBPMEvents(newEvent:CharterEvent) {
public function updateBPMEvents() {
buildEvents();
Conductor.mapBPMChanges(PlayState.SONG);
@@ -1281,11 +1293,11 @@ typedef NoteSustainChange = {
this = array == null ? [] : array;
// too lazy to put this in every for loop so i made it a abstract
public inline function loop(onNote:CharterNote->Void, ?onEvent:CharterEvent->Void) {
public inline function loop(onNote:CharterNote->Void, ?onEvent:CharterEvent->Void, ?draggableOnly:Bool = true) {
for (s in this) {
if (s is CharterNote && onNote != null && s.draggable)
if (s is CharterNote && onNote != null && (draggableOnly ? s.draggable: true))
onNote(cast(s, CharterNote));
else if (s is CharterEvent && onEvent != null && s.draggable)
else if (s is CharterEvent && onEvent != null && (draggableOnly ? s.draggable: true))
onEvent(cast(s, CharterEvent));
}
}
source/funkin/editors/charter/CharterEvent.hx
+1 -3
View File
@@ -77,10 +77,8 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
return (selectionBox.x + selectionBox.bWidth > x) && (selectionBox.x < x + bWidth) && (selectionBox.y + selectionBox.bHeight > y) && (selectionBox.y < y + bHeight);
}
public function handleDrag(change:FlxPoint) {
public function handleDrag(change:FlxPoint)
y = ((step += change.x) * 40) - 17;
Charter.instance.updateBPMEvents(this);
}
public function refreshEventIcons() {
while(icons.length > 0) {
source/funkin/editors/charter/CharterEventScreen.hx
+1 -1
View File
@@ -96,7 +96,7 @@ class CharterEventScreen extends UISubstateWindow {
}
close();
Charter.instance.updateBPMEvents(chartEvent);
Charter.instance.updateBPMEvents();
});
saveButton.x -= saveButton.bWidth;
saveButton.y -= saveButton.bHeight;