Merge pull request #443 from guzzard/follow-camera-lerp-bool
FollowCamera - add ability to turn lerp on/off
This commit is contained in:
commit
f6a50fe633
|
@ -15,6 +15,9 @@ class FollowCamera extends iron.Trait {
|
|||
@prop
|
||||
var target:String;
|
||||
|
||||
@prop
|
||||
var lerp:Bool = true;
|
||||
|
||||
@prop
|
||||
var lerpSpeed:Float = 0.1;
|
||||
|
||||
|
@ -40,8 +43,12 @@ class FollowCamera extends iron.Trait {
|
|||
notifyOnUpdate(function() {
|
||||
if(!disabled){
|
||||
if(targetObj != null) {
|
||||
var vec = Vec4.lerp(targetObj.transform.world.getLoc(), object.transform.world.getLoc(), lerpSpeed);
|
||||
object.transform.loc = vec;
|
||||
if(lerp){
|
||||
var vec = Vec4.lerp(targetObj.transform.world.getLoc(), object.transform.world.getLoc(), lerpSpeed);
|
||||
object.transform.loc = vec;
|
||||
} else {
|
||||
object.transform.loc = targetObj.transform.world.getLoc();
|
||||
}
|
||||
object.transform.buildMatrix();
|
||||
} else {
|
||||
targetObj = Scene.active.getChild(target);
|
||||
|
|
Loading…
Reference in a new issue