Comitting incase I break something

assets/games/liminal/scenes/scene-base.xml

@@ -1,12 +1,14 @@
 <scene name="TestScene">
-  <item position="0, 0, -10" >
+  <item lookAt="10, 10, 10, 0, 0, 0">
-    <Camera fov="0.436332" ref="camNew" />
+    <Camera ref="camera" />
-    <!-- <CameraTexture /> -->
   </item>
 
-  <item ref="eth" prefab="prefabs/EthPrefab" />
+  <item lookAt="0, 0, 5, 0, 0, 0" >
+    <Camera fov="0.436332" ref="cameraNew" />
+    <CameraTexture />
+  </item>
 
-  <!-- <item ref="canvasItem">
+  <item>
     <UICanvas ref="canvas" />
     <item ref="textbox" prefab="prefabs/VNTextbox" />
 
@@ -19,5 +21,5 @@
         ref="image"
       />
     </item>
-  </item> -->
+  </item>
 </scene>

assets/games/liminal/scenes/scene-extend.xml

@@ -0,0 +1,3 @@
+<scene name="ExtendedScene" extend="scenes/TestScene">
+  <item ref="eth" prefab="prefabs/EthPrefab" />
+</scene>

src/dawnliminal/CMakeLists.txt

@@ -19,6 +19,7 @@ add_subdirectory(save)
 # Assets
 set(LIMINAL_ASSETS_DIR ${DAWN_ASSETS_DIR}/games/liminal)
 tool_scene(${LIMINAL_ASSETS_DIR}/scenes/scene-base.xml)
+tool_scene(${LIMINAL_ASSETS_DIR}/scenes/scene-extend.xml)
 # tool_vnscene(${LIMINAL_ASSETS_DIR}/test.xml)
 
 tool_prefab(${LIMINAL_ASSETS_DIR}/VNTextbox.xml)

src/dawntools/scenetool/SceneParser.cpp

@@ -12,7 +12,9 @@ std::vector<std::string> SceneParser::getRequiredAttributes() {
 }
 
 std::map<std::string, std::string> SceneParser::getOptionalAttributes() {
-  return {};
+  return {
+    { "extend", "" }
+  };
 }
 
 int32_t SceneParser::onParse(
@@ -25,6 +27,7 @@ int32_t SceneParser::onParse(
 
   //Create the scene item
   out->name = values["name"];
+  out->extend = values["extend"];
 
   //Parse the children
   auto itChildren = node->children.begin();

src/dawntools/scenetool/SceneParser.hpp

@@ -9,6 +9,7 @@
 namespace Dawn {
   struct Scene {
     std::string name;
+    std::string extend;
     std::vector<struct SceneItem> items;
     struct SceneItemComponentRegistry *registry;
   };

src/dawntools/util/generator/SceneItemGenerator.cpp

@@ -64,6 +64,10 @@ void SceneItemGenerator::generate(
     line(initBody, name + "->transform.setLocalScale(" + item->scale + ");", "");
   }
 
+  if(item->lookAtPosition.size() > 0) {
+    line(initBody, name + "->transform.lookAt(" + item->lookAtPosition + ", " + item->lookAtTarget + ");", "");
+  }
+
   // Add assets
   auto itAssets = item->assets.begin();
   while(itAssets != item->assets.end()) {

src/dawntools/util/parser/SceneItemParser.cpp

@@ -15,6 +15,7 @@ std::map<std::string, std::string> SceneItemParser::getOptionalAttributes() {
   return {
     { "ref", "" },
     { "position", "" },
+    { "lookAt", "" },
     { "scale", "" },
     { "prefab", "" }
   };
@@ -38,6 +39,19 @@ int32_t SceneItemParser::onParse(
     if(error->size() > 0) return 1;
   }
 
+  if(values["lookAt"].size() > 0) {
+    auto lookAtSplit = stringSplit(values["lookAt"], ",");
+    if(lookAtSplit.size() != 6) {
+      *error = "Invalid lookAt value: " + values["lookAt"];
+      return 1;
+    }
+
+    out->lookAtPosition = vec3Parser(lookAtSplit[0] + "," + lookAtSplit[1] + "," + lookAtSplit[2], error);
+    if(error->size() > 0) return 1;
+    out->lookAtTarget = vec3Parser(lookAtSplit[3] + "," + lookAtSplit[4] + "," + lookAtSplit[5], error);
+    if(error->size() > 0) return 1;
+  }
+
   out->prefab = values["prefab"];
 
   auto itChildren = node->children.begin();

src/dawntools/util/parser/SceneItemParser.hpp

@@ -12,6 +12,8 @@ namespace Dawn {
     struct SceneItemComponentRegistry *registry;
     std::string ref;
     std::string position;
+    std::string lookAtPosition;
+    std::string lookAtTarget;
     std::string scale;
     std::string prefab;
     std::vector<struct SceneItemComponent> components;

src/dawntools/util/parser/TypeParsers.hpp

@@ -79,6 +79,26 @@ namespace Dawn {
   };
 
 
+  static inline std::string vec6Parser(std::string v, std::string *error) {
+    // Split string by comma into two strings that we pass into float
+    auto split = stringSplit(v, ",");
+    if(split.size() != 6) {
+      *error = "Invalid vec6 value: " + v;
+      return std::string("");
+    }
+    return std::string(
+      "glm::vec3(" +
+        floatParser(split[0], error) + ", " +
+        floatParser(split[1], error) + ", " +
+        floatParser(split[2], error) + ", " +
+        floatParser(split[3], error) + ", " +
+        floatParser(split[4], error) + ", " +
+        floatParser(split[5], error) +
+      ")"
+    );
+  };
+
+
   static inline std::string vec4Parser(std::string v, std::string *error) {
     // Split string by comma into two strings that we pass into float
     auto split = stringSplit(v, ",");