Major bug fixes, animation fixes, framerate improvements

.pio/build/project.checksum

@@ -1 +1 @@
-bb1d8e3902a2d9ef0ecc055b4189181fe86619ec
+33fbac06369f5bf11a69f69fbfd44d9348159aec

.pio/build/teensy40/idedata.json

@@ -0,0 +1 @@
+{"env_name": "teensy40", "libsource_dirs": ["c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\lib", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40", "C:\\Users\\Steven\\.platformio\\lib", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries"], "defines": ["PLATFORMIO=60001", "__IMXRT1062__", "ARDUINO_TEENSY40", "USB_SERIAL", "ARDUINO=10805", "TEENSYDUINO=156", "CORE_TEENSY", "F_CPU=600000000", "LAYOUT_US_ENGLISH"], "includes": {"build": ["c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\include", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\src", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\include", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\src", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\SmartMatrix\\src", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit APDS9960 Library", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit BusIO", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\SerialTransfer\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SPI", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit BNO055", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit BNO055\\utility", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Wire", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Wire\\utility", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\OctoWS2811", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit Unified Sensor", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\cores\\teensy4"], "compatlib": ["c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit APDS9960 Library", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit BNO055", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit BNO055\\utility", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit BusIO", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit Unified Sensor", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\OctoWS2811", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\OctoWS2811", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\SerialTransfer\\src", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\SmartMatrix\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SPI", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Wire", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Wire\\utility", "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\libdeps\\teensy40\\Adafruit [email protected]", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ADC", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\AccelStepper\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Adafruit_NeoPixel", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Adafruit_STMPE610", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Adafruit_VS1053", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Adafruit_nRF8001", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Adafruit_nRF8001\\utility", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\AltSoftSerial", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Artnet", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Audio", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Audio\\utility", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Bounce", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Bounce2\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\CapacitiveSensor", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\CryptoAccel\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\DS1307RTC", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\DmxSimple", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\DogLcd", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\EEPROM", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\EasyTransfer", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\EasyTransferI2C", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Encoder", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Encoder\\utility", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Entropy", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Ethernet\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FNET\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FastCRC", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FastLED\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FlexCAN", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FlexCAN_T4", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FlexIO_t4\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FlexiTimer2", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FreqCount", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FreqMeasure", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FreqMeasureMulti", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\FrequencyTimer2", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ILI9341_t3", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ILI9488_t3\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\IRremote\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Keypad\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\LedControl\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\LedDisplay", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\LiquidCrystal\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\LiquidCrystalFast", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\LittleFS\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\LowPower", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\MFRC522\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\MIDI\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Metro", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\MsTimer2", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\NXPMotionSense", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\NXPMotionSense\\utility", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\NativeEthernet\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\OSC", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\OctoWS2811", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\OneWire", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\PS2Keyboard", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\PS2Keyboard\\utility", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\PWMServo", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Ping", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\PulsePosition", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\QuadEncoder", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\RA8875", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\RadioHead", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ResponsiveAnalogRead\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SD\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SPIFlash", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ST7735_t3", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SdFat\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SerialFlash", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Servo", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ShiftPWM", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Snooze\\src", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SoftPWM", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\SoftwareSerial", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\TFT_ILI9163C", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Talkie", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\TeensyThreads", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Time", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\TimeAlarms", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\TimerOne", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\TimerThree", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\TinyGPS", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\Tlc5940", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\TouchScreen", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\USBHost_t36", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\USBHost_t36\\utility", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\UTFT", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\VirtualWire", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\WS2812Serial", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\XBee", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\XPT2046_Touchscreen", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\i2c_t3", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ks0108", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\ssd1351", "C:\\Users\\Steven\\.platformio\\packages\\framework-arduinoteensy\\libraries\\x10"], "toolchain": ["C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\arm-none-eabi\\include\\c++\\5.4.1", "C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\arm-none-eabi\\include\\c++\\5.4.1\\arm-none-eabi", "C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\lib\\gcc\\arm-none-eabi\\5.4.1\\include", "C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\lib\\gcc\\arm-none-eabi\\5.4.1\\include-fixed", "C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\arm-none-eabi\\include"]}, "cc_path": "C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\bin\\arm-none-eabi-gcc.exe", "cxx_path": "C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\bin\\arm-none-eabi-g++.exe", "gdb_path": "C:\\Users\\Steven\\.platformio\\packages\\toolchain-gccarmnoneeabi\\bin\\arm-none-eabi-gdb.exe", "prog_path": "c:\\Users\\Steven\\Documents\\GitHub\\ProtoTracer\\.pio\\build\\teensy40\\firmware.elf", "svd_path": null, "compiler_type": "gcc", "targets": [{"name": "upload", "group": "Platform", "title": "Upload"}, {"name": "compiledb", "title": "Compilation Database", "description": "Generate compilation database `compile_commands.json`", "group": "Advanced"}, {"name": "clean", "title": "Clean", "group": "General"}, {"name": "cleanall", "title": "Clean All", "group": "General", "description": "Clean a build environment and installed library dependencies"}], "extra": {"flash_images": []}, "cc_flags": "-Wall -ffunction-sections -fdata-sections -mthumb -mcpu=cortex-m7 -nostdlib -fsingle-precision-constant -mfloat-abi=hard -mfpu=fpv5-d16 -O2", "cxx_flags": "-fno-exceptions -felide-constructors -fno-rtti -std=gnu++14 -Wno-error=narrowing -fpermissive -fno-threadsafe-statics -Wall -ffunction-sections -fdata-sections -mthumb -mcpu=cortex-m7 -nostdlib -fsingle-precision-constant -mfloat-abi=hard -mfpu=fpv5-d16 -O2"}

