mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix place undo

Browse source
This commit is contained in:
Braedon Lewis 2023-09-27 02:11:54 -04:00
parent 065a09d48f
commit 65cd6aa294
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Assets/Scripts/LevelEditor/Commands/Block.cs
View file

@ -72,15 +72,15 @@ namespace HeavenStudio.Editor.Commands
public class Place : ICommand
{
private string placedEventJson;
private RiqEntity placedEntityData;
private Guid placedEventID;
// Redo times basically
private int placeTimes = 0;
public Place(string placedEventJson, Guid placedEventID)
public Place(RiqEntity entity, Guid placedEventID)
{
this.placedEventJson = placedEventJson;
this.placedEntityData = entity.DeepCopy();
this.placedEventID = placedEventID;
}
@ -88,10 +88,7 @@ namespace HeavenStudio.Editor.Commands
{
if (placeTimes > 0)
{
var entity = JsonConvert.DeserializeObject<RiqEntity>(placedEventJson, new JsonSerializerSettings()
{
TypeNameHandling = TypeNameHandling.None,
});
var entity = placedEntityData.DeepCopy();
entity.guid = placedEventID;
GameManager.instance.Beatmap.Entities.Add(entity);
@ -108,12 +105,7 @@ namespace HeavenStudio.Editor.Commands
var createdEntity = GameManager.instance.Beatmap.Entities.Find(c => c.guid == placedEventID);
if (createdEntity != null)
{
placedEventJson = JsonConvert.SerializeObject(createdEntity, Formatting.None, new JsonSerializerSettings()
{
TypeNameHandling = TypeNameHandling.None,
NullValueHandling = NullValueHandling.Include,
ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
});
placedEntityData = createdEntity.DeepCopy();
var marker = TimelineBlockManager.Instance.EntityMarkers[createdEntity.guid];

8
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -950,13 +950,7 @@ namespace HeavenStudio.Editor.Track
eventObjs.Add(marker);
var entitySerialize = JsonConvert.SerializeObject(marker.entity, Formatting.None, new JsonSerializerSettings()
{
TypeNameHandling = TypeNameHandling.None,
NullValueHandling = NullValueHandling.Include,
ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
});
CommandManager.Instance.AddCommand(new Commands.Place(entitySerialize, marker.entity.guid));
CommandManager.Instance.AddCommand(new Commands.Place(marker.entity, marker.entity.guid));
return marker;
}