Added GUI Frame
This commit is contained in:
@ -7,8 +7,6 @@
|
||||
|
||||
#include "game.h"
|
||||
|
||||
language_t language;
|
||||
|
||||
bool gameInit(game_t *game) {
|
||||
// Init the engine and the rendering pipeline
|
||||
engineInit(&game->engine, game);
|
||||
|
@ -7,6 +7,8 @@
|
||||
|
||||
#include "pokergame.h"
|
||||
|
||||
frame_t frame;
|
||||
|
||||
bool pokerGameInit(game_t *game) {
|
||||
pokergame_t *pokerGame = &game->pokerGame;
|
||||
|
||||
@ -18,11 +20,16 @@ bool pokerGameInit(game_t *game) {
|
||||
|
||||
// Initialize the UI.
|
||||
pokerUiInit(pokerGame);
|
||||
|
||||
frameInit(&frame);
|
||||
frame.texture = &pokerGame->assets.testTexture;
|
||||
|
||||
// Prep the VN Conversation Engine.
|
||||
vnSceneInit(&pokerGame->scene, &pokerGame->assets.font);
|
||||
pokerGameActionStartAdd(pokerGame);
|
||||
queueNext(&pokerGame->scene.conversation.actionQueue);
|
||||
// pokerGameActionStartAdd(pokerGame);
|
||||
// queueNext(&pokerGame->scene.conversation.actionQueue);
|
||||
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -37,11 +44,12 @@ void pokerGameUpdate(game_t *game) {
|
||||
// Bind the shader.
|
||||
shaderUse(&pokerGame->assets.shader);
|
||||
|
||||
// Render the visual novel scene
|
||||
vnSceneRenderWorld(&pokerGame->scene, &game->engine, &pokerGame->assets.shader);
|
||||
|
||||
// Render the visual novel scene
|
||||
// vnSceneRenderWorld(&pokerGame->scene, &game->engine, &pokerGame->assets.shader);
|
||||
vnSceneRenderGui(&pokerGame->scene, &game->engine, &pokerGame->assets.shader);
|
||||
pokerUiRender(pokerGame);
|
||||
frameRender(&frame, &pokerGame->assets.shader);
|
||||
// pokerUiRender(pokerGame);
|
||||
}
|
||||
|
||||
void pokerGameDispose(game_t *game) {
|
||||
|
@ -14,6 +14,8 @@
|
||||
#include "actions/start.h"
|
||||
#include "pokerui.h"
|
||||
|
||||
#include "../../ui/frame.h"
|
||||
|
||||
/**
|
||||
* Initializes the game state for the poker game.
|
||||
*
|
||||
|
@ -11,7 +11,8 @@ bool pokerGameAssetsInit(pokergameassets_t *assets) {
|
||||
assetShaderLoad(&assets->shader,
|
||||
"shaders/textured.vert", "shaders/textured.frag"
|
||||
);
|
||||
languageInit(&assets->language, "locales/language/en-US.csv");
|
||||
languageInit(&assets->language, "locale/language/en-US.csv");
|
||||
assetTextureLoad(&assets->testTexture, "test_texture.png");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user