YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moving some code around

Browse Source
This commit is contained in:
Dominic Masters
2021-05-23 22:27:19 -07:00
parent b0dce455f0
commit 76307d2746
19 changed files with 205 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/game/game.c
View File

@ -7,12 +7,6 @@
#include "game.h"
font_t font;
primitive_t quad;
texture_t mom;
primitive_t cube;
bool gameInit(game_t *game) {
// Init the game
game->name = GAME_NAME;
@ -21,18 +15,13 @@ bool gameInit(game_t *game) {
engineInit(&game->engine, game);
// Hand off to the poker logic.
pokerInit(&game->poker);
pokerInit(&game->poker, &game->engine.render);
assetFontLoad(&font, "fonts/opensans/OpenSans-Bold.ttf", 64.0);
char *text = "Ayy\nNice meme";
fonttextinfo_t info = fontGetTextInfo(&font, text);
fontmeasure_t *measure = fontTextMeasure(&font, text, &info);
fontTextInitFromMeasure(&font, &quad, text, &info, measure);
fontTextMeasureDispose(measure);
quadInit(&cube, 0, 0,0,0,0, 923,576,1,1);
assetTextureLoad(&mom, "cards_normal.png");
// char *text = "Ayy\nNice meme";
// fonttextinfo_t info = fontGetTextInfo(&font, text);
// fontmeasure_t *measure = fontTextMeasure(&font, text, &info);
// fontTextInitFromMeasure(&font, &quad, text, &info, measure);
// fontTextMeasureDispose(measure);
return true;
}
@ -42,32 +31,7 @@ bool gameUpdate(game_t *game, float platformDelta) {
engineUpdateStart(&game->engine, game, platformDelta);
// Hand off to the poker logic
shaderUse(&game->poker.shader);
// cameraPerspective(&game->poker.camera, 45,
// game->engine.render.width/game->engine.render.height,
// 0.01, 1000
// );
// cameraLookAt(&game->poker.camera, 300,300,300, 0,0,0);
cameraOrtho(&game->poker.camera,
0, game->engine.render.width,
game->engine.render.height, 0,
0.1, 1000
);
cameraLookAt(&game->poker.camera, 0,0,5, 0,0,-5);
shaderUseCamera(&game->poker.shader, &game->poker.camera);
shaderUseTexture(&game->poker.shader, &font.texture);
shaderUsePosition(&game->poker.shader, 0,0,0, 0,0,0);
primitiveDraw(&quad, 0, -1);
// shaderUseTexture(&game->poker.shader, &mom);
// shaderUsePosition(&game->poker.shader, 0,0,0, 0,0,0);
// primitiveDraw(&cube, 0, -1);
// pokerUpdate(&game->poker, &game->engine.render);
pokerUpdate(&game->poker, &game->engine.render);
// Hand back to the engine.
return engineUpdateEnd(&game->engine, game);