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

Collisions editing progress

Browse Source
This commit is contained in:
dexy
2020-01-03 22:50:23 +11:00
Unverified
parent d85f5eddb2
commit 0d066679cb
25 changed files with 5792 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CodeWalker.Core/GameFiles/FileTypes/CacheDatFile.cs
+2 -2
View File
@@ -327,8 +327,8 @@ namespace CodeWalker.GameFiles
public BoundsStoreItem(Bounds b)
{
Name = 0;
Min = b.BoundingBoxMin;
Max = b.BoundingBoxMax;
Min = b.BoxMin;
Max = b.BoxMax;
Layer = 0;
}
public BoundsStoreItem(BinaryReader br)
CodeWalker.Core/GameFiles/FileTypes/YbnFile.cs
+14
View File
@@ -11,6 +11,11 @@ namespace CodeWalker.GameFiles
{
public Bounds Bounds { get; set; }
//used by the editor:
public bool HasChanged { get; set; } = false;
public YbnFile() : base(null, GameFileType.Ybn)
{
}
@@ -18,6 +23,14 @@ namespace CodeWalker.GameFiles
{
}
public void Load(byte[] data)
{
//direct load from a raw, compressed ybn file
RpfFile.LoadResourceFile(this, data, 43);
Loaded = true;
}
public void Load(byte[] data, RpfFileEntry entry)
{
@@ -36,6 +49,7 @@ namespace CodeWalker.GameFiles
Bounds = rd.ReadBlock<Bounds>();
Bounds.OwnerYbn = this;
Bounds.OwnerName = entry.Name;
Loaded = true;
CodeWalker.Core/GameFiles/GameFileCache.cs
+28 -24
View File
@@ -3171,9 +3171,9 @@ namespace CodeWalker.GameFiles
}
public void TestYcds()
{
bool savetest = false;
var errorfiles = new List<YcdFile>();
var errorentries = new List<RpfEntry>();
foreach (RpfFile file in AllRpfs)
{
foreach (RpfEntry entry in file.AllEntries)
@@ -3192,17 +3192,13 @@ namespace CodeWalker.GameFiles
{
errorfiles.Add(ycd1);//these ones have file corruption issues and won't load as resource...
}
else
else if (savetest)
{
if (ycd1.ClipDictionary == null)
{ continue; }
//var data1 = ycd1.Save();
var t = true;
if (t)//just here to test loading only
{ continue; }
var xml = YcdXml.GetXml(ycd1);
var ycdX = XmlYcd.GetYcd(xml);
var data = ycdX.Save();
@@ -3444,6 +3440,7 @@ namespace CodeWalker.GameFiles
}
public void TestYtds()
{
bool savetest = false;
var errorfiles = new List<RpfEntry>();
foreach (RpfFile file in AllRpfs)
{
@@ -3464,7 +3461,7 @@ namespace CodeWalker.GameFiles
UpdateStatus("Error! " + ex.ToString());
errorfiles.Add(entry);
}
if ((ytdfile != null) && (ytdfile.TextureDict != null))
if (savetest && (ytdfile != null) && (ytdfile.TextureDict != null))
{
var fentry = entry as RpfFileEntry;
if (fentry == null)
@@ -3519,6 +3516,7 @@ namespace CodeWalker.GameFiles
}
public void TestYbns()
{
bool savetest = false;
var errorfiles = new List<RpfEntry>();
foreach (RpfFile file in AllRpfs)
{
@@ -3539,7 +3537,7 @@ namespace CodeWalker.GameFiles
UpdateStatus("Error! " + ex.ToString());
errorfiles.Add(entry);
}
if ((ybn != null) && (ybn.Bounds != null))
if (savetest && (ybn != null) && (ybn.Bounds != null))
{
var fentry = entry as RpfFileEntry;
if (fentry == null)
@@ -3562,7 +3560,7 @@ namespace CodeWalker.GameFiles
//quick check of roundtrip
switch (ybn2.Bounds.Type)
{
case 0: //return new BoundSphere();
case BoundsType.Sphere:
{
var a = ybn.Bounds as BoundSphere;
var b = ybn2.Bounds as BoundSphere;
@@ -3570,7 +3568,7 @@ namespace CodeWalker.GameFiles
{ continue; }
break;
}
case 1: //return new BoundCapsule();
case BoundsType.Capsule:
{
var a = ybn.Bounds as BoundCapsule;
var b = ybn2.Bounds as BoundCapsule;
@@ -3578,7 +3576,7 @@ namespace CodeWalker.GameFiles
{ continue; }
break;
}
case 3: //return new BoundBox();
case BoundsType.Box:
{
var a = ybn.Bounds as BoundBox;
var b = ybn2.Bounds as BoundBox;
@@ -3586,7 +3584,7 @@ namespace CodeWalker.GameFiles
{ continue; }
break;
}
case 4: //return new BoundGeometry();
case BoundsType.Geometry:
{
var a = ybn.Bounds as BoundGeometry;
var b = ybn2.Bounds as BoundGeometry;
@@ -3603,7 +3601,7 @@ namespace CodeWalker.GameFiles
}
break;
}
case 8: //return new BoundBVH();
case BoundsType.GeometryBVH:
{
var a = ybn.Bounds as BoundBVH;
var b = ybn2.Bounds as BoundBVH;
@@ -3622,7 +3620,7 @@ namespace CodeWalker.GameFiles
}
break;
}
case 10: //return new BoundComposite();
case BoundsType.Composite:
{
var a = ybn.Bounds as BoundComposite;
var b = ybn2.Bounds as BoundComposite;
@@ -3632,7 +3630,7 @@ namespace CodeWalker.GameFiles
{ }
break;
}
case 12: //return new BoundDisc();
case BoundsType.Disc:
{
var a = ybn.Bounds as BoundDisc;
var b = ybn2.Bounds as BoundDisc;
@@ -3640,7 +3638,7 @@ namespace CodeWalker.GameFiles
{ continue; }
break;
}
case 13: //return new BoundCylinder();
case BoundsType.Cylinder:
{
var a = ybn.Bounds as BoundCylinder;
var b = ybn2.Bounds as BoundCylinder;
@@ -3648,7 +3646,14 @@ namespace CodeWalker.GameFiles
{ continue; }
break;
}
case 15: //return null; //TODO: find out what this is!
case BoundsType.Cloth:
{
var a = ybn.Bounds as BoundCloth;
var b = ybn2.Bounds as BoundCloth;
if (b == null)
{ continue; }
break;
}
default: //return null; // throw new Exception("Unknown bound type");
break;
}
@@ -3669,6 +3674,7 @@ namespace CodeWalker.GameFiles
}
public void TestYdrs()
{
bool savetest = false;
var errorfiles = new List<RpfEntry>();
foreach (RpfFile file in AllRpfs)
{
@@ -3689,7 +3695,7 @@ namespace CodeWalker.GameFiles
UpdateStatus("Error! " + ex.ToString());
errorfiles.Add(entry);
}
if ((ydr != null) && (ydr.Drawable != null))
if (savetest && (ydr != null) && (ydr.Drawable != null))
{
var fentry = entry as RpfFileEntry;
if (fentry == null)
@@ -3722,6 +3728,7 @@ namespace CodeWalker.GameFiles
}
public void TestYdds()
{
bool savetest = false;
var errorfiles = new List<RpfEntry>();
foreach (RpfFile file in AllRpfs)
{
@@ -3742,7 +3749,7 @@ namespace CodeWalker.GameFiles
UpdateStatus("Error! " + ex.ToString());
errorfiles.Add(entry);
}
if ((ydd != null) && (ydd.DrawableDict != null))
if (savetest && (ydd != null) && (ydd.DrawableDict != null))
{
var fentry = entry as RpfFileEntry;
if (fentry == null)
@@ -3776,8 +3783,7 @@ namespace CodeWalker.GameFiles
}
public void TestYfts()
{
bool savetest = true;
bool savetest = false;
var errorfiles = new List<RpfEntry>();
foreach (RpfFile file in AllRpfs)
{
@@ -3798,14 +3804,12 @@ namespace CodeWalker.GameFiles
UpdateStatus("Error! " + ex.ToString());
errorfiles.Add(entry);
}
if ((yft != null) && (yft.Fragment != null))
if (savetest && (yft != null) && (yft.Fragment != null))
{
var fentry = entry as RpfFileEntry;
if (fentry == null)
{ continue; } //shouldn't happen
if (!savetest) continue;
var bytes = yft.Save();
CodeWalker.Core/GameFiles/Resources/Bounds.cs
+918 -694
View File
File diff suppressed because it is too large Load Diff
CodeWalker.Core/GameFiles/Resources/ResourceData.cs
+3
View File
@@ -46,6 +46,8 @@ namespace CodeWalker.GameFiles
private Stream systemStream;
private Stream graphicsStream;
public RpfResourceFileEntry FileEntry { get; set; }
// this is a dictionary that contains all the resource blocks
// which were read from this resource reader
private Dictionary<long, List<IResourceBlock>> blockPool;
@@ -84,6 +86,7 @@ namespace CodeWalker.GameFiles
public ResourceDataReader(RpfResourceFileEntry resentry, byte[] data, Endianess endianess = Endianess.LittleEndian)
: base((Stream)null, endianess)
{
FileEntry = resentry;
var systemSize = resentry.SystemSize;
var graphicsSize = resentry.GraphicsSize;