changed because of naming conflict

Fork of LinearBlend by Bradley Perry

Committer:
perr1940
Date:
Wed May 13 19:21:33 2015 +0000
Revision:
4:a25456624155
Parent:
3:3503662f78fb
initial publish

Who changed what in which revision?

UserRevisionLine numberNew contents of line
perr1940 2:8e81d72bf792 1 #include "LinearBlend.h"
perr1940 2:8e81d72bf792 2 #include "mbed.h"
perr1940 2:8e81d72bf792 3
perr1940 2:8e81d72bf792 4 /***********************************************************
perr1940 2:8e81d72bf792 5 Constructor
perr1940 2:8e81d72bf792 6 ***********************************************************/
perr1940 4:a25456624155 7 LinearBlend1::LinearBlend1():start(0),slope(0)
perr1940 2:8e81d72bf792 8 {
perr1940 2:8e81d72bf792 9 }
perr1940 2:8e81d72bf792 10
perr1940 2:8e81d72bf792 11 /***********************************************************
perr1940 2:8e81d72bf792 12 Initialize Blend Function
perr1940 2:8e81d72bf792 13 ***********************************************************/
perr1940 2:8e81d72bf792 14 //Function that sets the blend global variables to ready for blending calculations.
perr1940 2:8e81d72bf792 15 /*void LinearBlend::init(float end, float s, int t_blend)
perr1940 2:8e81d72bf792 16 {
perr1940 2:8e81d72bf792 17 slope=(end-s)/t_blend;
perr1940 2:8e81d72bf792 18 start=s;
perr1940 2:8e81d72bf792 19 }
perr1940 2:8e81d72bf792 20
perr1940 2:8e81d72bf792 21 /***********************************************************
perr1940 2:8e81d72bf792 22 Calculate Blend Function
perr1940 2:8e81d72bf792 23 ***********************************************************/
perr1940 2:8e81d72bf792 24 //Function that calculates the blending trajectory, point by point.
perr1940 3:3503662f78fb 25
perr1940 2:8e81d72bf792 26 /*float* LinearBlend::blend(float ref[])
perr1940 2:8e81d72bf792 27 {
perr1940 2:8e81d72bf792 28 //Pointer to the variable to store the trajectory point for the left side
perr1940 2:8e81d72bf792 29 for(int i=0; i<=t_blend; i++) {
perr1940 2:8e81d72bf792 30 ref[i]=slope*i+start;
perr1940 3:3503662f78fb 31
perr1940 2:8e81d72bf792 32 }
perr1940 2:8e81d72bf792 33
perr1940 2:8e81d72bf792 34 return ref;
perr1940 2:8e81d72bf792 35 }*/
perr1940 2:8e81d72bf792 36
perr1940 4:a25456624155 37 float* LinearBlend1::blend(float end, float s, int t_blend, float ref[])
perr1940 2:8e81d72bf792 38 {
perr1940 2:8e81d72bf792 39 slope=(end-s)/t_blend;
perr1940 2:8e81d72bf792 40 //Pointer to the variable to store the trajectory point for the left side
perr1940 2:8e81d72bf792 41 for(int i=0; i<t_blend; i++) {
perr1940 2:8e81d72bf792 42 ref[i]=slope*i+s;
perr1940 2:8e81d72bf792 43 }
perr1940 2:8e81d72bf792 44
perr1940 2:8e81d72bf792 45 return ref;
perr1940 3:3503662f78fb 46 }