support character uv animation
This commit is contained in:
@@ -20,7 +20,8 @@ public class UmaContainer : MonoBehaviour
|
||||
public LiveTimelineCharaLocator LiveLocator;
|
||||
|
||||
[Header("Other")]
|
||||
public CharaShaderEffectData ShaderEffectData;
|
||||
public CharaShaderEffectData HeadShaderEffectData;
|
||||
public CharaShaderEffectData BodyShaderEffectData;
|
||||
public List<MaterialHelper> Materials = new List<MaterialHelper>();
|
||||
|
||||
protected UmaViewerBuilder Builder => UmaViewerBuilder.Instance;
|
||||
@@ -38,16 +39,16 @@ public class UmaContainer : MonoBehaviour
|
||||
foreach(var rend in Renderers)
|
||||
{
|
||||
Debug.Log(rend.Key.name);
|
||||
Material[] mat = new Material[rend.Key.materials.Length];
|
||||
Material[] mat = new Material[rend.Key.sharedMaterials.Length];
|
||||
for(int i = 0; i < mat.Length; i++)
|
||||
{
|
||||
//if material slot is not in list, keep current material
|
||||
//if material slot in list and toggle is on - assign original
|
||||
//if material slot in list and toggle is off - assign invisible
|
||||
mat[i] = rend.Value.Contains(i) ? (value? Mat : UmaViewerBuilder.Instance.TransMaterialCharas ): rend.Key.materials[i];
|
||||
mat[i] = rend.Value.Contains(i) ? (value? Mat : UmaViewerBuilder.Instance.TransMaterialCharas ): rend.Key.sharedMaterials[i];
|
||||
}
|
||||
|
||||
rend.Key.materials = mat;
|
||||
rend.Key.sharedMaterials = mat;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,9 +159,9 @@ public class UmaContainerCharacter : UmaContainer
|
||||
//Materials
|
||||
foreach (var rend in gameObject.GetComponentsInChildren<Renderer>())
|
||||
{
|
||||
for (int i = 0; i < rend.materials.Length; i++)
|
||||
for (int i = 0; i < rend.sharedMaterials.Length; i++)
|
||||
{
|
||||
Material mat = rend.materials[i];
|
||||
Material mat = rend.sharedMaterials[i];
|
||||
|
||||
var matHlp = Materials.FirstOrDefault(m => m.Mat == mat);
|
||||
if (matHlp == null)
|
||||
@@ -401,6 +401,18 @@ public class UmaContainerCharacter : UmaContainer
|
||||
}
|
||||
|
||||
TearControllers.ForEach(a => a.UpdateOffset());
|
||||
|
||||
//Apply UV Animation
|
||||
|
||||
if(HeadShaderEffectData != null)
|
||||
{
|
||||
HeadShaderEffectData.updateUV(Time.fixedDeltaTime);
|
||||
}
|
||||
|
||||
if(BodyShaderEffectData != null)
|
||||
{
|
||||
BodyShaderEffectData.updateUV(Time.fixedDeltaTime);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -625,6 +637,16 @@ public class UmaContainerCharacter : UmaContainer
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var assetholder = Body.GetComponent<AssetHolder>();
|
||||
if (assetholder)
|
||||
{
|
||||
BodyShaderEffectData = assetholder._assetTable["chara_shader_effect"] as CharaShaderEffectData;
|
||||
if (BodyShaderEffectData)
|
||||
{
|
||||
BodyShaderEffectData.Initialize();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void LoadHead(UmaDatabaseEntry entry)
|
||||
@@ -773,10 +795,10 @@ public class UmaContainerCharacter : UmaContainer
|
||||
var assetholder = head.GetComponent<AssetHolder>();
|
||||
if (assetholder)
|
||||
{
|
||||
ShaderEffectData = assetholder._assetTable["chara_shader_effect"] as CharaShaderEffectData;
|
||||
if (ShaderEffectData)
|
||||
HeadShaderEffectData = assetholder._assetTable["chara_shader_effect"] as CharaShaderEffectData;
|
||||
if (HeadShaderEffectData)
|
||||
{
|
||||
ShaderEffectData.Initialize();
|
||||
HeadShaderEffectData.Initialize();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1318,8 +1340,10 @@ public class UmaContainerCharacter : UmaContainer
|
||||
var firsehead = Head;
|
||||
var faceDriven = Instantiate(firsehead.GetComponent<AssetHolder>()._assetTable["facial_target"]) as FaceDrivenKeyTarget;
|
||||
|
||||
//Need Instantiate or not?
|
||||
var earDriven = firsehead.GetComponent<AssetHolder>()._assetTable["ear_target"] as DrivenKeyTarget;
|
||||
var faceOverride = firsehead.GetComponent<AssetHolder>()._assetTable["face_override"] as FaceOverrideData;
|
||||
|
||||
faceDriven._earTarget = earDriven._targetFaces;
|
||||
FaceDrivenKeyTarget = faceDriven;
|
||||
FaceDrivenKeyTarget.Container = this;
|
||||
|
||||
@@ -6,6 +6,38 @@ namespace Gallop
|
||||
[Serializable]
|
||||
public class CharaShaderEffectData : ScriptableObject
|
||||
{
|
||||
|
||||
public const int DATA_UTYPE_INDEX = 0;
|
||||
public const int DATA_SCROLL_X = 1;
|
||||
public const int DATA_VTYPE_INDEX = 2;
|
||||
public const int DATA_SCROLL_Y = 3;
|
||||
public const int DATA_POWERTYPE_INDEX = 4;
|
||||
public const int DATA_POWER_INDEX = 5;
|
||||
public const int DATA_SCROLL_X_CURVE_INDEX = 6;
|
||||
public const int DATA_SCROLL_Y_CURVE_INDEX = 7;
|
||||
public const int DATA_SCROLL_POWER_CURVE_INDEX = 8;
|
||||
protected const int DATA_SET_TUEXTURE = 9;
|
||||
protected const int DATA_SET_SHADER = 10;
|
||||
protected const int DATA_SET_DIRT = 11;
|
||||
private const int DATA_NUM = 12;
|
||||
private const float INT_TO_FLOAT = 0.001f;
|
||||
|
||||
private int uTypeIndex;
|
||||
private int scrollX;
|
||||
private int vTypeIndex;
|
||||
private int scrollY;
|
||||
private int powerTypeIndex;
|
||||
private int powerIndex;
|
||||
private int xCurveIndex;
|
||||
private int yCurveIndex;
|
||||
private int powerCurveIndex;
|
||||
private int setTuexture;
|
||||
private int setShader;
|
||||
private int setDirt;
|
||||
|
||||
private float magicClock = 0;
|
||||
|
||||
|
||||
[SerializeField]
|
||||
private SettingData[] _settingDataArray;
|
||||
|
||||
@@ -34,11 +66,78 @@ namespace Gallop
|
||||
if (settingData.Type == EffectType.UVScrollEmissive)
|
||||
{
|
||||
var p = settingData.ParamArray;
|
||||
|
||||
/*
|
||||
uTypeIndex = p[0];
|
||||
scrollX = p[1];
|
||||
vTypeIndex = p[2];
|
||||
scrollY = p[3];
|
||||
powerTypeIndex = p[4];
|
||||
powerIndex = p[5];
|
||||
xCurveIndex = p[6];
|
||||
yCurveIndex = p[7];
|
||||
powerCurveIndex = p[8];
|
||||
setTuexture = p[9];
|
||||
setShader = p[10];
|
||||
setDirt = p[11];
|
||||
*/
|
||||
|
||||
mat.SetVector("_UVEmissiveRange", new Vector4(p[0], p[1], p[2],p[3]));
|
||||
//mat.SetVector("_UVEmissiveScroll", new Vector4(p[4], p[5], p[6], p[7]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public void updateUV(float deltaTime)
|
||||
{
|
||||
magicClock += deltaTime;
|
||||
|
||||
|
||||
foreach (var settingData in _settingDataArray)
|
||||
{
|
||||
if (settingData.TargetMaterial)
|
||||
{
|
||||
var mat = settingData.TargetMaterial;
|
||||
if (settingData.Type == EffectType.UVScrollEmissive)
|
||||
{
|
||||
var p = settingData.ParamArray;
|
||||
var a = settingData.ParamCurveArray;
|
||||
|
||||
float _xScroll = calcUV(p[0], p[1], p[6], a);
|
||||
float _yScroll = calcUV(p[2], p[3], p[7], a);
|
||||
float _powerScroll = calcUV(p[4], p[5], p[8], a);
|
||||
|
||||
Debug.Log(_powerScroll);
|
||||
|
||||
mat.SetVector("_UVEmissiveScroll", new Vector4(_xScroll, _yScroll, 0, 0));
|
||||
mat.SetFloat("_UVEmissivePower", _powerScroll);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public float calcUV(int index, int value, int curveIndex, AnimationCurve[] ParamCurveArray)
|
||||
{
|
||||
switch(index)
|
||||
{
|
||||
case 0:
|
||||
return value * 0.001f;
|
||||
case 1:
|
||||
return value * magicClock * 0.001f;
|
||||
case 2:
|
||||
float result = (value * magicClock * 0.001f) % 2.0f;
|
||||
Debug.Log(result);
|
||||
return result;
|
||||
case 5:
|
||||
float ratio = value * magicClock * 0.001f;
|
||||
return ParamCurveArray[curveIndex].Evaluate(ratio - Mathf.Floor(ratio));
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user