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

Added camera orbit controls.

Browse Source
This commit is contained in:
Dominic Masters
2021-08-24 22:04:01 -07:00
parent 02a485860f
commit eed325d702
9 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/poker/discussion/pokerdiscussion.c
View File

@ -20,7 +20,7 @@ void pokerDiscussionGet(
case POKER_DISCUSSION_REASON_MATCH_START:
discussion->count++;
discussion->messages[0] = "Match Start";
discussion->players[0] = 0;
discussion->players[0] = POKER_DEALER_INDEX;
discussion->emotions[0] = VN_CHARACTER_EMOTION_ANGRY;
break;
@ -28,15 +28,15 @@ void pokerDiscussionGet(
case POKER_DISCUSSION_REASON_ROUND_START:
discussion->count++;
discussion->messages[0] = "Round Start";
discussion->players[0] = 1;
discussion->emotions[0] = VN_CHARACTER_EMOTION_XXXX_THINKING10;
discussion->players[0] = 2;
discussion->emotions[0] = VN_CHARACTER_EMOTION_ANIME_MOM;
break;
// Fallback
default:
discussion->count++;
discussion->messages[0] = "Hmm, this seems to be an error message.";
discussion->players[0] = 2;
discussion->players[0] = 3;
discussion->emotions[0] = VN_CHARACTER_EMOTION_CONCERNED_WORRIED;
break;
}
@ -50,7 +50,8 @@ void pokerDiscussionQueue(pokerdiscussiondata_t *data) {
for(i = 0; i < discussion.count; i++) {
player = discussion.players[i];
if(player != 0xFF) pokerGameActionLookAdd(data->poker, player);
pokerGameActionLookAdd(data->poker, player);
vnConversationTalk(&data->poker->scene.conversation,
discussion.messages[i],

26
src/game/poker/pokerworld.c
View File

@ -14,19 +14,6 @@ void pokerWorldInit(pokergame_t *game) {
// Initialize the skywal
skywallInit(&game->world.skywall);
// Dealer (Penny)
character = game->scene.characters + POKER_GAME_SEAT_DEALER;
vnCharacterInit(character, &game->assets.pennyTexture,
POKER_GAME_PENNY_BASE_WIDTH, POKER_GAME_PENNY_BASE_HEIGHT,
POKER_GAME_PENNY_FACE_X, POKER_GAME_PENNY_FACE_Y,
POKER_GAME_PENNY_FACE_WIDTH, POKER_GAME_PENNY_FACE_HEIGHT
);
character->x = POKER_WORLD_SEAT_POSITION_X(POKER_GAME_SEAT_DEALER);
character->y = POKER_WORLD_SEAT_POSITION_Y;
character->z = POKER_WORLD_SEAT_POSITION_Z(POKER_GAME_SEAT_DEALER);
character->yaw = POKER_WORLD_SEAT_ROTATION(POKER_GAME_SEAT_DEALER);
game->scene.characterCount++;
// Initialize the players
for(i = 0x00; i < POKER_PLAYER_COUNT; i++) {
if(i == POKER_PLAYER_HUMAN_INDEX) continue;
@ -43,6 +30,19 @@ void pokerWorldInit(pokergame_t *game) {
game->scene.characterCount++;
}
// Dealer (Penny)
character = game->scene.characters + game->scene.characterCount;
vnCharacterInit(character, &game->assets.pennyTexture,
POKER_GAME_PENNY_BASE_WIDTH, POKER_GAME_PENNY_BASE_HEIGHT,
POKER_GAME_PENNY_FACE_X, POKER_GAME_PENNY_FACE_Y,
POKER_GAME_PENNY_FACE_WIDTH, POKER_GAME_PENNY_FACE_HEIGHT
);
character->x = POKER_WORLD_SEAT_POSITION_X(POKER_GAME_SEAT_DEALER);
character->y = POKER_WORLD_SEAT_POSITION_Y;
character->z = POKER_WORLD_SEAT_POSITION_Z(POKER_GAME_SEAT_DEALER);
character->yaw = POKER_WORLD_SEAT_ROTATION(POKER_GAME_SEAT_DEALER);
game->scene.characterCount++;
pokerWorldLookAtPlayer(&game->scene, 0x00);
}