AdditiveBlend now working, needs cleanup

This commit is contained in:
viktorljung
2016-02-17 14:55:02 +01:00
parent e7118ce8e5
commit db8bc612bd
3 changed files with 79 additions and 115 deletions
+10 -54
View File
@@ -29,10 +29,10 @@
<Entity name="Running">
<Components>
<c:Animation>
<AnimationName1>AimRifle</AnimationName1>
<Time1>0.94417153407339605</Time1>
<AnimationName1>Idle</AnimationName1>
<Time1>1.1429797894322036</Time1>
<Speed1>1</Speed1>
<Speed2>1</Speed2>
<AnimationName2></AnimationName2>
<Time2>0.032904333143131348</Time2>
<Time3>0.093923612201312068</Time3>
<Speed3>1</Speed3>
@@ -44,24 +44,7 @@
<Position X="-1" Y="0" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity name="R_Arm_Weapon_Joint">
<Components>
<c:BoneAttachment>
<BoneName>R_Arm_Weapon_Joint</BoneName>
<ScaleOffset X="0.200000003" Y="0.200000003" Z="0.200000003"/>
</c:BoneAttachment>
<c:Model>
<Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0.110472031" Y="1.3360424" Z="-0.158128098"/>
<Orientation X="0.894863248" Y="0.282616436" Z="-0.203133404"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
<Children/>
</Entity>
<Entity>
<Components>
@@ -103,43 +86,32 @@
<Components>
<c:Animation>
<AnimationName1>Idle</AnimationName1>
<Time1>0.17120540274882234</Time1>
<Time1>1.1429797894322036</Time1>
<Speed1>1</Speed1>
<Speed2>0.10000000149011612</Speed2>
<AnimationName2>StrafeRigh</AnimationName2>
<Weight2>0.5</Weight2>
<Time2>0.518960175468406</Time2>
<Time2>0.67154243305829331</Time2>
<Weight3>0.5</Weight3>
<Time3>0.32167823998061529</Time3>
<Speed3>1</Speed3>
</c:Animation>
<c:AnimationOffset>
<AnimationName>AimRifle</AnimationName>
<Time>0.15999999642372131</Time>
</c:AnimationOffset>
<c:Model>
<Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
</c:Model>
<c:Transform/>
</Components>
<Children>
<Entity>
<Components>
<c:BoneAttachment>
<BoneName>R_Arm_Weapon_Joint</BoneName>
</c:BoneAttachment>
<c:Model>
<Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
</c:Model>
<c:Transform/>
</Components>
<Children/>
</Entity>
</Children>
<Children/>
</Entity>
<Entity>
<Components>
<c:Animation>
<AnimationName1>AimRifle</AnimationName1>
<Time1>0.5</Time1>
</c:Animation>
<c:Model>
<Resource>Models/Characters/Assault/AssaultAnimations.mesh</Resource>
@@ -148,23 +120,7 @@
<Position X="1" Y="0" Z="0"/>
</c:Transform>
</Components>
<Children>
<Entity>
<Components>
<c:BoneAttachment>
<BoneName>R_Arm_Weapon_Joint</BoneName>
</c:BoneAttachment>
<c:Model>
<Resource>Models/Weapons/Red/AssaultWeaponRed.mesh</Resource>
</c:Model>
<c:Transform>
<Position X="0.109895043" Y="0.999449849" Z="-0.10118784"/>
<Orientation X="-1.15886247" Y="0.230158985" Z="0.138214692"/>
</c:Transform>
</Components>
<Children/>
</Entity>
</Children>
<Children/>
</Entity>
</Children>
</Entity>