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..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,6 +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 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/inkcpp/array.h b/inkcpp/array.h index d3b0567f..89a4099c 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..6dc98f3a 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 // @@ -10,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 fb940446..13f28b11 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..0dcba40b 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..b2b0abc8 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..622a59a9 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..64575b1d 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..3b521e2f 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..154d2d70 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..03c721b8 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..5f886834 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..9330ac59 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..5eef3cb7 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..a67b580d 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..e99d08cc 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..c4a2838b 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..a0e4fd9a 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..3d095553 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..4db814e1 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..727705ec 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..9aa0ef71 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..913af286 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..ad4b4290 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..4902399d 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..3dd54cc1 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..6ce66717 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..ea7b1dd6 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..40e82641 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..15dd4d86 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..880acfd5 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..cc4e41de 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..201977af 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..7246c551 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..86cf1db8 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..48080beb 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..f46f3dfe 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..b8a8640e 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..14608691 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..56deadfe 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..6fa6dfb9 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..2c85bc71 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..5f3e4865 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..f731e8ef 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..9ada2e7c 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..34bece35 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..58783e2e 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..fbf47d20 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..b8315b6d 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..55fa0fff 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..ad4f07f3 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..2f1c2c4a 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..a0f8ff49 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..30f9966b 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..256ab8aa 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..1142710d 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..6b5990c1 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..3474a1cd 100644 --- a/inkcpp/tuple.hpp +++ b/inkcpp/tuple.hpp @@ -1,116 +1,151 @@ +/* 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. #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 49a7bfca..106c1b42 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..676affc4 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..c3380ff2 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..a03137af 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..d601a08e 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..6af0811e 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..08221812 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..be8a029e 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..6c7d99a0 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..ae1458d4 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..a5b50a04 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..f71bbfb9 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..aebb82e6 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..859f6fdc 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..7faaf95b 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..ab6e01ba 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..359be80d 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 + } // namespace ink::compiler::internal 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..83ae6323 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..aac8a541 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..2dc23ddb 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..2e0c280f 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..db81dc29 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/Resources/Icon128.png b/unreal/inkcpp/Resources/Icon128.png index 1231d4aa..f632d02c 100644 Binary files a/unreal/inkcpp/Resources/Icon128.png and b/unreal/inkcpp/Resources/Icon128.png differ diff --git a/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp b/unreal/inkcpp/Source/inkcpp/Private/InkAsset.cpp index 98ee625c..f79c0d69 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..2b3cda39 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..f7df1dce 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..54b94722 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..d9a81a14 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..0a6d399b 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..03d2a9bc 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..f1685cf7 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..4101c293 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..742dd3db 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h +++ b/unreal/inkcpp/Source/inkcpp/Public/InkChoice.h @@ -1,5 +1,10 @@ +/* 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 "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..ba27ca3f 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..6c60dec7 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..845f2b64 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..a39312b9 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..9cbc1f72 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..8324abb3 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..145eda2b 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..cfefcc5f 100644 --- a/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h +++ b/unreal/inkcpp/Source/inkcpp/Public/inkcpp.h @@ -1,19 +1,51 @@ +/* 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 "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 +70,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 +100,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..c9639147 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..e99c257a 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" @@ -14,9 +20,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) { diff --git a/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h b/unreal/inkcpp/Source/inkcpp_editor/Private/InkAssetFactory.h index 5e870764..d3e85b05 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..251f3e61 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp +++ b/unreal/inkcpp/Source/inkcpp_editor/Private/inkcpp_editor.cpp @@ -1,6 +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_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) +DEFINE_LOG_CATEGORY(InkCpp); \ No newline at end of file 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..52b3e040 100644 --- a/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h +++ b/unreal/inkcpp/Source/inkcpp_editor/Public/inkcpp_editor.h @@ -1 +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 "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 143e7611..0b8e75d1 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..ffdc905d 100644 --- a/unreal/inkcpp/inkcpp.uplugin +++ b/unreal/inkcpp/inkcpp.uplugin @@ -1,15 +1,16 @@ { - "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#ue_example", + "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/494904fc50f747db879c297ee57cf122", + "SupportURL": "https://github.com/JBenda/inkcpp/issues", "CanContainContent": false, "IsBetaVersion": false, "Installed": false, @@ -19,15 +20,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 +}