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

VN Scene update prog.

Browse Source
This commit is contained in:
Dominic Masters
2023-05-18 09:35:03 -07:00
parent 5a60c10049
commit 02589c0b98
3 changed files with 196 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

365
src/dawntools/vnscenetool/VNSceneGen.cpp
View File

@ -14,138 +14,139 @@ void VNSceneGen::test(
std::vector<std::string> *body, std::vector<std::string> *body,
std::vector<std::string> *includes std::vector<std::string> *includes
) { ) {
std::string initType = "";
std::string toInclude = "";
std::string initArgs = "";
std::vector<std::string> afterLines;
switch(event->type) { // std::string initType = "";
case VN_SCENE_EVENT_TYPE_TEXT: // std::string toInclude = "";
initType = "VNTextEvent"; // std::string initArgs = "";
toInclude = "games/vn/events/VNTextEvent.hpp"; // std::vector<std::string> afterLines;
line(&afterLines, eventName + "->" + "text = \"" + event->text.texts.begin()->text + "\";", "");
break;
case VN_SCENE_EVENT_TYPE_POSITION: // switch(event->type) {
initType = "VNPositionEvent"; // case VN_SCENE_EVENT_TYPE_TEXT:
toInclude = "games/vn/events/VNPositionEvent.hpp"; // initType = "VNTextEvent";
line(&afterLines, eventName + "->item = " + event->position.item + ";", ""); // toInclude = "games/vn/events/VNTextEvent.hpp";
if(event->position.x != "") line(&afterLines, eventName + "->" + "to.x = " + event->position.x + ";", ""); // line(&afterLines, eventName + "->" + "text = \"" + event->text.texts.begin()->text + "\";", "");
if(event->position.y != "") line(&afterLines, eventName + "->" + "to.y = " + event->position.y + ";", ""); // break;
if(event->position.z != "") line(&afterLines, eventName + "->" + "to.z = " + event->position.z + ";", "");
break;
case VN_SCENE_EVENT_TYPE_SET: // case VN_SCENE_EVENT_TYPE_POSITION:
initType = "VNSetEvent<" + event->set.type + ">"; // initType = "VNPositionEvent";
toInclude = "games/vn/events/VNSetEvent.hpp"; // toInclude = "games/vn/events/VNPositionEvent.hpp";
line(&afterLines, eventName + "->modifies = &" + event->set.property + ";", ""); // line(&afterLines, eventName + "->item = " + event->position.item + ";", "");
line(&afterLines, eventName + "->to = " + event->set.to + ";", ""); // if(event->position.x != "") line(&afterLines, eventName + "->" + "to.x = " + event->position.x + ";", "");
if(event->set.from != "") line(&afterLines, eventName + "->from = " + event->set.from + ";", ""); // if(event->position.y != "") line(&afterLines, eventName + "->" + "to.y = " + event->position.y + ";", "");
if(event->set.duration != "") line(&afterLines, eventName + "->duration = " + event->set.duration + ";", ""); // if(event->position.z != "") line(&afterLines, eventName + "->" + "to.z = " + event->position.z + ";", "");
break; // break;
case VN_SCENE_EVENT_TYPE_WAIT: // case VN_SCENE_EVENT_TYPE_SET:
initType = "VNWaitEvent"; // initType = "VNSetEvent<" + event->set.type + ">";
toInclude = "games/vn/events/VNWaitEvent.hpp"; // toInclude = "games/vn/events/VNSetEvent.hpp";
line(&afterLines, eventName + "->duration = " + event->wait.duration + ";", ""); // line(&afterLines, eventName + "->modifies = &" + event->set.property + ";", "");
break; // line(&afterLines, eventName + "->to = " + event->set.to + ";", "");
// if(event->set.from != "") line(&afterLines, eventName + "->from = " + event->set.from + ";", "");
// if(event->set.duration != "") line(&afterLines, eventName + "->duration = " + event->set.duration + ";", "");
// break;
case VN_SCENE_EVENT_TYPE_PARALLEL: { // case VN_SCENE_EVENT_TYPE_WAIT:
initType = "VNParallelEvent"; // initType = "VNWaitEvent";
toInclude = "games/vn/events/VNParallelEvent.hpp"; // toInclude = "games/vn/events/VNWaitEvent.hpp";
// line(&afterLines, eventName + "->duration = " + event->wait.duration + ";", "");
// break;
auto itParallel = event->parallel.events.events.begin(); // case VN_SCENE_EVENT_TYPE_PARALLEL: {
while(itParallel != event->parallel.events.events.end()) { // initType = "VNParallelEvent";
std::string pEventName = "pEvent" + std::to_string((*eventIndex)++); // toInclude = "games/vn/events/VNParallelEvent.hpp";
VNSceneGen::test(
pEventName,
&(*itParallel),
eventIndex,
&afterLines,
includes
);
line(&afterLines, eventName + "->events.push_back(" + pEventName + ");", "");
line(&afterLines, "", "");
++itParallel;
}
break;
}
case VN_SCENE_EVENT_TYPE_MARKER: // auto itParallel = event->parallel.events.events.begin();
initType = "VNDummyEvent"; // while(itParallel != event->parallel.events.events.end()) {
toInclude = "games/vn/events/VNDummyEvent.hpp"; // std::string pEventName = "pEvent" + std::to_string((*eventIndex)++);
line(&afterLines, "auto marker_" + event->marker.name + " = " + eventName + ";", ""); // VNSceneGen::test(
break; // pEventName,
// &(*itParallel),
// eventIndex,
// &afterLines,
// includes
// );
// line(&afterLines, eventName + "->events.push_back(" + pEventName + ");", "");
// line(&afterLines, "", "");
// ++itParallel;
// }
// break;
// }
case VN_SCENE_EVENT_TYPE_GOTO_MARKER: // case VN_SCENE_EVENT_TYPE_MARKER:
initType = "VNDummyEvent"; // initType = "VNDummyEvent";
toInclude = "games/vn/events/VNDummyEvent.hpp"; // toInclude = "games/vn/events/VNDummyEvent.hpp";
line(&afterLines, eventName + "->then(marker_" + event->gotoMarker.name + ");", ""); // line(&afterLines, "auto marker_" + event->marker.name + " = " + eventName + ";", "");
break; // break;
case VN_SCENE_EVENT_TYPE_CHOICES: { // case VN_SCENE_EVENT_TYPE_GOTO_MARKER:
initType = "VNChoiceEvent"; // initType = "VNDummyEvent";
toInclude = "games/vn/events/VNChoiceEvent.hpp"; // toInclude = "games/vn/events/VNDummyEvent.hpp";
line(&afterLines, eventName + "->key = \"" + event->choices.key+ "\";", ""); // line(&afterLines, eventName + "->then(marker_" + event->gotoMarker.name + ");", "");
line(&afterLines, eventName + "->text = \"" + event->choices.titles.begin()->text + "\";", ""); // break;
auto itChoices = event->choices.choices.begin();
while(itChoices != event->choices.choices.end()) {
line(&afterLines, eventName + "->choices[\"" + itChoices->value + "\"] = \"" + itChoices->texts.begin()->text + "\";", "");
++itChoices;
}
break;
}
case VN_SCENE_EVENT_TYPE_CHOICE_SET: // case VN_SCENE_EVENT_TYPE_CHOICES: {
initType = "VNChoiceSetEvent"; // initType = "VNChoiceEvent";
toInclude = "games/vn/events/VNChoiceSetEvent.hpp"; // toInclude = "games/vn/events/VNChoiceEvent.hpp";
line(&afterLines, eventName + "->key = \"" + event->choiceSet.key + "\";", ""); // line(&afterLines, eventName + "->key = \"" + event->choices.key+ "\";", "");
line(&afterLines, eventName + "->value = \"" + event->choiceSet.value + "\";", ""); // line(&afterLines, eventName + "->text = \"" + event->choices.titles.begin()->text + "\";", "");
break; // auto itChoices = event->choices.choices.begin();
// while(itChoices != event->choices.choices.end()) {
// line(&afterLines, eventName + "->choices[\"" + itChoices->value + "\"] = \"" + itChoices->texts.begin()->text + "\";", "");
// ++itChoices;
// }
// break;
// }
case VN_SCENE_EVENT_TYPE_IF: { // case VN_SCENE_EVENT_TYPE_CHOICE_SET:
initType = "VNIfEvent"; // initType = "VNChoiceSetEvent";
toInclude = "games/vn/events/VNIfEvent.hpp"; // toInclude = "games/vn/events/VNChoiceSetEvent.hpp";
line(&afterLines, eventName + "->key = \"" + event->ifEvent.key + "\";", ""); // line(&afterLines, eventName + "->key = \"" + event->choiceSet.key + "\";", "");
line(&afterLines, eventName + "->value = \"" + event->ifEvent.value + "\";", ""); // line(&afterLines, eventName + "->value = \"" + event->choiceSet.value + "\";", "");
// break;
std::string ifPrevious = ""; // case VN_SCENE_EVENT_TYPE_IF: {
std::string ifFirst = ""; // initType = "VNIfEvent";
auto itIf = event->ifEvent.events.events.begin(); // toInclude = "games/vn/events/VNIfEvent.hpp";
while(itIf != event->ifEvent.events.events.end()) { // line(&afterLines, eventName + "->key = \"" + event->ifEvent.key + "\";", "");
std::string ifEventName = "ifEvent" + std::to_string((*eventIndex)++); // line(&afterLines, eventName + "->value = \"" + event->ifEvent.value + "\";", "");
VNSceneGen::test(
ifEventName,
&(*itIf),
eventIndex,
&afterLines,
includes
);
if(!ifPrevious.empty()) line(&afterLines, ifPrevious + "->then(" + ifEventName + ");", "");
ifPrevious = ifEventName;
if(ifFirst == "") ifFirst = ifEventName;
++itIf;
}
if(ifFirst == "" || ifPrevious == "") { // std::string ifPrevious = "";
std::cout << "If event must have at least one event" << std::endl; // std::string ifFirst = "";
assertUnreachable(); // auto itIf = event->ifEvent.events.events.begin();
} // while(itIf != event->ifEvent.events.events.end()) {
// std::string ifEventName = "ifEvent" + std::to_string((*eventIndex)++);
// VNSceneGen::test(
// ifEventName,
// &(*itIf),
// eventIndex,
// &afterLines,
// includes
// );
// if(!ifPrevious.empty()) line(&afterLines, ifPrevious + "->then(" + ifEventName + ");", "");
// ifPrevious = ifEventName;
// if(ifFirst == "") ifFirst = ifEventName;
// ++itIf;
// }
line(&afterLines, eventName + "->ifTrue = " + ifFirst + ";", ""); // if(ifFirst == "" || ifPrevious == "") {
line(&afterLines, eventName + "->ifEnd = " + ifPrevious + ";", ""); // std::cout << "If event must have at least one event" << std::endl;
break; // assertUnreachable();
} // }
default: // line(&afterLines, eventName + "->ifTrue = " + ifFirst + ";", "");
std::cout << "Unknown event type: " << event->type << std::endl; // line(&afterLines, eventName + "->ifEnd = " + ifPrevious + ";", "");
assertUnreachable(); // break;
} // }
if(!toInclude.empty()) includes->push_back(toInclude); // default:
// std::cout << "Unknown event type: " << event->type << std::endl;
// assertUnreachable();
// }
line(body, "auto " + eventName + " = vnManager->createEvent<" + initType + ">(" + initArgs + ");", ""); // if(!toInclude.empty()) includes->push_back(toInclude);
lines(body, afterLines, "");
// line(body, "auto " + eventName + " = vnManager->createEvent<" + initType + ">(" + initArgs + ");", "");
// lines(body, afterLines, "");
} }
void VNSceneGen::generate( void VNSceneGen::generate(
@ -153,84 +154,86 @@ void VNSceneGen::generate(
struct VNScene *scene, struct VNScene *scene,
std::string tabs std::string tabs
) { ) {
struct ClassGenInfo classInfo; std::cout << "Gen Scene" << std::endl;
classInfo.clazz = "TestScene";
classInfo.extend = "Scene";
classInfo.constructorArgs = "DawnGame *game";
classInfo.extendArgs = "game";
classInfo.includes.push_back("scene/Scene.hpp"); // struct ClassGenInfo classInfo;
// classInfo.clazz = "TestScene";
// classInfo.extend = "Scene";
// classInfo.constructorArgs = "DawnGame *game";
// classInfo.extendArgs = "game";
struct MethodGenInfo methodAssets; // classInfo.includes.push_back("scene/Scene.hpp");
methodAssets.name = "getRequiredAssets";
methodAssets.isOverride = true;
methodAssets.type = "std::vector<Asset*>";
line(&methodAssets.body, "auto assMan = &this->game->assetManager;", "");
line(&methodAssets.body, "std::vector<Asset*> assets;", "");
line(&methodAssets.body, "return assets;", "");
struct MethodGenInfo methodStage; // struct MethodGenInfo methodAssets;
methodStage.name = "stage"; // methodAssets.name = "getRequiredAssets";
methodStage.isOverride = "true"; // methodAssets.isOverride = true;
line(&methodStage.body, "// test", ""); // methodAssets.type = "std::vector<Asset*>";
// line(&methodAssets.body, "auto assMan = &this->game->assetManager;", "");
// line(&methodAssets.body, "std::vector<Asset*> assets;", "");
// line(&methodAssets.body, "return assets;", "");
// TEST // struct MethodGenInfo methodStage;
line(&methodStage.body, "auto canvas = UICanvas::create(this);", ""); // methodStage.name = "stage";
line(&methodStage.body, "", ""); // methodStage.isOverride = "true";
// line(&methodStage.body, "// test", "");
classInfo.includes.push_back("scene/components/display/Camera.hpp"); // // TEST
line(&methodStage.body, "auto camera = Camera::create(this);", ""); // line(&methodStage.body, "auto canvas = UICanvas::create(this);", "");
line(&methodStage.body, "camera->fov = 0.436332f;", ""); // line(&methodStage.body, "", "");
line(&methodStage.body, "camera->transform->lookAt(glm::vec3(10, 10, 10), glm::vec3(0, 0, 0));", "");
// Items // classInfo.includes.push_back("scene/components/display/Camera.hpp");
int32_t itemRefIndex = 0; // line(&methodStage.body, "auto camera = Camera::create(this);", "");
auto itItems = scene->items.begin(); // line(&methodStage.body, "camera->fov = 0.436332f;", "");
while(itItems != scene->items.end()) { // line(&methodStage.body, "camera->transform->lookAt(glm::vec3(10, 10, 10), glm::vec3(0, 0, 0));", "");
struct VNSceneItem item = *itItems;
if(item.ref.empty()) item.ref = "item" + std::to_string(itemRefIndex++);
classInfo.includes.push_back(item.prefab + ".hpp");
line(&methodStage.body, "", ""); // // Items
line(&methodStage.body, "auto " + item.ref + " = " + item.className + "::create(this);", ""); // int32_t itemRefIndex = 0;
// auto itItems = scene->items.begin();
// while(itItems != scene->items.end()) {
// struct VNSceneItem item = *itItems;
// if(item.ref.empty()) item.ref = "item" + std::to_string(itemRefIndex++);
// classInfo.includes.push_back(item.prefab + ".hpp");
++itItems; // line(&methodStage.body, "", "");
} // line(&methodStage.body, "auto " + item.ref + " = " + item.className + "::create(this);", "");
line(&methodStage.body, "", ""); // ++itItems;
// }
// Events // line(&methodStage.body, "", "");
classInfo.includes.push_back("games/vn/components/VNManager.hpp");
line(&methodStage.body, "auto vnItem = this->createSceneItem();", "");
line(&methodStage.body, "auto vnManager = vnItem->addComponent<VNManager>();", "");
line(&methodStage.body, "VNEvent *previous = vnManager->createEvent<VNDummyEvent>();", "");
line(&methodStage.body, "auto eventStart = previous;", "");
int32_t eventIndex = 0; // // Events
auto itEvents = scene->events.events.begin(); // classInfo.includes.push_back("games/vn/components/VNManager.hpp");
std::string previous = "eventStart"; // line(&methodStage.body, "auto vnItem = this->createSceneItem();", "");
while(itEvents != scene->events.events.end()) { // line(&methodStage.body, "auto vnManager = vnItem->addComponent<VNManager>();", "");
line(&methodStage.body, "", ""); // line(&methodStage.body, "VNEvent *previous = vnManager->createEvent<VNDummyEvent>();", "");
std::string eventName = "event" + std::to_string(eventIndex++); // line(&methodStage.body, "auto eventStart = previous;", "");
VNSceneGen::test(
eventName,
&(*itEvents),
&eventIndex,
&methodStage.body,
&classInfo.includes
);
line(&methodStage.body, previous + "->then(" + eventName + ");", "");
previous = eventName;
++itEvents;
}
line(&methodStage.body, "", ""); // int32_t eventIndex = 0;
line(&methodStage.body, "vnManager->setEvent(eventStart);", ""); // auto itEvents = scene->events.events.begin();
// std::string previous = "eventStart";
// while(itEvents != scene->events.events.end()) {
// line(&methodStage.body, "", "");
// std::string eventName = "event" + std::to_string(eventIndex++);
// VNSceneGen::test(
// eventName,
// &(*itEvents),
// &eventIndex,
// &methodStage.body,
// &classInfo.includes
// );
// line(&methodStage.body, previous + "->then(" + eventName + ");", "");
// previous = eventName;
// ++itEvents;
// }
// Add in methods // line(&methodStage.body, "", "");
CodeGen::methodGen(&classInfo.protectedCode, methodAssets); // line(&methodStage.body, "vnManager->setEvent(eventStart);", "");
line(&classInfo.protectedCode, "", "");
CodeGen::methodGen(&classInfo.protectedCode, methodStage);
CodeGen::classGen(out, classInfo); // // Add in methods
// CodeGen::methodGen(&classInfo.protectedCode, methodAssets);
// line(&classInfo.protectedCode, "", "");
// CodeGen::methodGen(&classInfo.protectedCode, methodStage);
// CodeGen::classGen(out, classInfo);
} }

26
src/dawntools/vnscenetool/VNSceneParser.cpp
View File

@ -24,27 +24,21 @@ int32_t VNSceneParser::onParse(
// //
int32_t ret; int32_t ret;
// First, pass as a standard scene
ret = (SceneParser()).parse(node, &out->scene, error);
if(ret != 0) return ret;
// Now pass the VN Events
auto itChildren = node->children.begin(); auto itChildren = node->children.begin();
while(itChildren != node->children.end()) { while(itChildren != node->children.end()) {
Xml *child = *itChildren; Xml *child = *itChildren;
if(child->node != "events") {
// Parse event(s) ++itChildren;
if(child->node == "item") { continue;
struct VNSceneItem item; }
ret = (VNSceneItemParser()).parse(child, &item, error);
if(ret != 0) return ret;
out->items.push_back(item);
} else if(child->node == "events") {
ret = (VNSceneEventsParser()).parse(child, &out->events, error); ret = (VNSceneEventsParser()).parse(child, &out->events, error);
if(ret != 0) return ret; if(ret != 0) return ret;
break;
} else {
// Unknown node
*error = "Unknown node '" + child->node + "' in <vnscene>";
return -1;
}
itChildren++;
} }
return 0; return 0;

2
src/dawntools/vnscenetool/VNSceneParser.hpp
View File

@ -4,9 +4,9 @@
// https://opensource.org/licenses/MIT // https://opensource.org/licenses/MIT
#pragma once #pragma once
#include "util/parser/SceneParser.hpp"
#include "VNSceneItemParser.hpp" #include "VNSceneItemParser.hpp"
#include "events/VNSceneEventsParser.hpp" #include "events/VNSceneEventsParser.hpp"
#include "util/parser/SceneItemParser.hpp"
namespace Dawn { namespace Dawn {
struct VNScene { struct VNScene {