57 lines
1.5 KiB
C#
57 lines
1.5 KiB
C#
|
using UnityEngine;
|
|||
|
|
using UnityEditor;
|
|||
|
|
|
|||
|
|
namespace GitMerge
|
|||
|
|
{
|
|||
|
|
/// <summary>
|
|||
|
|
/// The MergeAction that handles a GameObject which exists in "our" version but not "theirs".
|
|||
|
|
/// </summary>
|
|||
|
|
public class MergeActionDeleteGameObject : MergeActionExistence
|
|||
|
|
{
|
|||
|
|
private bool oursWasActive;
|
|||
|
|
|
|||
|
|
public MergeActionDeleteGameObject(GameObject ours, GameObject theirs)
|
|||
|
|
: base(ours, theirs)
|
|||
|
|
{
|
|||
|
|
oursWasActive = ours.activeSelf;
|
|||
|
|
|
|||
|
|
if(GitMergeWindow.automerge)
|
|||
|
|
{
|
|||
|
|
UseOurs();
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
protected override void ApplyOurs()
|
|||
|
|
{
|
|||
|
|
ours.SetActiveForMerging(true);
|
|||
|
|
ours.SetActive(oursWasActive);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
protected override void ApplyTheirs()
|
|||
|
|
{
|
|||
|
|
ours.SetActiveForMerging(false);
|
|||
|
|
SceneView.currentDrawingSceneView.Repaint();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
public override void EnsureExistence()
|
|||
|
|
{
|
|||
|
|
UseOurs();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
public override void OnGUI()
|
|||
|
|
{
|
|||
|
|
var defaultOptionColor = merged ? Color.gray : Color.white;
|
|||
|
|
|
|||
|
|
GUI.color = usingOurs ? Color.green : defaultOptionColor;
|
|||
|
|
if(GUILayout.Button("Keep GameObject"))
|
|||
|
|
{
|
|||
|
|
UseOurs();
|
|||
|
|
}
|
|||
|
|
GUI.color = usingTheirs ? Color.green : defaultOptionColor;
|
|||
|
|
if(GUILayout.Button("Delete GameObject"))
|
|||
|
|
{
|
|||
|
|
UseTheirs();
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
}
|