From 8f9e671340bebb3c474988190cc14d3126b3469c Mon Sep 17 00:00:00 2001 From: Cyberarm Date: Tue, 1 Oct 2019 11:48:22 -0500 Subject: [PATCH] Added Vector#lerp --- lib/cyberarm_engine.rb | 2 +- lib/cyberarm_engine/lib/vector.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/cyberarm_engine.rb b/lib/cyberarm_engine.rb index b12f1fd..190d94f 100644 --- a/lib/cyberarm_engine.rb +++ b/lib/cyberarm_engine.rb @@ -1,5 +1,5 @@ begin - require "../ffi-gosu/lib/gosu" + require File.expand_path("../../ffi-gosu/lib/gosu", File.dirname(__FILE__)) rescue LoadError => e pp e require "gosu" diff --git a/lib/cyberarm_engine/lib/vector.rb b/lib/cyberarm_engine/lib/vector.rb index e7bbb44..c9930e7 100644 --- a/lib/cyberarm_engine/lib/vector.rb +++ b/lib/cyberarm_engine/lib/vector.rb @@ -162,6 +162,10 @@ module CyberarmEngine @x + @y + @z end + def lerp(other, factor) + (self - other) * factor.clamp(0.0, 1.0) + end + # 2D distance using X and Y def distance(other) Math.sqrt((@x-other.x)**2 + (@y-other.y)**2)