Added assets
This commit is contained in:
@ -19,14 +19,6 @@ typedef struct {
|
||||
/** Engine for the game */
|
||||
engine_t engine;
|
||||
|
||||
texture_t texture;
|
||||
shader_t shader;
|
||||
primitive_t primitive;
|
||||
camera_t camera;
|
||||
|
||||
/** Poker Game State */
|
||||
poker_t poker;
|
||||
} game_t;
|
||||
|
||||
/** The current running game state. */
|
||||
extern game_t GAME_STATE;
|
@ -7,22 +7,15 @@
|
||||
|
||||
#include "game.h"
|
||||
|
||||
game_t GAME_STATE;
|
||||
|
||||
bool gameInit(game_t *game) {
|
||||
// Init the game
|
||||
game->name = GAME_NAME;
|
||||
|
||||
engineInit(&game->engine, game);
|
||||
|
||||
assetShaderLoad(&game->shader,"shaders/textured.vert","shaders/textured.frag");
|
||||
assetTextureLoad(&game->texture, "cards_normal.png");
|
||||
cubeInit(&game->primitive, 1, 1, 1);
|
||||
|
||||
// Init
|
||||
// gameTimeInit();
|
||||
// renderInit();
|
||||
// inputInit();
|
||||
// assetShaderLoad(&game->shader,"shaders/textured.vert","shaders/textured.frag");
|
||||
// assetTextureLoad(&game->texture, "cards_normal.png");
|
||||
// cubeInit(&game->primitive, 1, 1, 1);
|
||||
|
||||
// // Load the world shader.
|
||||
// GAME_STATE.shaderWorld = assetShaderLoad(
|
||||
|
@ -5,6 +5,8 @@
|
||||
|
||||
#include "glwfwplatform.h"
|
||||
|
||||
game_t GAME_STATE;
|
||||
|
||||
GLFWwindow *window = NULL;
|
||||
|
||||
int32_t main() {
|
||||
|
@ -16,6 +16,9 @@
|
||||
#define WINDOW_WIDTH_DEFAULT 480
|
||||
#define WINDOW_HEIGHT_DEFAULT 270
|
||||
|
||||
/** The current running game state. */
|
||||
extern game_t GAME_STATE;
|
||||
|
||||
/** The GLFW Window Context Pointer */
|
||||
extern GLFWwindow *window;
|
||||
|
||||
|
Reference in New Issue
Block a user