src/Animation/Animation.h

@@ -3,25 +3,20 @@
 #include "Arduino.h"
 #include "..\Render\Scene.h"
 
+template<size_t numObjects>
 class Animation{
 protected:
     long previousTime;
     float fade = 0.0f;
     float animationTime = 0.0f;
 
-    Scene* scene;
-
-    Animation(int numObjects){
-        scene = new Scene(numObjects);
-    }
+    Scene scene = Scene(numObjects);
 
 public:
-    Scene* GetScene(){
-        return scene;
-    }
+    Animation(){}
 
-    ~Animation(){
-        delete scene;
+    Scene* GetScene(){
+        return &scene;
     }
 
     float GetAnimationTime(){

src/Animation/AnimationTracks/AnimationTrack.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include "..\KeyFrameTrack.h"
+
+template<size_t maxParameters, size_t maxKeyFrames>
+class AnimationTrack{
+protected:
+    KeyFrameTrack<maxParameters, maxKeyFrames> track;
+
+private:
+    virtual void AddKeyFrames();
+
+public:
+    AnimationTrack() : track(KeyFrameTrack<maxParameters, maxKeyFrames>(0.0f, 1.0f, KeyFrameInterpolation::Cosine)){}
+
+    AnimationTrack(float min, float max, KeyFrameInterpolation::InterpolationMethod interpMethod) : track(KeyFrameTrack<maxParameters, maxKeyFrames>(min, max, interpMethod)){}
+
+    void Play(){
+        track.Play();
+    }
+
+    void Pause(){
+        track.Pause();
+    }
+
+    void Reset(){
+        track.Reset();
+    }
+
+    void Update(){
+        track.Update();
+    }
+
+    void AddParameter(float* parameter){
+        track.AddParameter(parameter);
+    }
+
+};

src/Animation/AnimationTracks/BlinkTrack.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "AnimationTrack.h"
+
+template<size_t parameters>
+class BlinkTrack : public AnimationTrack<parameters, 10>{
+private:
+    void AddKeyFrames(){
+        this->track.AddKeyFrame(0.0f, 0.0f);
+        this->track.AddKeyFrame(2.75f, 0.0f);
+        this->track.AddKeyFrame(3.0f, 1.0f);
+        this->track.AddKeyFrame(3.25f, 0.0f);
+        this->track.AddKeyFrame(9.75f, 0.0f);
+        this->track.AddKeyFrame(10.0f, 1.0f);
+        this->track.AddKeyFrame(10.25f, 0.0f);
+        this->track.AddKeyFrame(10.75f, 0.0f);
+        this->track.AddKeyFrame(11.0f, 1.0f);
+        this->track.AddKeyFrame(11.25f, 0.0f);
+        this->track.AddKeyFrame(15.0f, 0.0f);
+    }
+
+public:
+    BlinkTrack(){
+        AddKeyFrames();
+    }
+
+};
+

src/Animation/AnimationTracks/MouthTrack.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "AnimationTrack.h"
+
+template<size_t parameters>
+class MouthTrack : public AnimationTrack<parameters, 5>{
+private:
+    void AddKeyFrames(){
+        this->track.AddKeyFrame(0.0f, 0.0f);
+        this->track.AddKeyFrame(1.5f, 1.0f);
+        this->track.AddKeyFrame(4.0f, 0.0f);
+    }
+
+public:
+    MouthTrack(){
+        AddKeyFrames();
+    }
+
+};
+

src/Animation/Commissions/ArtleckAnimation.h

@@ -1,27 +1,27 @@
 #pragma once
 
-#include "Animation.h"
-#include "KeyFrameTrack.h"
-#include "EasyEaseAnimator.h"
-#include "..\Morph\ProtoArtleckMorph.h"
-#include "..\Render\Scene.h"
-#include "..\Materials\GradientMaterial.h"
-#include "..\Materials\SimplexNoise.h"
-#include "..\Math\FunctionGenerator.h"
-#include "..\Sensors\MicrophoneSimple_MAX9814.h"
-#include "..\Sensors\ButtonHandler.h"
-#include "..\Sensors\BoopSensor.h"
-#include "..\Materials\NormalMaterial.h"
-
-#include "..\Materials\CombineMaterial.h"
+#include "..\Animation.h"
+#include "..\KeyFrameTrack.h"
+#include "..\EasyEaseAnimator.h"
+#include "..\..\Morph\ProtoArtleckMorph.h"
+#include "..\..\Render\Scene.h"
+#include "..\..\Materials\GradientMaterial.h"
+#include "..\..\Materials\SimplexNoise.h"
+#include "..\..\Signals\FunctionGenerator.h"
+#include "..\..\Sensors\MicrophoneSimple_MAX9814.h"
+#include "..\..\Sensors\ButtonHandler.h"
+#include "..\..\Sensors\BoopSensor.h"
+#include "..\..\Materials\NormalMaterial.h"
+
+#include "..\..\Materials\CombineMaterial.h"
 
 
 class ProtogenArtleckAnimation : public Animation{
 private:
     float colorMix;
 
     ProtoArtleck pM;
-    EasyEaseAnimator eEA = EasyEaseAnimator(20, EasyEaseAnimator::Overshoot, 1.0f, 0.5f);
+    EasyEaseAnimator<20> eEA = EasyEaseAnimator<20>(EasyEaseInterpolation::Overshoot, 1.0f, 0.5f);
 
     RGBColor noiseSpectrum[4] = {RGBColor(0, 255, 0), RGBColor(255, 0, 0), RGBColor(0, 255, 0), RGBColor(0, 0, 255)};
     GradientMaterial gNoiseMat = GradientMaterial(4, noiseSpectrum, 2.0f, false);
@@ -93,9 +93,9 @@ class ProtogenArtleckAnimation : public Animation{
     }
 
     void ChangeInterpolationMethods(){
-        eEA.SetInterpolationMethod(ProtoArtleck::Sadness, EasyEaseAnimator::Cosine);
-        eEA.SetInterpolationMethod(ProtoArtleck::vrc_v_ou, EasyEaseAnimator::Cosine);
-        eEA.SetInterpolationMethod(99, EasyEaseAnimator::Cosine);
+        eEA.SetInterpolationMethod(ProtoArtleck::Sadness, EasyEaseInterpolation::Cosine);
+        eEA.SetInterpolationMethod(ProtoArtleck::vrc_v_ou, EasyEaseInterpolation::Cosine);
+        eEA.SetInterpolationMethod(99, EasyEaseInterpolation::Cosine);
     }
 
 public:

src/Animation/Commissions/DatBlueHuskyAnimation.h

@@ -7,7 +7,7 @@
 #include "..\..\Render\Scene.h"
 #include "..\..\Materials\GradientMaterial.h"
 #include "..\..\Materials\SimplexNoise.h"
-#include "..\..\Math\FunctionGenerator.h"
+#include "..\..\Signals\FunctionGenerator.h"
 #include "..\..\Sensors\MicrophoneSimple_MAX9814.h"
 #include "..\..\Sensors\ButtonHandler.h"
 #include "..\..\Sensors\BoopSensor.h"
@@ -22,7 +22,7 @@ class WaffleDaProtoAnimation : public Animation{
     float colorMix;
 
     NukudeFace pM;
-    EasyEaseAnimator eEA = EasyEaseAnimator(20, EasyEaseAnimator::Overshoot);
+    EasyEaseAnimator<20> eEA = EasyEaseAnimator<20>(EasyEaseInterpolation::Overshoot);
 
     RGBColor noiseSpectrum[4] = {RGBColor(0, 255, 0), RGBColor(255, 0, 0), RGBColor(0, 255, 0), RGBColor(0, 0, 255)};
     GradientMaterial gNoiseMat = GradientMaterial(4, noiseSpectrum, 2.0f, false);
@@ -106,8 +106,8 @@ class WaffleDaProtoAnimation : public Animation{
     }
 
     void ChangeInterpolationMethods(){
-        eEA.SetInterpolationMethod(NukudeFace::Sadness, EasyEaseAnimator::Cosine);
-        eEA.SetInterpolationMethod(99, EasyEaseAnimator::Cosine);
+        eEA.SetInterpolationMethod(NukudeFace::Sadness, EasyEaseInterpolation::Cosine);
+        eEA.SetInterpolationMethod(99, EasyEaseInterpolation::Cosine);
     }
 
 public: