diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1646502 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "src/godot/godot-cpp"] + path = src/godot/godot-cpp + url = https://github.com/godotengine/godot-cpp + branch = 3.x diff --git a/src/base/storybook.cpp b/src/base/storybook.cpp index 24e13d4..a2cf42a 100644 --- a/src/base/storybook.cpp +++ b/src/base/storybook.cpp @@ -4,6 +4,10 @@ #include "storybook.h" +Storybook::Storybook() { + // TODO +} + Storybook::Storybook(FILE* fin) { pages = CyoaParse(fin); } diff --git a/src/base/storybook.h b/src/base/storybook.h index b80dd4d..73cf681 100644 --- a/src/base/storybook.h +++ b/src/base/storybook.h @@ -15,6 +15,7 @@ private: void print_choice(Choice *c); public: + Storybook(); Storybook(FILE* fin); // Functions for looking up and printing stats diff --git a/src/godot/.gitignore b/src/godot/.gitignore new file mode 100644 index 0000000..c0b5f3e --- /dev/null +++ b/src/godot/.gitignore @@ -0,0 +1,2 @@ +.sconsign.dblite +bin/ \ No newline at end of file diff --git a/src/godot/SConstruct b/src/godot/SConstruct new file mode 100644 index 0000000..10d97e1 --- /dev/null +++ b/src/godot/SConstruct @@ -0,0 +1,109 @@ +#!python +import os + +opts = Variables([], ARGUMENTS) + +# Gets the standard flags CC, CCX, etc. +env = DefaultEnvironment() + +# Define our options +opts.Add(EnumVariable('target', "Compilation target", 'debug', ['d', 'debug', 'r', 'release'])) +opts.Add(EnumVariable('platform', "Compilation platform", '', ['', 'windows', 'x11', 'linux', 'osx'])) +opts.Add(EnumVariable('p', "Compilation target, alias for 'platform'", '', ['', 'windows', 'x11', 'linux', 'osx'])) +opts.Add(BoolVariable('use_llvm', "Use the LLVM / Clang compiler", 'no')) +opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'bin/')) +opts.Add(PathVariable('target_name', 'The library name.', 'libgdexample', PathVariable.PathAccept)) + +# Local dependency paths, adapt them to your setup +godot_headers_path = "godot-cpp/godot-headers/" +cpp_bindings_path = "godot-cpp/" +cpp_library = "libgodot-cpp" + +# only support 64 at this time.. +bits = 64 + +# Updates the environment with the option variables. +opts.Update(env) + +# Process some arguments +if env['use_llvm']: + env['CC'] = 'clang' + env['CXX'] = 'clang++' + +if env['p'] != '': + env['platform'] = env['p'] + +if env['platform'] == '': + print("No valid target platform selected.") + quit(); + +# For the reference: +# - CCFLAGS are compilation flags shared between C and C++ +# - CFLAGS are for C-specific compilation flags +# - CXXFLAGS are for C++-specific compilation flags +# - CPPFLAGS are for pre-processor flags +# - CPPDEFINES are for pre-processor defines +# - LINKFLAGS are for linking flags + +# Check our platform specifics +if env['platform'] == "osx": + env['target_path'] += 'osx/' + cpp_library += '.osx' + env.Append(CCFLAGS=['-arch', 'x86_64']) + env.Append(CXXFLAGS=['-std=c++17']) + env.Append(LINKFLAGS=['-arch', 'x86_64']) + if env['target'] in ('debug', 'd'): + env.Append(CCFLAGS=['-g', '-O2']) + else: + env.Append(CCFLAGS=['-g', '-O3']) + +elif env['platform'] in ('x11', 'linux'): + env['target_path'] += 'x11/' + cpp_library += '.linux' + env.Append(CCFLAGS=['-fPIC']) + env.Append(CXXFLAGS=['-std=c++17']) + if env['target'] in ('debug', 'd'): + env.Append(CCFLAGS=['-g3', '-Og']) + else: + env.Append(CCFLAGS=['-g', '-O3']) + +elif env['platform'] == "windows": + env['target_path'] += 'win64/' + cpp_library += '.windows' + # This makes sure to keep the session environment variables on windows, + # that way you can run scons in a vs 2017 prompt and it will find all the required tools + env.Append(ENV=os.environ) + + env.Append(CPPDEFINES=['WIN32', '_WIN32', '_WINDOWS', '_CRT_SECURE_NO_WARNINGS']) + env.Append(CCFLAGS=['-W3', '-GR']) + env.Append(CXXFLAGS='/std:c++17') + if env['target'] in ('debug', 'd'): + env.Append(CPPDEFINES=['_DEBUG']) + env.Append(CCFLAGS=['-EHsc', '-MDd', '-ZI']) + env.Append(LINKFLAGS=['-DEBUG']) + else: + env.Append(CPPDEFINES=['NDEBUG']) + env.Append(CCFLAGS=['-O2', '-EHsc', '-MD']) + +if env['target'] in ('debug', 'd'): + cpp_library += '.debug' +else: + cpp_library += '.release' + +cpp_library += '.' + str(bits) + +# make sure our binding library is properly includes +env.Append(CPPPATH=['.', godot_headers_path, cpp_bindings_path + 'include/', cpp_bindings_path + 'include/core/', cpp_bindings_path + 'include/gen/', '../base/']) +env.Append(LIBPATH=[cpp_bindings_path + 'bin/', '../base']) +env.Append(LIBS=[cpp_library]) + +# tweak this if you want to use different folders, or more folders, to store your source code in. +env.Append(CPPPATH=['src/']) +sources = Glob('src/*.cpp') + +library = env.SharedLibrary(target=env['target_path'] + env['target_name'] , source=sources) + +Default(library) + +# Generates help for the -h scons option. +Help(opts.GenerateHelpText(env)) diff --git a/src/godot/godot-cpp b/src/godot/godot-cpp new file mode 160000 index 0000000..4efceef --- /dev/null +++ b/src/godot/godot-cpp @@ -0,0 +1 @@ +Subproject commit 4efceefe138b2494e3c691e1dead1c60efb621b1 diff --git a/src/godot/src/gdlibrary.cpp b/src/godot/src/gdlibrary.cpp new file mode 100644 index 0000000..c7bde96 --- /dev/null +++ b/src/godot/src/gdlibrary.cpp @@ -0,0 +1,16 @@ +// Required for all godot modules +#include "storybook_godot.h" + +extern "C" void GDN_EXPORT godot_gdnative_init(godot_gdnative_init_options *o) { + godot::Godot::gdnative_init(o); +} + +extern "C" void GDN_EXPORT godot_gdnative_terminate(godot_gdnative_terminate_options *o) { + godot::Godot::gdnative_terminate(o); +} + +extern "C" void GDN_EXPORT godot_nativescript_init(void *handle) { + godot::Godot::nativescript_init(handle); + + godot::register_class(); +} diff --git a/src/godot/src/gdlibrary.os b/src/godot/src/gdlibrary.os new file mode 100644 index 0000000..0f74e7b Binary files /dev/null and b/src/godot/src/gdlibrary.os differ diff --git a/src/godot/src/storybook_godot.cpp b/src/godot/src/storybook_godot.cpp new file mode 100644 index 0000000..09eeb43 --- /dev/null +++ b/src/godot/src/storybook_godot.cpp @@ -0,0 +1,13 @@ +#include "storybook_godot.h" + +using namespace godot; + +void Story::_register_methods() { + // TODO + // e.g. register_method("_process", &Story::_process); +} + +Story::Story(){} +Story::~Story(){} + + diff --git a/src/godot/src/storybook_godot.h b/src/godot/src/storybook_godot.h new file mode 100644 index 0000000..c664049 --- /dev/null +++ b/src/godot/src/storybook_godot.h @@ -0,0 +1,23 @@ +#ifndef STORYBOOK_GODOT_H +#define STORYBOOK_GODOT_H + +#include + +#include +#include + +namespace godot { + class Story : public Node { + GODOT_CLASS(Story, Node) + private: + Storybook storybook; + public: + static void _register_methods(); + Story(); + ~Story(); + + void _init(); + }; +}; + +#endif /* STORYBOOK_GODOT_H */ diff --git a/src/godot/src/storybook_godot.os b/src/godot/src/storybook_godot.os new file mode 100644 index 0000000..98c1dd3 Binary files /dev/null and b/src/godot/src/storybook_godot.os differ