diff --git a/src/example_apps/RubiksApp/RubiksApp.cpp b/src/example_apps/RubiksApp/RubiksApp.cpp index d840e5d..a4dcefa 100644 --- a/src/example_apps/RubiksApp/RubiksApp.cpp +++ b/src/example_apps/RubiksApp/RubiksApp.cpp @@ -1,6 +1,6 @@ -#include "SandboxEmbed.h" +#include "RubiksApp.h" -bool SandboxEmbed::onEvent(const Archimedes::Event& event) { +bool RubiksApp::onEvent(const Archimedes::Event& event) { unsigned int type = getEventType(event); @@ -33,7 +33,7 @@ bool SandboxEmbed::onEvent(const Archimedes::Event& event) { return false; } -void SandboxEmbed::run() { +void RubiksApp::run() { for(std::string m : runOrder) { modules[m]->onLoad(); diff --git a/src/example_apps/RubiksApp/RubiksApp.h b/src/example_apps/RubiksApp/RubiksApp.h index d699e89..f0cdb83 100644 --- a/src/example_apps/RubiksApp/RubiksApp.h +++ b/src/example_apps/RubiksApp/RubiksApp.h @@ -1,9 +1,9 @@ #define ENTRYPOINT #include "Archimedes.h" -#include "modules/Archimedes-Modules/Sandbox/Sandbox.h" +#include "modules/Archimedes-Modules/Rubiks/Rubiks.h" -class SandboxEmbed : public Archimedes::App { +class RubiksApp : public Archimedes::App { private: @@ -12,12 +12,12 @@ class SandboxEmbed : public Archimedes::App { bool onEvent(const Archimedes::Event&) override; public: - SandboxEmbed() { - Archimedes::Module* m = (Archimedes::Module*) new Sandbox(Get(), nullptr); + RubiksApp() { + Archimedes::Module* m = (Archimedes::Module*) new Rubiks(Get(), nullptr); load(m); }; - ~SandboxEmbed() {}; + ~RubiksApp() {}; void handleArgs(const int& argc, char* argv[]) override {}; @@ -25,5 +25,5 @@ class SandboxEmbed : public Archimedes::App { }; -#define APP_TYPE SandboxEmbed +#define APP_TYPE RubiksApp #include "endApp.h" diff --git a/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp b/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp index c73b238..c42d366 100644 --- a/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp +++ b/src/modules/Archimedes-Modules/Rubiks/Rubiks.cpp @@ -113,7 +113,8 @@ void Rubiks::run() { cube.getMesh(), cube.getTransform(), camera.getTransform(), - camera.getPerspective() + camera.getPerspective(), + color ); {