lachrymal/NouVeL
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rudimentary serialization + NVL Director

Browse source
This commit is contained in:
lachrymaL 2023-04-08 02:33:37 -04:00
parent 3a40e5697d
commit 6903c2d3ca
No known key found for this signature in database
GPG key ID: F3640ACFA174B1C1
10 changed files with 140 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
ADVect/ADVect.cpp
View file

@ -3,6 +3,7 @@
#include "Graphics.h"
#include "Track.h"
#include "Compiler.h"
#include "Director.h"
#include <SDL.h>
#include <SDL_main.h>
@ -25,16 +26,14 @@ namespace {
u16 window_height = 720;
u64 init_time, last_time, current_time, delta_t;
bool running = false;
bool running = false, rolling = true;
bool draw_ui = true;
bool m_keys[65536]{}; // terrible
bool mouse[256]{ true }; // terrible
std::vector<NVL::Parse::Scene> scenes;
u32 current_scene = 0;
u32 scene_pos = 0;
std::unique_ptr<NVL::Director::Director> director;
ADVect::MarkupTextTransitionTrack m_text{
.current{},
@ -65,8 +64,8 @@ namespace {
}
namespace ADVect {
bool Init(std::string name, const std::vector<NVL::Parse::Scene>& sc) {
scenes = sc; // sure make a copy whatever
bool Init(std::string name, const NVL::Compiler::NVLGraph& g) {
director = std::make_unique<NVL::Director::Director>(g);
if (SDL_Init(SDL_INIT_VIDEO)) {
std::cerr << "ADV: Failed to init SDL: " << SDL_GetError() << std::endl;
@ -140,21 +139,15 @@ namespace ADVect {
void Advance() {
if (!m_text.transition.done) m_text.transition.done = true;
else {
size_t curr_size = scenes[current_scene].get().size();
while (scene_pos < curr_size && std::get<NVL::String>(scenes[current_scene].get()[scene_pos][0].value) != u"Say") {
NVL::Environment::Apply(scenes[current_scene].get()[scene_pos]);
scene_pos++;
}
if (curr_size == scene_pos) {
running = false;
return;
}
if (std::get<NVL::String>(scenes[current_scene].get()[scene_pos][0].value) == u"Say") {
NVL::Environment::Apply(scenes[current_scene].get()[scene_pos]);
scene_pos++;
}
else if (director->active) {
rolling = true;
director->Advance();
}
else
running = false;
if (running && rolling)
Advance();
}
void Update() {
@ -207,8 +200,7 @@ namespace ADVect {
bgfx::dbgTextPrintf(0, 0, 0xf8, " %u FPS", stat->cpuTimerFreq / stat->cpuTimeFrame);
bgfx::dbgTextPrintf(0, 1, 0xf8, " NouVeL x ADVect :: %s :: Build %s %s", BX_COMPILER_NAME, __DATE__, __TIME__);
bgfx::dbgTextPrintf(0, 2, 0xf8, " SDL %i.%i.%2i :: bgfx 1.%i :: %s", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL, BGFX_API_VERSION, bgfx::getRendererName(bgfx::getRendererType()));
bgfx::dbgTextPrintf(0, 3, 0xf8, " Current Position: %u", scene_pos);
bgfx::dbgTextPrintf(0, 4, 0xf8, " Current Scene: %s", NVL::to_std_string(scenes[current_scene].name).c_str());
bgfx::dbgTextPrintf(0, 3, 0xf8, " NVL Director State: %s", NVL::to_std_string(director->description).c_str());
bgfx::frame();
}
@ -254,67 +246,75 @@ namespace ADVect {
int main(int argc, char* argv[]) {
std::filesystem::current_path("E:\\Archive\\Projects\\NouVeL\\ADVect\\runtime");
//std::filesystem::current_path("/Users/lachrymal/Projects/NouVeL/ADVect/runtime/");
NVL::Environment::ENVIRONMENT.enter({
{
u"Say",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
NVL::Environment::MarkupString str = NVL::Environment::UnpackMarkupVariable(std::get<std::vector<NVL::Environment::Variable>>(args[0].value));
size_t len = str.length();
m_text.change(current_time, str, len * 10, [len](NVL::Number x) { return static_cast<size_t>(x * len); });
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"SwitchSpeaker",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
speaker.current = std::get<NVL::String>(args[0].value);
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"BG",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
bg.change(current_time, ADVect::Graphics::GetImageTextureFromFile(NVL::to_std_string(std::get<NVL::String>(args[0].value))), 200);
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"Avatar",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
avatar.change(current_time, ADVect::Graphics::GetImageTextureFromFile(NVL::to_std_string(std::get<NVL::String>(args[0].value))), 200);
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"BGDialogue",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
dialogue_bg.current = ADVect::Graphics::GetImageTextureFromFile(NVL::to_std_string(std::get<NVL::String>(args[0].value)));
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"Show",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
std::get<std::function<NVL::Environment::Variable(std::vector<NVL::Environment::Variable>)>>(args[0].value)({args[1]});
return NVL::Environment::Type::Nil;
}, 2)
}
});
std::vector<NVL::Parse::Scene> SCENES = NVL::Parse::ParseFile("dialogue.nvl");
if (SCENES.empty()) {
std::cerr << "Main: Empty NVL parse, check file" << std::endl;
return EXIT_FAILURE;
{
u"Say",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
NVL::Environment::MarkupString str = NVL::Environment::UnpackMarkupVariable(std::get<std::vector<NVL::Environment::Variable>>(args[0].value));
size_t len = str.length();
m_text.change(current_time, str, len * 10, [len](NVL::Number x) { return static_cast<size_t>(x * len); });
rolling = false;
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"SwitchSpeaker",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
speaker.current = std::get<NVL::String>(args[0].value);
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"BG",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
bg.change(current_time, ADVect::Graphics::GetImageTextureFromFile(NVL::to_std_string(std::get<NVL::String>(args[0].value))), 200);
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"Avatar",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
avatar.change(current_time, ADVect::Graphics::GetImageTextureFromFile(NVL::to_std_string(std::get<NVL::String>(args[0].value))), 200);
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"BGDialogue",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
dialogue_bg.current = ADVect::Graphics::GetImageTextureFromFile(NVL::to_std_string(std::get<NVL::String>(args[0].value)));
return NVL::Environment::Type::Nil;
}, 1)
},
{
u"Show",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
std::get<std::function<NVL::Environment::Variable(std::vector<NVL::Environment::Variable>)>>(args[0].value)({args[1]});
return NVL::Environment::Type::Nil;
}, 2)
}
});
//auto a = NVL::Compiler::Compile(SCENES, 0);
//std::vector<NVL::Parse::Scene> scenes = NVL::Parse::ParseFile("dialogue.nvl");
//if (scenes.empty()) {
// std::cerr << "Main: Empty NVL parse, check file" << std::endl;
// return EXIT_FAILURE;
//}
//auto a = NVL::Compiler::Compile(scenes, 0);
//auto b = NVL::Compiler::Serialize(a);
//std::istringstream c{b.str()};
//auto d = NVL::Compiler::Deserialize(c);
std::ifstream f;
f.open("mmoker.nvlb", std::ios::binary);
if (!ADVect::Init("ADV Test", SCENES)) return EXIT_FAILURE;
std::stringstream c;
c << f.rdbuf();
f.close();
std::istringstream d(c.str());
auto e = NVL::Compiler::Deserialize(d);
if (!ADVect::Init("ADV Test", e)) return EXIT_FAILURE;
ADVect::Run();
ADVect::Shutdown();

BIN
ADVect/runtime/mmoker.nvlb Normal file
View file

Binary file not shown.

19
CMakePresets.json
View file

@ -17,7 +17,9 @@
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"hostOS": [ "Windows" ]
"hostOS": [
"Windows"
]
}
}
},
@ -33,12 +35,23 @@
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"hostOS": [ "Linux" ]
"hostOS": [
"Linux"
]
},
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
"sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
}
}
},
{
"name": "x64-release",
"displayName": "x64 Release",
"inherits": "windows-default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_MSVC_RUNTIME_LIBRARY": "MultiThreaded"
}
}
]
}
}

