maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1966 from knowledgenude/master

Browse source 
Add Bounce and Elastic to Mix nodes
This commit is contained in:
Lubos Lenco 2020-10-29 09:32:13 +01:00 committed by GitHub
parent 2f762187cf bb1fab992d
commit 1eaf05218f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sources/armory/logicnode/MixNode.hx
View file

@ -34,6 +34,10 @@ class MixNode extends LogicNode {
ease = property1 == "In" ? Tween.easeCircIn : (property1 == "Out" ? Tween.easeCircOut : Tween.easeCircInOut);
case "Back":
ease = property1 == "In" ? Tween.easeBackIn : (property1 == "Out" ? Tween.easeBackOut : Tween.easeBackInOut);
case "Bounce":
ease = property1 == "In" ? Tween.easeBounceIn : (property1 == "Out" ? Tween.easeBounceOut : Tween.easeBounceInOut);
case "Elastic":
ease = property1 == "In" ? Tween.easeElasticIn : (property1 == "Out" ? Tween.easeElasticOut : Tween.easeElasticInOut);
default:
ease = Tween.easeLinear;
}

4
Sources/armory/logicnode/VectorMixNode.hx
View file

@ -37,6 +37,10 @@ class VectorMixNode extends LogicNode {
ease = property1 == "In" ? Tween.easeCircIn : (property1 == "Out" ? Tween.easeCircOut : Tween.easeCircInOut);
case "Back":
ease = property1 == "In" ? Tween.easeBackIn : (property1 == "Out" ? Tween.easeBackOut : Tween.easeBackInOut);
case "Bounce":
ease = property1 == "In" ? Tween.easeBounceIn : (property1 == "Out" ? Tween.easeBounceOut : Tween.easeBounceInOut);
case "Elastic":
ease = property1 == "In" ? Tween.easeElasticIn : (property1 == "Out" ? Tween.easeElasticOut : Tween.easeElasticInOut);
default:
ease = Tween.easeLinear;
}

2
blender/arm/logicnode/math/LN_mix.py
View file

@ -15,6 +15,8 @@ class MixNode(ArmLogicTreeNode):
('Expo', 'Expo', 'Expo'),
('Circ', 'Circ', 'Circ'),
('Back', 'Back', 'Back'),
('Bounce', 'Bounce', 'Bounce'),
('Elastic', 'Elastic', 'Elastic'),
],
name='', default='Linear')
property1: EnumProperty(

2
blender/arm/logicnode/math/LN_mix_vector.py
View file

@ -17,6 +17,8 @@ class VectorMixNode(ArmLogicTreeNode):
('Expo', 'Expo', 'Expo'),
('Circ', 'Circ', 'Circ'),
('Back', 'Back', 'Back'),
('Bounce', 'Bounce', 'Bounce'),
('Elastic', 'Elastic', 'Elastic'),
],
name='', default='Linear')
property1: EnumProperty(