Skip to content

Psk export fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gabbyh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Psk export fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6522db9
Fix export psk : add a check on VertexBuffer null
gabbyh Jun 4, 2017
ece9505
Fix psk export : search for higher lods chunks in globalchunks
gabbyh Jun 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions DAILibWV/DBAccess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,23 @@ public static ChunkInformation[] GetChunkInformationBySHA1(string sha1)
return res.ToArray();
}

public static ChunkInformation GetGlobalChunkInformationById(byte[] id)
{
ChunkInformation res = new ChunkInformation();
res.id = id;
res.bundleIndex = -1;
SQLiteConnection con = GetConnection();
con.Open();
SQLiteDataReader reader = getAllWhere("globalchunks", "id = '" + Helpers.ByteArrayToHexString(id) + "'", con);
if (reader.Read())
{
res.id = Helpers.HexStringToByteArray((string)reader["id"]);
res.sha1 = Helpers.HexStringToByteArray((string)reader["sha1"]);
}
con.Close();
return res;
}

#endregion

#region initial scan stuff
Expand Down
14 changes: 12 additions & 2 deletions DAIToolsWV/ContentTools/MeshTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ private void RefreshPreview()
byte[] data = new byte[0];
if (toci.incas)
{
DBAccess.ChunkInformation ci = DBAccess.GetChunkInformationById(id);
DBAccess.ChunkInformation ci = GetChunkById(id);
if (ci.sha1 == null)
continue;
data = SHA1Access.GetDataBySha1(ci.sha1);
Expand All @@ -188,7 +188,7 @@ private void RefreshPreview()
data = c._data;
if (data.Length == 0)
{
DBAccess.ChunkInformation ci = DBAccess.GetChunkInformationById(id);
DBAccess.ChunkInformation ci = GetChunkById(id);
if (ci.sha1 == null)
continue;
data = SHA1Access.GetDataBySha1(ci.sha1);
Expand All @@ -213,6 +213,16 @@ private void RefreshPreview()
}
}

private DBAccess.ChunkInformation GetChunkById(byte[] cid)
{
DBAccess.ChunkInformation ci = DBAccess.GetChunkInformationById(cid);
if (ci.sha1 == null)
{
ci = DBAccess.GetGlobalChunkInformationById(cid);
}
return ci;
}

private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
{
RefreshPreview();
Expand Down
2 changes: 1 addition & 1 deletion DAIToolsWV/PSKFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public PSKFile(DAILibWV.Frostbite.Mesh m)
foreach (DAILibWV.Frostbite.Mesh.MeshLOD lod in m.header.LODs)
if(l == null)
foreach(DAILibWV.Frostbite.Mesh.MeshSection sec in lod.Sections)
if (sec.VertexBuffer.Count != 0)
if (sec.VertexBuffer != null && sec.VertexBuffer.Count != 0)
{
l = lod;
break;
Expand Down