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

Slowly renaming things from Holdem to Poker

Browse Source
This commit is contained in:
Dominic Masters
2021-05-17 06:13:50 -07:00
parent 4dbd5acab9
commit 9af4115bad
28 changed files with 253 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/poker/render/card.c
View File

@ -11,20 +11,20 @@ void holdemRenderCardInit() {
tilesetdiv_t *cardBack;
// Load Cards Texture
HOLDEM_GAME_STATE.cardTexture = assetTextureLoad("cards_normal.png");
HOLDEM_GAME_STATE.cardTileset = tilesetCreate(CARD_COUNT_PER_SUIT, 6,
HOLDEM_GAME_STATE.cardTexture->width, HOLDEM_GAME_STATE.cardTexture->height,
POKER_STATE.cardTexture = assetTextureLoad("cards_normal.png");
POKER_STATE.cardTileset = tilesetCreate(CARD_COUNT_PER_SUIT, 6,
POKER_STATE.cardTexture->width, POKER_STATE.cardTexture->height,
0, 0, 0, 0
);
// Cards Primitive
cardBack = HOLDEM_GAME_STATE.cardTileset->divisions+(
HOLDEM_GAME_STATE.cardTileset->columns * 4
cardBack = POKER_STATE.cardTileset->divisions+(
POKER_STATE.cardTileset->columns * 4
);
HOLDEM_GAME_STATE.cardPrimitive = primitiveCreate(
POKER_STATE.cardPrimitive = primitiveCreate(
QUAD_VERTICE_COUNT * 2, QUAD_INDICE_COUNT * 2
);
quadBuffer(HOLDEM_GAME_STATE.cardPrimitive, -HOLDEM_GAME_CARD_DEPTH,
quadBuffer(POKER_STATE.cardPrimitive, -HOLDEM_GAME_CARD_DEPTH,
-HOLDEM_GAME_CARD_WIDTH, -HOLDEM_GAME_CARD_HEIGHT,
cardBack->x0, cardBack->y1,
HOLDEM_GAME_CARD_WIDTH, HOLDEM_GAME_CARD_HEIGHT,
@ -33,8 +33,8 @@ void holdemRenderCardInit() {
);
}
holdemrenderposition_t holdemRenderCardGetPosition(uint8_t seat, uint8_t slot) {
holdemrenderposition_t position;
pokerposition_t holdemRenderCardGetPosition(uint8_t seat, uint8_t slot) {
pokerposition_t position;
float t, t2;
position.yaw = HOLDEM_GAME_SEAT_ANGLE(seat);
@ -74,8 +74,8 @@ holdemrenderposition_t holdemRenderCardGetPosition(uint8_t seat, uint8_t slot) {
void holdemRenderCard(card_t card, float x, float y, float z,
float pitch, float yaw, float roll
) {
tilesetdiv_t *cardFront = HOLDEM_GAME_STATE.cardTileset->divisions + card;
quadBuffer(HOLDEM_GAME_STATE.cardPrimitive, HOLDEM_GAME_CARD_DEPTH,
tilesetdiv_t *cardFront = POKER_STATE.cardTileset->divisions + card;
quadBuffer(POKER_STATE.cardPrimitive, HOLDEM_GAME_CARD_DEPTH,
-HOLDEM_GAME_CARD_WIDTH, -HOLDEM_GAME_CARD_HEIGHT,
cardFront->x0, cardFront->y1,
HOLDEM_GAME_CARD_WIDTH, HOLDEM_GAME_CARD_HEIGHT,
@ -83,12 +83,12 @@ void holdemRenderCard(card_t card, float x, float y, float z,
0, 0
);
shaderUseTexture(GAME_STATE.shaderWorld, HOLDEM_GAME_STATE.cardTexture);
shaderUseTexture(GAME_STATE.shaderWorld, POKER_STATE.cardTexture);
shaderUsePosition(GAME_STATE.shaderWorld, x,y,z, pitch,yaw,roll);
primitiveDraw(HOLDEM_GAME_STATE.cardPrimitive, 0, -1);
primitiveDraw(POKER_STATE.cardPrimitive, 0, -1);
}
void holdemRenderCardForSeat(uint8_t seat, card_t card, uint8_t slot) {
holdemrenderposition_t position = holdemRenderCardGetPosition(seat, slot);
pokerposition_t position = holdemRenderCardGetPosition(seat, slot);
holdemRenderCard(card, position.x, 0, position.z, mathDeg2Rad(-90), position.yaw, 0);
}

2
src/poker/render/card.h
View File

@ -25,7 +25,7 @@ void holdemRenderCardInit();
* @param slot Slot within the player/dealers' hand that the card belongs to.
* @return A struct containing X, Z and YAW properties.
*/
holdemrenderposition_t holdemRenderCardGetPosition(uint8_t seat, uint8_t slot);
pokerposition_t holdemRenderCardGetPosition(uint8_t seat, uint8_t slot);
/**
* Render's a given card at the specified coordinates. Card is a reused quad

56
src/poker/render/frame.c
View File

@ -13,10 +13,10 @@ void holdemRenderFrameInit() {
// Prepare the two frame buffers.
lWidth = HOLDEM_GAME_FRAME_LEFT_WIDTH, rWidth = HOLDEM_GAME_FRAME_RIGHT_WIDTH;
height = HOLDEM_GAME_FRAME_HEIGHT;
HOLDEM_GAME_STATE.frameLeft = frameBufferCreate(lWidth, height);
HOLDEM_GAME_STATE.frameRight = frameBufferCreate(rWidth, height);
HOLDEM_GAME_STATE.quadLeft = quadCreate(0, 0, 0, 0, 0, lWidth, height, 1, 1);
HOLDEM_GAME_STATE.quadRight = quadCreate(0, 0, 0, 0, 0, rWidth, height, 1, 1);
POKER_STATE.frameLeft = frameBufferCreate(lWidth, height);
POKER_STATE.frameRight = frameBufferCreate(rWidth, height);
POKER_STATE.quadLeft = quadCreate(0, 0, 0, 0, 0, lWidth, height, 1, 1);
POKER_STATE.quadRight = quadCreate(0, 0, 0, 0, 0, rWidth, height, 1, 1);
}
void holdemRenderFrameUpdate() {
@ -25,21 +25,21 @@ void holdemRenderFrameUpdate() {
lWidth = HOLDEM_GAME_FRAME_LEFT_WIDTH, rWidth = HOLDEM_GAME_FRAME_RIGHT_WIDTH;
height = HOLDEM_GAME_FRAME_HEIGHT;
if((
HOLDEM_GAME_STATE.frameLeft->texture->width == lWidth &&
HOLDEM_GAME_STATE.frameLeft->texture->height == height
POKER_STATE.frameLeft->texture->width == lWidth &&
POKER_STATE.frameLeft->texture->height == height
)) return;
// Recreate frame buffers.
frameBufferDispose(HOLDEM_GAME_STATE.frameLeft);
frameBufferDispose(HOLDEM_GAME_STATE.frameRight);
HOLDEM_GAME_STATE.frameLeft = frameBufferCreate(lWidth, height);
HOLDEM_GAME_STATE.frameRight = frameBufferCreate(rWidth, height);
quadBuffer(HOLDEM_GAME_STATE.quadLeft, 0,
frameBufferDispose(POKER_STATE.frameLeft);
frameBufferDispose(POKER_STATE.frameRight);
POKER_STATE.frameLeft = frameBufferCreate(lWidth, height);
POKER_STATE.frameRight = frameBufferCreate(rWidth, height);
quadBuffer(POKER_STATE.quadLeft, 0,
0, 0, 0, 1,
lWidth, height, 1, 0,
0, 0
);
quadBuffer(HOLDEM_GAME_STATE.quadRight, 0,
quadBuffer(POKER_STATE.quadRight, 0,
0, 0, 0, 1,
rWidth, height, 1, 0,
0, 0
@ -48,27 +48,27 @@ void holdemRenderFrameUpdate() {
void holdemRenderFrameUseLeft() {
glClearColor(0.3, 0, 0, 1);
frameBufferUse(HOLDEM_GAME_STATE.frameLeft, true);
cameraPerspective(&HOLDEM_GAME_STATE.cameraLeft, 35,
frameBufferUse(POKER_STATE.frameLeft, true);
cameraPerspective(&POKER_STATE.cameraLeft, 35,
(
(float)HOLDEM_GAME_STATE.frameLeft->texture->width /
(float)HOLDEM_GAME_STATE.frameLeft->texture->height
(float)POKER_STATE.frameLeft->texture->width /
(float)POKER_STATE.frameLeft->texture->height
), 0.2f, 1000.0f
);
shaderUseCamera(GAME_STATE.shaderWorld, &HOLDEM_GAME_STATE.cameraLeft);
shaderUseCamera(GAME_STATE.shaderWorld, &POKER_STATE.cameraLeft);
}
void holdemRenderFrameUseRight() {
glClearColor(0.3, 0.3, 0, 1);
frameBufferUse(HOLDEM_GAME_STATE.frameRight, true);
cameraPerspective(&HOLDEM_GAME_STATE.cameraRight, 45,
frameBufferUse(POKER_STATE.frameRight, true);
cameraPerspective(&POKER_STATE.cameraRight, 45,
(
(float)HOLDEM_GAME_STATE.frameRight->texture->width /
(float)HOLDEM_GAME_STATE.frameRight->texture->height
(float)POKER_STATE.frameRight->texture->width /
(float)POKER_STATE.frameRight->texture->height
), 0.2f, 1000.0f
);
cameraLookAt(&HOLDEM_GAME_STATE.cameraRight, 0, 3, 3, 0, 0, 0);
shaderUseCamera(GAME_STATE.shaderWorld, &HOLDEM_GAME_STATE.cameraRight);
cameraLookAt(&POKER_STATE.cameraRight, 0, 3, 3, 0, 0, 0);
shaderUseCamera(GAME_STATE.shaderWorld, &POKER_STATE.cameraRight);
}
void holdemRenderFrameBack() {
@ -82,12 +82,12 @@ void holdemRenderFrameBack() {
shaderUsePosition(GAME_STATE.shaderWorld,
0, 0, 0, 0, 0, 0
);
shaderUseTexture(GAME_STATE.shaderWorld, HOLDEM_GAME_STATE.frameLeft->texture);
primitiveDraw(HOLDEM_GAME_STATE.quadLeft, 0, -1);
shaderUseTexture(GAME_STATE.shaderWorld, POKER_STATE.frameLeft->texture);
primitiveDraw(POKER_STATE.quadLeft, 0, -1);
shaderUsePosition(GAME_STATE.shaderWorld,
RENDER_STATE.width - HOLDEM_GAME_STATE.frameRight->texture->width,
RENDER_STATE.width - POKER_STATE.frameRight->texture->width,
0, 0, 0, 0, 0
);
shaderUseTexture(GAME_STATE.shaderWorld, HOLDEM_GAME_STATE.frameRight->texture);
primitiveDraw(HOLDEM_GAME_STATE.quadRight, 0, -1);
shaderUseTexture(GAME_STATE.shaderWorld, POKER_STATE.frameRight->texture);
primitiveDraw(POKER_STATE.quadRight, 0, -1);
}

4
src/poker/render/look.c
View File

@ -12,7 +12,7 @@ void holdemRenderLookSeat(camera_t *camera, uint8_t seat) {
angle = HOLDEM_GAME_SEAT_ANGLE(seat);
x = sin(angle);
z = cos(angle);
cameraLookAt(&HOLDEM_GAME_STATE.cameraLeft,
cameraLookAt(&POKER_STATE.cameraLeft,
x, 0.2, z,
-x, 0.2, -z
);
@ -23,7 +23,7 @@ void holdemRenderLookHand(camera_t *camera, uint8_t seat) {
angle = HOLDEM_GAME_SEAT_ANGLE(seat);
x = sin(angle);
z = cos(angle);
cameraLookAt(&HOLDEM_GAME_STATE.cameraLeft,
cameraLookAt(&POKER_STATE.cameraLeft,
x*0.1, 0.8, z*0.1,
-x*0.5, 0.2, -z*0.5
);

30
src/poker/render/player.c
View File

@ -8,13 +8,13 @@
#include "player.h"
void holdemRenderPlayerInit() {
HOLDEM_GAME_STATE.kagamiTexture = assetTextureLoad("kagami.png");
HOLDEM_GAME_STATE.kagamiTileset = tilesetCreate(3, 2,
HOLDEM_GAME_STATE.kagamiTexture->width,
HOLDEM_GAME_STATE.kagamiTexture->height,
POKER_STATE.kagamiTexture = assetTextureLoad("kagami.png");
POKER_STATE.kagamiTileset = tilesetCreate(3, 2,
POKER_STATE.kagamiTexture->width,
POKER_STATE.kagamiTexture->height,
0, 0, 0, 0
);
HOLDEM_GAME_STATE.kagamiQuad = quadCreate(0, 0, 0, 0, 0, 1, 1, 1, 1);
POKER_STATE.kagamiQuad = quadCreate(0, 0, 0, 0, 0, 1, 1, 1, 1);
}
uint8_t holdemRenderPlayerGetSeatForPlayer(uint8_t player) {
@ -43,27 +43,27 @@ void holdemRenderPlayer(uint8_t seat) {
// Determine size
float w, h;
w = 0.6, h = (
(float)HOLDEM_GAME_STATE.kagamiTileset->divY /
(float)HOLDEM_GAME_STATE.kagamiTileset->divX
(float)POKER_STATE.kagamiTileset->divY /
(float)POKER_STATE.kagamiTileset->divX
) * w;
// Animation
int i = (int32_t)(TIME_STATE.current*10)%HOLDEM_GAME_STATE.kagamiTileset->count;
quadBuffer(HOLDEM_GAME_STATE.kagamiQuad, 0,
int i = (int32_t)(TIME_STATE.current*10)%POKER_STATE.kagamiTileset->count;
quadBuffer(POKER_STATE.kagamiQuad, 0,
-w/2, -h/2,
HOLDEM_GAME_STATE.kagamiTileset->divisions[i].x0,
HOLDEM_GAME_STATE.kagamiTileset->divisions[i].y1,
POKER_STATE.kagamiTileset->divisions[i].x0,
POKER_STATE.kagamiTileset->divisions[i].y1,
w/2, h/2,
HOLDEM_GAME_STATE.kagamiTileset->divisions[i].x1,
HOLDEM_GAME_STATE.kagamiTileset->divisions[i].y0,
POKER_STATE.kagamiTileset->divisions[i].x1,
POKER_STATE.kagamiTileset->divisions[i].y0,
0, 0
);
// Render
shaderUseTexture(GAME_STATE.shaderWorld, HOLDEM_GAME_STATE.kagamiTexture);
shaderUseTexture(GAME_STATE.shaderWorld, POKER_STATE.kagamiTexture);
shaderUsePosition(GAME_STATE.shaderWorld,
x, 0.34, z,
0, angle, 0
);
primitiveDraw(HOLDEM_GAME_STATE.kagamiQuad, 0, -1);
primitiveDraw(POKER_STATE.kagamiQuad, 0, -1);
}

8
src/poker/render/scene.c
View File

@ -8,8 +8,8 @@
#include "scene.h"
void holdemRenderSceneInit() {
HOLDEM_GAME_STATE.tablePrimitive = pokerTableCreate();
HOLDEM_GAME_STATE.tableTexture = assetTextureLoad("pokertable.png");
POKER_STATE.tablePrimitive = pokerTableCreate();
POKER_STATE.tableTexture = assetTextureLoad("pokertable.png");
}
void holdemRenderScene() {
@ -19,6 +19,6 @@ void holdemRenderScene() {
0, 0, 0,
3.4, 3.4, 3.4
);
shaderUseTexture(GAME_STATE.shaderWorld, HOLDEM_GAME_STATE.tableTexture);
primitiveDraw(HOLDEM_GAME_STATE.tablePrimitive, 0, -1);
shaderUseTexture(GAME_STATE.shaderWorld, POKER_STATE.tableTexture);
primitiveDraw(POKER_STATE.tablePrimitive, 0, -1);
}

12
src/poker/render/world.c
View File

@ -9,28 +9,28 @@
void holdemRenderWorld() {
uint8_t i, j;
holdemplayer_t *player;
pokerplayer_t *player;
uint8_t seat;
holdemRenderScene();
// Render the dealer and her hand
holdemRenderPlayer(HOLDEM_GAME_SEAT_DEALER);
for(i = 0x00; i < HOLDEM_GAME_STATE.cardsFacing; i++) {
for(i = 0x00; i < POKER_STATE.cardsFacing; i++) {
holdemRenderCardForSeat(
HOLDEM_GAME_SEAT_DEALER,
HOLDEM_GAME_STATE.cards[i],
POKER_STATE.cards[i],
HOLDEM_GAME_CARD_SLOT_FLOP0 + i
);
}
// Test
for(i = 0x00; i < HOLDEM_PLAYER_COUNT; i++) {
player = HOLDEM_GAME_STATE.players + i;
for(i = 0x00; i < POKER_PLAYER_COUNT; i++) {
player = POKER_STATE.players + i;
seat = holdemRenderPlayerGetSeatForPlayer(i);
holdemRenderPlayer(seat);
if(player->state & HOLDEM_STATE_FOLDED) continue;
if(player->state & POKER_STATE_FOLDED) continue;
for(j = 0x00; j < player->cardCount; j++) {
holdemRenderCardForSeat(seat, player->cards[j], HOLDEM_GAME_CARD_SLOT_HAND0+j);