diff --git a/lib/Animator/AnimationTypes.h b/lib/Animator/AnimationTypes.h new file mode 100644 index 0000000..482ceeb --- /dev/null +++ b/lib/Animator/AnimationTypes.h @@ -0,0 +1,33 @@ +#pragma once +#include "Vector3D.h" +#include +#include + +namespace ANIMATION_TYPES{ + // for cube spots which aren't defined in a key frame, + // you can have the controller automatically interpolate a color + enum FillInterpolation{ + NO_FILL, // if not specified, the cube color will be black + CLOSEST_COLOR, // The cube color will be the same color as the cube closest to it + LINEAR_WEIGHTED_DISTANCE, // the cube color will be an average of all specified cube colors weighted by the linear distance to this cube + SQUARE_WEIGHTED_DISTANCE // same as linear, but further colors have exponentially less impact on the color + }; + + enum FrameInterpolation{ + SNAP, // After the delay, snap to the next key frame + FADE // over the course of the delay, fade to the next frame + }; + + struct Cell{ + V3D position; + V3D color; + }; + + // this contains all of the information to specify exactly how a single frame should look and fade to the next frame + struct AnimationFrame{ + std::vector frame; + FillInterpolation fillInterpolation; + FrameInterpolation frameInterpolation; + std::chrono::milliseconds delay; + }; +}; \ No newline at end of file diff --git a/lib/Animator/Animator.h b/lib/Animator/Animator.h index 37f384f..0ee4d98 100644 --- a/lib/Animator/Animator.h +++ b/lib/Animator/Animator.h @@ -2,68 +2,114 @@ #include #include +#include #include #include #include #include #include "Vector3D.h" +#include "AnimationTypes.h" +using namespace ANIMATION_TYPES; + +template +class Animator{ -class Animation{ public: -// for cube spots which aren't defined in a key frame, -// you can have the controller automatically interpolate a color -enum FillInterpolation{ - NO_FILL, // if not specified, the cube color will be black - CLOSEST_COLOR, // The cube color will be the same color as the cube closest to it - LINEAR_WEIGHTED_DISTANCE, // the cube color will be an average of all specified cube colors weighted by the linear distance to this cube - SQUARE_WEIGHTED_DISTANCE // same as linear, but further colors have exponentially less impact on the color +typedef std::array, BOARD_DIMS.y>, BOARD_DIMS.x> Frame; + + +void StartAnimation(const std::vector *animationSequence); + +void RunAnimation(const std::chrono::milliseconds& timePassed); + +void SetLoop(bool isLooping); + +bool HasInterpolatedFrameChanged(){return this->interpolatedFrameHasChanged;} + +Frame &GetInterpolatedFrame(){return this->interpolatedFrame;} + +bool isEnabled{true}; + +private: +bool isLooping{true}; +bool interpolatedFrameHasChanged{false}; +// these are the uncompressed frames you get by following the key colors and interpolation instructions of an animation frame +Frame startFrame; +Frame interpolatedFrame; +Frame endFrame; +std::chrono::milliseconds timeElapsed; + +const std::vector *animationSequence; +uint32_t animationIndex{0}; + +void incrimentAnimationIndex(); + +void uncompressFrame(const AnimationFrame &keyFrame, Frame &frameBuffer); + +void copyFrame(Frame ©From, Frame ©To){ + std::memcpy(©To, ©From, sizeof(Frame)); +} + +V3D getInterpolatedColor(const AnimationFrame &keyFrame, V3D position); + +V3D keyFrame2BoardCoords(const V3D &keyFramePosition); + +V3D noFillInterpolate(const AnimationFrame &keyFrame, V3D position); + +V3D closestColorInterpolate(const AnimationFrame &keyFrame, V3D position); + +V3D linearInterpolate(const AnimationFrame &keyFrame, V3D position); + +V3D squareInterpolate(const AnimationFrame &keyFrame, V3D position); + +void PrintUncompressedFrame(){ + for(uint32_t x = 0; x < BOARD_DIMS.x; x++){ + for(uint32_t y = 0; y < BOARD_DIMS.y; y++){ + for(uint32_t z = 0; z < BOARD_DIMS.z; z++){ + auto color = this->startFrame[x][y][z]; + Serial.print("Cube X:" + String(x) + ",Y:" + String(y) + ",Z:" + String(z)); + Serial.println("\tColor R:" + String(color.x) + ",G:" + String(color.y) + ",B:" + String(color.z)); + } + } + } +} + }; -enum FrameInterpolation{ - SNAP, // After the delay, snap to the next key frame - FADE // over the course of the delay, fade to the next frame -}; +template +void Animator::StartAnimation(const std::vector *animationSequence){ -struct Cell{ - V3D position; - V3D color; -}; - -// this contains all of the information to specify exactly how a single frame should look and fade to the next frame -struct AnimationFrame{ - std::vector frame; - FillInterpolation fillInterpolation; - FrameInterpolation frameInterpolation; - std::chrono::milliseconds delay; -}; - -typedef std::array, Y_SIZE>, X_SIZE> Frame; - - -void StartAnimation(const std::vector &animationSequence){ this->animationSequence = animationSequence; this->animationIndex = 0; this->timeElapsed = std::chrono::milliseconds(0); - if(animationSequence.size() == 0){ + if(animationSequence->size() == 0){ return; } - else if(animationSequence.size() == 1){ - this->uncompressFrame(animationSequence[0], this->startFrame); - this->uncompressFrame(animationSequence[0], this->endFrame); + else if(animationSequence->size() == 1){ + AnimationFrame frame{((*this->animationSequence)[0])}; + this->uncompressFrame(frame, this->startFrame); + this->copyFrame(this->startFrame, this->interpolatedFrame); + this->copyFrame(this->startFrame, this->endFrame); } else{ - this->uncompressFrame(animationSequence[0], this->startFrame); - this->uncompressFrame(animationSequence[1], this->endFrame); + this->uncompressFrame((*this->animationSequence)[0], this->startFrame); + this->copyFrame(this->startFrame, this->interpolatedFrame); + this->uncompressFrame((*this->animationSequence)[1], this->endFrame); } + this->PrintUncompressedFrame(); } -Frame &RunAnimation(std::chrono::milliseconds timePassed){ - auto delayTime = this->animationSequence[this->animationIndex].delay; +template +void Animator::RunAnimation(const std::chrono::milliseconds& timePassed){ + if(!(this->isEnabled)){ + this->interpolatedFrameHasChanged = false; + } + + auto delayTime = (*this->animationSequence)[this->animationIndex].delay; this->timeElapsed += timePassed; - Frame interpolatedFrame; // load in the next frame if we're done with this transition if(this->timeElapsed >= delayTime){ @@ -71,61 +117,66 @@ Frame &RunAnimation(std::chrono::milliseconds timePassed){ } // don't do frame interpolations if we're doing snap fades - if(this->animationSequence[this->animationIndex].frameInterpolation == FrameInterpolation::SNAP){ - return; + if((*this->animationSequence)[this->animationIndex].frameInterpolation == FrameInterpolation::SNAP){ + this->interpolatedFrameHasChanged = false; } // linearly interpolate between the two uncompressed frames - for(uint32_t x = 0; x < this->X_SIZE; x++){ - for(uint32_t y = 0; y < this->Y_SIZE; y++){ - for(uint32_t z = 0; z < this->Z_SIZE; z++){ + for(uint32_t x = 0; x < BOARD_DIMS.x; x++){ + for(uint32_t y = 0; y < BOARD_DIMS.y; y++){ + for(uint32_t z = 0; z < BOARD_DIMS.z; z++){ V3D startColor{this->startFrame[x][y][z]}; V3D endColor{this->endFrame[x][y][z]}; - V3D difference{endColor - startColor}; - V3D interpolatedColor = this->timeElapsed.count() * difference / delayTime.count() + startColor; - interpolatedFrame[x][y][z] = interpolatedColor; + V3D difference{endColor}; + difference -= startColor; + + V3D interpolatedColor{difference}; + interpolatedColor *= this->timeElapsed.count(); + interpolatedColor /= delayTime.count(); + interpolatedColor += startColor; + + this->interpolatedFrame[x][y][z] = interpolatedColor; } } } + + this->interpolatedFrameHasChanged = true; } -void SetLoop(bool isLooping){ +template +void Animator::SetLoop(bool isLooping){ this->isLooping = isLooping; } -private: -uint32_t X_SIZE{3}; -uint32_t Y_SIZE{3}; -uint32_t Z_SIZE{3}; -bool isLooping{true}; -// these are the uncompressed frames you get by following the key colors and interpolation instructions of an animation frame -Frame startFrame; -Frame endFrame; -std::chrono::milliseconds timeElapsed; - -const std::vector & animationSequence; -uint32_t animationIndex{0}; - -void incrimentAnimationIndex(){ - if(this->animationIndex < animationSequence.size() - 1){ +template +void Animator::incrimentAnimationIndex(){ + if(this->animationIndex < this->animationSequence->size() - 1){ this->animationIndex++; - this->timeElapsed = std::chrono::millis(0); - this->uncompressFrame(this->animationSequence[this->animationIndex], this->startFrame); - this->uncompressFrame(this->animationSequence[this->animationIndex + 1], this->endFrame); + this->timeElapsed = std::chrono::milliseconds(0); + this->uncompressFrame((*this->animationSequence)[this->animationIndex], this->startFrame); + this->uncompressFrame((*this->animationSequence)[this->animationIndex + 1], this->endFrame); } + else if(isLooping){ + this->StartAnimation(this->animationSequence); + } + + Serial.println("Animator::incrimentAnimationIndex" + String(animationIndex)); + this->PrintUncompressedFrame(); } -void uncompressFrame(const AnimationFrame &keyFrame, Frame &frameBuffer){ - for(uint32_t x = 0; x < X_SIZE; x++){ - for(uint32_t y = 0; y < Y_SIZE; y++){ - for(uint32_t z = 0; z < Z_SIZE; z++){ +template +void Animator::uncompressFrame(const AnimationFrame &keyFrame, Frame &frameBuffer){ + for(uint32_t x = 0; x < BOARD_DIMS.x; x++){ + for(uint32_t y = 0; y < BOARD_DIMS.y; y++){ + for(uint32_t z = 0; z < BOARD_DIMS.z; z++){ frameBuffer[x][y][z] = getInterpolatedColor(keyFrame, V3D(x, y, z)); } } } } -V3D &getInterpolatedColor(const AnimationFrame &keyFrame, V3D position){ +template +V3D Animator::getInterpolatedColor(const AnimationFrame &keyFrame, V3D position){ switch(keyFrame.fillInterpolation){ case FillInterpolation::NO_FILL: return noFillInterpolate(keyFrame, position); @@ -136,17 +187,19 @@ V3D &getInterpolatedColor(const AnimationFrame &keyFrame, V3D position){ case FillInterpolation::SQUARE_WEIGHTED_DISTANCE: return squareInterpolate(keyFrame, position); default: - return V3D{}; + V3D black{}; + return black; } } -V3D &keyFrame2BoardCoords(V3D &keyFramePosition){ +template +V3D Animator::keyFrame2BoardCoords(const V3D &keyFramePosition){ V3D returnValue{}; float maxValue{static_cast(std::numeric_limits::max())}; // scale the key frame values down to be within board coordinates - float keyFrame_X = static_cast(this->X_SIZE) * static_cast(keyFramePosition.x) / maxValue; - float keyFrame_Y = static_cast(this->Y_SIZE) * static_cast(keyFramePosition.y) / maxValue; - float keyFrame_Z = static_cast(this->Z_SIZE) * static_cast(keyFramePosition.z) / maxValue; + float keyFrame_X = static_cast(BOARD_DIMS.x) * static_cast(keyFramePosition.x) / maxValue; + float keyFrame_Y = static_cast(BOARD_DIMS.y) * static_cast(keyFramePosition.y) / maxValue; + float keyFrame_Z = static_cast(BOARD_DIMS.z) * static_cast(keyFramePosition.z) / maxValue; // carefully quantize the float values back into ints with a precise rounding operation if(keyFrame_X - std::floor(keyFrame_X) < 0.5f){ @@ -173,7 +226,8 @@ V3D &keyFrame2BoardCoords(V3D &keyFramePosition){ return returnValue; } -V3D &noFillInterpolate(const AnimationFrame &keyFrame, V3D position){ +template +V3D Animator::noFillInterpolate(const AnimationFrame &keyFrame, V3D position){ V3D returnColor{}; for(Cell cell : keyFrame.frame){ if(keyFrame2BoardCoords(cell.position) == position){ @@ -184,170 +238,58 @@ V3D &noFillInterpolate(const AnimationFrame &keyFrame, V3D position){ return returnColor; } -V3D &closestColorInterpolate(const AnimationFrame &keyFrame, V3D position){ +template +V3D Animator::closestColorInterpolate(const AnimationFrame &keyFrame, V3D position){ V3D returnColor{}; - float closestDistance = (keyframe.frame[0].position - position).mag(); + V3D distance{keyFrame.frame[0].position}; + distance -= position; + float closestDistance = distance.magnitude(); for(Cell cell : keyFrame.frame){ - float distance = (keyFrame2BoardCoords(cell.position) - position).mag(); - if(distance < closestDistance){ + distance = keyFrame2BoardCoords(cell.position); + distance -= position; + float euclidDistance = distance.magnitude(); + if(euclidDistance < closestDistance){ returnColor = cell.color; - closestDistance = distance; + closestDistance = euclidDistance; } } return returnColor; } -V3D &linearInterpolate(const AnimationFrame &keyFrame, V3D position){ +template +V3D Animator::linearInterpolate(const AnimationFrame &keyFrame, V3D position){ V3D returnColor{}; for(Cell cell : keyFrame.frame){ - uint32_t distance = static_cast((keyFrame2BoardCoords(cell.position) - position).mag()); + V3D vectorDistance{keyFrame2BoardCoords(cell.position)}; + vectorDistance -= position; + uint32_t distance = static_cast(vectorDistance.magnitude()); if(distance == 0) distance = 1; - returnColor = returnColor + cell.color / distance; + returnColor += cell.color; + returnColor /= distance; } - returnColor = returnColor / keyFrame.frame.size(); + returnColor /= keyFrame.frame.size(); return returnColor; } -V3D &squareInterpolate(const AnimationFrame &keyFrame, V3D position){ +template +V3D Animator::squareInterpolate(const AnimationFrame &keyFrame, V3D position){ V3D returnColor{}; for(Cell cell : keyFrame.frame){ - uint32_t distance = static_cast((keyFrame2BoardCoords(cell.position) - position).mag()); + V3D vectorDistance{keyFrame2BoardCoords(cell.position)}; + vectorDistance -= position; + uint32_t distance = static_cast(vectorDistance.magnitude()); distance *= distance; if(distance == 0) distance = 1; - returnColor = returnColor + cell.color / distance; + returnColor += cell.color; + returnColor /= distance; } - returnColor = returnColor / keyFrame.frame.size(); + returnColor /= keyFrame.frame.size(); return returnColor; -} -}; - -// let's make some test animation frames - -namespace TestFrames{ - V3D red{255,0,0}; - V3D green{0,255,0}; - V3D blue{0,0,255}; - uint32_t maxValue{std::numeric_limits::max()}; - - Animation::Cell &CreateCell(float x_percent, float y_percent, float z_percent, V3D &color){ - float continuousMaxValue{static_cast(std::numeric_limits::max())}; - Animation::Cell cell{ - .position = V3D{ - static_cast(continuousMaxValue*x_percent), - static_cast(continuousMaxValue*y_percent), - static_cast(continuousMaxValue*z_percent) - }, - .color = color - }; - - return cell; - } - - Animation::AnimationFrame noFillFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::NO_FILL; - .frameInterpolation = FrameInterpolation::SNAP; - .delay = std::chrono::millis(10000); - } - - Animation::AnimationFrame closestColorFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::CLOSEST_COLOR; - .frameInterpolation = FrameInterpolation::SNAP; - .delay = std::chrono::millis(10000); - } - - Animation::AnimationFrame linearFillFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::LINEAR_WEIGHTED_DISTANCE; - .frameInterpolation = FrameInterpolation::SNAP; - .delay = std::chrono::millis(10000); - } - - Animation::AnimationFrame squareFillFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::SQUARE_WEIGHTED_DISTANCE; - .frameInterpolation = FrameInterpolation::SNAP; - .delay = std::chrono::millis(10000); - } - - Animation::AnimationFrame noFillFadeFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::NO_FILL; - .frameInterpolation = FrameInterpolation::FADE; - .delay = std::chrono::millis(10000); - } - - Animation::AnimationFrame closestColorFadeFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::CLOSEST_COLOR; - .frameInterpolation = FrameInterpolation::FADE; - .delay = std::chrono::millis(10000); - } - - Animation::AnimationFrame linearFillFadeFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::LINEAR_WEIGHTED_DISTANCE; - .frameInterpolation = FrameInterpolation::FADE; - .delay = std::chrono::millis(10000); - } - - Animation::AnimationFrame squareFillFadeFrame{ - .frame = { - CreateCell(0,0,0,red), - CreateCell(0.5,0.5,0.5,green), - CreateCell(1,1,1,blue) - }; - .fillInterpolation = FillInterpolation::SQUARE_WEIGHTED_DISTANCE; - .frameInterpolation = FrameInterpolation::FADE; - .delay = std::chrono::millis(10000); - } - - std::vector testAnimationSequence{ - noFillFrame, - closestColorFrame, - linearFillFrame, - squareFillFrame, - noFillFadeFrame, - closestFillFadeFrame, - linearFillFadeFrame, - squareFillFadeFrame - }; -} - - +} \ No newline at end of file diff --git a/lib/Animator/TestFrames.h b/lib/Animator/TestFrames.h new file mode 100644 index 0000000..673955c --- /dev/null +++ b/lib/Animator/TestFrames.h @@ -0,0 +1,158 @@ +#pragma once + +#include "AnimationTypes.h" +#include "Vector3D.h" +#include "Animator.h" + +using namespace ANIMATION_TYPES; + +namespace TestFrames{ + + V3D red{255,0,0}; + V3D green{0,255,0}; + V3D blue{0,0,255}; + uint32_t maxValue{std::numeric_limits::max()}; + + Cell CreateCell(float x_percent, float y_percent, float z_percent, V3D &color){ + float continuousMaxValue{static_cast(std::numeric_limits::max())}; + Cell cell{ + .position = V3D{ + static_cast(continuousMaxValue*x_percent), + static_cast(continuousMaxValue*y_percent), + static_cast(continuousMaxValue*z_percent) + }, + .color = color + }; + + return cell; + } + + AnimationFrame noFillFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::NO_FILL, + .frameInterpolation = FrameInterpolation::SNAP, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame closestColorFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::CLOSEST_COLOR, + .frameInterpolation = FrameInterpolation::SNAP, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame linearFillFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::LINEAR_WEIGHTED_DISTANCE, + .frameInterpolation = FrameInterpolation::SNAP, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame squareFillFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::SQUARE_WEIGHTED_DISTANCE, + .frameInterpolation = FrameInterpolation::SNAP, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame noFillFadeFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::NO_FILL, + .frameInterpolation = FrameInterpolation::FADE, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame closestColorFadeFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::CLOSEST_COLOR, + .frameInterpolation = FrameInterpolation::FADE, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame linearFillFadeFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::LINEAR_WEIGHTED_DISTANCE, + .frameInterpolation = FrameInterpolation::FADE, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame squareFillFadeFrame{ + .frame = { + CreateCell(0,0,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,1,0,blue) + }, + .fillInterpolation = FillInterpolation::SQUARE_WEIGHTED_DISTANCE, + .frameInterpolation = FrameInterpolation::FADE, + .delay = std::chrono::milliseconds(10000) + }; + + std::vector testAnimationSequence2{ + noFillFrame, // 0 + closestColorFrame, // 1 + linearFillFrame, // 2 + squareFillFrame, // 3 + noFillFadeFrame, // 4 + closestColorFadeFrame, // 5 + linearFillFadeFrame, // 6 + squareFillFadeFrame // 7 + }; + + + AnimationFrame noFillFrame2{ + .frame = { + CreateCell(0,1,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(1,0,0,green) + }, + .fillInterpolation = FillInterpolation::NO_FILL, + .frameInterpolation = FrameInterpolation::SNAP, + .delay = std::chrono::milliseconds(10000) + }; + + AnimationFrame noFillFrame3{ + .frame = { + CreateCell(0.5,0.5,0,red), + // CreateCell(0.5,0.5,0,green), + CreateCell(0,1,0,blue) + }, + .fillInterpolation = FillInterpolation::NO_FILL, + .frameInterpolation = FrameInterpolation::SNAP, + .delay = std::chrono::milliseconds(10000) + }; + + std::vector testAnimationSequence1{ + noFillFrame, + noFillFrame2, + noFillFrame3, + noFillFrame3 + }; +} \ No newline at end of file diff --git a/lib/Board/Board.h b/lib/Board/Board.h index 16ba9bc..c5496e3 100644 --- a/lib/Board/Board.h +++ b/lib/Board/Board.h @@ -79,6 +79,16 @@ class Board{ uint32_t SliceBoard(const V3D &column, BOARD_TYPES::Cube ** sliceBuffer); void PrintEntireBoard() const; + + void UpdateAllColors(const std::array, BOARD_DIMS.y>, BOARD_DIMS.x>& colorFrame){ + for(uint32_t x = 0; x < BOARD_DIMS.x; x++){ + for(uint32_t y = 0; y < BOARD_DIMS.y; y++){ + for(uint32_t z = 0; z < BOARD_DIMS.z; z++){ + this->cubes[x][y][z].color = colorFrame[x][y][z]; + } + } + } + } private: // this is a 3d array of cubes to represent the board. Good luck visualizing it /* _____________ diff --git a/lib/Board/BoardManager.h b/lib/Board/BoardManager.h index 6f273eb..417117b 100644 --- a/lib/Board/BoardManager.h +++ b/lib/Board/BoardManager.h @@ -7,11 +7,12 @@ #include "Board.h" #include "BoardDriver.h" #include "Vector3D.h" +#include "Animator.h" template class BoardManager{ public: - BoardManager(BoardDriver &boardDriver); + BoardManager(BoardDriver &boardDriver, Animator &animator); ~BoardManager() = default; @@ -66,9 +67,12 @@ class BoardManager{ */ void Board2StackString(String& messageBuffer); + void FillColor(const V3D &color){this->board.FillColor(color);} + private: BoardDriver &driver; Board board{}; + Animator &animator; void updateStackColors(const V3D &column); @@ -88,11 +92,20 @@ class BoardManager{ } } + void updateColorsFromAnimator(); + }; +template +void BoardManager::updateColorsFromAnimator(){ + if(this->animator.HasInterpolatedFrameChanged()){ + this->board.UpdateAllColors(this->animator.GetInterpolatedFrame()); + } +} template -BoardManager::BoardManager(BoardDriver &boardDriver): - driver(boardDriver){} +BoardManager::BoardManager(BoardDriver &boardDriver, Animator &animator): + driver(boardDriver), + animator(animator){} template void BoardManager::Init(){ @@ -101,6 +114,7 @@ void BoardManager::Init(){ template void BoardManager::Update(){ + this->updateColorsFromAnimator(); // update the occupied cubes on the board and the cube colors for(uint32_t x = 0; x < BOARD_DIMS.x; x++){ for(uint32_t y = 0; y < BOARD_DIMS.y; y++){ diff --git a/src/main.cpp b/src/main.cpp index e297b81..ccb7ede 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,6 +19,9 @@ #include "BoardDriver.h" #include "BoardTypes.h" +#include "Animator.h" +#include "TestFrames.h" + // -------------------------------------------------- // ----------------- VARIABLES ---------------------- // -------------------------------------------------- @@ -31,8 +34,9 @@ SerialMessage serialMessage(&Serial); Adafruit_NeoPixel pixelController{BOARD_HEIGHT*2, STACK1_LED_PIN, NEO_GRB + NEO_KHZ800}; +Animator animator{}; BoardDriver boardDriver{stacks, pixelController}; -BoardManager boardManager{boardDriver}; +BoardManager boardManager{boardDriver, animator}; // -------------------------------------------------- // ----------------- FUNCTIONS ---------------------- // -------------------------------------------------- @@ -95,26 +99,31 @@ void parseData(Message &message){ uint32_t argsLength{message.GetPopulatedArgs()}; uint32_t command = args[0]; switch(command){ - case Commands::BoardState: + case Commands::BoardState:{ printBoardState(); break; - case Commands::PING: + } + case Commands::PING:{ GlobalPrint::Println("!" + String(Commands::PING) + ";"); break; - case Commands::SetStackColors: + } + case Commands::SetStackColors:{ GlobalPrint::Println("!2;"); - // TODO: replace this with the animator - // colorManager.Enable(false); + animator.isEnabled = false; + V3D black{}; + boardManager.FillColor(black); SetStackColor(reinterpret_cast(args), argsLength); break; - case Commands::GoToIdle: + } + case Commands::GoToIdle:{ GlobalPrint::Println("!3;"); - // TODO: replace this with the animator - // colorManager.Enable(true); + animator.isEnabled = true; break; - default: + } + default:{ GlobalPrint::Println("INVALID COMMAND"); break; + } } // now that we have run the command we can clear the data for the next command. @@ -155,6 +164,7 @@ void UpdateBoard(void * params){ boardManager.ClearBoardChanged(); } + animator.RunAnimation(updateTickRate); boardManager.Update(); boardStateTimer += updateTickRate; @@ -185,6 +195,8 @@ void setup() { Serial.println("Beginning Board Initializaiton"); boardManager.Init(); + animator.SetLoop(true); + animator.StartAnimation(&(TestFrames::testAnimationSequence1)); xTaskCreate(UpdateBoard, "UpdateBoard", 10000, NULL, 0, &updateBoardTask); Serial.println("Setup Complete");