New MetaNames, Fragments glass windows progress, Renaming some things in Skeleton and Bone

This commit is contained in:
dexy
2019-11-05 20:47:10 +11:00
Unverified
parent 8335fd065c
commit 4cc780a461
12 changed files with 647 additions and 379 deletions
+25 -25
View File
@@ -186,32 +186,32 @@ namespace CodeWalker.Project.Panels
ScenarioChainEdgeActionComboBox.Items.Clear();
ScenarioChainEdgeActionComboBox.Items.Add(Unk_3609807418.Move);
ScenarioChainEdgeActionComboBox.Items.Add(Unk_3609807418.Unk_7865678);
ScenarioChainEdgeActionComboBox.Items.Add(Unk_3609807418.MoveFollowMaster);
ScenarioChainEdgeActionComboBox.Items.Add(CScenarioChainingEdge__eAction.Move);
ScenarioChainEdgeActionComboBox.Items.Add(CScenarioChainingEdge__eAction.Unk_7865678);
ScenarioChainEdgeActionComboBox.Items.Add(CScenarioChainingEdge__eAction.MoveFollowMaster);
ScenarioChainEdgeNavModeComboBox.Items.Clear();
ScenarioChainEdgeNavModeComboBox.Items.Add(Unk_3971773454.Direct);
ScenarioChainEdgeNavModeComboBox.Items.Add(Unk_3971773454.NavMesh);
ScenarioChainEdgeNavModeComboBox.Items.Add(Unk_3971773454.Roads);
ScenarioChainEdgeNavModeComboBox.Items.Add(CScenarioChainingEdge__eNavMode.Direct);
ScenarioChainEdgeNavModeComboBox.Items.Add(CScenarioChainingEdge__eNavMode.NavMesh);
ScenarioChainEdgeNavModeComboBox.Items.Add(CScenarioChainingEdge__eNavMode.Roads);
ScenarioChainEdgeNavSpeedComboBox.Items.Clear();
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_00_3279574318);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_01_2212923970);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_02_4022799658);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_03_1425672334);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_04_957720931);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_05_3795195414);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_06_2834622009);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_07_1876554076);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_08_698543797);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_09_1544199634);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_10_2725613303);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_11_4033265820);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_12_3054809929);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_13_3911005380);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_14_3717649022);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(Unk_941086046.Unk_15_3356026130);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_00_3279574318);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_01_2212923970);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_02_4022799658);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_03_1425672334);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_04_957720931);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_05_3795195414);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_06_2834622009);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_07_1876554076);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_08_698543797);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_09_1544199634);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_10_2725613303);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_11_4033265820);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_12_3054809929);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_13_3911005380);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_14_3717649022);
ScenarioChainEdgeNavSpeedComboBox.Items.Add(CScenarioChainingEdge__eNavSpeed.Unk_15_3356026130);
}
@@ -1896,7 +1896,7 @@ namespace CodeWalker.Project.Panels
{
if (populatingui) return;
if (CurrentScenarioChainEdge == null) return;
Unk_3609807418 v = (Unk_3609807418)ScenarioChainEdgeActionComboBox.SelectedItem;
CScenarioChainingEdge__eAction v = (CScenarioChainingEdge__eAction)ScenarioChainEdgeActionComboBox.SelectedItem;
lock (ProjectForm.ProjectSyncRoot)
{
if (CurrentScenarioChainEdge.Action != v)
@@ -1911,7 +1911,7 @@ namespace CodeWalker.Project.Panels
{
if (populatingui) return;
if (CurrentScenarioChainEdge == null) return;
Unk_3971773454 v = (Unk_3971773454)ScenarioChainEdgeNavModeComboBox.SelectedItem;
CScenarioChainingEdge__eNavMode v = (CScenarioChainingEdge__eNavMode)ScenarioChainEdgeNavModeComboBox.SelectedItem;
lock (ProjectForm.ProjectSyncRoot)
{
if (CurrentScenarioChainEdge.NavMode != v)
@@ -1926,7 +1926,7 @@ namespace CodeWalker.Project.Panels
{
if (populatingui) return;
if (CurrentScenarioChainEdge == null) return;
Unk_941086046 v = (Unk_941086046)ScenarioChainEdgeNavSpeedComboBox.SelectedItem;
CScenarioChainingEdge__eNavSpeed v = (CScenarioChainingEdge__eNavSpeed)ScenarioChainEdgeNavSpeedComboBox.SelectedItem;
lock (ProjectForm.ProjectSyncRoot)
{
if (CurrentScenarioChainEdge.NavSpeed != v)
+1 -1
View File
@@ -154,7 +154,7 @@ namespace CodeWalker.Project.Panels
for (int j = 0; j < skeleton.Bones.Data.Count; j++)
{
var tbone = skeleton.Bones.Data[j];
if (tbone.Id == la.BoneId)
if (tbone.Tag == la.BoneId)
{
boneidx = j;
bone = tbone;
+7 -7
View File
@@ -4263,9 +4263,9 @@ namespace CodeWalker.Project
if (vals[0].StartsWith("X")) continue;
Vector3 pos = Vector3.Zero;
float dir = 0;
var action = Unk_3609807418.Move;
var navMode = Unk_3971773454.Direct;
var navSpeed = Unk_941086046.Unk_00_3279574318;
var action = CScenarioChainingEdge__eAction.Move;
var navMode = CScenarioChainingEdge__eNavMode.Direct;
var navSpeed = CScenarioChainingEdge__eNavSpeed.Unk_00_3279574318;
var stype = new ScenarioTypeRef(defaulttype);
var modelset = defaultmodelset;
var flags = defaultflags;
@@ -4284,15 +4284,15 @@ namespace CodeWalker.Project
byte nsb = 0;
byte.TryParse(vals[4].Trim(), out nsb);
if (nsb > 15) nsb = 15;
navSpeed = (Unk_941086046)nsb;
navSpeed = (CScenarioChainingEdge__eNavSpeed)nsb;
}
if (vals.Length > 5)
{
switch (vals[5].Trim())
{
case "Direct": navMode = Unk_3971773454.Direct; break;
case "NavMesh": navMode = Unk_3971773454.NavMesh; break;
case "Roads": navMode = Unk_3971773454.Roads; break;
case "Direct": navMode = CScenarioChainingEdge__eNavMode.Direct; break;
case "NavMesh": navMode = CScenarioChainingEdge__eNavMode.NavMesh; break;
case "Roads": navMode = CScenarioChainingEdge__eNavMode.Roads; break;
}
}
if (vals.Length > 6)