Working on some visual novel elements

include/dawn/dawn.h

@@ -58,6 +58,6 @@
 #include "util/rand.h"
 
 // Visual Novel Objects
-#include "vn/conversation.h"
-
-#include "vn/gui/vntextbox.h"
+#include "vn/vncharacter.h"
+#include "vn/vnconversation.h"
+#include "vn/vntextbox.h"

include/dawn/vn/conversation.h

@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include "../libs.h"
-
-#define CONVERSATION_TEXT_COUNT_MAX 32
-
-typedef struct {
-  char *text;
-  uint8_t speaker;
-} conversationtext_t;
-
-typedef struct {
-  conversationtext_t texts[CONVERSATION_TEXT_COUNT_MAX];
-  uint8_t textCount;
-  uint8_t textCurrent;
-} conversation_t;

include/dawn/vn/vncharacter.h

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "../libs.h"
+#include "../display/texture.h"
+#include "../display/primitive.h"
+#include "../display/tileset.h"
+
+#define VNCHARACTER_EMOTION_NEUTRAL 0x00
+
+typedef struct {
+  float x, y, z;
+  float yaw, pitch, roll;
+
+  uint8_t emotion;
+  bool talking;
+
+  float t;
+  
+  texture_t *textureEyes;
+  texture_t *textureBody;
+  texture_t *textureMouth;
+  texture_t *textureFace;
+
+  primitive_t primitive;
+} vncharacter_t;

include/dawn/vn/vnconversation.h

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include "../libs.h"
+#include "vntextbox.h"
+
+#define VN_CONVERSATION_TEXT_COUNT_MAX 32
+
+#define VN_CONVERSATION_TYPE_DELAY 0x01
+#define VN_CONVERSATION_TYPE_TEXT 0x02
+
+typedef struct {
+  /** Conversation Type to decide what this data is used for */
+  uint8_t type;
+
+  /** Pointer to the string for text to display */
+  char *text;
+
+  /** Time in seconds to delay if type is delay */
+  float delay;
+} vnconversationtext_t;
+
+typedef struct {
+  vntextbox_t textbox;
+  vnconversationtext_t texts[VN_CONVERSATION_TEXT_COUNT_MAX];
+
+  float timeline;
+  float delayStart;
+
+  uint8_t textCount;
+  uint8_t textCurrent;
+} vnconversation_t;

include/dawn/vn/vntextbox.h

@@ -6,14 +6,14 @@
  */
 
 #pragma once
-#include "../../libs.h"
-#include "../../display/animation/timeline.h"
-#include "../../display/gui/font.h"
+#include "../libs.h"
+#include "../display/animation/timeline.h"
+#include "../display/gui/font.h"
 
 /** Amount of characters scrolled, per second */
 #define VN_TEXTBOX_SCROLL_SPEED 60
 
