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

Fix updating entity position/rotation from project window

Browse Source
This commit is contained in:
dexy
2024-08-05 16:04:56 +10:00
Unverified
parent 3d22e9b2a4
commit 2ced29ab82
4 changed files with 106 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CodeWalker/Project/Panels/EditYmapEntityPanel.cs
+9 -29
View File
@@ -381,26 +381,17 @@ namespace CodeWalker.Project.Panels
Vector3 v = FloatUtil.ParseVector3String(EntityPositionTextBox.Text);
lock (ProjectForm.ProjectSyncRoot)
{
if (CurrentEntity.MloParent != null)
if (CurrentEntity._CEntityDef.position != v)
{
v = CurrentEntity.MloParent.Position + CurrentEntity.MloParent.Orientation.Multiply(v);
CurrentEntity.SetPosition(v);
CurrentEntity.SetPositionRaw(v);
ProjectItemChanged();
}
else
{
if (CurrentEntity.Position != v)
var wf = ProjectForm.WorldForm;
if (wf != null)
{
CurrentEntity.SetPosition(v);
ProjectItemChanged();
var wf = ProjectForm.WorldForm;
if (wf != null)
wf.BeginInvoke(new Action(() =>
{
wf.BeginInvoke(new Action(() =>
{
wf.SetWidgetPosition(CurrentEntity.WidgetPosition, true);
}));
}
wf.SetWidgetPosition(CurrentEntity.WidgetPosition, true);
}));
}
}
}
@@ -416,20 +407,9 @@ namespace CodeWalker.Project.Panels
{
if (CurrentEntity._CEntityDef.rotation != v)
{
var wf = ProjectForm.WorldForm;
if (CurrentEntity.MloParent != null)
{
var world = Quaternion.Normalize(Quaternion.Multiply(q, CurrentEntity.MloParent.Orientation));
CurrentEntity.SetOrientation(world);
}
else
{
bool useInverse = (CurrentEntity.MloInstance == null);
CurrentEntity.SetOrientation(q, useInverse);
}
CurrentEntity.SetOrientationRaw(q);
ProjectItemChanged();
var wf = ProjectForm.WorldForm;
wf?.BeginInvoke(new Action(() =>
{
wf.SetWidgetRotation(CurrentEntity.WidgetOrientation, true);
CodeWalker/Project/ProjectForm.cs
+1 -1
View File
@@ -3588,7 +3588,7 @@ namespace CodeWalker.Project
var createindex = mloArch.entities.Length;
var ment = new MCEntityDef(ref cent, mloArch);
var outEnt = mloInstance.CreateYmapEntity(mloInstance.Owner, ment, createindex);
var outEnt = new YmapEntityDef(mloInstance.Owner, ment, createindex);
try
{