Added camera orbit controls.

include/dawn/game/poker/pokergame.h

@@ -21,7 +21,7 @@
 #define POKER_GAME_SEAT_FOR_PLAYER(p) (p < POKER_PLAYER_HUMAN_INDEX ? \
   p + 1 : POKER_GAME_SEAT_COUNT - (p - POKER_PLAYER_HUMAN_INDEX) \
 )
-#define POKER_GAME_SEAT_DEALER 0x00
+#define POKER_GAME_SEAT_DEALER POKER_PLAYER_COUNT
 
 #define POKER_GAME_PENNY_BASE_WIDTH 1000
 #define POKER_GAME_PENNY_BASE_HEIGHT 1920

include/dawn/poker/dealer.h

@@ -15,6 +15,9 @@
 /** How many cards the grave can hold */
 #define POKER_DEALER_GRAVE_SIZE CARD_DECK_SIZE
 
+/** Which VN Character index is the dealer */
+#define POKER_DEALER_INDEX POKER_PLAYER_COUNT
+
 /** Representation of the dealer state */
 typedef struct {
   /** Current Card Deck */

include/dawn/poker/player.h

@@ -8,7 +8,6 @@
 #pragma once
 #include "../libs.h"
 #include "bet.h"
-#include "dealer.h"
 #include "card.h"
 
 /** How many cards a player can hold in their hand */

src/display/camera.c

@@ -35,4 +35,15 @@ void cameraOrtho(camera_t *camera,
 ) {
   matrixIdentity(&camera->projection);
   matrixOrtho(&camera->projection, left, right, bottom, top, camNear, camFar);
+}
+
+void cameraOrbit(camera_t *camera,
+  float distance, float yaw, float pitch,
+  float targetX, float targetY, float targetZ
+) {
+  float cy = cos(pitch);
+  float x = distance * sin(yaw) * cy;
+  float y = distance * sin(pitch);
+  float z = distance * cos(yaw) * cy;
+  cameraLookAt(camera, x, y, z, targetX, targetY, targetZ);
 }

src/display/camera.h

@@ -65,4 +65,20 @@ void cameraPerspective(camera_t *camera,
  */
 void cameraOrtho(camera_t *camera,
   float left, float right, float bottom, float top, float camNear, float camFar
+);
+
+/**
+ * Update a camera to orbit around a point.
+ * 
+ * @param camera Camera to update
+ * @param distance Distance from the point
+ * @param yaw Yaw (Y axis) rotation.
+ * @param pitch Pitch (X/Z axis) rotation.
+ * @param targetX X point to orbit around.
+ * @param targetY Y point to orbit around.
+ * @param targetZ Z point to orbit around.
+ */
+void cameraOrbit(camera_t *camera,
+  float distance, float yaw, float pitch,
+  float targetX, float targetY, float targetZ
 );

src/game/poker/discussion/pokerdiscussion.c

@@ -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->players[0] = 2;
-      discussion->emotions[0] = VN_CHARACTER_EMOTION_XXXX_THINKING10;
+      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],

src/game/poker/pokerworld.c

@@ -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);
 }
 

src/vn/vncharacter.c

@@ -106,6 +106,7 @@ void vnCharacterUpdate(vncharacter_t *character, engine_t *engine) {
   }
   _vnCharacterFaceBuffer(character, mouth, VN_CHARACTER_QUAD_MOUTH);
 
+
   // float n;
   // // Update the blinking frames
   // n = (engine->time.current - character->blinkStart) * 3.0f;

src/vn/vnscene.c

@@ -42,9 +42,16 @@ void vnSceneDispose(vnscene_t *scene) {
 void vnSceneRenderWorld(vnscene_t *scene, engine_t *engine, shader_t *shader) {
   // Adjust 3D Space position
 
-  cameraLookAt(&scene->camera,
+  // cameraLookAt(&scene->camera,
-    scene->cameraX, scene->cameraY, scene->cameraZ,
+  //   scene->cameraX, scene->cameraY, scene->cameraZ,
-    scene->cameraLookX, scene->cameraLookY, scene->cameraLookZ
+  //   scene->cameraLookX, scene->cameraLookY, scene->cameraLookZ
+  // );
+
+  float d = 2;
+
+  cameraOrbit(&scene->camera,
+    2, engine->time.current / 3.0f, mathDeg2Rad(35),
+    0, 0, 0
   );
 
   // Set Camera Perspective