Bradley Perry
changed because of naming conflict
Fork of
LinearBlend
by 
Bradley Perry
Diff: LinearBlend.cpp
- Revision:
- 4:a25456624155
- Parent:
- 3:3503662f78fb
--- a/LinearBlend.cpp Mon Nov 24 03:33:14 2014 +0000
+++ b/LinearBlend.cpp Wed May 13 19:21:33 2015 +0000
@@ -4,7 +4,7 @@
/***********************************************************
Constructor
***********************************************************/
-LinearBlend::LinearBlend():start(0),slope(0)
+LinearBlend1::LinearBlend1():start(0),slope(0)
{
}
@@ -34,7 +34,7 @@
return ref;
}*/
-float* LinearBlend::blend(float end, float s, int t_blend, float ref[])
+float* LinearBlend1::blend(float end, float s, int t_blend, float ref[])
{
slope=(end-s)/t_blend;
//Pointer to the variable to store the trajectory point for the left side