ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-07-07 18:31:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from neos7/master

Browse Source 
Minus grass related stuffs
This commit is contained in:
dexyfex 2018-02-25 17:13:44 +11:00 committed by GitHub
commit 26533807fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 80 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
CodeWalker.Core/GameFiles/FileTypes/YmapFile.cs
View File

@ -29,6 +29,7 @@ namespace CodeWalker.GameFiles
public Unk_975711773[] CBoxOccluders { get; set; }
public Unk_2741784237[] COccludeModels { get; set; }
public rage__fwGrassInstanceListDef[] GrassInstanceList { get; set; }
public string[] Strings { get; set; }
@ -571,6 +572,26 @@ namespace CodeWalker.GameFiles
}
}
public void BuildInstances()
{
if (GrassInstanceBatches == null)
{
GrassInstanceList = null;
return;
}
if (PropInstanceBatches == null)
{ }
int count = GrassInstanceBatches.Length;
GrassInstanceList = new rage__fwGrassInstanceListDef[count];
for (int i = 0; i < count; i++)
{
GrassInstanceList[i] = GrassInstanceBatches[i].Batch;
}
}
public byte[] Save()
{
//direct save to a raw, compressed ymap file (openIV-compatible format)
@ -909,6 +930,46 @@ namespace CodeWalker.GameFiles
}
public void AddGrassBatch(YmapGrassInstanceBatch newbatch)
{
List<YmapGrassInstanceBatch> batches = new List<YmapGrassInstanceBatch>();
if (GrassInstanceBatches != null) batches.AddRange(GrassInstanceBatches);
newbatch.Ymap = this;
batches.Add(newbatch);
GrassInstanceBatches = batches.ToArray();
HasChanged = true;
}
public bool RemoveGrassBatch(YmapGrassInstanceBatch batch)
{
if (batch == null) return false;
List<YmapGrassInstanceBatch> batches = new List<YmapGrassInstanceBatch>();
if (GrassInstanceBatches != null)
{
for (int i = 0; i < GrassInstanceBatches.Length; i++)
{
var gb = GrassInstanceBatches[i];
if (gb != batch)
{
batches.Add(gb);
}
}
if (batches.Count == GrassInstanceBatches.Length)
{
return false; //nothing removed... wasn't present?
}
}
GrassInstanceBatches = batches.ToArray();
HasChanged = true;
return true;
}
@ -1049,14 +1110,14 @@ namespace CodeWalker.GameFiles
if (GrassInstanceBatches != null)
{
var lodoffset = Vector3.Zero;// new Vector3(0, 0, 100); //IDK WHY -neos7 //dexy: i guess it's not completely necessary...
//var lodoffset = Vector3.Zero;// new Vector3(0, 0, 100); //IDK WHY -neos7 //dexy: i guess it's not completely necessary... //blame neos
foreach (var batch in GrassInstanceBatches) //thanks to Neos7
{
emin = Vector3.Min(emin, batch.AABBMin);
emax = Vector3.Max(emax, batch.AABBMax);
smin = Vector3.Min(smin, (batch.AABBMin - batch.Batch.lodDist) + lodoffset);
smax = Vector3.Min(smax, (batch.AABBMax + batch.Batch.lodDist) - lodoffset);
smin = Vector3.Min(smin, (batch.AABBMin - batch.Batch.lodDist)); // + lodoffset
smax = Vector3.Max(smax, (batch.AABBMax + batch.Batch.lodDist)); // - lodoffset
}
}

5
CodeWalker.Core/GameFiles/Resources/Drawable.cs
View File

@ -2032,11 +2032,12 @@ namespace CodeWalker.GameFiles
public byte ColorR { get; set; }
public byte ColorG { get; set; }
public byte ColorB { get; set; }
public byte Unknown_1Bh { get; set; }
public byte Flashiness { get; set; }
public float Intensity { get; set; }
public uint Flags { get; set; }
public ushort BoneId { get; set; }
public ushort Type { get; set; }
public byte Type { get; set; }
public byte GroupId { get; set; }
public uint TimeFlags { get; set; }
public float Falloff { get; set; }
public float FalloffExponent { get; set; }

13
ProjectForm.cs
View File

@ -1300,6 +1300,19 @@ namespace CodeWalker
ccgnode.Tag = cargen;
}
}
if ((ymap.GrassInstanceBatches != null) && (ymap.GrassInstanceBatches.Length > 0))
{
var grassbatchesnodes = node.Nodes.Add("Grass Batches (" + ymap.GrassInstanceBatches.Length.ToString() + ")");
grassbatchesnodes.Name = "GrassBatches";
grassbatchesnodes.Tag = ymap;
var grassbatches = ymap.GrassInstanceBatches;
for (int i = 0; i < grassbatches.Length; i++)
{
var batch = grassbatches[i];
var gbnode = grassbatchesnodes.Nodes.Add(batch.ToString());
gbnode.Tag = batch;
}
}
}