test
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -113,7 +113,8 @@ void Rubiks::run() {
|
||||
cube.getMesh(),
|
||||
cube.getTransform(),
|
||||
camera.getTransform(),
|
||||
camera.getPerspective()
|
||||
camera.getPerspective(),
|
||||
color
|
||||
);
|
||||
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user