max/VertexAnimation
1
0
Fork 0
mirror of https://github.com/maxartz15/VertexAnimation.git synced 2024-11-09 14:22:54 +01:00
Code Issues Projects Releases Wiki Activity

Added bounds.

Browse Source
This commit is contained in:
max 2021-02-17 21:20:53 +01:00
parent 3c14c98cf9
commit 2ea76b947e
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Editor/Scripts/Editor/LitGUI.cs
View File

@ -1,4 +1,3 @@
using System.Linq;
using UnityEditor; using UnityEditor;
using UnityEngine; using UnityEngine;

1
Editor/Scripts/ModelBaker/VA_ModelBaker.cs
View File

@ -113,6 +113,7 @@ namespace TAO.VertexAnimation.Editor
foreach (var m in meshes) foreach (var m in meshes)
{ {
m.bounds = bakedData.mesh.bounds;
m.Finalize(); m.Finalize();
AssetDatabase.AddObjectToAsset(m, this); AssetDatabase.AddObjectToAsset(m, this);
} }

26
Runtime/Scripts/ModelBaker/AnimationBaker.cs
View File

@ -79,6 +79,9 @@ namespace TAO.VertexAnimation
// Get the info for the biggest animation. // Get the info for the biggest animation.
AnimationInfo animationInfo = new AnimationInfo(mesh, applyRootMotion, maxFrames, textureWidth, fps); AnimationInfo animationInfo = new AnimationInfo(mesh, applyRootMotion, maxFrames, textureWidth, fps);
// Bounds
Bounds bounds = new Bounds();
foreach (AnimationClip ac in animationClips) foreach (AnimationClip ac in animationClips)
{ {
// Set the frames for this animation. // Set the frames for this animation.
@ -88,8 +91,13 @@ namespace TAO.VertexAnimation
bakedData.mesh = bd.mesh; bakedData.mesh = bd.mesh;
bakedData.positionMaps.AddRange(bd.positionMaps); bakedData.positionMaps.AddRange(bd.positionMaps);
bakedData.maxFrames = maxFrames; bakedData.maxFrames = maxFrames;
bounds.min = Vector3.Min(bounds.min, mesh.bounds.min);
bounds.max = Vector3.Max(bounds.max, mesh.bounds.max);
} }
bakedData.mesh.bounds = bounds;
return bakedData; return bakedData;
} }
@ -116,18 +124,27 @@ namespace TAO.VertexAnimation
BakedData bakedData = new BakedData() BakedData bakedData = new BakedData()
{ {
mesh = mesh, mesh = mesh,
positionMaps = new List<Texture2D>() { BakePositionMap(model, animationClip, animationInfo) }, positionMaps = new List<Texture2D>() { BakePositionMap(model, animationClip, animationInfo, out Bounds bounds) },
maxFrames = animationInfo.maxFrames maxFrames = animationInfo.maxFrames,
}; };
mesh.bounds = bounds;
return bakedData; return bakedData;
} }
public static Texture2D BakePositionMap(this GameObject model, AnimationClip animationClip, AnimationInfo animationInfo) // TODO: Add nicer way to return data/bounds.
public static Texture2D BakePositionMap(this GameObject model, AnimationClip animationClip, AnimationInfo animationInfo, out Bounds bounds)
{ {
// Create positionMap Texture without MipMaps which is Linear and HDR to store values in a bigger range. // Create positionMap Texture without MipMaps which is Linear and HDR to store values in a bigger range.
Texture2D positionMap = new Texture2D(animationInfo.textureWidth, animationInfo.textureHeight, TextureFormat.RGBAHalf, false, true); Texture2D positionMap = new Texture2D(animationInfo.textureWidth, animationInfo.textureHeight, TextureFormat.RGBAHalf, false, true);
// Keep track of min/max bounds.
bounds = new Bounds
{
min = new Vector3(float.MaxValue, float.MaxValue, float.MaxValue),
max = new Vector3(float.MinValue, float.MinValue, float.MinValue)
};
// Create instance to sample from. // Create instance to sample from.
GameObject inst = GameObject.Instantiate(model); GameObject inst = GameObject.Instantiate(model);
SkinnedMeshRenderer skinnedMeshRenderer = inst.GetComponent<SkinnedMeshRenderer>(); SkinnedMeshRenderer skinnedMeshRenderer = inst.GetComponent<SkinnedMeshRenderer>();
@ -139,7 +156,10 @@ namespace TAO.VertexAnimation
Mesh sampledMesh = new Mesh(); Mesh sampledMesh = new Mesh();
skinnedMeshRenderer.BakeMesh(sampledMesh); skinnedMeshRenderer.BakeMesh(sampledMesh);
sampledMesh.RecalculateBounds(); sampledMesh.RecalculateBounds();
bounds.min = Vector3.Min(bounds.min, sampledMesh.bounds.min + bounds.center);
bounds.max = Vector3.Min(bounds.max, sampledMesh.bounds.max + bounds.center);
List<Vector3> verts = new List<Vector3>(); List<Vector3> verts = new List<Vector3>();
sampledMesh.GetVertices(verts); sampledMesh.GetVertices(verts);