From e6fc4fe3cd0d14c1566f7ce7fce9c2e4f357396c Mon Sep 17 00:00:00 2001 From: Julian Benda Date: Fri, 26 Jan 2024 11:34:32 +0100 Subject: [PATCH 1/5] UE release fixes + add copy right notice + update update uplugin file + move third party software to seperate directory + add include import --- LICENSE.txt | 1 + inkcpp/CMakeLists.txt | 3 + inkcpp/array.h | 6 ++ inkcpp/avl_array.h | 3 +- inkcpp/casting.h | 6 ++ inkcpp/choice.cpp | 6 ++ inkcpp/collections/restorable.cpp | 6 ++ inkcpp/collections/restorable.h | 6 ++ inkcpp/container_operations.cpp | 6 ++ inkcpp/container_operations.h | 6 ++ inkcpp/executioner.h | 6 ++ inkcpp/functional.cpp | 6 ++ inkcpp/functions.cpp | 6 ++ inkcpp/functions.h | 6 ++ inkcpp/globals_impl.cpp | 6 ++ inkcpp/globals_impl.h | 6 ++ inkcpp/header.cpp | 6 ++ inkcpp/include/choice.h | 6 ++ inkcpp/include/functional.h | 6 ++ inkcpp/include/globals.h | 6 ++ inkcpp/include/list.h | 6 ++ inkcpp/include/runner.h | 6 ++ inkcpp/include/snapshot.h | 6 ++ inkcpp/include/story.h | 6 ++ inkcpp/include/story_ptr.h | 6 ++ inkcpp/include/traits.h | 6 ++ inkcpp/include/types.h | 6 ++ inkcpp/list_impl.cpp | 6 ++ inkcpp/list_impl.h | 6 ++ inkcpp/list_operations.cpp | 6 ++ inkcpp/list_operations.h | 6 ++ inkcpp/list_table.cpp | 6 ++ inkcpp/list_table.h | 6 ++ inkcpp/numeric_operations.cpp | 6 ++ inkcpp/numeric_operations.h | 6 ++ inkcpp/operation_bases.h | 6 ++ inkcpp/operations.h | 6 ++ inkcpp/output.cpp | 6 ++ inkcpp/output.h | 6 ++ inkcpp/platform.h | 8 +- inkcpp/random.h | 6 ++ inkcpp/runner_impl.cpp | 6 ++ inkcpp/runner_impl.h | 6 ++ inkcpp/simple_restorable_stack.h | 6 ++ inkcpp/snapshot_impl.cpp | 6 ++ inkcpp/snapshot_impl.h | 6 ++ inkcpp/snapshot_interface.h | 6 ++ inkcpp/stack.cpp | 6 ++ inkcpp/stack.h | 6 ++ inkcpp/story_impl.cpp | 6 ++ inkcpp/story_impl.h | 6 ++ inkcpp/story_ptr.cpp | 6 ++ inkcpp/string_operations.cpp | 6 ++ inkcpp/string_operations.h | 6 ++ inkcpp/string_table.cpp | 6 ++ inkcpp/string_table.h | 6 ++ inkcpp/string_utils.h | 6 ++ inkcpp/system.cpp | 6 ++ inkcpp/tuple.hpp | 6 ++ inkcpp/value.cpp | 6 ++ inkcpp/value.h | 6 ++ inkcpp_compiler/CMakeLists.txt | 4 +- inkcpp_compiler/binary_emitter.cpp | 6 ++ inkcpp_compiler/binary_emitter.h | 6 ++ inkcpp_compiler/binary_stream.cpp | 6 ++ inkcpp_compiler/binary_stream.h | 6 ++ inkcpp_compiler/command.cpp | 6 ++ inkcpp_compiler/compiler.cpp | 6 ++ inkcpp_compiler/emitter.cpp | 6 ++ inkcpp_compiler/emitter.h | 6 ++ inkcpp_compiler/include/compilation_results.h | 6 ++ inkcpp_compiler/include/compiler.h | 13 +++- inkcpp_compiler/json_compiler.cpp | 6 ++ inkcpp_compiler/json_compiler.h | 6 ++ inkcpp_compiler/list_data.cpp | 6 ++ inkcpp_compiler/list_data.h | 6 ++ inkcpp_compiler/reporter.cpp | 6 ++ inkcpp_compiler/reporter.h | 8 +- inkcpp_compiler/text_emitter.cpp | 0 inkcpp_compiler/text_emitter.h | 0 shared/CMakeLists.txt | 2 +- shared/private/command.h | 6 ++ shared/private/header.h | 6 ++ shared/public/config.h | 6 ++ shared/public/system.h | 6 ++ shared/public/version.h | 6 ++ unreal/CMakeLists.txt | 12 +-- .../inkcpp/Source/inkcpp/Private/InkAsset.cpp | 8 +- .../Source/inkcpp/Private/InkChoice.cpp | 8 +- .../inkcpp/Source/inkcpp/Private/InkList.cpp | 6 ++ .../Source/inkcpp/Private/InkRuntime.cpp | 8 +- .../Source/inkcpp/Private/InkThread.cpp | 8 +- .../inkcpp/Source/inkcpp/Private/InkVar.cpp | 6 ++ .../inkcpp/Source/inkcpp/Private/TagList.cpp | 8 +- unreal/inkcpp/Source/inkcpp/Private/ink/EMPTY | 0 .../inkcpp/Source/inkcpp/Private/inkcpp.cpp | 8 +- unreal/inkcpp/Source/inkcpp/Public/InkAsset.h | 6 ++ .../inkcpp/Source/inkcpp/Public/InkChoice.h | 8 +- .../Source/inkcpp/Public/InkDelegates.h | 6 ++ unreal/inkcpp/Source/inkcpp/Public/InkList.h | 6 ++ .../inkcpp/Source/inkcpp/Public/InkRuntime.h | 8 +- .../inkcpp/Source/inkcpp/Public/InkSnapshot.h | 6 ++ .../inkcpp/Source/inkcpp/Public/InkThread.h | 8 +- unreal/inkcpp/Source/inkcpp/Public/InkVar.h | 11 ++- unreal/inkcpp/Source/inkcpp/Public/TagList.h | 8 +- unreal/inkcpp/Source/inkcpp/Public/ink/EMPTY | 0 unreal/inkcpp/Source/inkcpp/Public/inkcpp.h | 51 +++++++++++-- unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs | 3 +- .../inkcpp_editor/Private/InkAssetFactory.cpp | 73 ++++++++++++++++++- .../inkcpp_editor/Private/InkAssetFactory.h | 6 ++ .../Source/inkcpp_editor/Private/ink/EMPTY | 0 .../inkcpp_editor/Private/inkcpp_editor.cpp | 8 +- .../Private/inklecate_cmd.cpp.in | 6 ++ .../inkcpp_editor/Public/inkcpp_editor.h | 6 ++ .../inkcpp_editor/inkcpp_editor.Build.cs | 1 + unreal/inkcpp/Source/shared/Private/EMPTY | 0 unreal/inkcpp/Source/shared/Public/EMPTY | 0 unreal/inkcpp/inkcpp.uplugin | 48 +++++++----- 118 files changed, 779 insertions(+), 60 deletions(-) delete mode 100644 inkcpp_compiler/text_emitter.cpp delete mode 100644 inkcpp_compiler/text_emitter.h delete mode 100644 unreal/inkcpp/Source/inkcpp/Private/ink/EMPTY delete mode 100644 unreal/inkcpp/Source/inkcpp/Public/ink/EMPTY delete mode 100644 unreal/inkcpp/Source/inkcpp_editor/Private/ink/EMPTY delete mode 100644 unreal/inkcpp/Source/shared/Private/EMPTY delete mode 100644 unreal/inkcpp/Source/shared/Public/EMPTY diff --git a/LICENSE.txt b/LICENSE.txt index d78ada43..c23f08cf 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,6 @@ MIT License +Copyright (c) 2024 Julian Benda Copyright (c) 2020 Brook Jensen Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/inkcpp/CMakeLists.txt b/inkcpp/CMakeLists.txt index 455ce745..a3ddfbb8 100644 --- a/inkcpp/CMakeLists.txt +++ b/inkcpp/CMakeLists.txt @@ -60,5 +60,8 @@ target_compile_features(inkcpp PUBLIC cxx_std_17) # Unreal installation install(DIRECTORY "include/" DESTINATION "inkcpp/Source/inkcpp/Public/ink/" COMPONENT unreal EXCLUDE_FROM_ALL) +list(REMOVE_ITEM SOURCE "avl_array.h") +install(FILES "avl_array.h" DESTINATION "inkcpp/Source/ThirdParty/Private" + COMPONENT unreal EXCLUDE_FROM_ALL) install(FILES ${SOURCES} DESTINATION "inkcpp/Source/inkcpp/Private/ink/" COMPONENT unreal EXCLUDE_FROM_ALL) install(FILES ${COLLECTION_SOURCES} DESTINATION "inkcpp/Source/inkcpp/Private/ink/collections/" COMPONENT unreal EXCLUDE_FROM_ALL) diff --git a/inkcpp/array.h b/inkcpp/array.h index d3b0567f..5216c13b 100644 --- a/inkcpp/array.h +++ b/inkcpp/array.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "snapshot_interface.h" diff --git a/inkcpp/avl_array.h b/inkcpp/avl_array.h index e4fb3a24..271f6b18 100644 --- a/inkcpp/avl_array.h +++ b/inkcpp/avl_array.h @@ -1,4 +1,5 @@ -/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +// Copyright // \author (c) Marco Paland (info@paland.com) // 2017, PALANDesign Hannover, Germany // diff --git a/inkcpp/casting.h b/inkcpp/casting.h index fb940446..50dc1756 100644 --- a/inkcpp/casting.h +++ b/inkcpp/casting.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// Managing casting between value types. diff --git a/inkcpp/choice.cpp b/inkcpp/choice.cpp index 005bb166..ae863e85 100644 --- a/inkcpp/choice.cpp +++ b/inkcpp/choice.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "choice.h" #include "output.h" diff --git a/inkcpp/collections/restorable.cpp b/inkcpp/collections/restorable.cpp index 6ce8e495..b617e774 100644 --- a/inkcpp/collections/restorable.cpp +++ b/inkcpp/collections/restorable.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "restorable.h" #include "../stack.h" diff --git a/inkcpp/collections/restorable.h b/inkcpp/collections/restorable.h index 6ed6c0a6..10c99d80 100644 --- a/inkcpp/collections/restorable.h +++ b/inkcpp/collections/restorable.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "../snapshot_impl.h" diff --git a/inkcpp/container_operations.cpp b/inkcpp/container_operations.cpp index 79de3f93..57703e50 100644 --- a/inkcpp/container_operations.cpp +++ b/inkcpp/container_operations.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "stack.h" #include "value.h" #include "operations.h" diff --git a/inkcpp/container_operations.h b/inkcpp/container_operations.h index e780c5a9..6cace6df 100644 --- a/inkcpp/container_operations.h +++ b/inkcpp/container_operations.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once namespace ink::runtime::internal { diff --git a/inkcpp/executioner.h b/inkcpp/executioner.h index 78703aa5..84585b23 100644 --- a/inkcpp/executioner.h +++ b/inkcpp/executioner.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// Defines the executioner class which initialize the different operations diff --git a/inkcpp/functional.cpp b/inkcpp/functional.cpp index 5bdde70d..cf346250 100644 --- a/inkcpp/functional.cpp +++ b/inkcpp/functional.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "functional.h" #include "value.h" diff --git a/inkcpp/functions.cpp b/inkcpp/functions.cpp index 26cd1de2..ac19eaf8 100644 --- a/inkcpp/functions.cpp +++ b/inkcpp/functions.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "functions.h" namespace ink::runtime::internal diff --git a/inkcpp/functions.h b/inkcpp/functions.h index 57dc052e..76ae7288 100644 --- a/inkcpp/functions.h +++ b/inkcpp/functions.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "functional.h" diff --git a/inkcpp/globals_impl.cpp b/inkcpp/globals_impl.cpp index 9e543227..1051cbb0 100644 --- a/inkcpp/globals_impl.cpp +++ b/inkcpp/globals_impl.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "globals_impl.h" #include "story_impl.h" #include "runner_impl.h" diff --git a/inkcpp/globals_impl.h b/inkcpp/globals_impl.h index 2913a48a..30464601 100644 --- a/inkcpp/globals_impl.h +++ b/inkcpp/globals_impl.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "config.h" diff --git a/inkcpp/header.cpp b/inkcpp/header.cpp index 57faf733..ecf30902 100644 --- a/inkcpp/header.cpp +++ b/inkcpp/header.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "header.h" #include "version.h" diff --git a/inkcpp/include/choice.h b/inkcpp/include/choice.h index 381c577b..8bd352b9 100644 --- a/inkcpp/include/choice.h +++ b/inkcpp/include/choice.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp/include/functional.h b/inkcpp/include/functional.h index e2d5ebaa..e35fd1b4 100644 --- a/inkcpp/include/functional.h +++ b/inkcpp/include/functional.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "config.h" diff --git a/inkcpp/include/globals.h b/inkcpp/include/globals.h index 97513516..8ce96b7c 100644 --- a/inkcpp/include/globals.h +++ b/inkcpp/include/globals.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "types.h" diff --git a/inkcpp/include/list.h b/inkcpp/include/list.h index aca8e8b3..9881983d 100644 --- a/inkcpp/include/list.h +++ b/inkcpp/include/list.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp/include/runner.h b/inkcpp/include/runner.h index e0158701..748ae246 100644 --- a/inkcpp/include/runner.h +++ b/inkcpp/include/runner.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "config.h" diff --git a/inkcpp/include/snapshot.h b/inkcpp/include/snapshot.h index 9bbc12e8..fad5603a 100644 --- a/inkcpp/include/snapshot.h +++ b/inkcpp/include/snapshot.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "types.h" diff --git a/inkcpp/include/story.h b/inkcpp/include/story.h index 55249eda..a085ea83 100644 --- a/inkcpp/include/story.h +++ b/inkcpp/include/story.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "types.h" diff --git a/inkcpp/include/story_ptr.h b/inkcpp/include/story_ptr.h index b75e9425..5227b8dd 100644 --- a/inkcpp/include/story_ptr.h +++ b/inkcpp/include/story_ptr.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp/include/traits.h b/inkcpp/include/traits.h index 85411704..91793db4 100644 --- a/inkcpp/include/traits.h +++ b/inkcpp/include/traits.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "config.h" diff --git a/inkcpp/include/types.h b/inkcpp/include/types.h index f7276f20..a91756ff 100644 --- a/inkcpp/include/types.h +++ b/inkcpp/include/types.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "list.h" diff --git a/inkcpp/list_impl.cpp b/inkcpp/list_impl.cpp index bb442e97..3357de74 100644 --- a/inkcpp/list_impl.cpp +++ b/inkcpp/list_impl.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "list_impl.h" #include "list.h" #include "list_table.h" diff --git a/inkcpp/list_impl.h b/inkcpp/list_impl.h index 73a7d9ee..f3d31fcb 100644 --- a/inkcpp/list_impl.h +++ b/inkcpp/list_impl.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "list.h" diff --git a/inkcpp/list_operations.cpp b/inkcpp/list_operations.cpp index eac2bbb8..e21a0816 100644 --- a/inkcpp/list_operations.cpp +++ b/inkcpp/list_operations.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ /// implements operations on lists #include "stack.h" diff --git a/inkcpp/list_operations.h b/inkcpp/list_operations.h index 5589e306..cd181dc8 100644 --- a/inkcpp/list_operations.h +++ b/inkcpp/list_operations.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// defines operations on lists diff --git a/inkcpp/list_table.cpp b/inkcpp/list_table.cpp index b4ca3bbc..8a9fbfa0 100644 --- a/inkcpp/list_table.cpp +++ b/inkcpp/list_table.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "list_table.h" #include "traits.h" #include "header.h" diff --git a/inkcpp/list_table.h b/inkcpp/list_table.h index e34bd838..6c0d2e6e 100644 --- a/inkcpp/list_table.h +++ b/inkcpp/list_table.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp/numeric_operations.cpp b/inkcpp/numeric_operations.cpp index 6d17c57c..454a4f83 100644 --- a/inkcpp/numeric_operations.cpp +++ b/inkcpp/numeric_operations.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "stack.h" #include "value.h" #include "operations.h" diff --git a/inkcpp/numeric_operations.h b/inkcpp/numeric_operations.h index 8d909790..c312270a 100644 --- a/inkcpp/numeric_operations.h +++ b/inkcpp/numeric_operations.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "value.h" diff --git a/inkcpp/operation_bases.h b/inkcpp/operation_bases.h index 88bfd6e0..8d6dfe8b 100644 --- a/inkcpp/operation_bases.h +++ b/inkcpp/operation_bases.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// defines data storage for operations. diff --git a/inkcpp/operations.h b/inkcpp/operations.h index 17019daa..71211b66 100644 --- a/inkcpp/operations.h +++ b/inkcpp/operations.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// Define base constructs to specify by operation headers. diff --git a/inkcpp/output.cpp b/inkcpp/output.cpp index ef1ce58b..6552dc03 100644 --- a/inkcpp/output.cpp +++ b/inkcpp/output.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "output.h" #include "string_table.h" #include "list_table.h" diff --git a/inkcpp/output.h b/inkcpp/output.h index 2aed9171..f557106c 100644 --- a/inkcpp/output.h +++ b/inkcpp/output.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "value.h" diff --git a/inkcpp/platform.h b/inkcpp/platform.h index d98c420d..7cb83700 100644 --- a/inkcpp/platform.h +++ b/inkcpp/platform.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "config.h" @@ -13,4 +19,4 @@ #endif #ifdef INK_ENABLE_UNREAL #include "Containers/UnrealString.h" -#endif \ No newline at end of file +#endif diff --git a/inkcpp/random.h b/inkcpp/random.h index 518e3e27..c8cdabe6 100644 --- a/inkcpp/random.h +++ b/inkcpp/random.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp/runner_impl.cpp b/inkcpp/runner_impl.cpp index 5d600c5e..0713e5dc 100644 --- a/inkcpp/runner_impl.cpp +++ b/inkcpp/runner_impl.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "runner_impl.h" #include "story_impl.h" #include "command.h" diff --git a/inkcpp/runner_impl.h b/inkcpp/runner_impl.h index 97c7c564..4885d2eb 100644 --- a/inkcpp/runner_impl.h +++ b/inkcpp/runner_impl.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "value.h" diff --git a/inkcpp/simple_restorable_stack.h b/inkcpp/simple_restorable_stack.h index 3e359adb..53b54106 100644 --- a/inkcpp/simple_restorable_stack.h +++ b/inkcpp/simple_restorable_stack.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp/snapshot_impl.cpp b/inkcpp/snapshot_impl.cpp index 009e323a..f2d0b84c 100644 --- a/inkcpp/snapshot_impl.cpp +++ b/inkcpp/snapshot_impl.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "snapshot_impl.h" #include "story_impl.h" diff --git a/inkcpp/snapshot_impl.h b/inkcpp/snapshot_impl.h index e341e4f2..7f7afe74 100644 --- a/inkcpp/snapshot_impl.h +++ b/inkcpp/snapshot_impl.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "snapshot.h" diff --git a/inkcpp/snapshot_interface.h b/inkcpp/snapshot_interface.h index 0eedc529..e2b0c176 100644 --- a/inkcpp/snapshot_interface.h +++ b/inkcpp/snapshot_interface.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "snapshot.h" diff --git a/inkcpp/stack.cpp b/inkcpp/stack.cpp index ef5bcde2..35fe3c0c 100644 --- a/inkcpp/stack.cpp +++ b/inkcpp/stack.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "stack.h" #include "string_table.h" diff --git a/inkcpp/stack.h b/inkcpp/stack.h index 7faca24f..12fdd2ad 100644 --- a/inkcpp/stack.h +++ b/inkcpp/stack.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "value.h" diff --git a/inkcpp/story_impl.cpp b/inkcpp/story_impl.cpp index a3eacd79..c23f01b3 100644 --- a/inkcpp/story_impl.cpp +++ b/inkcpp/story_impl.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "story_impl.h" #include "platform.h" #include "runner_impl.h" diff --git a/inkcpp/story_impl.h b/inkcpp/story_impl.h index 172c16a2..784808ec 100644 --- a/inkcpp/story_impl.h +++ b/inkcpp/story_impl.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include diff --git a/inkcpp/story_ptr.cpp b/inkcpp/story_ptr.cpp index 780aa8e8..3cf16d4f 100644 --- a/inkcpp/story_ptr.cpp +++ b/inkcpp/story_ptr.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "story_ptr.h" namespace ink::runtime::internal diff --git a/inkcpp/string_operations.cpp b/inkcpp/string_operations.cpp index 75e235cf..a290a1cc 100644 --- a/inkcpp/string_operations.cpp +++ b/inkcpp/string_operations.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ /// implementation for commands on strings /// string_cast is a class which convert an value to a string. /// if the value is already a string it dose nothing (just serve the pointer), diff --git a/inkcpp/string_operations.h b/inkcpp/string_operations.h index d7a8de27..f5bd806b 100644 --- a/inkcpp/string_operations.h +++ b/inkcpp/string_operations.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// defines operations allowed on strings. diff --git a/inkcpp/string_table.cpp b/inkcpp/string_table.cpp index 05f70378..cba9c7ea 100644 --- a/inkcpp/string_table.cpp +++ b/inkcpp/string_table.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "string_table.h" namespace ink::runtime::internal diff --git a/inkcpp/string_table.h b/inkcpp/string_table.h index 09b05513..12e27968 100644 --- a/inkcpp/string_table.h +++ b/inkcpp/string_table.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "avl_array.h" diff --git a/inkcpp/string_utils.h b/inkcpp/string_utils.h index 33dc26e2..5bad4cc9 100644 --- a/inkcpp/string_utils.h +++ b/inkcpp/string_utils.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp/system.cpp b/inkcpp/system.cpp index f303cb02..349e4b35 100644 --- a/inkcpp/system.cpp +++ b/inkcpp/system.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "system.h" #ifndef INK_ENABLE_UNREAL diff --git a/inkcpp/tuple.hpp b/inkcpp/tuple.hpp index eb4f99a5..89452e45 100644 --- a/inkcpp/tuple.hpp +++ b/inkcpp/tuple.hpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// very basic flat tuple implementation, only use for trivial data types. diff --git a/inkcpp/value.cpp b/inkcpp/value.cpp index 49a7bfca..a3432199 100644 --- a/inkcpp/value.cpp +++ b/inkcpp/value.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "value.h" #include "list_impl.h" diff --git a/inkcpp/value.h b/inkcpp/value.h index 7d02e216..09f8bf61 100644 --- a/inkcpp/value.h +++ b/inkcpp/value.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once /// The value class contains the information which type its hold and a small diff --git a/inkcpp_compiler/CMakeLists.txt b/inkcpp_compiler/CMakeLists.txt index ea90cf0c..7ce011e4 100644 --- a/inkcpp_compiler/CMakeLists.txt +++ b/inkcpp_compiler/CMakeLists.txt @@ -3,7 +3,6 @@ list(APPEND SOURCES json_compiler.h json_compiler.cpp emitter.h emitter.cpp reporter.h reporter.cpp - text_emitter.h text_emitter.cpp binary_emitter.h binary_emitter.cpp list_data.h list_data.cpp command.cpp @@ -31,5 +30,8 @@ target_compile_features(inkcpp_compiler PUBLIC cxx_std_17) target_compile_features(inkcpp_compiler PUBLIC cxx_std_17) # Unreal installation +list(REMOVE_ITEM SOURCES "json.hpp") +install(FILES "json.hpp" DESTINATION "inkcpp/Source/ThirdParty/Private/" + COMPONENT unreal EXCLUDE_FROM_ALL) install(DIRECTORY "include/" DESTINATION "inkcpp/Source/inkcpp_editor/Private/ink/" COMPONENT unreal EXCLUDE_FROM_ALL) install(FILES ${SOURCES} DESTINATION "inkcpp/Source/inkcpp_editor/Private/ink/" COMPONENT unreal EXCLUDE_FROM_ALL) diff --git a/inkcpp_compiler/binary_emitter.cpp b/inkcpp_compiler/binary_emitter.cpp index 4b66023c..f83e0853 100644 --- a/inkcpp_compiler/binary_emitter.cpp +++ b/inkcpp_compiler/binary_emitter.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "binary_emitter.h" #include "header.h" diff --git a/inkcpp_compiler/binary_emitter.h b/inkcpp_compiler/binary_emitter.h index 7033c909..aa7aecbe 100644 --- a/inkcpp_compiler/binary_emitter.h +++ b/inkcpp_compiler/binary_emitter.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "emitter.h" diff --git a/inkcpp_compiler/binary_stream.cpp b/inkcpp_compiler/binary_stream.cpp index 6c57064d..77547f3a 100644 --- a/inkcpp_compiler/binary_stream.cpp +++ b/inkcpp_compiler/binary_stream.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "binary_stream.h" #include diff --git a/inkcpp_compiler/binary_stream.h b/inkcpp_compiler/binary_stream.h index d5228727..a105a73b 100644 --- a/inkcpp_compiler/binary_stream.h +++ b/inkcpp_compiler/binary_stream.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp_compiler/command.cpp b/inkcpp_compiler/command.cpp index c8cea04a..217f4271 100644 --- a/inkcpp_compiler/command.cpp +++ b/inkcpp_compiler/command.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "command.h" namespace ink diff --git a/inkcpp_compiler/compiler.cpp b/inkcpp_compiler/compiler.cpp index 5084a9af..0a3e2cbb 100644 --- a/inkcpp_compiler/compiler.cpp +++ b/inkcpp_compiler/compiler.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "compiler.h" #include "json_compiler.h" diff --git a/inkcpp_compiler/emitter.cpp b/inkcpp_compiler/emitter.cpp index 2b43b271..7bf3c710 100644 --- a/inkcpp_compiler/emitter.cpp +++ b/inkcpp_compiler/emitter.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "emitter.h" namespace ink::compiler::internal diff --git a/inkcpp_compiler/emitter.h b/inkcpp_compiler/emitter.h index cee87890..5f2796a9 100644 --- a/inkcpp_compiler/emitter.h +++ b/inkcpp_compiler/emitter.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "command.h" diff --git a/inkcpp_compiler/include/compilation_results.h b/inkcpp_compiler/include/compilation_results.h index f4a91652..0025a1c7 100644 --- a/inkcpp_compiler/include/compilation_results.h +++ b/inkcpp_compiler/include/compilation_results.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include diff --git a/inkcpp_compiler/include/compiler.h b/inkcpp_compiler/include/compiler.h index 7a1f7d37..ed28146a 100644 --- a/inkcpp_compiler/include/compiler.h +++ b/inkcpp_compiler/include/compiler.h @@ -1,8 +1,17 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "config.h" #ifdef INK_EXPOSE_JSON -#include "../json.hpp" +# ifdef INK_ENABLE_UNREAL +# error Exposing JSON is not supported currently in UE +# endif +# include "../json.hpp" #endif #include "compilation_results.h" #include @@ -32,4 +41,4 @@ namespace compiler /** stream -> file */ void run(std::istream& in, const char* filenameOut, compilation_results* results = nullptr); } // namespace compiler -} +} // namespace ink diff --git a/inkcpp_compiler/json_compiler.cpp b/inkcpp_compiler/json_compiler.cpp index 811b38dd..9ab77aa3 100644 --- a/inkcpp_compiler/json_compiler.cpp +++ b/inkcpp_compiler/json_compiler.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "json_compiler.h" #include "command.h" diff --git a/inkcpp_compiler/json_compiler.h b/inkcpp_compiler/json_compiler.h index 5179ea40..3c4fcf9e 100644 --- a/inkcpp_compiler/json_compiler.h +++ b/inkcpp_compiler/json_compiler.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "json.hpp" #include "system.h" diff --git a/inkcpp_compiler/list_data.cpp b/inkcpp_compiler/list_data.cpp index b4c76ca1..6d41c9a6 100644 --- a/inkcpp_compiler/list_data.cpp +++ b/inkcpp_compiler/list_data.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "list_data.h" #include diff --git a/inkcpp_compiler/list_data.h b/inkcpp_compiler/list_data.h index 2581320f..4a4bb538 100644 --- a/inkcpp_compiler/list_data.h +++ b/inkcpp_compiler/list_data.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/inkcpp_compiler/reporter.cpp b/inkcpp_compiler/reporter.cpp index b3b7b553..189d8247 100644 --- a/inkcpp_compiler/reporter.cpp +++ b/inkcpp_compiler/reporter.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "reporter.h" #include "compilation_results.h" #include "system.h" diff --git a/inkcpp_compiler/reporter.h b/inkcpp_compiler/reporter.h index a7033b9d..c746c776 100644 --- a/inkcpp_compiler/reporter.h +++ b/inkcpp_compiler/reporter.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "compilation_results.h" @@ -46,4 +52,4 @@ namespace ink::compiler::internal error_strbuf _buffer; std::ostream _stream; }; -} \ No newline at end of file +} diff --git a/inkcpp_compiler/text_emitter.cpp b/inkcpp_compiler/text_emitter.cpp deleted file mode 100644 index e69de29b..00000000 diff --git a/inkcpp_compiler/text_emitter.h b/inkcpp_compiler/text_emitter.h deleted file mode 100644 index e69de29b..00000000 diff --git a/shared/CMakeLists.txt b/shared/CMakeLists.txt index e01c32c0..f2a01649 100644 --- a/shared/CMakeLists.txt +++ b/shared/CMakeLists.txt @@ -10,5 +10,5 @@ FILE(GLOB PUBLIC_HEADERS "public/*") set_target_properties(inkcpp_shared PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}") # Unreal installation -install(DIRECTORY "public/" DESTINATION "inkcpp/Source/shared/Public/" COMPONENT unreal EXCLUDE_FROM_ALL) +install(DIRECTORY "public/" DESTINATION "inkcpp/Source/shared/Public" COMPONENT unreal EXCLUDE_FROM_ALL) install(DIRECTORY "private/" DESTINATION "inkcpp/Source/shared/Private/" COMPONENT unreal EXCLUDE_FROM_ALL) diff --git a/shared/private/command.h b/shared/private/command.h index 881963ea..dc2d2482 100644 --- a/shared/private/command.h +++ b/shared/private/command.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once namespace ink diff --git a/shared/private/header.h b/shared/private/header.h index c4574593..1f34fe78 100644 --- a/shared/private/header.h +++ b/shared/private/header.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/shared/public/config.h b/shared/public/config.h index eab3ba0e..f48df343 100644 --- a/shared/public/config.h +++ b/shared/public/config.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #ifdef INKCPP_API diff --git a/shared/public/system.h b/shared/public/system.h index 86556d8a..f376ba2c 100644 --- a/shared/public/system.h +++ b/shared/public/system.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "config.h" diff --git a/shared/public/version.h b/shared/public/version.h index 2298a7d0..a7116c41 100644 --- a/shared/public/version.h +++ b/shared/public/version.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "system.h" diff --git a/unreal/CMakeLists.txt b/unreal/CMakeLists.txt index 133f7d39..80183726 100644 --- a/unreal/CMakeLists.txt +++ b/unreal/CMakeLists.txt @@ -6,17 +6,17 @@ set(CMAKE_TLS_VERIFY true) FetchContent_Declare(inklecate_mac URL https://github.com/inkle/ink/releases/download/v1.1.1/inklecate_mac.zip URL_HASH SHA256=c516402bca5fa249a7712e62591b048b137eba3098c53f9fb85a4253f9b9e2c0 -SOURCE_DIR "inkcpp/Resources/inklecate/mac" +SOURCE_DIR "inkcpp/Source/ThirdParty/inklecate/mac" ) FetchContent_Declare(inklecate_windows URL https://github.com/inkle/ink/releases/download/v1.1.1/inklecate_windows.zip URL_HASH SHA256=6f317cb4c59bf1b31c6dd61e80c6a2287a1d8c241a703f0586f736ae00871aab -SOURCE_DIR "inkcpp/Resources/inklecate/windows" +SOURCE_DIR "inkcpp/Source/ThirdParty/inklecate/windows" ) FetchContent_Declare(inklecate_linux URL https://github.com/inkle/ink/releases/download/v1.1.1/inklecate_linux.zip URL_HASH SHA256=26f4e188e02536d6e99e73e71d9b13e2c2144187f1368a87e82fd5066176cff8 -SOURCE_DIR "inkcpp/Resources/inklecate/linux" +SOURCE_DIR "inkcpp/Source/ThirdParty/inklecate/linux" ) set(FETCHCONTENT_QUIET OFF) @@ -26,7 +26,7 @@ if(NOT inklecate_windows_SOURCE_DIR) message(WARNING "failed to download inklecate for windows, " "the unreal plugin will be unable use a .ink file as asset directly") else() -set(INKLECATE_CMD_WIN "Resources/inklecate/windows/inklecate.exe") +set(INKLECATE_CMD_WIN "Source/ThirdParty/inklecate/windows/inklecate.exe") endif() FetchContent_MakeAvailable(inklecate_mac) @@ -34,7 +34,7 @@ if(NOT inklecate_mac_SOURCE_DIR) message(WARNING "failed to download inklecate for MacOS, " "the unreal plugin will be unable use a .ink file as asset directly") else() -set(INKLECATE_CMD_MAC "Resources/inklecate/mac/inklecate") +set(INKLECATE_CMD_MAC "Source/ThirdParty/inklecate/mac/inklecate") endif() FetchContent_MakeAvailable(inklecate_linux) @@ -42,7 +42,7 @@ if(NOT inklecate_linux_SOURCE_DIR) message(WARNING "failed to download inklecate for linux, " "the unreal plugin will be unable use a .ink file as asset directly") else() -set(INKLECATE_CMD_LINUX "Resources/inklecate/linux/inklecate") +set(INKLECATE_CMD_LINUX "Source/ThirdParty/inklecate/linux/inklecate") endif() configure_file( diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp index 98ee625c..fdc7b0b4 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "InkAsset.h" #include "Misc/FileHelper.h" @@ -38,4 +44,4 @@ void UInkAsset::GetAssetRegistryTags(TArray& OutTags) const Super::GetAssetRegistryTags(OutTags); } -#endif \ No newline at end of file +#endif diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp index 32307a9e..b6ee84fe 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "InkChoice.h" #include "ink/choice.h" @@ -31,4 +37,4 @@ void UInkChoice::Initialize(const ink::runtime::choice* c) } tags->Initialize(fstring_tags); } -} \ No newline at end of file +} diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp index 9df8d1eb..cf23eda9 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "InkList.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp index 62c0a4eb..59d88b7a 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp @@ -1,5 +1,9 @@ -// Fill out your copyright notice in the Description page of Project Settings. - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "InkRuntime.h" // Game includes diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp index c299eed9..9f41e235 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp @@ -1,5 +1,9 @@ -// Fill out your copyright notice in the Description page of Project Settings. - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "InkThread.h" #include "inkcpp.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp index 169c3574..6333dc68 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "InkVar.h" #include "ink/types.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp b/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp index bb0f43a6..31f93200 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp @@ -1,5 +1,9 @@ -// Fill out your copyright notice in the Description page of Project Settings. - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "TagList.h" UTagList::UTagList() diff --git a/unreal/inkcpp/Source/inkcpp/Private/ink/EMPTY b/unreal/inkcpp/Source/inkcpp/Private/ink/EMPTY deleted file mode 100644 index e69de29b..00000000 diff --git a/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp b/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp index 5d0e9868..4a076337 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp @@ -1,7 +1,13 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "inkcpp.h" #include "CoreMinimal.h" #include "Modules/ModuleManager.h" IMPLEMENT_MODULE(FDefaultGameModuleImpl, inkcpp) -DEFINE_LOG_CATEGORY(InkCpp); \ No newline at end of file +DEFINE_LOG_CATEGORY(InkCpp); diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h b/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h index 4b63d3c2..c5639ac0 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "UObject/Object.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h index 9cae6577..87965cea 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h @@ -1,5 +1,9 @@ -#pragma once - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "TagList.h" #include "UObject/Object.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h b/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h index c7967c0d..a0d43762 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "CoreMinimal.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkList.h b/unreal/inkcpp/Source/inkcpp/Public/InkList.h index 17e5d8a7..4b8f08f7 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkList.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkList.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "InkList.generated.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h b/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h index 17737426..c5abbf16 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h @@ -1,5 +1,9 @@ -// Fill out your copyright notice in the Description page of Project Settings. - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "CoreMinimal.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h b/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h index 5dc678cd..24fa8b4c 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "InkSnapshot.generated.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkThread.h b/unreal/inkcpp/Source/inkcpp/Public/InkThread.h index e60389e5..128889af 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkThread.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkThread.h @@ -1,5 +1,9 @@ -// Fill out your copyright notice in the Description page of Project Settings. - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "CoreMinimal.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkVar.h b/unreal/inkcpp/Source/inkcpp/Public/InkVar.h index afa72cff..6239a965 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkVar.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkVar.h @@ -1,7 +1,14 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + * + * Based on Copyright (c) 2020 David Colson + * UnrealInk @ https://github.com/DavidColson/UnrealInk + */ #pragma once -// NOTICE: EInkVarType and FInkVar are copied from David Colson's UnrealInk project @ https://github.com/DavidColson/UnrealInk - #include "CoreMinimal.h" #include "Kismet/BlueprintFunctionLibrary.h" #include "UObject/TextProperty.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/TagList.h b/unreal/inkcpp/Source/inkcpp/Public/TagList.h index a576a9d8..830e3344 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/TagList.h +++ b/unreal/inkcpp/Source/inkcpp/Public/TagList.h @@ -1,5 +1,9 @@ -// Fill out your copyright notice in the Description page of Project Settings. - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "CoreMinimal.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/ink/EMPTY b/unreal/inkcpp/Source/inkcpp/Public/ink/EMPTY deleted file mode 100644 index e69de29b..00000000 diff --git a/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h b/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h index ef07ecf9..c75b7702 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h +++ b/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h @@ -1,19 +1,45 @@ -#pragma once - +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "Logging/LogMacros.h" /** * @defgroup unreal Unreal Blueprints * Blueprint Classes usable in Unreal. An example can be found * [here](unreal/inkCPP_DEMO.zip), do not forgett to install the plugin via the marketplace(soonTM) - * or unzipping the `unreal.zip` from the [release page]() to `/UNREAL_ENGINE/Engine/Plugins`.
+ * or unzipping the `unreal.zip` from the [release page](https://github.com/JBenda/inkcpp/releases/latest) to `/YOUR_UNREAL_PROJECT/Plugins/`.
* And eitherway activating the plugin. * * The C++ API will be available soon(TM). * - * In the following the [Demo project](../unreal/InkCPP_DEMO.zip) will be @ref ue_example - * "shown".
- * But firsta more general explenation of the @ref ue_components "UE5 Blueprits" + * + @ref ue_setup "General setup" + * + @ref ue_components "UE5 Blueprits" + * + @ref ue_example "Demo project & setup" + * + * @section ue_setup Setup + * + * After installing the plugin (see above) you need to activate it via `Plugins->...`. + * Then to run your Ink script you need a instance of @ref AInkRuntime. The story will + * only proceed if this actor is active. + * + * On this instance set the `Ink|InkAsset` property to the story that you will run. + * To create this InkAsset you need to import a `.ink` file or `.ink.json` file. + * + * With the @ref AInkRuntime you can then create @ref UInkThreads with @ref AInkRuntime::Start(). + * In addition does the runtime allows you access to the global variables via @ref AInkRuntime::ObserveChange() "observer" or directly @ref AInkRuntime::Set() "setter" und @ref AInkRuntime::Get() "getter". + * + * Notice that all threads spawned in the + * same runtime will share a global state. So if you want to play the same story with different + * states, you need multiple runtimes. + * + * The @ref UInkThread class provides will fire events when new context is available. The easiest way to + * implement then is to create a custom Blueprint based on @ref UInkThread. For a overview see @ref ue_thread. + * + * Below you can find the blueprints of a @ref ue_example_minimal "minimal example". Which is included + * for further inspection inside the @ref ue_example "Example project" (in the map `Minimal`). * * @section ue_components Components * @@ -38,7 +64,7 @@ * * The most importent events/functions are: * + @ref UInkThread::OnLineWritten() which is called by each new line of output - * + @ref UInkThread::OnLineWritten() which is called if a choice is encounterd and must be handled + * + @ref UInkThread::OnChoice() which is called if a choice is encounterd and must be handled * + @ref UInkThread::PickChoice() to pick a choice and continue the thread. * * @subsection ue_choice Choice @@ -68,6 +94,17 @@ * * [Download](../unreal/inkCPP_DEMO.zip) * + * @subsection ue_example_setup Setup + * + * To setup the [example project](../unreal/inkCPP_DEMO.zip) install the Plugin via the [UE + * marketplace](https://www.unrealengine.com/product/494904fc50f747db879c297ee57cf122) place unpack + * the `unreal.zip` from the [release page](https://github.com/JBenda/inkcpp/releases/latest) inside + * `/PATH/inkCPP_DEMO/Plugins/`. + * + * Next open the project via the `inkCPP_DEMO/inkCPP_DEMO.uproject` flie. + * + * Than you can hit play to run the demo. + * * The example contains two maps: * + @ref ue_example_demo "`Demo`": An extensive example demonstrating many but not all features * provided by inkCPP like: diff --git a/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs b/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs index fde602c6..1f7e2602 100644 --- a/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs +++ b/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs @@ -23,7 +23,8 @@ public inkcpp(ReadOnlyTargetRules Target) : base(Target) new string[] { Path.Combine(ModuleDirectory, "../shared/Private"), Path.Combine(ModuleDirectory, "Private/ink"), - Path.Combine(ModuleDirectory, "Public/ink") + Path.Combine(ModuleDirectory, "Public/ink"), + Path.Combine(moduleDirectory, "../ThirdParty/Private"), } ); diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp index 8cf2d283..b77ca3e3 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "InkAssetFactory.h" #include "EditorFramework/AssetImportData.h" @@ -10,9 +16,12 @@ #include "inklecate_cmd.cpp" #include +#include #include #include #include +#include +#include DECLARE_LOG_CATEGORY_EXTERN(InkCpp, Log, All); DEFINE_LOG_CATEGORY(InkCpp); @@ -34,12 +43,55 @@ UInkAssetFactory::UInkAssetFactory(const FObjectInitializer& ObjectInitializer) } +void find_includes(std::filesystem::path file_path, std::vector& files, std::string& line) { + using path = std::filesystem::path; + files.push(file_path); + size_t curr_size = files.size(); + { + path dir_path = file_path; + dir_path = file_path.remove_filename(); + file_path.make_preferred(); + std::ifstream file(file_path); + if (!file) { + UE_LOG(InkCPP, Error, TEXT("Failed To inspect file '%s', maybe not all dependencies for the asset were listed"), ANSI_TO_TCHAR(path.c_str())); + return; + } + + std::string line; + while(std::getline(file, line)) { + size_t i = 0; + // remove leading spaces + while(std::isspace(static_cast(line[i]))) { ++i; } + // check for "INCLUDE" + if(strncmp("INCLUDE", line.c_str() + i, 7) != 0) { + continue; + } + i += 7; + size_t end = i; + // remove spaces (but at least one) + while(std::isspace(statc_cast(line[i]))) { ++i; } + if (end == i) { continue; } + + path new_file_path(line.c_str() + i); + if (new_file_path.is_relative()) { + new_file_path = dir_path / new_file_path; + } + files.push(new_file_path); + } + } + size_t end = files.size(); + for(size_t i = curr_size; i < end; ++i) { + find_includes(files[i], files); + } +} + UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled) { std::stringstream output; std::stringstream cmd{}; const std::string inklecate_cmd = get_inklecate_cmd(); static const std::string ink_suffix{".ink"}; + std::vector story_files; try { std::string cFilename = TCHAR_TO_ANSI(*Filename); @@ -56,8 +108,11 @@ UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, path path_bin(TCHAR_TO_ANSI(*IPluginManager::Get().FindPlugin(TEXT("InkCPP"))->GetBaseDir()), path::format::generic_format); path_bin.make_preferred(); path_bin /= path(inklecate_cmd, path::format::generic_format).make_preferred(); + path story_path(cFilename, path::format::generic_format); + find_includes(story_path, story_fiels); story_path.make_preferred(); + const char* filename = std::tmpnam(nullptr); if(filename == nullptr) { UE_LOG(InkCpp, Error, TEXT("Failed to create temporary file")); @@ -93,6 +148,19 @@ UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, FMemory::Memcpy(asset->CompiledStory.GetData(), data.c_str(), data.length()); // Paths + TArray source_files; + for(auto& src_path : story_files) { + src_path.make_preferred(); + source_files.Add( + SanitizeImportFilename(FString(ANSI_TO_TCHAR(src_path.c_str()))), + FDateTime.UtcNow(), + FMD5Hash(), + FString(TEXT("Ink story file")) + ); + } + if (! source_files.empty()) { + asset->AssetImportData->SetSourceFiles(std::move(source_files)); + } asset->AssetImportData->Update(CurrentFilename); // Not cancelled @@ -112,7 +180,9 @@ UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, bool UInkAssetFactory::FactoryCanImport(const FString& Filename) { - return true; // Fuck you Unreal + return Filename.EndsWith(TEXT(".ink.json"), ESearchCase::IgnoreCase) + || Filename.EndsWith(TEXT(".ink"), ESearchCase::IgnoreCase) + || Filename.EndsWith(TEXT(".json"), ESearchCase::IgnoreCase); } bool UInkAssetFactory::CanReimport(UObject* Obj, TArray& OutFilenames) @@ -161,6 +231,7 @@ EReimportResult::Type UInkAssetFactory::Reimport(UObject* Obj) // Run the import again EReimportResult::Type Result = EReimportResult::Failed; + // TODO: set to true? bool OutCanceled = false; if (ImportObject(InkAsset->GetClass(), InkAsset->GetOuter(), *InkAsset->GetName(), RF_Public | RF_Standalone, Filename, nullptr, OutCanceled) != nullptr) diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h index 5e870764..fbd19dd0 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "EditorReimportHandler.h" diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/ink/EMPTY b/unreal/inkcpp/Source/inkcpp_editor/Private/ink/EMPTY deleted file mode 100644 index e69de29b..00000000 diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp index fad3a194..39ddcb94 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp @@ -1,6 +1,12 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #include "inkcpp_editor.h" #include "CoreMinimal.h" #include "Modules/ModuleManager.h" -IMPLEMENT_MODULE(FDefaultGameModuleImpl, inkcpp_editor) \ No newline at end of file +IMPLEMENT_MODULE(FDefaultGameModuleImpl, inkcpp_editor) diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/inklecate_cmd.cpp.in b/unreal/inkcpp/Source/inkcpp_editor/Private/inklecate_cmd.cpp.in index cff127b6..45f161d1 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/inklecate_cmd.cpp.in +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/inklecate_cmd.cpp.in @@ -1,3 +1,9 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once #include "Kismet/GameplayStatics.h" diff --git a/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h b/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h index 6f70f09b..3d8ac21f 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h +++ b/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h @@ -1 +1,7 @@ +/* Copyright (c) 2024 Julian Benda + * + * This file is part of inkCPP which is released under MIT license. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs b/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs index 143e7611..08f050fe 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs +++ b/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs @@ -23,6 +23,7 @@ public inkcpp_editor(ReadOnlyTargetRules Target) : base(Target) new string[] { Path.Combine(ModuleDirectory, "../shared/Private"), Path.Combine(ModuleDirectory, "../shared/Public"), + Path.Combine(moduleDirectory, "../ThirdParty/Private"), } ); diff --git a/unreal/inkcpp/Source/shared/Private/EMPTY b/unreal/inkcpp/Source/shared/Private/EMPTY deleted file mode 100644 index e69de29b..00000000 diff --git a/unreal/inkcpp/Source/shared/Public/EMPTY b/unreal/inkcpp/Source/shared/Public/EMPTY deleted file mode 100644 index e69de29b..00000000 diff --git a/unreal/inkcpp/inkcpp.uplugin b/unreal/inkcpp/inkcpp.uplugin index 425d8ffb..6719524d 100644 --- a/unreal/inkcpp/inkcpp.uplugin +++ b/unreal/inkcpp/inkcpp.uplugin @@ -1,15 +1,17 @@ { - "FileVersion": 3, + "FileVersion": 1, + "EngineVersion": "5.3", "Version": 1, - "VersionName": "1.0", + "VersionName": "0.1.3", "FriendlyName": "inkcpp", "Description": "inkcpp integration", "Category": "Narrative", - "CreatedBy": "brwarner", - "CreatedByURL": "", - "DocsURL": "", - "MarketplaceURL": "", - "SupportURL": "", + "CreatedBy": "Julian Benda", + "CreatedByURL": "https://github.com/JBenda/inkcpp/", + "DocsURL": "https://jbenda.github.io/inkcpp/html/group__unreal.html", + "MarketplaceURL": "com.epicgames.launcher: +//ue/marketplace/product/494904fc50f747db879c297ee57cf122", + "SupportURL": "https://github.com/JBenda/inkcpp/issues", "CanContainContent": false, "IsBetaVersion": false, "Installed": false, @@ -19,15 +21,25 @@ "Linux" ], "Modules": [ - { - "Name": "inkcpp", - "Type": "Runtime", - "LoadingPhase": "Default" - }, - { - "Name": "inkcpp_editor", - "Type": "Editor", - "LoadingPhase": "Default" - } + { + "Name": "inkcpp", + "Type": "Runtime", + "LoadingPhase": "Default" + "WhitelistPlatforms": [ + "Win64", + "Mac", + "Linux" + ] + }, + { + "Name": "inkcpp_editor", + "Type": "Editor", + "LoadingPhase": "Default" + "WhitelistPlatforms": [ + "Win64", + "Mac", + "Linux" + ] + } ] -} \ No newline at end of file +} From 2cbff8a2c29c8bac69b7b94c323297f7294b1406 Mon Sep 17 00:00:00 2001 From: Julian Benda Date: Tue, 30 Jan 2024 09:17:43 +0100 Subject: [PATCH 2/5] Update UE Icon --- unreal/inkcpp/Resources/Icon128.png | Bin 12699 -> 9805 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/unreal/inkcpp/Resources/Icon128.png b/unreal/inkcpp/Resources/Icon128.png index 1231d4aad4d0d462fb7b178eb5b30aa61a10df0b..f632d02c0aaac4a7276665dadf7f9a88904b3c18 100644 GIT binary patch literal 9805 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 literal 12699 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 a;7#~yJh_ha>A&A^fRdb=Y>l)<=>Gxy=2LS3 From 36a2ec5f9bed746200000137d5f8e2caad384a13 Mon Sep 17 00:00:00 2001 From: JBenda Date: Tue, 30 Jan 2024 16:22:20 +0100 Subject: [PATCH 3/5] fix spelling isios --- .../inkcpp/Source/inkcpp/Public/InkChoice.h | 1 + unreal/inkcpp/Source/inkcpp/Public/inkcpp.h | 1 + unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs | 2 +- .../inkcpp_editor/Private/InkAssetFactory.cpp | 28 +++++++++---------- .../inkcpp_editor/Private/inkcpp_editor.cpp | 1 + .../inkcpp_editor/Public/inkcpp_editor.h | 2 ++ .../inkcpp_editor/inkcpp_editor.Build.cs | 2 +- unreal/inkcpp/inkcpp.uplugin | 9 +++--- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h index 87965cea..9f21a9f8 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h @@ -4,6 +4,7 @@ * See file LICENSE.txt or go to * https://github.com/JBenda/inkcpp for full license details. */ +#pragma once #include "TagList.h" #include "UObject/Object.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h b/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h index c75b7702..c02f5104 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h +++ b/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h @@ -4,6 +4,7 @@ * See file LICENSE.txt or go to * https://github.com/JBenda/inkcpp for full license details. */ +#pragma once #include "Logging/LogMacros.h" /** diff --git a/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs b/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs index 1f7e2602..c9639147 100644 --- a/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs +++ b/unreal/inkcpp/Source/inkcpp/inkcpp.Build.cs @@ -24,7 +24,7 @@ public inkcpp(ReadOnlyTargetRules Target) : base(Target) Path.Combine(ModuleDirectory, "../shared/Private"), Path.Combine(ModuleDirectory, "Private/ink"), Path.Combine(ModuleDirectory, "Public/ink"), - Path.Combine(moduleDirectory, "../ThirdParty/Private"), + Path.Combine(ModuleDirectory, "../ThirdParty/Private"), } ); diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp index b77ca3e3..eb61d0a8 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp @@ -23,9 +23,6 @@ #include #include -DECLARE_LOG_CATEGORY_EXTERN(InkCpp, Log, All); -DEFINE_LOG_CATEGORY(InkCpp); - UInkAssetFactory::UInkAssetFactory(const FObjectInitializer& ObjectInitializer) : UFactory(ObjectInitializer), FReimportHandler(), object_ptr(this) { @@ -43,9 +40,9 @@ UInkAssetFactory::UInkAssetFactory(const FObjectInitializer& ObjectInitializer) } -void find_includes(std::filesystem::path file_path, std::vector& files, std::string& line) { +void find_includes(std::filesystem::path file_path, std::vector& files) { using path = std::filesystem::path; - files.push(file_path); + files.push_back(file_path); size_t curr_size = files.size(); { path dir_path = file_path; @@ -53,7 +50,7 @@ void find_includes(std::filesystem::path file_path, std::vector(line[i]))) { ++i; } + while(std::isspace(static_cast(line[i]))) { ++i; } if (end == i) { continue; } path new_file_path(line.c_str() + i); if (new_file_path.is_relative()) { new_file_path = dir_path / new_file_path; } - files.push(new_file_path); + files.push_back(new_file_path); } } size_t end = files.size(); @@ -87,6 +84,7 @@ void find_includes(std::filesystem::path file_path, std::vectorCompiledStory.GetData(), data.c_str(), data.length()); // Paths - TArray source_files; + TArray source_files; for(auto& src_path : story_files) { src_path.make_preferred(); - source_files.Add( - SanitizeImportFilename(FString(ANSI_TO_TCHAR(src_path.c_str()))), - FDateTime.UtcNow(), + source_files.Add(FAssetImportInfo::FSourceFile( + asset->AssetImportData->SanitizeImportFilename(FString(ANSI_TO_TCHAR(src_path.string().c_str()))), + FDateTime::UtcNow(), FMD5Hash(), FString(TEXT("Ink story file")) - ); + )); } - if (! source_files.empty()) { + if (! source_files.Num()) { asset->AssetImportData->SetSourceFiles(std::move(source_files)); } asset->AssetImportData->Update(CurrentFilename); diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp index 39ddcb94..b4ea3c60 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp @@ -10,3 +10,4 @@ #include "Modules/ModuleManager.h" IMPLEMENT_MODULE(FDefaultGameModuleImpl, inkcpp_editor) +DEFINE_LOG_CATEGORY(InkCpp); \ No newline at end of file diff --git a/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h b/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h index 3d8ac21f..1832a5e4 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h +++ b/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h @@ -5,3 +5,5 @@ * https://github.com/JBenda/inkcpp for full license details. */ #pragma once +#include "Logging/LogMacros.h" +DECLARE_LOG_CATEGORY_EXTERN(InkCpp, Log, All); \ No newline at end of file diff --git a/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs b/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs index 08f050fe..0b8e75d1 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs +++ b/unreal/inkcpp/Source/inkcpp_editor/inkcpp_editor.Build.cs @@ -23,7 +23,7 @@ public inkcpp_editor(ReadOnlyTargetRules Target) : base(Target) new string[] { Path.Combine(ModuleDirectory, "../shared/Private"), Path.Combine(ModuleDirectory, "../shared/Public"), - Path.Combine(moduleDirectory, "../ThirdParty/Private"), + Path.Combine(ModuleDirectory, "../ThirdParty/Private"), } ); diff --git a/unreal/inkcpp/inkcpp.uplugin b/unreal/inkcpp/inkcpp.uplugin index 6719524d..ffdc905d 100644 --- a/unreal/inkcpp/inkcpp.uplugin +++ b/unreal/inkcpp/inkcpp.uplugin @@ -8,9 +8,8 @@ "Category": "Narrative", "CreatedBy": "Julian Benda", "CreatedByURL": "https://github.com/JBenda/inkcpp/", - "DocsURL": "https://jbenda.github.io/inkcpp/html/group__unreal.html", - "MarketplaceURL": "com.epicgames.launcher: -//ue/marketplace/product/494904fc50f747db879c297ee57cf122", + "DocsURL": "https://jbenda.github.io/inkcpp/html/group__unreal.html#ue_example", + "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/494904fc50f747db879c297ee57cf122", "SupportURL": "https://github.com/JBenda/inkcpp/issues", "CanContainContent": false, "IsBetaVersion": false, @@ -24,7 +23,7 @@ { "Name": "inkcpp", "Type": "Runtime", - "LoadingPhase": "Default" + "LoadingPhase": "Default", "WhitelistPlatforms": [ "Win64", "Mac", @@ -34,7 +33,7 @@ { "Name": "inkcpp_editor", "Type": "Editor", - "LoadingPhase": "Default" + "LoadingPhase": "Default", "WhitelistPlatforms": [ "Win64", "Mac", From 370e7539aa20ada5a9f257a0dd339217c71eacea Mon Sep 17 00:00:00 2001 From: JBenda Date: Tue, 30 Jan 2024 17:50:33 +0100 Subject: [PATCH 4/5] put evrything to third party --- inkcpp/CMakeLists.txt | 6 +- .../inkcpp_editor/Private/InkAssetFactory.cpp | 68 +------------------ 2 files changed, 4 insertions(+), 70 deletions(-) diff --git a/inkcpp/CMakeLists.txt b/inkcpp/CMakeLists.txt index a3ddfbb8..9ed3d8e9 100644 --- a/inkcpp/CMakeLists.txt +++ b/inkcpp/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCES system.cpp value.h value.cpp tuple.hpp - string_table.h string_table.cpp avl_array.h + string_table.h string_table.cpp list_table.h list_table.cpp list_impl.h list_impl.cpp operations.h operation_bases.h @@ -59,9 +59,9 @@ target_compile_features(inkcpp PUBLIC cxx_std_17) # Unreal installation -install(DIRECTORY "include/" DESTINATION "inkcpp/Source/inkcpp/Public/ink/" COMPONENT unreal EXCLUDE_FROM_ALL) -list(REMOVE_ITEM SOURCE "avl_array.h") +list(REMOVE_ITEM SOURCES "avl_array.h") install(FILES "avl_array.h" DESTINATION "inkcpp/Source/ThirdParty/Private" COMPONENT unreal EXCLUDE_FROM_ALL) install(FILES ${SOURCES} DESTINATION "inkcpp/Source/inkcpp/Private/ink/" COMPONENT unreal EXCLUDE_FROM_ALL) +install(FILES ${PUBLIC_HEADERS} DESTINATION "inkcpp/Source/inkcpp/Public/ink" COMPONENT unreal EXCLUDE_FROM_ALL) install(FILES ${COLLECTION_SOURCES} DESTINATION "inkcpp/Source/inkcpp/Private/ink/collections/" COMPONENT unreal EXCLUDE_FROM_ALL) diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp index eb61d0a8..33fd4538 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp @@ -16,12 +16,9 @@ #include "inklecate_cmd.cpp" #include -#include #include #include #include -#include -#include UInkAssetFactory::UInkAssetFactory(const FObjectInitializer& ObjectInitializer) : UFactory(ObjectInitializer), FReimportHandler(), object_ptr(this) @@ -40,56 +37,12 @@ UInkAssetFactory::UInkAssetFactory(const FObjectInitializer& ObjectInitializer) } -void find_includes(std::filesystem::path file_path, std::vector& files) { - using path = std::filesystem::path; - files.push_back(file_path); - size_t curr_size = files.size(); - { - path dir_path = file_path; - dir_path = file_path.remove_filename(); - file_path.make_preferred(); - std::ifstream file(file_path); - if (!file) { - UE_LOG(InkCpp, Error, TEXT("Failed To inspect file '%s', maybe not all dependencies for the asset were listed"), ANSI_TO_TCHAR(file_path.string().c_str())); - return; - } - - std::string line; - while(std::getline(file, line)) { - size_t i = 0; - // remove leading spaces - while(std::isspace(static_cast(line[i]))) { ++i; } - // check for "INCLUDE" - if(strncmp("INCLUDE", line.c_str() + i, 7) != 0) { - continue; - } - i += 7; - size_t end = i; - // remove spaces (but at least one) - while(std::isspace(static_cast(line[i]))) { ++i; } - if (end == i) { continue; } - - path new_file_path(line.c_str() + i); - if (new_file_path.is_relative()) { - new_file_path = dir_path / new_file_path; - } - files.push_back(new_file_path); - } - } - size_t end = files.size(); - for(size_t i = curr_size; i < end; ++i) { - find_includes(files[i], files); - } -} - UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, FName InName, EObjectFlags Flags, const FString& Filename, const TCHAR* Parms, FFeedbackContext* Warn, bool& bOutOperationCanceled) { - using path = std::filesystem::path; std::stringstream output; std::stringstream cmd{}; const std::string inklecate_cmd = get_inklecate_cmd(); static const std::string ink_suffix{".ink"}; - std::vector story_files; try { std::string cFilename = TCHAR_TO_ANSI(*Filename); @@ -106,11 +59,8 @@ UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, path path_bin(TCHAR_TO_ANSI(*IPluginManager::Get().FindPlugin(TEXT("InkCPP"))->GetBaseDir()), path::format::generic_format); path_bin.make_preferred(); path_bin /= path(inklecate_cmd, path::format::generic_format).make_preferred(); - path story_path(cFilename, path::format::generic_format); - find_includes(story_path, story_files); story_path.make_preferred(); - const char* filename = std::tmpnam(nullptr); if(filename == nullptr) { UE_LOG(InkCpp, Error, TEXT("Failed to create temporary file")); @@ -146,19 +96,6 @@ UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, FMemory::Memcpy(asset->CompiledStory.GetData(), data.c_str(), data.length()); // Paths - TArray source_files; - for(auto& src_path : story_files) { - src_path.make_preferred(); - source_files.Add(FAssetImportInfo::FSourceFile( - asset->AssetImportData->SanitizeImportFilename(FString(ANSI_TO_TCHAR(src_path.string().c_str()))), - FDateTime::UtcNow(), - FMD5Hash(), - FString(TEXT("Ink story file")) - )); - } - if (! source_files.Num()) { - asset->AssetImportData->SetSourceFiles(std::move(source_files)); - } asset->AssetImportData->Update(CurrentFilename); // Not cancelled @@ -178,9 +115,7 @@ UObject* UInkAssetFactory::FactoryCreateFile(UClass* InClass, UObject* InParent, bool UInkAssetFactory::FactoryCanImport(const FString& Filename) { - return Filename.EndsWith(TEXT(".ink.json"), ESearchCase::IgnoreCase) - || Filename.EndsWith(TEXT(".ink"), ESearchCase::IgnoreCase) - || Filename.EndsWith(TEXT(".json"), ESearchCase::IgnoreCase); + return true; // Fuck you Unreal } bool UInkAssetFactory::CanReimport(UObject* Obj, TArray& OutFilenames) @@ -229,7 +164,6 @@ EReimportResult::Type UInkAssetFactory::Reimport(UObject* Obj) // Run the import again EReimportResult::Type Result = EReimportResult::Failed; - // TODO: set to true? bool OutCanceled = false; if (ImportObject(InkAsset->GetClass(), InkAsset->GetOuter(), *InkAsset->GetName(), RF_Public | RF_Standalone, Filename, nullptr, OutCanceled) != nullptr) From 10856ba3fcd17e3a634df10fbe87512a72c9f89a Mon Sep 17 00:00:00 2001 From: Julian Benda Date: Wed, 31 Jan 2024 12:17:55 +0100 Subject: [PATCH 5/5] Formatting --- inkcpp/array.h | 4 +- inkcpp/avl_array.h | 6 +- inkcpp/casting.h | 4 +- inkcpp/choice.cpp | 4 +- inkcpp/collections/restorable.cpp | 4 +- inkcpp/collections/restorable.h | 4 +- inkcpp/container_operations.cpp | 4 +- inkcpp/container_operations.h | 4 +- inkcpp/executioner.h | 4 +- inkcpp/functional.cpp | 4 +- inkcpp/functions.cpp | 4 +- inkcpp/functions.h | 4 +- inkcpp/globals_impl.cpp | 4 +- inkcpp/globals_impl.h | 4 +- inkcpp/header.cpp | 4 +- inkcpp/include/choice.h | 4 +- inkcpp/include/functional.h | 4 +- inkcpp/include/globals.h | 4 +- inkcpp/include/list.h | 4 +- inkcpp/include/runner.h | 4 +- inkcpp/include/snapshot.h | 4 +- inkcpp/include/story.h | 4 +- inkcpp/include/story_ptr.h | 4 +- inkcpp/include/traits.h | 4 +- inkcpp/include/types.h | 4 +- inkcpp/list_impl.cpp | 4 +- inkcpp/list_impl.h | 4 +- inkcpp/list_operations.cpp | 4 +- inkcpp/list_operations.h | 4 +- inkcpp/list_table.cpp | 4 +- inkcpp/list_table.h | 4 +- inkcpp/numeric_operations.cpp | 4 +- inkcpp/numeric_operations.h | 4 +- inkcpp/operation_bases.h | 4 +- inkcpp/operations.h | 4 +- inkcpp/output.cpp | 4 +- inkcpp/output.h | 4 +- inkcpp/platform.h | 4 +- inkcpp/random.h | 4 +- inkcpp/runner_impl.cpp | 4 +- inkcpp/runner_impl.h | 4 +- inkcpp/simple_restorable_stack.h | 4 +- inkcpp/snapshot_impl.cpp | 4 +- inkcpp/snapshot_impl.h | 4 +- inkcpp/snapshot_interface.h | 4 +- inkcpp/stack.cpp | 4 +- inkcpp/stack.h | 4 +- inkcpp/story_impl.cpp | 4 +- inkcpp/story_impl.h | 4 +- inkcpp/story_ptr.cpp | 4 +- inkcpp/string_operations.cpp | 4 +- inkcpp/string_operations.h | 4 +- inkcpp/string_table.cpp | 4 +- inkcpp/string_table.h | 4 +- inkcpp/string_utils.h | 4 +- inkcpp/system.cpp | 4 +- inkcpp/tuple.hpp | 229 ++++++++++-------- inkcpp/value.cpp | 4 +- inkcpp/value.h | 4 +- inkcpp_compiler/binary_emitter.cpp | 4 +- inkcpp_compiler/binary_emitter.h | 4 +- inkcpp_compiler/binary_stream.cpp | 4 +- inkcpp_compiler/binary_stream.h | 4 +- inkcpp_compiler/command.cpp | 4 +- inkcpp_compiler/compiler.cpp | 4 +- inkcpp_compiler/emitter.cpp | 4 +- inkcpp_compiler/emitter.h | 4 +- inkcpp_compiler/include/compilation_results.h | 4 +- inkcpp_compiler/json_compiler.cpp | 4 +- inkcpp_compiler/json_compiler.h | 4 +- inkcpp_compiler/list_data.cpp | 4 +- inkcpp_compiler/list_data.h | 4 +- inkcpp_compiler/reporter.cpp | 4 +- inkcpp_compiler/reporter.h | 6 +- shared/private/command.h | 4 +- shared/private/header.h | 4 +- shared/public/config.h | 4 +- shared/public/system.h | 4 +- shared/public/version.h | 4 +- .../inkcpp/Source/inkcpp/Private/InkAsset.cpp | 4 +- .../Source/inkcpp/Private/InkChoice.cpp | 4 +- .../inkcpp/Source/inkcpp/Private/InkList.cpp | 4 +- .../Source/inkcpp/Private/InkRuntime.cpp | 4 +- .../Source/inkcpp/Private/InkThread.cpp | 4 +- .../inkcpp/Source/inkcpp/Private/InkVar.cpp | 4 +- .../inkcpp/Source/inkcpp/Private/TagList.cpp | 4 +- .../inkcpp/Source/inkcpp/Private/inkcpp.cpp | 4 +- unreal/inkcpp/Source/inkcpp/Public/InkAsset.h | 4 +- .../inkcpp/Source/inkcpp/Public/InkChoice.h | 4 +- .../Source/inkcpp/Public/InkDelegates.h | 4 +- unreal/inkcpp/Source/inkcpp/Public/InkList.h | 4 +- .../inkcpp/Source/inkcpp/Public/InkRuntime.h | 4 +- .../inkcpp/Source/inkcpp/Public/InkSnapshot.h | 4 +- .../inkcpp/Source/inkcpp/Public/InkThread.h | 4 +- unreal/inkcpp/Source/inkcpp/Public/InkVar.h | 6 +- unreal/inkcpp/Source/inkcpp/Public/TagList.h | 4 +- unreal/inkcpp/Source/inkcpp/Public/inkcpp.h | 19 +- .../inkcpp_editor/Private/InkAssetFactory.cpp | 4 +- .../inkcpp_editor/Private/InkAssetFactory.h | 4 +- .../inkcpp_editor/Private/inkcpp_editor.cpp | 4 +- .../inkcpp_editor/Public/inkcpp_editor.h | 4 +- 101 files changed, 342 insertions(+), 308 deletions(-) diff --git a/inkcpp/array.h b/inkcpp/array.h index 5216c13b..89a4099c 100644 --- a/inkcpp/array.h +++ b/inkcpp/array.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/avl_array.h b/inkcpp/avl_array.h index 271f6b18..6dc98f3a 100644 --- a/inkcpp/avl_array.h +++ b/inkcpp/avl_array.h @@ -1,4 +1,4 @@ -/////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////////////////////////////////////////////////// // Copyright // \author (c) Marco Paland (info@paland.com) // 2017, PALANDesign Hannover, Germany @@ -11,10 +11,10 @@ // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell // copies of the Software, and to permit persons to whom the Software is // furnished to do so, subject to the following conditions: -// +// // The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. -// +// // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE diff --git a/inkcpp/casting.h b/inkcpp/casting.h index 50dc1756..13f28b11 100644 --- a/inkcpp/casting.h +++ b/inkcpp/casting.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/choice.cpp b/inkcpp/choice.cpp index ae863e85..0dcba40b 100644 --- a/inkcpp/choice.cpp +++ b/inkcpp/choice.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "choice.h" diff --git a/inkcpp/collections/restorable.cpp b/inkcpp/collections/restorable.cpp index b617e774..b2b0abc8 100644 --- a/inkcpp/collections/restorable.cpp +++ b/inkcpp/collections/restorable.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "restorable.h" #include "../stack.h" diff --git a/inkcpp/collections/restorable.h b/inkcpp/collections/restorable.h index 10c99d80..622a59a9 100644 --- a/inkcpp/collections/restorable.h +++ b/inkcpp/collections/restorable.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/container_operations.cpp b/inkcpp/container_operations.cpp index 57703e50..64575b1d 100644 --- a/inkcpp/container_operations.cpp +++ b/inkcpp/container_operations.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "stack.h" #include "value.h" diff --git a/inkcpp/container_operations.h b/inkcpp/container_operations.h index 6cace6df..3b521e2f 100644 --- a/inkcpp/container_operations.h +++ b/inkcpp/container_operations.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/executioner.h b/inkcpp/executioner.h index 84585b23..154d2d70 100644 --- a/inkcpp/executioner.h +++ b/inkcpp/executioner.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/functional.cpp b/inkcpp/functional.cpp index cf346250..03c721b8 100644 --- a/inkcpp/functional.cpp +++ b/inkcpp/functional.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "functional.h" diff --git a/inkcpp/functions.cpp b/inkcpp/functions.cpp index ac19eaf8..5f886834 100644 --- a/inkcpp/functions.cpp +++ b/inkcpp/functions.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "functions.h" diff --git a/inkcpp/functions.h b/inkcpp/functions.h index 76ae7288..9330ac59 100644 --- a/inkcpp/functions.h +++ b/inkcpp/functions.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/globals_impl.cpp b/inkcpp/globals_impl.cpp index 1051cbb0..5eef3cb7 100644 --- a/inkcpp/globals_impl.cpp +++ b/inkcpp/globals_impl.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "globals_impl.h" #include "story_impl.h" diff --git a/inkcpp/globals_impl.h b/inkcpp/globals_impl.h index 30464601..a67b580d 100644 --- a/inkcpp/globals_impl.h +++ b/inkcpp/globals_impl.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/header.cpp b/inkcpp/header.cpp index ecf30902..e99d08cc 100644 --- a/inkcpp/header.cpp +++ b/inkcpp/header.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "header.h" #include "version.h" diff --git a/inkcpp/include/choice.h b/inkcpp/include/choice.h index 8bd352b9..c4a2838b 100644 --- a/inkcpp/include/choice.h +++ b/inkcpp/include/choice.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once #include "system.h" diff --git a/inkcpp/include/functional.h b/inkcpp/include/functional.h index e35fd1b4..a0e4fd9a 100644 --- a/inkcpp/include/functional.h +++ b/inkcpp/include/functional.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/globals.h b/inkcpp/include/globals.h index 8ce96b7c..3d095553 100644 --- a/inkcpp/include/globals.h +++ b/inkcpp/include/globals.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/list.h b/inkcpp/include/list.h index 9881983d..4db814e1 100644 --- a/inkcpp/include/list.h +++ b/inkcpp/include/list.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/runner.h b/inkcpp/include/runner.h index 748ae246..727705ec 100644 --- a/inkcpp/include/runner.h +++ b/inkcpp/include/runner.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/snapshot.h b/inkcpp/include/snapshot.h index fad5603a..9aa0ef71 100644 --- a/inkcpp/include/snapshot.h +++ b/inkcpp/include/snapshot.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/story.h b/inkcpp/include/story.h index a085ea83..913af286 100644 --- a/inkcpp/include/story.h +++ b/inkcpp/include/story.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/story_ptr.h b/inkcpp/include/story_ptr.h index 5227b8dd..ad4b4290 100644 --- a/inkcpp/include/story_ptr.h +++ b/inkcpp/include/story_ptr.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/traits.h b/inkcpp/include/traits.h index 91793db4..4902399d 100644 --- a/inkcpp/include/traits.h +++ b/inkcpp/include/traits.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/include/types.h b/inkcpp/include/types.h index a91756ff..3dd54cc1 100644 --- a/inkcpp/include/types.h +++ b/inkcpp/include/types.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/list_impl.cpp b/inkcpp/list_impl.cpp index 3357de74..6ce66717 100644 --- a/inkcpp/list_impl.cpp +++ b/inkcpp/list_impl.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "list_impl.h" #include "list.h" diff --git a/inkcpp/list_impl.h b/inkcpp/list_impl.h index f3d31fcb..ea7b1dd6 100644 --- a/inkcpp/list_impl.h +++ b/inkcpp/list_impl.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/list_operations.cpp b/inkcpp/list_operations.cpp index e21a0816..40e82641 100644 --- a/inkcpp/list_operations.cpp +++ b/inkcpp/list_operations.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ /// implements operations on lists diff --git a/inkcpp/list_operations.h b/inkcpp/list_operations.h index cd181dc8..15dd4d86 100644 --- a/inkcpp/list_operations.h +++ b/inkcpp/list_operations.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/list_table.cpp b/inkcpp/list_table.cpp index 8a9fbfa0..880acfd5 100644 --- a/inkcpp/list_table.cpp +++ b/inkcpp/list_table.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "list_table.h" #include "traits.h" diff --git a/inkcpp/list_table.h b/inkcpp/list_table.h index 6c0d2e6e..cc4e41de 100644 --- a/inkcpp/list_table.h +++ b/inkcpp/list_table.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/numeric_operations.cpp b/inkcpp/numeric_operations.cpp index 454a4f83..201977af 100644 --- a/inkcpp/numeric_operations.cpp +++ b/inkcpp/numeric_operations.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "stack.h" #include "value.h" diff --git a/inkcpp/numeric_operations.h b/inkcpp/numeric_operations.h index c312270a..7246c551 100644 --- a/inkcpp/numeric_operations.h +++ b/inkcpp/numeric_operations.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once #include "value.h" diff --git a/inkcpp/operation_bases.h b/inkcpp/operation_bases.h index 8d6dfe8b..86cf1db8 100644 --- a/inkcpp/operation_bases.h +++ b/inkcpp/operation_bases.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/operations.h b/inkcpp/operations.h index 71211b66..48080beb 100644 --- a/inkcpp/operations.h +++ b/inkcpp/operations.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/output.cpp b/inkcpp/output.cpp index 6552dc03..f46f3dfe 100644 --- a/inkcpp/output.cpp +++ b/inkcpp/output.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "output.h" #include "string_table.h" diff --git a/inkcpp/output.h b/inkcpp/output.h index f557106c..b8a8640e 100644 --- a/inkcpp/output.h +++ b/inkcpp/output.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/platform.h b/inkcpp/platform.h index 7cb83700..14608691 100644 --- a/inkcpp/platform.h +++ b/inkcpp/platform.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/random.h b/inkcpp/random.h index c8cdabe6..56deadfe 100644 --- a/inkcpp/random.h +++ b/inkcpp/random.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/runner_impl.cpp b/inkcpp/runner_impl.cpp index 0713e5dc..6fa6dfb9 100644 --- a/inkcpp/runner_impl.cpp +++ b/inkcpp/runner_impl.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "runner_impl.h" #include "story_impl.h" diff --git a/inkcpp/runner_impl.h b/inkcpp/runner_impl.h index 4885d2eb..2c85bc71 100644 --- a/inkcpp/runner_impl.h +++ b/inkcpp/runner_impl.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/simple_restorable_stack.h b/inkcpp/simple_restorable_stack.h index 53b54106..5f3e4865 100644 --- a/inkcpp/simple_restorable_stack.h +++ b/inkcpp/simple_restorable_stack.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/snapshot_impl.cpp b/inkcpp/snapshot_impl.cpp index f2d0b84c..f731e8ef 100644 --- a/inkcpp/snapshot_impl.cpp +++ b/inkcpp/snapshot_impl.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "snapshot_impl.h" diff --git a/inkcpp/snapshot_impl.h b/inkcpp/snapshot_impl.h index 7f7afe74..9ada2e7c 100644 --- a/inkcpp/snapshot_impl.h +++ b/inkcpp/snapshot_impl.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/snapshot_interface.h b/inkcpp/snapshot_interface.h index e2b0c176..34bece35 100644 --- a/inkcpp/snapshot_interface.h +++ b/inkcpp/snapshot_interface.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/stack.cpp b/inkcpp/stack.cpp index 35fe3c0c..58783e2e 100644 --- a/inkcpp/stack.cpp +++ b/inkcpp/stack.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "stack.h" #include "string_table.h" diff --git a/inkcpp/stack.h b/inkcpp/stack.h index 12fdd2ad..fbf47d20 100644 --- a/inkcpp/stack.h +++ b/inkcpp/stack.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/story_impl.cpp b/inkcpp/story_impl.cpp index c23f01b3..b8315b6d 100644 --- a/inkcpp/story_impl.cpp +++ b/inkcpp/story_impl.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "story_impl.h" #include "platform.h" diff --git a/inkcpp/story_impl.h b/inkcpp/story_impl.h index 784808ec..55fa0fff 100644 --- a/inkcpp/story_impl.h +++ b/inkcpp/story_impl.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/story_ptr.cpp b/inkcpp/story_ptr.cpp index 3cf16d4f..ad4f07f3 100644 --- a/inkcpp/story_ptr.cpp +++ b/inkcpp/story_ptr.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "story_ptr.h" diff --git a/inkcpp/string_operations.cpp b/inkcpp/string_operations.cpp index a290a1cc..2f1c2c4a 100644 --- a/inkcpp/string_operations.cpp +++ b/inkcpp/string_operations.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ /// implementation for commands on strings /// string_cast is a class which convert an value to a string. diff --git a/inkcpp/string_operations.h b/inkcpp/string_operations.h index f5bd806b..a0f8ff49 100644 --- a/inkcpp/string_operations.h +++ b/inkcpp/string_operations.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/string_table.cpp b/inkcpp/string_table.cpp index cba9c7ea..30f9966b 100644 --- a/inkcpp/string_table.cpp +++ b/inkcpp/string_table.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "string_table.h" diff --git a/inkcpp/string_table.h b/inkcpp/string_table.h index 12e27968..256ab8aa 100644 --- a/inkcpp/string_table.h +++ b/inkcpp/string_table.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/string_utils.h b/inkcpp/string_utils.h index 5bad4cc9..1142710d 100644 --- a/inkcpp/string_utils.h +++ b/inkcpp/string_utils.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp/system.cpp b/inkcpp/system.cpp index 349e4b35..6b5990c1 100644 --- a/inkcpp/system.cpp +++ b/inkcpp/system.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "system.h" diff --git a/inkcpp/tuple.hpp b/inkcpp/tuple.hpp index 89452e45..3474a1cd 100644 --- a/inkcpp/tuple.hpp +++ b/inkcpp/tuple.hpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once @@ -10,113 +10,142 @@ #include "traits.h" -namespace ink::runtime::internal { - namespace tuple_internal { - /// data member of tuple - template - class tuple_leaf{ - public: - tuple_leaf() : _value() {}; - template - explicit tuple_leaf(U&& u) : _value(std::forward(u)) {} - T& get() { return _value; } - const T& get() const { return _value; } - private: - T _value; - tuple_leaf(const tuple_leaf& tl) = delete; - tuple_leaf& operator=(const tuple_leaf&) = delete; - }; - - // handle indexing - template - struct tuple_indexes {}; - - // create tuple_indexes in [Start,End[ - template - struct make_tuple_indexes { - using type = typename make_tuple_indexes::type; - }; - template - struct make_tuple_indexes { - using type = tuple_indexes; - }; - - /// get the index of first appearance of an type in tuple - template - struct type_index_imp : type_index_imp {}; - template - struct type_index_imp { - static constexpr size_t value = I; - }; - template - constexpr size_t type_index = type_index_imp::value; - - - /// implementation class to extract indices - template - struct tuple_imp; - template - struct tuple_imp, Tys...> - : public tuple_leaf... - { - template - tuple_imp(Us&& ... us) : tuple_leaf(std::forward(us))... { - static_assert(sizeof...(Us) == sizeof...(Tys), - "Tuple must be initialized with same amount of arguments" - ", then types!"); - } - }; - } - - /// minimal tuple class, only for simple data types! - /// flat tuple implementation - template - class tuple - : public tuple_internal::tuple_imp< - typename tuple_internal::make_tuple_indexes::type, - Tys... > +namespace ink::runtime::internal +{ +namespace tuple_internal +{ + /// data member of tuple + template + class tuple_leaf { - using base = tuple_internal::tuple_imp< - typename tuple_internal::make_tuple_indexes::type, - Tys...>; - using this_type = tuple; public: - template - using element_type = typename get_ith_type::type; - template - static constexpr size_t type_index = tuple_internal::type_index; + tuple_leaf() + : _value(){}; + + template + explicit tuple_leaf(U&& u) + : _value(std::forward(u)) + { + } + + T& get() { return _value; } + + const T& get() const { return _value; } - template - tuple(Us&& ... us) : base(std::forward(us)...) {} + private: + T _value; + tuple_leaf(const tuple_leaf& tl) = delete; + tuple_leaf& operator=(const tuple_leaf&) = delete; }; - /// access tuple element by index - template - constexpr auto const& - get(const T& t) { - return static_cast>const&>(t).get(); + // handle indexing + template + struct tuple_indexes { }; - /// access tuple element by type. First of this type - template - constexpr const T& - get(const Tuple& t) { - return get, Tuple>(t); + // create tuple_indexes in [Start,End[ + template + struct make_tuple_indexes { + using type = typename make_tuple_indexes::type; }; - template<> - class tuple<> { - public: - tuple() {} + template + struct make_tuple_indexes { + using type = tuple_indexes; + }; + + /// get the index of first appearance of an type in tuple + template + struct type_index_imp : type_index_imp { }; - /// check if tuple contains type - template - struct has_type; + template + struct type_index_imp { + static constexpr size_t value = I; + }; + + template + constexpr size_t type_index = type_index_imp::value; + + + /// implementation class to extract indices + template + struct tuple_imp; + + template + struct tuple_imp, Tys...> : public tuple_leaf... { + template + tuple_imp(Us&&... us) + : tuple_leaf(std::forward(us))... + { + static_assert( + sizeof...(Us) == sizeof...(Tys), + "Tuple must be initialized with same amount of arguments" + ", then types!" + ); + } + }; +} // namespace tuple_internal + +/// minimal tuple class, only for simple data types! +/// flat tuple implementation +template +class tuple + : public tuple_internal::tuple_imp< + typename tuple_internal::make_tuple_indexes::type, Tys...> +{ + using base = tuple_internal::tuple_imp< + typename tuple_internal::make_tuple_indexes::type, Tys...>; + using this_type = tuple; + +public: + template + using element_type = typename get_ith_type::type; template - struct has_type> : false_type {}; - template - struct has_type> : has_type> {}; - template - struct has_type> : true_type {}; -} + static constexpr size_t type_index = tuple_internal::type_index; + + template + tuple(Us&&... us) + : base(std::forward(us)...) + { + } +}; + +/// access tuple element by index +template +constexpr const auto& get(const T& t) +{ + return static_cast>&>(t) + .get(); +}; + +/// access tuple element by type. First of this type +template +constexpr const T& get(const Tuple& t) +{ + return get, Tuple>(t); +}; + +template<> +class tuple<> +{ +public: + tuple() {} +}; + +/// check if tuple contains type +template +struct has_type; + +template +struct has_type> : false_type { +}; + +template +struct has_type> : has_type> { +}; + +template +struct has_type> : true_type { +}; +} // namespace ink::runtime::internal diff --git a/inkcpp/value.cpp b/inkcpp/value.cpp index a3432199..106c1b42 100644 --- a/inkcpp/value.cpp +++ b/inkcpp/value.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "value.h" diff --git a/inkcpp/value.h b/inkcpp/value.h index 09f8bf61..676affc4 100644 --- a/inkcpp/value.h +++ b/inkcpp/value.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp_compiler/binary_emitter.cpp b/inkcpp_compiler/binary_emitter.cpp index f83e0853..c3380ff2 100644 --- a/inkcpp_compiler/binary_emitter.cpp +++ b/inkcpp_compiler/binary_emitter.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "binary_emitter.h" diff --git a/inkcpp_compiler/binary_emitter.h b/inkcpp_compiler/binary_emitter.h index aa7aecbe..a03137af 100644 --- a/inkcpp_compiler/binary_emitter.h +++ b/inkcpp_compiler/binary_emitter.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp_compiler/binary_stream.cpp b/inkcpp_compiler/binary_stream.cpp index 77547f3a..d601a08e 100644 --- a/inkcpp_compiler/binary_stream.cpp +++ b/inkcpp_compiler/binary_stream.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "binary_stream.h" diff --git a/inkcpp_compiler/binary_stream.h b/inkcpp_compiler/binary_stream.h index a105a73b..6af0811e 100644 --- a/inkcpp_compiler/binary_stream.h +++ b/inkcpp_compiler/binary_stream.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp_compiler/command.cpp b/inkcpp_compiler/command.cpp index 217f4271..08221812 100644 --- a/inkcpp_compiler/command.cpp +++ b/inkcpp_compiler/command.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "command.h" diff --git a/inkcpp_compiler/compiler.cpp b/inkcpp_compiler/compiler.cpp index 0a3e2cbb..be8a029e 100644 --- a/inkcpp_compiler/compiler.cpp +++ b/inkcpp_compiler/compiler.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "compiler.h" diff --git a/inkcpp_compiler/emitter.cpp b/inkcpp_compiler/emitter.cpp index 7bf3c710..6c7d99a0 100644 --- a/inkcpp_compiler/emitter.cpp +++ b/inkcpp_compiler/emitter.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "emitter.h" diff --git a/inkcpp_compiler/emitter.h b/inkcpp_compiler/emitter.h index 5f2796a9..ae1458d4 100644 --- a/inkcpp_compiler/emitter.h +++ b/inkcpp_compiler/emitter.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp_compiler/include/compilation_results.h b/inkcpp_compiler/include/compilation_results.h index 0025a1c7..a5b50a04 100644 --- a/inkcpp_compiler/include/compilation_results.h +++ b/inkcpp_compiler/include/compilation_results.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp_compiler/json_compiler.cpp b/inkcpp_compiler/json_compiler.cpp index 9ab77aa3..f71bbfb9 100644 --- a/inkcpp_compiler/json_compiler.cpp +++ b/inkcpp_compiler/json_compiler.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "json_compiler.h" diff --git a/inkcpp_compiler/json_compiler.h b/inkcpp_compiler/json_compiler.h index 3c4fcf9e..aebb82e6 100644 --- a/inkcpp_compiler/json_compiler.h +++ b/inkcpp_compiler/json_compiler.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once #include "json.hpp" diff --git a/inkcpp_compiler/list_data.cpp b/inkcpp_compiler/list_data.cpp index 6d41c9a6..859f6fdc 100644 --- a/inkcpp_compiler/list_data.cpp +++ b/inkcpp_compiler/list_data.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "list_data.h" diff --git a/inkcpp_compiler/list_data.h b/inkcpp_compiler/list_data.h index 4a4bb538..7faaf95b 100644 --- a/inkcpp_compiler/list_data.h +++ b/inkcpp_compiler/list_data.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/inkcpp_compiler/reporter.cpp b/inkcpp_compiler/reporter.cpp index 189d8247..ab6e01ba 100644 --- a/inkcpp_compiler/reporter.cpp +++ b/inkcpp_compiler/reporter.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "reporter.h" #include "compilation_results.h" diff --git a/inkcpp_compiler/reporter.h b/inkcpp_compiler/reporter.h index c746c776..359be80d 100644 --- a/inkcpp_compiler/reporter.h +++ b/inkcpp_compiler/reporter.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once @@ -52,4 +52,4 @@ namespace ink::compiler::internal error_strbuf _buffer; std::ostream _stream; }; -} + } // namespace ink::compiler::internal diff --git a/shared/private/command.h b/shared/private/command.h index dc2d2482..83ae6323 100644 --- a/shared/private/command.h +++ b/shared/private/command.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/shared/private/header.h b/shared/private/header.h index 1f34fe78..aac8a541 100644 --- a/shared/private/header.h +++ b/shared/private/header.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/shared/public/config.h b/shared/public/config.h index f48df343..2dc23ddb 100644 --- a/shared/public/config.h +++ b/shared/public/config.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/shared/public/system.h b/shared/public/system.h index f376ba2c..2e0c280f 100644 --- a/shared/public/system.h +++ b/shared/public/system.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/shared/public/version.h b/shared/public/version.h index a7116c41..db81dc29 100644 --- a/shared/public/version.h +++ b/shared/public/version.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp index fdc7b0b4..f79c0d69 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "InkAsset.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp index b6ee84fe..2b3cda39 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkChoice.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "InkChoice.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp index cf23eda9..f7df1dce 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkList.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp index 59d88b7a..54b94722 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkRuntime.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "InkRuntime.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp index 9f41e235..d9a81a14 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkThread.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "InkThread.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp index 6333dc68..0a6d399b 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/InkVar.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "InkVar.h" #include "ink/types.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp b/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp index 31f93200..03d2a9bc 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/TagList.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "TagList.h" diff --git a/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp b/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp index 4a076337..f1685cf7 100644 --- a/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp +++ b/unreal/inkcpp/Source/inkcpp/Private/inkcpp.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "inkcpp.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h b/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h index c5639ac0..4101c293 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkAsset.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h index 9f21a9f8..742dd3db 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once #include "TagList.h" diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h b/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h index a0d43762..ba27ca3f 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkDelegates.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkList.h b/unreal/inkcpp/Source/inkcpp/Public/InkList.h index 4b8f08f7..6c60dec7 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkList.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkList.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h b/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h index c5abbf16..845f2b64 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkRuntime.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h b/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h index 24fa8b4c..a39312b9 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkSnapshot.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkThread.h b/unreal/inkcpp/Source/inkcpp/Public/InkThread.h index 128889af..9cbc1f72 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkThread.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkThread.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Public/InkVar.h b/unreal/inkcpp/Source/inkcpp/Public/InkVar.h index 6239a965..8324abb3 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkVar.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkVar.h @@ -1,9 +1,9 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. - * + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. + * * Based on Copyright (c) 2020 David Colson * UnrealInk @ https://github.com/DavidColson/UnrealInk */ diff --git a/unreal/inkcpp/Source/inkcpp/Public/TagList.h b/unreal/inkcpp/Source/inkcpp/Public/TagList.h index 830e3344..145eda2b 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/TagList.h +++ b/unreal/inkcpp/Source/inkcpp/Public/TagList.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h b/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h index c02f5104..cfefcc5f 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h +++ b/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h @@ -11,7 +11,8 @@ * @defgroup unreal Unreal Blueprints * Blueprint Classes usable in Unreal. An example can be found * [here](unreal/inkCPP_DEMO.zip), do not forgett to install the plugin via the marketplace(soonTM) - * or unzipping the `unreal.zip` from the [release page](https://github.com/JBenda/inkcpp/releases/latest) to `/YOUR_UNREAL_PROJECT/Plugins/`.
+ * or unzipping the `unreal.zip` from the [release + * page](https://github.com/JBenda/inkcpp/releases/latest) to `/YOUR_UNREAL_PROJECT/Plugins/`.
* And eitherway activating the plugin. * * The C++ API will be available soon(TM). @@ -30,17 +31,21 @@ * To create this InkAsset you need to import a `.ink` file or `.ink.json` file. * * With the @ref AInkRuntime you can then create @ref UInkThreads with @ref AInkRuntime::Start(). - * In addition does the runtime allows you access to the global variables via @ref AInkRuntime::ObserveChange() "observer" or directly @ref AInkRuntime::Set() "setter" und @ref AInkRuntime::Get() "getter". + * In addition does the runtime allows you access to the global variables via @ref + * AInkRuntime::ObserveChange() "observer" or directly @ref AInkRuntime::Set() "setter" und @ref + * AInkRuntime::Get() "getter". * * Notice that all threads spawned in the - * same runtime will share a global state. So if you want to play the same story with different + * same runtime will share a global state. So if you want to play the same story with different * states, you need multiple runtimes. * - * The @ref UInkThread class provides will fire events when new context is available. The easiest way to - * implement then is to create a custom Blueprint based on @ref UInkThread. For a overview see @ref ue_thread. + * The @ref UInkThread class provides will fire events when new context is available. The easiest + * way to implement then is to create a custom Blueprint based on @ref UInkThread. For a overview + * see @ref ue_thread. * - * Below you can find the blueprints of a @ref ue_example_minimal "minimal example". Which is included - * for further inspection inside the @ref ue_example "Example project" (in the map `Minimal`). + * Below you can find the blueprints of a @ref ue_example_minimal "minimal example". Which is + * included for further inspection inside the @ref ue_example "Example project" (in the map + * `Minimal`). * * @section ue_components Components * diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp index 33fd4538..e99c257a 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "InkAssetFactory.h" diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h index fbd19dd0..d3e85b05 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp b/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp index b4ea3c60..251f3e61 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #include "inkcpp_editor.h" diff --git a/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h b/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h index 1832a5e4..52b3e040 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h +++ b/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h @@ -1,8 +1,8 @@ /* Copyright (c) 2024 Julian Benda * * This file is part of inkCPP which is released under MIT license. - * See file LICENSE.txt or go to - * https://github.com/JBenda/inkcpp for full license details. + * See file LICENSE.txt or go to + * https://github.com/JBenda/inkcpp for full license details. */ #pragma once #include "Logging/LogMacros.h"