2
NVL/CMakeLists.txt
View file

@ -5,7 +5,7 @@ cmake_minimum_required (VERSION 3.8)
project (NVL)
include_directories("include")
add_library (NVL STATIC "Parser.cpp" "Environment.cpp" "Environment.h" "Common.h" "Compiler.cpp" "Compiler.h" "Director.h")
add_library (NVL STATIC "Parser.cpp" "Environment.cpp" "Environment.h" "Common.h" "Compiler.cpp" "Compiler.h" "Director.h" "Director.cpp")
# add_executable (NVL "NouVeL.cpp" "Parser.cpp" "Environment.cpp" "Environment.h" "Common.h" )
# TODO: Add tests and install targets if needed.

5
NVL/Compiler.cpp
View file

@ -69,7 +69,7 @@ namespace {
return vs;
}
case Type::Nil:
return {};
return {Type::Nil};
case Type::Number:
case Type::StaticReference:
{
@ -119,6 +119,7 @@ namespace NVL::Compiler {
// TODO route nodes when JUMP
n.sequence.push_back(s);
n.description = scenes[entry_scene_index].name;
}
nodes.push_back(n);
return NVLGraph{ nodes, procedure_names };
@ -133,6 +134,7 @@ namespace NVL::Compiler {
}
SerializeDirect(s, static_cast<u16>(g.nodes.size()));
for (const _DirectedGraphNode& n : g.nodes) {
SerializeString(s, n.description);
SerializeDirect(s, static_cast<u16>(n.sequence.size()));
for (const Vector<Environment::Variable>& c : n.sequence) {
SerializeDirect(s, static_cast<u16>(c.size()));
@ -156,6 +158,7 @@ namespace NVL::Compiler {
DeserializeDirect(buf, size);
for (u16 i = 0; i < size; i++) {
_DirectedGraphNode n{};
n.description = DeserializeString(buf);
u16 size2{};
DeserializeDirect(buf, size2);
for (u16 j = 0; j < size2; j++) {

3
NVL/Compiler.h
View file

@ -8,6 +8,7 @@
namespace NVL::Compiler {
struct _DirectedGraphNode {
String description;
Vector<Vector<Environment::Variable>> sequence;
};
@ -16,7 +17,7 @@ namespace NVL::Compiler {
Vector<String> static_refs;
};
Environment::Variable StaticEval(Vector<String>& refs, const Parse::Object& obj);
Environment::Variable StaticEval(const Environment::Environment& env, Vector<String>& refs, const Parse::Object& obj);
NVLGraph Compile(const Vector<Parse::Scene>& scenes, i32 entry_scene_index);

30
NVL/Director.cpp
View file

@ -1,15 +1,35 @@
#include "Director.h"
namespace NVL::Director {
Director(const Compiler::NVLGraph& g, const Environment::Environment env) : g(g), current_position(0), environment(env) {
Director::Director(const Compiler::NVLGraph& g) :
g(g), current_position(0), active(true), description(g.nodes[0].description), current_node(g.nodes[0]) {
for (const String& s : g.static_refs)
resolve.push_back(env.get(s));
resolve.push_back(Environment::ENVIRONMENT.get(s));
}
String& GetSceneName() {
Environment::Variable Director::CollectVariable(const Environment::Variable& v) {
if (v.type == Environment::Type::StaticReference)
return this->resolve[static_cast<u16>(std::get<Number>(v.value))];
else if (v.type == Environment::Type::Array) {
Vector<Environment::Variable> a{};
for (const auto& x : std::get<Vector<Environment::Variable>>(v.value))
a.push_back(CollectVariable(x));
return Environment::Variable(a);
}
else
return v;
}
void Director::Advance() {
if (current_position >= current_node.sequence.size()) {
this->active = false;
return;
}
const auto& cmd = this->current_node.sequence[current_position];
Vector<Environment::Variable> args{};
for (u32 i = 1; i < cmd.size(); i++) {
args.push_back(CollectVariable(cmd[i]));
}
std::get<std::function<Environment::Variable(Vector<Environment::Variable>)>>(CollectVariable(cmd[0]).value)(args);
this->current_position++;
}
void Director::GetBacklog() {

15
NVL/Director.h
View file

@ -6,15 +6,16 @@
namespace NVL::Director {
class Director {
private:
u64 current_position;
const Compiler::NVLGraph& g;
const Environment::Environment& environment;
Vector<Environment::Variable> resolve;
u64 current_position{};
const Compiler::_DirectedGraphNode& current_node{};
const Compiler::NVLGraph& g{};
Vector<Environment::Variable> resolve{};
Environment::Variable CollectVariable(const Environment::Variable& v);
public:
bool active;
const String& description;
bool active = false;
Director() = delete;
Director(const Compiler::NVLGraph& g, const Environment::Environment env);
String& GetSceneName();
Director(const Compiler::NVLGraph& g);
void Advance();
void GetBacklog();
void Save();

11
NVL/Environment.cpp
View file

@ -1,10 +1,10 @@
#include "Environment.h"
#include "Parser.h"
#include <stdexcept>
namespace NVL::Environment {
Environment ENVIRONMENT;
Variable::Variable() : type(Type::Nil), length(0) { }
Variable::Variable(Type t) : type(t), length(0) {
if (t != Type::Nil)
@ -45,7 +45,7 @@ namespace NVL::Environment {
env[name] = p;
}
Variable& Environment::get(const String& name) {
const Variable& Environment::get(const String& name) const {
return env.at(name);
}
@ -79,11 +79,10 @@ namespace NVL::Environment {
Vector<Variable> args{};
Variable f = Eval(c[0]);
u32 i = 1;
while (i < c.size()) {
args.push_back(Eval(c[i++]));
for (u32 i = 1; i < c.size(); i++) {
args.push_back(Eval(c[i]));
}
if (f.length != -1 && f.length != i - 1) throw std::runtime_error("Function arity mismatch");
if (f.length != -1 && f.length != c.size() - 1) throw std::runtime_error("Function arity mismatch");
return std::get<std::function<Variable(Vector<Variable>)>>(f.value)(args);
}

4
NVL/Environment.h
View file

@ -6,7 +6,7 @@
#include "Common.h"
namespace NVL::Environment {
enum class Type { StaticReference, Procedure, Number, String, Array, Nil };
enum class Type { Nil, StaticReference, Procedure, Number, String, Array };
struct Variable {
Type type;
@ -29,7 +29,7 @@ namespace NVL::Environment {
void enter(const String& name, Variable p);
void enter(std::initializer_list<std::pair<String, Variable>> p);
void set(const String& name, Variable p);
Variable& get(const String& name);
const Variable& get(const String& name) const;
bool exists(const String& name);
};