Added frame to the VN Textbox

include/dawn/ui/frame.h

@@ -11,10 +11,11 @@
 #include "../display/gui/font.h"
 
 #define FRAME_BORDER_SIZE 16
+#define FRAME_BORDER_SIZE_FULL FRAME_BORDER_SIZE * 2
 #define FRAME_PRIMITIVE_COUNT 9
 
 typedef struct {
-  float x, y, z;
+  float x, y;
   texture_t *texture;
   primitive_t primitive;
 } frame_t;

include/dawn/vn/vntextbox.h

@@ -9,6 +9,7 @@
 #include "../libs.h"
 #include "../display/animation/timeline.h"
 #include "../display/gui/font.h"
+#include "../ui/frame.h"
 
 /** Amount of characters scrolled, per second */
 #define VN_TEXTBOX_SCROLL_SPEED 60
@@ -43,9 +44,8 @@ typedef struct {
   /** Primitive to hold talking text */
   primitive_t primitive;
 
-  // Testing assets
+  /** The frame for the textbox */
-  primitive_t testPrimitive;
+  frame_t frame;
-  texture_t testTexture;
 
   /** Current spoken text, tracked in-case of re-render */
   char *text;

src/display/gui/font.c

@@ -51,20 +51,21 @@ float fontGetScale(float fontSize) {
 void fontTextBuffer(font_t *font, primitive_t *primitive, fonttextinfo_t *info){
   stbtt_aligned_quad *quad;
   int32_t i;
-  
+
   for(i = 0; i < info->realLength; i++) {
     quad = info->quads + i;
     quadBuffer(primitive, 0,
       quad->x0, quad->y0, quad->s0, quad->t0,
       quad->x1, quad->y1, quad->s1, quad->t1,
-      i*QUAD_VERTICE_COUNT, i*QUAD_INDICE_COUNT
+      i * QUAD_VERTICE_COUNT, i * QUAD_INDICE_COUNT
     );
   }
 }
 
 void fontTextInit(font_t *font, primitive_t *primitive, fonttextinfo_t *info) {
   primitiveInit(primitive,
-    QUAD_VERTICE_COUNT * info->realLength, QUAD_INDICE_COUNT * info->realLength
+    QUAD_VERTICE_COUNT * info->realLength,
+    QUAD_INDICE_COUNT * info->realLength
   );
   fontTextBuffer(font, primitive, info);
 }

src/game/poker/pokergame.c

@@ -7,8 +7,6 @@
 
 #include "pokergame.h"
 
-frame_t frame;
-
 bool pokerGameInit(game_t *game) {
   pokergame_t *pokerGame = &game->pokerGame;
 
@@ -20,16 +18,11 @@ bool pokerGameInit(game_t *game) {
 
   // Initialize the UI.
   pokerUiInit(pokerGame);
-
-  frameInit(&frame);
-  frame.texture = &pokerGame->assets.testTexture;
   
   // Prep the VN Conversation Engine.
-  vnSceneInit(&pokerGame->scene, &pokerGame->assets.font);
+  vnSceneInit(&pokerGame->scene, &pokerGame->assets.font, &pokerGame->assets.testTexture);
-  // pokerGameActionStartAdd(pokerGame);
+  pokerGameActionStartAdd(pokerGame);
-  // queueNext(&pokerGame->scene.conversation.actionQueue);
+  queueNext(&pokerGame->scene.conversation.actionQueue);
-
-
 
   return true;
 } 
@@ -48,8 +41,7 @@ void pokerGameUpdate(game_t *game) {
   // Render the visual novel scene
   // vnSceneRenderWorld(&pokerGame->scene, &game->engine, &pokerGame->assets.shader);
   vnSceneRenderGui(&pokerGame->scene, &game->engine, &pokerGame->assets.shader);
-  frameRender(&frame, &pokerGame->assets.shader);
+  pokerUiRender(pokerGame);
-  // pokerUiRender(pokerGame);
 }
 
 void pokerGameDispose(game_t *game) {

src/game/poker/pokergameassets.c

@@ -17,6 +17,7 @@ bool pokerGameAssetsInit(pokergameassets_t *assets) {
 }
 
 void pokerGameAssetsDispose(pokergameassets_t *assets) {
+  textureDispose(&assets->testTexture);
   languageDispose(&assets->language);
   shaderDispose(&assets->shader);
   fontDispose(&assets->font);

src/game/poker/pokergameassets.h

@@ -9,6 +9,7 @@
 #include <dawn/dawn.h>
 #include "../../file/asset.h"
 #include "../../locale/language.h"
+#include "../../display/texture.h"
 
 bool pokerGameAssetsInit(pokergameassets_t *assets);
 void pokerGameAssetsDispose(pokergameassets_t *assets);

src/game/poker/pokerui.c

@@ -36,6 +36,7 @@ void pokerUiRender(pokergame_t *pokerGame) {
   char buffer[256];
 
   for(i = 0; i < POKER_PLAYER_COUNT; i++) {
+    break;
     playerUi = pokerGame->ui.players + i;
     playerPoker = pokerGame->poker.players + i;
 

src/test/testscene.c

@@ -14,7 +14,7 @@ void testSceneInit(testscene_t *scene, game_t *game) {
   );
 
   // Init Conversation
-  vnConversationInit(&scene->conversation, &scene->font);
+  // vnConversationInit(&scene->conversation, &scene->font);
   scene->conversation.textbox.linesMax = 3;
   scene->conversation.textbox.widthMax = game->engine.render.width;
 

src/ui/frame.c

@@ -10,7 +10,6 @@
 void frameInit(frame_t *frame) {
   frame->x = 0;
   frame->y = 0;
-  frame->z = 0;
 
   primitiveInit(
     &frame->primitive,
@@ -105,7 +104,7 @@ void frameSetInnerSize(frame_t *frame, float width, float height) {
 }
 
 void frameRender(frame_t *frame, shader_t *shader) {
-  shaderUsePosition(shader, frame->x, frame->y, frame->z, 0, 0, 0);
+  shaderUsePosition(shader, frame->x, frame->y, 0,  0, 0, 0);
   shaderUseTexture(shader, frame->texture);
   primitiveDraw(&frame->primitive, 0, -1);
 }

src/vn/conversation/vnconversation.c

@@ -7,8 +7,8 @@
 
 #include "vnconversation.h"
 
-void vnConversationInit(vnconversation_t *convo, font_t *font) {
+void vnConversationInit(vnconversation_t *convo, font_t *font, texture_t *tex) {
-  vnTextBoxInit(&convo->textbox, font);
+  vnTextBoxInit(&convo->textbox, font, tex);
   queueInit(&convo->actionQueue);
 }
 

src/vn/conversation/vnconversation.h

@@ -17,8 +17,9 @@
  * then ensure you call vnConversationNext to begin the conversation.
  * @param convo Conversation to initialize.
  * @param font Font to initialize with.
+ * @param tex GUI Texture.
  */
-void vnConversationInit(vnconversation_t *convo, font_t *font);
+void vnConversationInit(vnconversation_t *convo, font_t *font, texture_t *text);
 
 /**
  * Add a text element to the conversation.

src/vn/gui/vntextbox.c

@@ -7,7 +7,7 @@
 
 #include "vntextbox.h"
 
-void vnTextBoxInit(vntextbox_t *box, font_t *font) {
+void vnTextBoxInit(vntextbox_t *box, font_t *font, texture_t *texture) {
   box->font = font;
   box->widthMax = 400;
   box->text = NULL;
@@ -15,6 +15,10 @@ void vnTextBoxInit(vntextbox_t *box, font_t *font) {
   box->linesMax = 3;
   box->lineCurrent = 0;
   box->state = 0;
+
+
+  frameInit(&box->frame);
+  box->frame.texture = texture;
 }
 
 void vnTextBoxSetText(vntextbox_t *box, char *text) {
@@ -27,29 +31,25 @@ void vnTextBoxSetText(vntextbox_t *box, char *text) {
 
 void vnTextBoxRebuffer(vntextbox_t *box) {
   if(box->primitive.indiceCount > 0) {
-    vnTextBoxDispose(box);
+    primitiveDispose(&box->primitive);
+    box->primitive.indiceCount = 0;
   }
 
   if(box->text == NULL) return;
 
+  // Determine size of the textbox inside the frame.
+  float textMaxWidth = box->widthMax - FRAME_BORDER_SIZE_FULL;
+
   // Rebuffer the text.
   fontTextClamp(
-    box->font, &box->textInfo, box->text, box->widthMax, VN_TEXTBOX_FONT_SIZE
+    box->font, &box->textInfo, box->text, textMaxWidth, VN_TEXTBOX_FONT_SIZE
   );
   fontTextInit(box->font, &box->primitive, &box->textInfo);
 
-  // Test "Background"
+  // Resize the frame
-  quadInit(&box->testPrimitive, 0,
+  frameSetSize(
-    0, 0, 0.3, 0.3,
+    &box->frame, box->widthMax, FONT_LINE_HEIGHT * box->linesMax
-    box->textInfo.width, box->textInfo.height, 0.6, 0.6
   );
-
-  pixel_t pixels[25];
-  for(uint8_t i = 0; i < 25; i++) {
-    pixels[i].r = pixels[i].a = 0xFF;
-    pixels[i].g = pixels[i].b = 0x00;
-  }
-  textureInit(&box->testTexture, 5, 5, pixels);
 }
 
 void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) {
@@ -110,20 +110,26 @@ void vnTextBoxRender(vntextbox_t *box, shader_t *shader) {
   if(charCount < 1) return;
 
   // Render the debug box.
-  shaderUsePosition(shader, box->x,box->y - yOffset,0, 0,0,0);
+  box->frame.x = box->x;
-  shaderUseTexture(shader, &box->testTexture);
+  box->frame.y = box->y - yOffset;
-  primitiveDraw(&box->testPrimitive, 0, -1);
+  frameRender(&box->frame, shader);
   
   // Render the Text Box
+  shaderUsePosition(shader,
+    box->x + FRAME_BORDER_SIZE, box->y - yOffset + FRAME_BORDER_SIZE, 0,
+    0,0,0
+  );
   shaderUseTexture(shader, &box->font->texture);
   primitiveDraw(&box->primitive, charStart, charCount);
 }
 
 void vnTextBoxDispose(vntextbox_t *box) {
-  primitiveDispose(&box->primitive);
+  frameDispose(&box->frame);
-  primitiveDispose(&box->testPrimitive);
+  
-  textureDispose(&box->testTexture);
+  if(box->primitive.indiceCount > 0) {
-  box->primitive.indiceCount = 0;
+    primitiveDispose(&box->primitive);
+    box->primitive.indiceCount = 0;
+  }
 }
 
 bool vnTextBoxHasScrolled(vntextbox_t *box) {

src/vn/gui/vntextbox.h

@@ -13,14 +13,16 @@
 #include "../../display/gui/font.h"
 #include "../../display/primitives/quad.h"
 #include "../../input/input.h"
+#include "../../ui/frame.h"
 
 /**
  * Initializes the Visual Novel Text Box to its initial state.
  * 
  * @param box The box to initialize.
  * @param font Font for the text box to use by default.
+ * @param texture Texture for the GUI Frame Element.
  */
-void vnTextBoxInit(vntextbox_t *box, font_t *font);
+void vnTextBoxInit(vntextbox_t *box, font_t *font, texture_t *texture);
 
 /**
  * Sets just the text and does all necessary changes to the text. Set up your

src/vn/vnscene.c

@@ -7,9 +7,9 @@
 
 #include "vnscene.h"
 
-void vnSceneInit(vnscene_t *scene, font_t *font) {
+void vnSceneInit(vnscene_t *scene, font_t *font, texture_t *text) {
   // Init the conversation
-  vnConversationInit(&scene->conversation, font);
+  vnConversationInit(&scene->conversation, font, text);
   scene->conversation.textbox.linesMax = 3;
 
   // Reset character count

src/vn/vnscene.h

@@ -13,7 +13,7 @@
 #include "../display/camera.h"
 #include "../display/shader.h"
 
-void vnSceneInit(vnscene_t *scene, font_t *font);
+void vnSceneInit(vnscene_t *scene, font_t *font, texture_t *text);
 
 void vnSceneUpdate(vnscene_t *scene, engine_t *engine);