-#define VN_BOX_STATE_CLOSED 0x01
+#define VN_TEXTBOX_STATE_CLOSED 0x01
 
 typedef struct {
   /** Stores the maximum width that this textbox can take up */
@@ -34,8 +34,6 @@ typedef struct {
 
   /** Animation of the textbox */
   float textScroll;
-  // timeline_t animTimeline;
-  // timelineaction_t animActions;
 
   /** Information about the current rendered text */
   fonttextinfo_t textInfo;

src/test/testscene.c

@@ -8,16 +8,22 @@
 #include "testscene.h"
 
 void testSceneInit(testscene_t *scene, game_t *game) {
+  vnconversationtext_t *text;
   assetFontLoad(&scene->font, "fonts/opensans/OpenSans-Bold.ttf");
   assetShaderLoad(&scene->shader,
     "shaders/textured.vert", "shaders/textured.frag"
   );
 
-
-  vnTextBoxInit(&scene->box, &scene->font);
-  scene->box.text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent aliquam volutpat libero, vitae laoreet neque egestas et. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Fusce dui leo, molestie et consectetur quis, blandit eu velit. Suspendisse at dolor sed ligula consectetur luctus. Donec mollis semper lacus id pretium. Maecenas et magna lorem. Nullam non viverra dui. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Pellentesque dapibus facilisis ipsum, eu placerat justo pretium tempus. Quisque vehicula sapien vel sem ullamcorper vestibulum. Mauris pellentesque sapien vel volutpat imperdiet.";
-  scene->box.widthMax = game->engine.render.width;
-  vnTextBoxRebuffer(&scene->box);
+  assetTextureLoad(&scene->pennyEyes, "characters/penny/textures/eyes.png");
+  assetTextureLoad(&scene->pennyBody, "characters/penny/textures/body.png");
+  assetTextureLoad(&scene->pennyFace, "characters/penny/textures/face.png");
+  assetTextureLoad(&scene->pennyMouth, "characters/penny/textures/mouth.png");
+  characterInit(&scene->character,
+    &scene->pennyEyes,
+    &scene->pennyBody,
+    &scene->pennyMouth,
+    &scene->pennyFace
+  );
 }
 
 void testSceneRender(testscene_t *scene, game_t *game) {
@@ -44,7 +50,7 @@ void testSceneRender(testscene_t *scene, game_t *game) {
 
   shaderUse(&scene->shader);
   shaderUseCamera(&scene->shader, &scene->camera);
-
-  vnTextBoxUpdate(&scene->box, &game->engine);
-  vnTextBoxRender(&scene->box, &scene->shader);
+  vnCharacterRender(&scene->character, &scene->shader);
+  // conversationUpdate(&scene->conv, &game->engine);
+  // conversationRender(&scene->conv, &scene->shader);
 }

src/test/testscene.h

@@ -11,15 +11,22 @@
 #include "../display/camera.h"
 #include "../display/gui/font.h"
 #include "../file/asset.h"
-#include "../vn/gui/vntextbox.h"
+
 #include "../display/gui/font.h"
+#include "../display/texture.h"
+#include "../vn/vncharacter.h"
 
 typedef struct {
   shader_t shader;
   camera_t camera;
   font_t font;
   
-  vntextbox_t box;
+  vncharacter_t character;
+
+  texture_t pennyEyes;
+  texture_t pennyBody;
+  texture_t pennyMouth;
+  texture_t pennyFace;
 } testscene_t;
 
 void testSceneInit(testscene_t *scene, game_t *game);

src/vn/conversation.c

@@ -1,26 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#include "conversation.h"
-
-void conversationInit(conversation_t *convo) {
-  convo->textCount = 0x00;
-  convo->textCurrent = 0x00;
-}
-
-void conversationNext(conversation_t *convo) {
-  convo->textCurrent++;
-}
-
-conversationtext_t * conversationAdd(conversation_t *convo, uint8_t speaker,
-  char *text
-) {
-  conversationtext_t *txt = convo->texts + (convo->textCount++);
-  txt->text = text;
-  txt->speaker = speaker;
-  return txt;
-}

src/vn/conversation.h

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2021 Dominic Masters
- * 
- * This software is released under the MIT License.
- * https://opensource.org/licenses/MIT
- */
-
-#pragma once
-#include <dawn/dawn.h>
-#include "../util/array.h"
-#include "../display/animation/timeline.h"
-
-/**
- * Initialize the conversation set.
- * @param convo Conversation to initialize.
- */
-void conversationInit(conversation_t *convo);
-
-/**
- * Proceed to the next conversation element.
- * @param convo Conversation to advance.
- */
-void conversationNext(conversation_t *convo);
-
-/**
- * Add a text element to the conversation.
- * 
- * @param convo Conversation to add to.
- * @param speaker Speaker that said this thing.
- * @param text Text to speak
- * @return The pointer to the text element.
- */
-conversationtext_t * conversationAdd(conversation_t *convo, uint8_t speaker,
-  char *text
-);

src/vn/vncharacter.c

@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "vncharacter.h"
+
+void vnCharacterInit(vncharacter_t *character,
+  texture_t *textureEyes,
+  texture_t *textureBody,
+  texture_t *textureMouth,
+  texture_t *textureFace
+) {
+  character->x = 0;
+  character->y = 0;
+  character->z = 0;
+
+  character->yaw = 0;
+  character->pitch = 0;
+  character->roll = 0;
+
+  // Setup Textures
+  character->textureEyes = textureEyes;
+  character->textureBody = textureBody;
+  character->textureMouth = textureMouth;
+  character->textureFace = textureFace;
+
+  character->emotion = VNCHARACTER_EMOTION_NEUTRAL;
+  character->talking = false;
+
+  character->t = 0;
+}
+
+void vnCharacterRender(vncharacter_t *character, shader_t *shader) {
+
+}

src/vn/vncharacter.h

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include <dawn/dawn.h>
+
+void vnCharacterInit(vncharacter_t *character,
+  texture_t *textureEyes,
+  texture_t *textureBody,
+  texture_t *textureMouth,
+  texture_t *textureFace
+);
+
+void vnCharacterRender(vncharacter_t *character, shader_t *shader);

src/vn/vnconversation.c

@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#include "vnconversation.h"
+
+void vnConversationInit(vnconversation_t *convo, font_t *font) {
+  convo->textCount = 0x00;
+  convo->textCurrent = 0xFF;
+  convo->timeline = 0;
+  convo->delayStart = 0;
+  vnTextBoxInit(&convo->textbox, font);
+}
+
+void vnConversationNext(vnconversation_t *convo) {
+  vnconversationtext_t *text;
+  convo->textCurrent++;
+  if(convo->textCurrent >= convo->textCount) return;
+  convo->delayStart = convo->timeline;
+  text = convo->texts + convo->textCurrent;
+
+  if(text->text != NULL) {
+    vnTextBoxSetText(&convo->textbox, text->text);
+  }
+}
+
+vnconversationtext_t * vnConversationAdd(vnconversation_t *conversation) {
+  vnconversationtext_t *text = conversation->texts + conversation->textCount;
+  conversation->textCount++;
+  text->text = NULL;
+  return text;
+}
+
+void vnConversationUpdate(vnconversation_t *convo, engine_t *engine) {
+  vnconversationtext_t *text;
+
+  // Get the current text
+  convo->timeline += engine->time.delta;
+  if(convo->textCurrent >= convo->textCount) return;
+
+  text = convo->texts + convo->textCurrent;
+  if(text->text != NULL) {
+    vnTextBoxUpdate(&convo->textbox, engine);
+    if(convo->textbox.state & VN_TEXTBOX_STATE_CLOSED) {
+      vnConversationNext(convo);
+    }
+  } else if(text->delay > 0) {
+    if(convo->delayStart + text->delay <= convo->timeline) {
+      vnConversationNext(convo);
+    }
+  }
+}
+
+void vnConversationRender(vnconversation_t *convo, shader_t *shader) {
+  vnTextBoxRender(&convo->textbox, shader);
+}
+
+void vnConversationDispose(vnconversation_t *convo) {
+  vnTextBoxDispose(&convo->textbox);
+}

src/vn/vnconversation.h

@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2021 Dominic Masters
+ * 
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
+#pragma once
+#include <dawn/dawn.h>
+#include  "vntextbox.h"
+#include "../util/array.h"
+#include "../display/animation/timeline.h"
+
+/**
+ * Initialize the conversation set. After adding your first conversation element
+ * then ensure you call conversationNext to begin the first conversation piece.
+ * @param convo Conversation to initialize.
+ * @param font Font to initialize with.
+ */
+void vnConversationInit(vnconversation_t *convo, font_t *font);
+
+/**
+ * Add a text element to the conversation.
+ * @param convo Conversation to add to.
+ * @return The pointer to the text element.
+ */
+vnconversationtext_t * vnConversationAdd(vnconversation_t *convo);
+
+/**
+ * Updates the conversation logic and the wrapped textbox.
+ * @param convo Conversation to update.
+ * @param engine Engine used to update.
+ */
+void vnConversationUpdate(vnconversation_t *convo, engine_t *engine);
+
+/**
+ * Renders the conversation, mostly just a wrapper for the textbox.
+ * @param convo Conversation to render.
+ * @param shader Shader to use while rendering.
+ */
+void vnConversationRender(vnconversation_t *convo, shader_t *shader);
+
+/**
+ * Dispose the conversation when finished.
+ * @param convo Conversation to dispose.
+ */
+void vnConversationDispose(vnconversation_t *convo);

src/vn/vntextbox.c

@@ -17,6 +17,13 @@ void vnTextBoxInit(vntextbox_t *box, font_t *font) {
   box->state = 0;
 }
 
+void vnTextBoxSetText(vntextbox_t *box, char *text) {
+  box->text = text;
+  box->lineCurrent = 0;
+  box->state = 0;
+  vnTextBoxRebuffer(box);
+}
+
 void vnTextBoxRebuffer(vntextbox_t *box) {
   if(box->primitive.indiceCount > 0) {
     vnTextBoxDispose(box);
@@ -43,7 +50,7 @@ void vnTextBoxRebuffer(vntextbox_t *box) {
 
 void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) {
   int32_t i;
-  if(box->state & VN_BOX_STATE_CLOSED > 0) return;
+  if(box->state & VN_TEXTBOX_STATE_CLOSED > 0) return;
 
   // "Next text box"
   if(!vnTextBoxHasScrolled(box)) {
@@ -56,8 +63,7 @@ void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) {
 
   if(vnTextBoxCanBeClosed(box)) {
     // Box can be closed.
-    printf("Box Closed");
-    box->state |= VN_BOX_STATE_CLOSED;
+    box->state |= VN_TEXTBOX_STATE_CLOSED;
     return;
   }
 
@@ -71,7 +77,7 @@ void vnTextBoxUpdate(vntextbox_t *box, engine_t *engine) {
 void vnTextBoxRender(vntextbox_t *box, shader_t *shader) {
   int32_t charStart, charCount;
   float yOffset;
-  if(box->text == NULL || box->state & VN_BOX_STATE_CLOSED > 0) return;
+  if(box->text == NULL || box->state & VN_TEXTBOX_STATE_CLOSED > 0) return;
 
   // Determine where we're rendering the indices up to.
   charCount = box->textScroll;

src/vn/vntextbox.h

@@ -7,12 +7,12 @@
 
 #pragma once
 #include <dawn/dawn.h>
-#include "../../display/primitive.h"
-#include "../../display/shader.h"
-#include "../../display/animation/timeline.h"
-#include "../../display/gui/font.h"
-#include "../../display/primitives/quad.h"
-#include "../../input/input.h"
+#include "../display/primitive.h"
+#include "../display/shader.h"
+#include "../display/animation/timeline.h"
+#include "../display/gui/font.h"
+#include "../display/primitives/quad.h"
+#include "../input/input.h"
 
 /**
  * Initializes the Visual Novel Text Box to its initial state.
@@ -22,6 +22,14 @@
  */
 void vnTextBoxInit(vntextbox_t *box, font_t *font);
 
+/**
+ * Sets just the text and does all necessary changes to the text. Set up your
+ * text box how you like then use this to set just new texts moving forward.
+ * @param box Box to modify.
+ * @param text Text to set onto the textbox.
+ */
+void vnTextBoxSetText(vntextbox_t *box, char *text);
+
 /**
  * Method required to be called when changing anything within the textbox. This
  * will recalculate the text widths, fonts, etc.