ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2026-05-14 12:54:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Multiple selection improvements

Browse Source
This commit is contained in:
dexy
2020-01-09 00:44:35 +11:00
Unverified
parent 09da0a2f54
commit efd58b5044
9 changed files with 1355 additions and 1312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Project/ProjectForm.cs
+4 -4
View File
@@ -6237,7 +6237,7 @@ namespace CodeWalker.Project
var grassbatch = sel.GrassBatch;
var collvert = sel.CollisionVertex;
var collpoly = sel.CollisionPoly;
var collbound = sel.CollisionBounds ?? collpoly?.Owner ?? collvert.Owner;
var collbound = sel.CollisionBounds ?? collpoly?.Owner ?? collvert?.Owner;
var pathnode = sel.PathNode;
var pathlink = sel.PathLink;
var navpoly = sel.NavPoly;
@@ -6404,17 +6404,17 @@ namespace CodeWalker.Project
}
catch { }
}
public void OnWorldSelectionModified(MapSelection sel, List<MapSelection> items)
public void OnWorldSelectionModified(MapSelection sel)
{
try
{
if (InvokeRequired)
{
BeginInvoke(new Action(() => { OnWorldSelectionModified(sel, items); }));
BeginInvoke(new Action(() => { OnWorldSelectionModified(sel); }));
}
else
{
if (sel.MultipleSelection)
if (sel.MultipleSelectionItems != null)
{
//TODO!!
}
Project/UndoStep.cs
+122 -39
View File
@@ -21,44 +21,11 @@ namespace CodeWalker.Project
}
public class MultiPositionUndoStep : UndoStep
public abstract class MultiItemUndoStep : UndoStep
{
private MapSelection Selection;
private MapSelection[] Items;
public Vector3 StartPosition { get; set; }
public Vector3 EndPosition { get; set; }
protected MapSelection Selection;
public MultiPositionUndoStep(MapSelection multiSel, MapSelection[] items, Vector3 startpos, WorldForm wf)
{
Selection = multiSel;
Items = items;
StartPosition = startpos;
EndPosition = multiSel.WidgetPosition;
UpdateGraphics(wf);
}
private void Update(WorldForm wf, ref MapSelection sel, Vector3 p, Vector3 o)
{
//update selection items positions for new widget position p
Vector3 dp = p - o;
for (int i = 0; i < Items.Length; i++)
{
var refpos = Items[i].WidgetPosition;
Items[i].SetPosition(refpos + dp, false);
}
sel.MultipleSelectionCenter = p; //center used for widget pos...
wf.SelectMulti(Items);
wf.SetWidgetPosition(p);
UpdateGraphics(wf);
}
private void UpdateGraphics(WorldForm wf)
protected void UpdateGraphics(WorldForm wf)
{
Dictionary<YndFile, int> pathYnds = new Dictionary<YndFile, int>();
@@ -67,9 +34,9 @@ namespace CodeWalker.Project
Dictionary<YmtFile, int> scenarioYmts = new Dictionary<YmtFile, int>();
Dictionary<Bounds, int> bounds = new Dictionary<Bounds, int>();
if (Items != null)
if (Selection.MultipleSelectionItems != null)
{
foreach (var item in Items)
foreach (var item in Selection.MultipleSelectionItems)
{
if (item.PathNode != null)
{
@@ -133,7 +100,35 @@ namespace CodeWalker.Project
}
}
public class MultiPositionUndoStep : MultiItemUndoStep
{
public Vector3 StartPosition { get; set; }
public Vector3 EndPosition { get; set; }
public MultiPositionUndoStep(MapSelection multiSel, Vector3 startpos, WorldForm wf)
{
Selection = multiSel;
StartPosition = startpos;
EndPosition = multiSel.WidgetPosition;
UpdateGraphics(wf);
}
private void Update(WorldForm wf, ref MapSelection sel, Vector3 p, Vector3 o)
{
//update selection items positions for new widget position p
Selection.MultipleSelectionCenter = o;
Selection.SetPosition(p, false);
sel.MultipleSelectionCenter = p; //center used for widget pos...
wf.SelectMulti(Selection.MultipleSelectionItems);
wf.SetWidgetPosition(p);
UpdateGraphics(wf);
}
public override void Undo(WorldForm wf, ref MapSelection sel)
{
@@ -147,7 +142,95 @@ namespace CodeWalker.Project
public override string ToString()
{
return (Items?.Length ?? 0).ToString() + " items: Position";
return (Selection.MultipleSelectionItems?.Length ?? 0).ToString() + " items: Position";
}
}
public class MultiRotationUndoStep : MultiItemUndoStep
{
public Quaternion StartRotation { get; set; }
public Quaternion EndRotation { get; set; }
public MultiRotationUndoStep(MapSelection multiSel, Quaternion startrot, WorldForm wf)
{
Selection = multiSel;
StartRotation = startrot;
EndRotation = multiSel.WidgetRotation;
UpdateGraphics(wf);
}
private void Update(WorldForm wf, ref MapSelection sel, Quaternion r, Quaternion o)
{
//update selection items positions+rotations for new widget rotation r
Selection.MultipleSelectionRotation = o;
Selection.SetRotation(r, false);
sel.MultipleSelectionRotation = r; //used for widget rot...
wf.SelectMulti(Selection.MultipleSelectionItems);
wf.SetWidgetRotation(r);
UpdateGraphics(wf);
}
public override void Undo(WorldForm wf, ref MapSelection sel)
{
Update(wf, ref sel, StartRotation, EndRotation);
}
public override void Redo(WorldForm wf, ref MapSelection sel)
{
Update(wf, ref sel, EndRotation, StartRotation);
}
public override string ToString()
{
return (Selection.MultipleSelectionItems?.Length ?? 0).ToString() + " items: Rotation";
}
}
public class MultiScaleUndoStep : MultiItemUndoStep
{
public Vector3 StartScale { get; set; }
public Vector3 EndScale { get; set; }
public MultiScaleUndoStep(MapSelection multiSel, Vector3 startpos, WorldForm wf)
{
Selection = multiSel;
StartScale = startpos;
EndScale = multiSel.WidgetScale;
UpdateGraphics(wf);
}
private void Update(WorldForm wf, ref MapSelection sel, Vector3 s, Vector3 o)
{
//update selection items positions for new widget position p
Selection.MultipleSelectionScale = o;
Selection.SetScale(s, false);
sel.MultipleSelectionScale = s; // used for widget scale...
wf.SelectMulti(Selection.MultipleSelectionItems);
wf.SetWidgetScale(s);
UpdateGraphics(wf);
}
public override void Undo(WorldForm wf, ref MapSelection sel)
{
Update(wf, ref sel, StartScale, EndScale);
}
public override void Redo(WorldForm wf, ref MapSelection sel)
{
Update(wf, ref sel, EndScale, StartScale);
}
public override string ToString()
{
return (Selection.MultipleSelectionItems?.Length ?? 0).ToString() + " items: Scale";
}
}