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

Peds and weapons rendering support for multiple skeleton instances

Browse Source
This commit is contained in:
dexy
2019-11-27 15:01:43 +11:00
Unverified
parent 0823702527
commit 783248aeab
5 changed files with 109 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rendering/Renderer.cs
+6 -23
View File
@@ -2504,7 +2504,7 @@ namespace CodeWalker.Rendering
return res;
}
public bool RenderDrawable(DrawableBase drawable, Archetype arche, YmapEntityDef entity, uint txdHash = 0, TextureDictionary txdExtra = null, Texture diffOverride = null, ClipMapEntry animClip = null, Ped ped = null)
public bool RenderDrawable(DrawableBase drawable, Archetype arche, YmapEntityDef entity, uint txdHash = 0, TextureDictionary txdExtra = null, Texture diffOverride = null, ClipMapEntry animClip = null)
{
//enqueue a single drawable for rendering.
@@ -2529,10 +2529,10 @@ namespace CodeWalker.Rendering
rndbl.ResetBoneTransforms();
}
return RenderRenderable(rndbl, arche, entity, ped);
return RenderRenderable(rndbl, arche, entity);
}
private bool RenderRenderable(Renderable rndbl, Archetype arche, YmapEntityDef entity, Ped ped = null)
private bool RenderRenderable(Renderable rndbl, Archetype arche, YmapEntityDef entity)
{
//enqueue a single renderable for rendering.
@@ -2572,15 +2572,6 @@ namespace CodeWalker.Rendering
camrel += position;
distance = entity.Distance;
}
else if (ped != null)
{
position = ped.Position;
orientation = ped.Rotation;
bbmin += position;
bbmax += position;
camrel += position;
distance = (camrel + bscen).Length();
}
else
{
distance = (camrel + bscen).Length();
@@ -2751,18 +2742,10 @@ namespace CodeWalker.Rendering
public void RenderWeapon(Weapon weapon, ClipMapEntry animClip = null)
{
YdrFile ydr = gameFileCache.GetYdr(weapon.ModelHash);
if (ydr == null)
if (weapon?.Drawable != null)
{
ydr = gameFileCache.GetYdr(weapon.NameHash);//fallback to low def version?
}
if ((ydr != null) && (ydr.Loaded) && (ydr.Drawable != null))
{
var d = ydr.Drawable;
var d = weapon.Drawable;
var txdhash = weapon.NameHash;
RenderDrawable(d, null, weapon.RenderEntity, txdhash, null, null, animClip);
}
}
@@ -2849,7 +2832,7 @@ namespace CodeWalker.Rendering
if (drawFlag)
{
RenderDrawable(drawable, null, null, 0, td, texture, ac, ped);
RenderDrawable(drawable, null, ped.RenderEntity, 0, td, texture, ac);
}