|
@@ -27,20 +27,22 @@ int main(int argAmount, char* const* args) {
|
|
|
if(parseArgs(argAmount, args, options)) {
|
|
|
return 0;
|
|
|
}
|
|
|
-
|
|
|
- TextInput* input = nullptr;
|
|
|
- Window w(input, options);
|
|
|
- if(w.getError().has()) {
|
|
|
- std::cout << w.getError().message << '\n';
|
|
|
+ Window w;
|
|
|
+ Error error = w.open(options);
|
|
|
+ if(error.has()) {
|
|
|
+ error.message.printLine();
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- Shader shader("resources/shader/vertex.vs", "resources/shader/fragment.fs");
|
|
|
- if(shader.hasError()) {
|
|
|
+ Shader cubeShader;
|
|
|
+ error = cubeShader.compile("resources/shader/vertex.vs", nullptr,
|
|
|
+ "resources/shader/fragment.fs");
|
|
|
+ if(error.has()) {
|
|
|
+ error.message.printLine();
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- Controller controller(w.getButtons());
|
|
|
+ Controller controller(w.buttons);
|
|
|
static Game game(controller, w.getFrameClock(), w.getTickClock(), size);
|
|
|
|
|
|
struct GameBase {
|
|
@@ -75,7 +77,7 @@ int main(int argAmount, char* const* args) {
|
|
|
return game.isRunning();
|
|
|
}
|
|
|
};
|
|
|
- GameBase base(w, game, shader);
|
|
|
+ GameBase base(w, game, cubeShader);
|
|
|
w.run(base, 10'000'000);
|
|
|
return 0;
|
|
|
}
|