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