From 5b0d5c95d896ca00ec7c231bf83d80f2deaa3d68 Mon Sep 17 00:00:00 2001 From: Anatoliy 'TLK' Kolesnick Date: Mon, 30 Apr 2018 17:32:17 +0300 Subject: [PATCH 01/27] Corrected message of ContextStillHasRetainedEntitiesException Initial message considered to call `systems.ClearReactiveSystems()` method which actually did not do the trick because reactive systems still retained references to entities. However `systems.DeactivateReactiveSystems()` does the expected behavior, so I updated exception message correspondingly. --- .../Exceptions/ContextStillHasRetainedEntitiesException.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Entitas/Entitas/Context/Exceptions/ContextStillHasRetainedEntitiesException.cs b/Entitas/Entitas/Context/Exceptions/ContextStillHasRetainedEntitiesException.cs index 27b799d28..ba002e2ee 100644 --- a/Entitas/Entitas/Context/Exceptions/ContextStillHasRetainedEntitiesException.cs +++ b/Entitas/Entitas/Context/Exceptions/ContextStillHasRetainedEntitiesException.cs @@ -7,8 +7,9 @@ public class ContextStillHasRetainedEntitiesException : EntitasException { public ContextStillHasRetainedEntitiesException(IContext context, IEntity[] entities) : base("'" + context + "' detected retained entities " + "although all entities got destroyed!", - "Did you release all entities? Try calling systems.ClearReactiveSystems()" + - "before calling context.DestroyAllEntities() to avoid memory leaks.\n" + + "Did you release all entities? Try calling systems.DeactivateReactiveSystems()" + + "before calling context.DestroyAllEntities() to avoid memory leaks." + + "Do not forget to activate them back when needed.\n" + string.Join("\n", entities .Select(e => { var safeAerc = e.aerc as SafeAERC; From 77fa338a9d056723d96c1c5278aae8063ad8e69d Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Sun, 2 Sep 2018 20:34:01 +0200 Subject: [PATCH 02/27] Fix github attachment upload --- project.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/project.sh b/project.sh index eed9a1bec..3213bac98 100644 --- a/project.sh +++ b/project.sh @@ -1,6 +1,8 @@ #!/bin/bash +source "${HOME}/.bee/entitas" BUILD="${ROOT}/Build" +BUILD_DIST="${BUILD}/dist" # utils UTILS_RSYNC_INCLUDE="${ROOT}/Scripts/rsync_include.txt" @@ -44,14 +46,13 @@ GITHUB_CHANGES="${CHANGELOG_CHANGES}" GITHUB_RELEASE_PREFIX="${DOTNET_PROJECT_NAME}" GITHUB_REPO="sschmid/Entitas-CSharp" declare -a -r GITHUB_ATTACHMENTS_ZIP=( - "${DOTNET_PROJECT_NAME}.zip" -# "${DOTNET_PROJECT_NAME}.docset.tgz" + "${BUILD_DIST}/${DOTNET_PROJECT_NAME}.zip" +# "${BUILD_DIST}/${DOTNET_PROJECT_NAME}.docset.tgz" ) # entitas BUILD_SRC="${BUILD}/src" BUILD_FILES="${BUILD_SRC}/files" -BUILD_DIST="${BUILD}/dist" DEPS_DIR="${ROOT}/Libraries/Dependencies/DesperateDevs" declare -a -r DEPS=( From e03e7aaefeca53922927fc1e66aef26fea521b31 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Thu, 13 Sep 2018 21:41:14 +0200 Subject: [PATCH 03/27] Fixed typo --- .../Entity/CodeGenerators/EntityGenerator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Entity/CodeGenerators/EntityGenerator.cs b/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Entity/CodeGenerators/EntityGenerator.cs index edef9a7c6..470a74d80 100644 --- a/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Entity/CodeGenerators/EntityGenerator.cs +++ b/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Entity/CodeGenerators/EntityGenerator.cs @@ -18,11 +18,11 @@ public class EntityGenerator : ICodeGenerator { public CodeGenFile[] Generate(CodeGeneratorData[] data) { return data .OfType() - .Select(generte) + .Select(generate) .ToArray(); } - CodeGenFile generte(ContextData data) { + CodeGenFile generate(ContextData data) { var contextName = data.GetContextName(); return new CodeGenFile( contextName + Path.DirectorySeparatorChar + From 38e88895a2b22f58365b6fe92a6e5a8aedd166ce Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Sun, 30 Sep 2018 00:48:22 +0200 Subject: [PATCH 04/27] Using latest bee --- .gitignore | 4 +- RELEASE_NOTES.md => CHANGELOG.md | 0 Entitas/Entitas/version.txt | 2 +- bee.sh | 41 +++ {Scripts/res => bee/docs}/docs-logo.png | Bin {Scripts/res => bee/docs}/docset.doxyfile | 0 {Scripts/res => bee/docs}/html.doxyfile | 0 {Scripts/res => bee/docs}/icon.png | Bin {Scripts/res => bee/docs}/icon@2x.png | Bin bee/entitas.sh | 246 +++++++++++++++ {Scripts => bee/utils}/rsync_exclude.txt | 0 {Scripts => bee/utils}/rsync_include.txt | 0 project.sh | 351 ---------------------- 13 files changed, 289 insertions(+), 355 deletions(-) rename RELEASE_NOTES.md => CHANGELOG.md (100%) create mode 100644 bee.sh rename {Scripts/res => bee/docs}/docs-logo.png (100%) rename {Scripts/res => bee/docs}/docset.doxyfile (100%) rename {Scripts/res => bee/docs}/html.doxyfile (100%) rename {Scripts/res => bee/docs}/icon.png (100%) rename {Scripts/res => bee/docs}/icon@2x.png (100%) create mode 100644 bee/entitas.sh rename {Scripts => bee/utils}/rsync_exclude.txt (100%) rename {Scripts => bee/utils}/rsync_include.txt (100%) delete mode 100644 project.sh diff --git a/.gitignore b/.gitignore index 629e0db6b..5b144e979 100644 --- a/.gitignore +++ b/.gitignore @@ -23,13 +23,11 @@ Temp Assembly-CSharp*.csproj # Custom +CHANGES.md *.userproperties Build **/Assets/Libraries **/Assets/Libraries.meta Tests/Unity/CodeGenerator/Jenny -private.sh Blueprints.sln VisualDebugging.sln -changes.md -bee.sln diff --git a/RELEASE_NOTES.md b/CHANGELOG.md similarity index 100% rename from RELEASE_NOTES.md rename to CHANGELOG.md diff --git a/Entitas/Entitas/version.txt b/Entitas/Entitas/version.txt index a7ee35a3e..53adb84c8 100644 --- a/Entitas/Entitas/version.txt +++ b/Entitas/Entitas/version.txt @@ -1 +1 @@ -1.8.3 +1.8.2 diff --git a/bee.sh b/bee.sh new file mode 100644 index 000000000..6bea52145 --- /dev/null +++ b/bee.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +PROJECT="Entitas" +PLUGINS=(changelog dotnet doxygen git github tree utils version) + +# changelog +CHANGELOG_PATH=CHANGELOG.md +CHANGELOG_CHANGES=CHANGES.md + +# dotnet +DOTNET_SOLUTION="${PROJECT}.sln" +DOTNET_TESTS_PROJECT=Tests/Tests/Tests.csproj +DOTNET_TESTS_RUNNER=Tests/Tests/bin/Release/Tests.exe + +# doxygen +DOXYGEN_EXPORT_PATH=docs +DOXYGEN_DOXY_FILES=(bee/docs/html.doxyfile) +DOXYGEN_DOCSET_NAME="${PROJECT}.docset" +DOXYGEN_DOCSET="com.desperatedevs.${PROJECT}.docset" +DOXYGEN_DOCSET_KEY="$(echo "${PROJECT}" | tr "[:upper:]" "[:lower:]")" +DOXYGEN_DOCSET_ICONS=(bee/docs/icon.png bee/docs/icon@2x.png) + +# github +GITHUB_CHANGES=CHANGES.md +GITHUB_RELEASE_PREFIX="${PROJECT} " +GITHUB_REPO="sschmid/Entitas-CSharp" +GITHUB_ATTACHMENTS_ZIP=(Build/dist/${PROJECT}.zip) +source "${HOME}/.bee/github" + +# tree +TREE_IGNORE="bin|obj|Library|Libraries|*Tests|Readme|ProjectSettings|Build|docs|Temp|Examples|*.csproj|*.meta|*.sln|*.userprefs|*.properties|tree.txt" +TREE_PATH=tree.txt + +# utils +UTILS_RSYNC_INCLUDE=bee/utils/rsync_include.txt +UTILS_RSYNC_EXCLUDE=bee/utils/rsync_exclude.txt + +# version +VERSION_PATH=version.txt + +# entitas +source bee/entitas.sh diff --git a/Scripts/res/docs-logo.png b/bee/docs/docs-logo.png similarity index 100% rename from Scripts/res/docs-logo.png rename to bee/docs/docs-logo.png diff --git a/Scripts/res/docset.doxyfile b/bee/docs/docset.doxyfile similarity index 100% rename from Scripts/res/docset.doxyfile rename to bee/docs/docset.doxyfile diff --git a/Scripts/res/html.doxyfile b/bee/docs/html.doxyfile similarity index 100% rename from Scripts/res/html.doxyfile rename to bee/docs/html.doxyfile diff --git a/Scripts/res/icon.png b/bee/docs/icon.png similarity index 100% rename from Scripts/res/icon.png rename to bee/docs/icon.png diff --git a/Scripts/res/icon@2x.png b/bee/docs/icon@2x.png similarity index 100% rename from Scripts/res/icon@2x.png rename to bee/docs/icon@2x.png diff --git a/bee/entitas.sh b/bee/entitas.sh new file mode 100644 index 000000000..aa0aacbdf --- /dev/null +++ b/bee/entitas.sh @@ -0,0 +1,246 @@ +#!/usr/bin/env bash + +BUILD="Build" +BUILD_SRC="${BUILD}/src" +BUILD_FILES="${BUILD_SRC}/files" + +DEPS_DIR="Libraries/Dependencies/DesperateDevs" +DEPS=( + "../DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor/bin/Release/" + "../DesperateDevs/DesperateDevs.CodeGeneration.Plugins/bin/Release/" + "../DesperateDevs/DesperateDevs.CodeGeneration.Unity.Plugins/bin/Release/" + "../DesperateDevs/DesperateDevs.Unity.Editor/bin/Release/" + "../DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor/Compile.cs" +) +ENTITAS_PROJECTS=( + 'Entitas' + + 'Addons/Entitas.CodeGeneration.Attributes' + 'Addons/Entitas.CodeGeneration.Plugins' + + 'Addons/Entitas.Migration' + 'Addons/Entitas.Migration.Unity.Editor' + + 'Addons/Entitas.Unity' + 'Addons/Entitas.Unity.Editor' + + 'Addons/Entitas.VisualDebugging.Unity' + 'Addons/Entitas.VisualDebugging.Unity.Editor' + 'Addons/Entitas.VisualDebugging.CodeGeneration.Plugins' +) +ENTITAS_EDITOR=( + 'Entitas.Migration.dll' + 'Entitas.Migration.Unity.Editor.dll' + 'Entitas.Unity.Editor.dll' + 'Entitas.VisualDebugging.Unity.Editor.dll' +) +ENTITAS_PLUGINS=( + 'Entitas.CodeGeneration.Plugins.dll' + 'Entitas.VisualDebugging.CodeGeneration.Plugins.dll' +) +BLUEPRINTS_PROJECTS=( + 'Addons/Entitas.Blueprints' + 'Addons/Entitas.Blueprints.CodeGeneration.Plugins' + 'Addons/Entitas.Blueprints.CodeGeneration.Unity.Plugins' + 'Addons/Entitas.Blueprints.Unity' + 'Addons/Entitas.Blueprints.Unity.Editor' +) +BLUEPRINTS_EDITOR=( + 'Entitas.Blueprints.Unity.Editor.dll' +) +BLUEPRINTS_PLUGINS=( + 'Entitas.Blueprints.CodeGeneration.Plugins.dll' + 'Entitas.Blueprints.CodeGeneration.Unity.Plugins.dll' +) +IMAGES=( + "Addons/Entitas.Unity.Editor/Entitas.Unity.Editor/Images/" + "Addons/Entitas.VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/Images/" +) +FILES=( + 'EntitasUpgradeGuide.md' + 'LICENSE.txt' + 'README.md' + 'CHANGELOG.md' +) +DESPERATEDEVS=( + 'Compile.cs' + 'DesperateDevs.Logging.dll' + 'DesperateDevs.Networking.dll' + 'DesperateDevs.Serialization.dll' + 'DesperateDevs.Utils.dll' +) +DESPERATEDEVS_EDITOR=( + 'DesperateDevs.Analytics.dll' + 'DesperateDevs.CodeGeneration.CodeGenerator.dll' + 'DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor.dll' + 'DesperateDevs.CodeGeneration.dll' + 'DesperateDevs.Unity.Editor.dll' +) +DESPERATEDEVS_PLUGINS=( + 'DesperateDevs.CodeGeneration.Plugins.dll' + 'DesperateDevs.CodeGeneration.Unity.Plugins.dll' +) + +entitas::update() { + log_func + utils::clean_dir "${DEPS_DIR}" + for d in "${DEPS[@]}"; do + utils::sync_files "${d}" "${DEPS_DIR}" + done +} + +entitas::generate() { + dotnet::build + local properties=( + 'Tests/TestFixtures/Preferences.properties' + 'Readme/Prefrences.properties' + ) + for p in "${properties[@]}"; do + local dir="$(dirname ${p})" + pushd "${dir}" > /dev/null + log_strong "Generating ${p}" + jenny gen "$(basename ${p})" + popd > /dev/null + done +} + +entitas::collect_entitas_unity() { + log_func + local entitas_dir="${BUILD_SRC}/Unity/Entitas/Assets/Entitas" + local entitas_editor_dir="${entitas_dir}/Editor" + local entitas_plugins_dir="${entitas_editor_dir}/Plugins" + local images_dir="${entitas_editor_dir}/Images" + local desperatedevs_dir="${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" + local desperatedevs_editor_dir="${desperatedevs_dir}/Editor" + local desperatedevs_plugins_dir="${desperatedevs_editor_dir}/Plugins" + utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \ + "${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}" + + for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync_files "${p}/bin/Release/" "${entitas_dir}"; done + utils::sync_files "${DEPS_DIR}/" "${entitas_dir}" + for f in "${ENTITAS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${entitas_editor_dir}"; done + for f in "${ENTITAS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${entitas_plugins_dir}"; done + for f in "${IMAGES[@]}"; do utils::sync_files "${f}" "${images_dir}"; done + for f in "${DESPERATEDEVS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_dir}"; done + for f in "${DESPERATEDEVS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}"; done + for f in "${DESPERATEDEVS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}"; done +} + +entitas::collect_entitas_with_blueprints_unity() { + log_func + local entitas_dir="${BUILD_SRC}/Unity/Entitas/Assets/Entitas-Blueprints" + local entitas_editor_dir="${entitas_dir}/Editor" + local entitas_plugins_dir="${entitas_editor_dir}/Plugins" + local images_dir="${entitas_editor_dir}/Images" + local desperatedevs_dir="${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" + local desperatedevs_editor_dir="${desperatedevs_dir}/Editor" + local desperatedevs_plugins_dir="${desperatedevs_editor_dir}/Plugins" + utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \ + "${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}" + + for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync_files "${p}/bin/Release/" "${entitas_dir}"; done + for p in "${BLUEPRINTS_PROJECTS[@]}"; do utils::sync_files "${p}/bin/Release/" "${entitas_dir}"; done + utils::sync_files "${DEPS_DIR}/" "${entitas_dir}" + for f in "${ENTITAS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${entitas_editor_dir}"; done + for f in "${BLUEPRINTS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${entitas_editor_dir}"; done + for f in "${ENTITAS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${entitas_plugins_dir}"; done + for f in "${BLUEPRINTS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${entitas_plugins_dir}"; done + for d in "${IMAGES[@]}"; do utils::sync_files "${d}" "${images_dir}"; done + for f in "${DESPERATEDEVS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_dir}"; done + for f in "${DESPERATEDEVS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}"; done + for f in "${DESPERATEDEVS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}"; done +} + +entitas::collect_files() { + log_func + utils::clean_dir "${BUILD_FILES}" + for f in "${FILES[@]}"; do + utils::sync_files "${f}" "${BUILD_FILES}/${f}" + done +} + +entitas::sync_unity_visualdebugging() { + log_func + entitas::collect_entitas_unity + local unity_libs="Tests/Unity/VisualDebugging/Assets/Libraries" + utils::clean_dir "${unity_libs}" + utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/Entitas" "${unity_libs}" + utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" +} + +entitas::sync_unity_blueprints() { + log_func + entitas::collect_entitas_with_blueprints_unity + local unity_libs="Tests/Unity/Blueprints/Assets/Libraries" + utils::clean_dir "${unity_libs}" + utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/Entitas-Blueprints" "${unity_libs}" + utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" +} + +entitas::sync() { + entitas::sync_unity_visualdebugging + entitas::sync_unity_blueprints +} + +entitas::pack_entitas_unity() { + log_func + entitas::collect_entitas_unity + entitas::collect_files + local tmp_dir="${BUILD}/tmp" + utils::clean_dir "${tmp_dir}" + + utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets" "${tmp_dir}" + utils::sync_files "${BUILD_FILES}/" "${tmp_dir}/Assets/Entitas" + + pushd "${tmp_dir}" > /dev/null + zip -rq "$BUILD_DIST/${PROJECT_NAME}.zip" ./ + popd > /dev/null + rm -rf "${tmp_dir}" +} + +entitas::pack() { + log_func + entitas::update + dotnet::clean_build + dotnet::tests + + utils::clean_dir "${BUILD_SRC}" "${BUILD_DIST}" + + docs::generate +# create docset tgz +# pushd "${DOCS_BUILD}/docset" > /dev/null +# tar --exclude='.DS_Store' -czf "${BUILD_DIST}/${PROJECT_NAME}.docset.tgz" "${PROJECT_NAME}.docset" +# popd > /dev/null + + entitas::pack_entitas_unity + tree::create +} + +entitas::dist() { + log_func + changelog::merge + entitas::pack + git::commit_release_sync_master + git::push_all + + log "bzzz... giving GitHub some time to process..." + sleep 10 + + github::create_release + open "https://github.com/${GITHUB_REPO}/releases" +} + +entitas::dist_major() { + version::bump_major + entitas::dist +} + +entitas::dist_minor() { + version::bump_minor + entitas::dist +} + +entitas::dist_patch() { + version::bump_patch + entitas::dist +} diff --git a/Scripts/rsync_exclude.txt b/bee/utils/rsync_exclude.txt similarity index 100% rename from Scripts/rsync_exclude.txt rename to bee/utils/rsync_exclude.txt diff --git a/Scripts/rsync_include.txt b/bee/utils/rsync_include.txt similarity index 100% rename from Scripts/rsync_include.txt rename to bee/utils/rsync_include.txt diff --git a/project.sh b/project.sh deleted file mode 100644 index 3213bac98..000000000 --- a/project.sh +++ /dev/null @@ -1,351 +0,0 @@ -#!/bin/bash - -source "${HOME}/.bee/entitas" -BUILD="${ROOT}/Build" -BUILD_DIST="${BUILD}/dist" - -# utils -UTILS_RSYNC_INCLUDE="${ROOT}/Scripts/rsync_include.txt" -UTILS_RSYNC_EXCLUDE="${ROOT}/Scripts/rsync_exclude.txt" -UTILS_TREE_IGNORE="bin|obj|Library|Libraries|*Tests|Readme|ProjectSettings|Build|docs|Temp|Examples|*.csproj|*.meta|*.sln|*.userprefs|*.properties|tree.txt" -UTILS_TREE_PATH="tree.txt" - -# dotnet -DOTNET_PROJECT_NAME="Entitas" -DOTNET_SOLUTION="${ROOT}/${DOTNET_PROJECT_NAME}.sln" -DOTNET_TESTS_PROJECT="${ROOT}/Tests/Tests/Tests.csproj" -DOTNET_TESTS_RUNNER="${ROOT}/Tests/Tests/bin/Release/Tests.exe" - -# version -VERSION_PATH="${ROOT}/${DOTNET_PROJECT_NAME}/${DOTNET_PROJECT_NAME}/version.txt" - -# unity -UNITY_PROJECT_PATH="${ROOT}" - -# docs -DOCS_BUILD="${BUILD}/docs" -DOCS_RES="${ROOT}/Scripts/res" -DOCS_EXPORT="${ROOT}/docs" -declare -a -r DOCS_DOXY_FILES=( - "${DOCS_RES}/html.doxyfile" -# "${DOCS_RES}/docset.doxyfile" -) -DOCS_DOCSET="com.desperatedevs.${DOTNET_PROJECT_NAME}.docset" -DOCS_DOCSET_KEY="$(echo ${DOTNET_PROJECT_NAME} | tr "[:upper:]" "[:lower:]")" -declare -a -r DOCS_DOCSET_ICONS=( - "${DOCS_RES}/icon.png" - "${DOCS_RES}/icon@2x.png" -) - -# changelog -CHANGELOG_PATH="${ROOT}/RELEASE_NOTES.md" -CHANGELOG_CHANGES="${ROOT}/changes.md" - -# github -GITHUB_CHANGES="${CHANGELOG_CHANGES}" -GITHUB_RELEASE_PREFIX="${DOTNET_PROJECT_NAME}" -GITHUB_REPO="sschmid/Entitas-CSharp" -declare -a -r GITHUB_ATTACHMENTS_ZIP=( - "${BUILD_DIST}/${DOTNET_PROJECT_NAME}.zip" -# "${BUILD_DIST}/${DOTNET_PROJECT_NAME}.docset.tgz" -) - -# entitas -BUILD_SRC="${BUILD}/src" -BUILD_FILES="${BUILD_SRC}/files" - -DEPS_DIR="${ROOT}/Libraries/Dependencies/DesperateDevs" -declare -a -r DEPS=( - "../DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor/bin/Release/" - "../DesperateDevs/DesperateDevs.CodeGeneration.Plugins/bin/Release/" - "../DesperateDevs/DesperateDevs.CodeGeneration.Unity.Plugins/bin/Release/" - "../DesperateDevs/DesperateDevs.Unity.Editor/bin/Release/" - "../DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor/Compile.cs" -) - -declare -a -r entitas_projects=( - 'Entitas' - - 'Addons/Entitas.CodeGeneration.Attributes' - 'Addons/Entitas.CodeGeneration.Plugins' - - 'Addons/Entitas.Migration' - 'Addons/Entitas.Migration.Unity.Editor' - - 'Addons/Entitas.Unity' - 'Addons/Entitas.Unity.Editor' - - 'Addons/Entitas.VisualDebugging.Unity' - 'Addons/Entitas.VisualDebugging.Unity.Editor' - 'Addons/Entitas.VisualDebugging.CodeGeneration.Plugins' -) - -declare -a -r entitas_editor=( - 'Entitas.Migration.dll' - 'Entitas.Migration.Unity.Editor.dll' - 'Entitas.Unity.Editor.dll' - 'Entitas.VisualDebugging.Unity.Editor.dll' -) - -declare -a -r entitas_plugins=( - 'Entitas.CodeGeneration.Plugins.dll' - 'Entitas.VisualDebugging.CodeGeneration.Plugins.dll' -) - -declare -a -r images=( - "Addons/Entitas.Unity.Editor/Entitas.Unity.Editor/Images/" - "Addons/Entitas.VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/Images/" -) - -declare -a -r desperatedevs=( - 'Compile.cs' - 'DesperateDevs.Logging.dll' - 'DesperateDevs.Networking.dll' - 'DesperateDevs.Serialization.dll' - 'DesperateDevs.Utils.dll' -) - -declare -a -r desperatedevs_editor=( - 'DesperateDevs.Analytics.dll' - 'DesperateDevs.CodeGeneration.CodeGenerator.dll' - 'DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor.dll' - 'DesperateDevs.CodeGeneration.dll' - 'DesperateDevs.Unity.Editor.dll' -) - -declare -a -r desperatedevs_plugins=( - 'DesperateDevs.CodeGeneration.Plugins.dll' - 'DesperateDevs.CodeGeneration.Unity.Plugins.dll' -) - -entitas::update() { - bee::log_func - utils::clean_dir "${DEPS_DIR}" - for d in "${DEPS[@]}"; do - utils::sync_files ${d} "${DEPS_DIR}" - done -} - -entitas::generate() { - dotnet::build - declare -a -r properties=( - 'Tests/TestFixtures/Preferences.properties' - 'Readme/Prefrences.properties' - ) - for p in "${properties[@]}"; do - local dir=$(dirname ${p}) - pushd "${dir}" > /dev/null - bee::log_strong "Generating ${p}" - mono "${ROOT}/../DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.CLI/bin/Release/DesperateDevs.CodeGeneration.CodeGenerator.CLI.exe" gen "${ROOT}/${p}" - popd > /dev/null - done -} - -entitas::collect_entitas_unity() { - bee::log_func - local entitas_dir="${BUILD_SRC}/Unity/Entitas/Assets/Entitas" - local entitas_editor_dir="${entitas_dir}/Editor" - local entitas_plugins_dir="${entitas_editor_dir}/Plugins" - local images_dir="${entitas_editor_dir}/Images" - local desperatedevs_dir="${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" - local desperatedevs_editor_dir="${desperatedevs_dir}/Editor" - local desperatedevs_plugins_dir="${desperatedevs_editor_dir}/Plugins" - utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \ - "${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}" - - for p in "${entitas_projects[@]}"; do - utils::sync_files "${ROOT}/${p}/bin/Release/" "${entitas_dir}" - done - - utils::sync_files "${DEPS_DIR}/" "${entitas_dir}" - - for f in "${entitas_editor[@]}"; do - mv "${entitas_dir}/${f}" "${entitas_editor_dir}" - done - - for f in "${entitas_plugins[@]}"; do - mv "${entitas_dir}/${f}" "${entitas_plugins_dir}" - done - - for d in "${images[@]}"; do - utils::sync_files "${ROOT}/${d}" "${images_dir}" - done - - for f in "${desperatedevs[@]}"; do - mv "${entitas_dir}/${f}" "${desperatedevs_dir}" - done - - for f in "${desperatedevs_editor[@]}"; do - mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}" - done - - for f in "${desperatedevs_plugins[@]}"; do - mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}" - done -} - -entitas::collect_entitas_with_blueprints_unity() { - bee::log_func - local entitas_dir="${BUILD_SRC}/Unity/Entitas/Assets/Entitas-Blueprints" - local entitas_editor_dir="${entitas_dir}/Editor" - local entitas_plugins_dir="${entitas_editor_dir}/Plugins" - local images_dir="${entitas_editor_dir}/Images" - local desperatedevs_dir="${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" - local desperatedevs_editor_dir="${desperatedevs_dir}/Editor" - local desperatedevs_plugins_dir="${desperatedevs_editor_dir}/Plugins" - utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \ - "${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}" - - declare -a -r blueprints_projects=( - 'Addons/Entitas.Blueprints' - 'Addons/Entitas.Blueprints.CodeGeneration.Plugins' - 'Addons/Entitas.Blueprints.CodeGeneration.Unity.Plugins' - 'Addons/Entitas.Blueprints.Unity' - 'Addons/Entitas.Blueprints.Unity.Editor' - ) - for p in "${entitas_projects[@]}"; do - utils::sync_files "${ROOT}/${p}/bin/Release/" "${entitas_dir}" - done - for p in "${blueprints_projects[@]}"; do - utils::sync_files "${ROOT}/${p}/bin/Release/" "${entitas_dir}" - done - - utils::sync_files "${DEPS_DIR}/" "${entitas_dir}" - - declare -a -r blueprints_editor=( - 'Entitas.Blueprints.Unity.Editor.dll' - ) - for f in "${entitas_editor[@]}"; do - mv "${entitas_dir}/${f}" "${entitas_editor_dir}" - done - for f in "${blueprints_editor[@]}"; do - mv "${entitas_dir}/${f}" "${entitas_editor_dir}" - done - - declare -a -r blueprints_plugins=( - 'Entitas.Blueprints.CodeGeneration.Plugins.dll' - 'Entitas.Blueprints.CodeGeneration.Unity.Plugins.dll' - ) - for f in "${entitas_plugins[@]}"; do - mv "${entitas_dir}/${f}" "${entitas_plugins_dir}" - done - for f in "${blueprints_plugins[@]}"; do - mv "${entitas_dir}/${f}" "${entitas_plugins_dir}" - done - - for d in "${images[@]}"; do - utils::sync_files "${ROOT}/${d}" "${images_dir}" - done - - for f in "${desperatedevs[@]}"; do - mv "${entitas_dir}/${f}" "${desperatedevs_dir}" - done - - for f in "${desperatedevs_editor[@]}"; do - mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}" - done - - for f in "${desperatedevs_plugins[@]}"; do - mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}" - done -} - -entitas::collect_files() { - bee::log_func - utils::clean_dir "${BUILD_FILES}" - declare -a -r files=( - 'EntitasUpgradeGuide.md' - 'LICENSE.txt' - 'README.md' - 'RELEASE_NOTES.md' - ) - for f in "${files[@]}"; do - utils::sync_files "${ROOT}/${f}" "${BUILD_FILES}/${f}" - done -} - -entitas::sync_unity_visualdebugging() { - bee::log_func - entitas::collect_entitas_unity - local unity_libs="${ROOT}/Tests/Unity/VisualDebugging/Assets/Libraries" - utils::clean_dir "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/Entitas" "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" -} - -entitas::sync_unity_blueprints() { - bee::log_func - entitas::collect_entitas_with_blueprints_unity - local unity_libs="${ROOT}/Tests/Unity/Blueprints/Assets/Libraries" - utils::clean_dir "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/Entitas-Blueprints" "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" -} - -entitas::sync() { - entitas::sync_unity_visualdebugging - entitas::sync_unity_blueprints -} - -entitas::pack_entitas_unity() { - bee::log_func - entitas::collect_entitas_unity - entitas::collect_files - local tmp_dir="${BUILD}/tmp" - utils::clean_dir "${tmp_dir}" - - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets" "${tmp_dir}" - utils::sync_files "${BUILD_FILES}/" "${tmp_dir}/Assets/Entitas" - - pushd "${tmp_dir}" > /dev/null - zip -rq "$BUILD_DIST/${DOTNET_PROJECT_NAME}.zip" ./ - popd > /dev/null - rm -rf "${tmp_dir}" -} - -entitas::pack() { - bee::log_func - entitas::update - dotnet::clean_build - dotnet::tests - - utils::clean_dir "${BUILD_SRC}" "${BUILD_DIST}" - - docs::generate -# create docset tgz -# pushd "${DOCS_BUILD}/docset" > /dev/null -# tar --exclude='.DS_Store' -czf "${BUILD_DIST}/${DOTNET_PROJECT_NAME}.docset.tgz" "${DOTNET_PROJECT_NAME}.docset" -# popd > /dev/null - - entitas::pack_entitas_unity - utils::tree -} - -entitas::dist() { - bee::log_func - changelog::merge - entitas::pack - git::commit_release - git::push - - bee::log "bzzz... giving GitHub some time to process..." - sleep 10 - - github::create_release - open "https://github.com/${GITHUB_REPO}/releases" -} - -entitas::dist_major() { - version::bump_major - entitas::dist -} - -entitas::dist_minor() { - version::bump_minor - entitas::dist -} - -entitas::dist_patch() { - version::bump_patch - entitas::dist -} From 7e4a9135ede915a4ce29b330fe270e33c00595c4 Mon Sep 17 00:00:00 2001 From: Yevhenii Vitiuk Date: Tue, 16 Oct 2018 17:35:46 +0300 Subject: [PATCH 05/27] * safe execute method cover --- Entitas/Entitas/Systems/MultiReactiveSystem.cs | 15 +++++++++++---- Entitas/Entitas/Systems/ReactiveSystem.cs | 15 +++++++++++---- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Entitas/Entitas/Systems/MultiReactiveSystem.cs b/Entitas/Entitas/Systems/MultiReactiveSystem.cs index 1de9c8ebd..2c9941b81 100644 --- a/Entitas/Entitas/Systems/MultiReactiveSystem.cs +++ b/Entitas/Entitas/Systems/MultiReactiveSystem.cs @@ -77,11 +77,18 @@ public void Execute() { } if (_buffer.Count != 0) { - Execute(_buffer); - for (int i = 0; i < _buffer.Count; i++) { - _buffer[i].Release(this); + try + { + Execute(_buffer); + } + finally + { + for (int i = 0; i < _buffer.Count; i++) + { + _buffer[i].Release(this); + } + _buffer.Clear(); } - _buffer.Clear(); } } diff --git a/Entitas/Entitas/Systems/ReactiveSystem.cs b/Entitas/Entitas/Systems/ReactiveSystem.cs index 8cb4c94ee..e735085e2 100644 --- a/Entitas/Entitas/Systems/ReactiveSystem.cs +++ b/Entitas/Entitas/Systems/ReactiveSystem.cs @@ -65,11 +65,18 @@ public void Execute() { _collector.ClearCollectedEntities(); if (_buffer.Count != 0) { - Execute(_buffer); - for (int i = 0; i < _buffer.Count; i++) { - _buffer[i].Release(this); + try + { + Execute(_buffer); + } + finally + { + for (int i = 0; i < _buffer.Count; i++) + { + _buffer[i].Release(this); + } + _buffer.Clear(); } - _buffer.Clear(); } } } From 7bd93a5565ef25fe9b2cf2beda8b7081460a4678 Mon Sep 17 00:00:00 2001 From: Yevhenii Vitiuk Date: Tue, 16 Oct 2018 17:37:14 +0300 Subject: [PATCH 06/27] * style fix --- Entitas/Entitas/Systems/MultiReactiveSystem.cs | 6 ++---- Entitas/Entitas/Systems/ReactiveSystem.cs | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Entitas/Entitas/Systems/MultiReactiveSystem.cs b/Entitas/Entitas/Systems/MultiReactiveSystem.cs index 2c9941b81..7582ef1e4 100644 --- a/Entitas/Entitas/Systems/MultiReactiveSystem.cs +++ b/Entitas/Entitas/Systems/MultiReactiveSystem.cs @@ -77,12 +77,10 @@ public void Execute() { } if (_buffer.Count != 0) { - try - { + try{ Execute(_buffer); } - finally - { + finally{ for (int i = 0; i < _buffer.Count; i++) { _buffer[i].Release(this); diff --git a/Entitas/Entitas/Systems/ReactiveSystem.cs b/Entitas/Entitas/Systems/ReactiveSystem.cs index e735085e2..58c8a0f40 100644 --- a/Entitas/Entitas/Systems/ReactiveSystem.cs +++ b/Entitas/Entitas/Systems/ReactiveSystem.cs @@ -65,12 +65,10 @@ public void Execute() { _collector.ClearCollectedEntities(); if (_buffer.Count != 0) { - try - { + try{ Execute(_buffer); } - finally - { + finally{ for (int i = 0; i < _buffer.Count; i++) { _buffer[i].Release(this); From a812509210129004d6e7d81e3894c8c951067045 Mon Sep 17 00:00:00 2001 From: Yevhenii Vitiuk Date: Tue, 16 Oct 2018 17:38:35 +0300 Subject: [PATCH 07/27] * style fix --- Entitas/Entitas/Systems/MultiReactiveSystem.cs | 3 +-- Entitas/Entitas/Systems/ReactiveSystem.cs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Entitas/Entitas/Systems/MultiReactiveSystem.cs b/Entitas/Entitas/Systems/MultiReactiveSystem.cs index 7582ef1e4..4be471613 100644 --- a/Entitas/Entitas/Systems/MultiReactiveSystem.cs +++ b/Entitas/Entitas/Systems/MultiReactiveSystem.cs @@ -81,8 +81,7 @@ public void Execute() { Execute(_buffer); } finally{ - for (int i = 0; i < _buffer.Count; i++) - { + for (int i = 0; i < _buffer.Count; i++){ _buffer[i].Release(this); } _buffer.Clear(); diff --git a/Entitas/Entitas/Systems/ReactiveSystem.cs b/Entitas/Entitas/Systems/ReactiveSystem.cs index 58c8a0f40..a1b05afd0 100644 --- a/Entitas/Entitas/Systems/ReactiveSystem.cs +++ b/Entitas/Entitas/Systems/ReactiveSystem.cs @@ -69,8 +69,7 @@ public void Execute() { Execute(_buffer); } finally{ - for (int i = 0; i < _buffer.Count; i++) - { + for (int i = 0; i < _buffer.Count; i++){ _buffer[i].Release(this); } _buffer.Clear(); From d0bc8c5bc120b4698781ae27d0b4f8fbb30c90b2 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Tue, 16 Oct 2018 21:05:39 +0200 Subject: [PATCH 08/27] Added test scene --- .../Entitas/Systems/MultiReactiveSystem.cs | 7 +- Entitas/Entitas/Systems/ReactiveSystem.cs | 7 +- .../Reactive System Exception.meta | 3 + .../Reactive System Exception Scene.unity | 155 ++++++++++++++++++ ...Reactive System Exception Scene.unity.meta | 7 + .../ReactiveSystemExceptionController.cs | 41 +++++ .../ReactiveSystemExceptionController.cs.meta | 3 + 7 files changed, 215 insertions(+), 8 deletions(-) create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception.meta create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity.meta create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs.meta diff --git a/Entitas/Entitas/Systems/MultiReactiveSystem.cs b/Entitas/Entitas/Systems/MultiReactiveSystem.cs index 4be471613..7749c460e 100644 --- a/Entitas/Entitas/Systems/MultiReactiveSystem.cs +++ b/Entitas/Entitas/Systems/MultiReactiveSystem.cs @@ -77,11 +77,10 @@ public void Execute() { } if (_buffer.Count != 0) { - try{ + try { Execute(_buffer); - } - finally{ - for (int i = 0; i < _buffer.Count; i++){ + } finally { + for (int i = 0; i < _buffer.Count; i++) { _buffer[i].Release(this); } _buffer.Clear(); diff --git a/Entitas/Entitas/Systems/ReactiveSystem.cs b/Entitas/Entitas/Systems/ReactiveSystem.cs index a1b05afd0..ce237ea71 100644 --- a/Entitas/Entitas/Systems/ReactiveSystem.cs +++ b/Entitas/Entitas/Systems/ReactiveSystem.cs @@ -65,11 +65,10 @@ public void Execute() { _collector.ClearCollectedEntities(); if (_buffer.Count != 0) { - try{ + try { Execute(_buffer); - } - finally{ - for (int i = 0; i < _buffer.Count; i++){ + } finally { + for (int i = 0; i < _buffer.Count; i++) { _buffer[i].Release(this); } _buffer.Clear(); diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception.meta b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception.meta new file mode 100644 index 000000000..9b1c74c0f --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 95a1991d296b43cdacda4c6f66a842e5 +timeCreated: 1539714655 \ No newline at end of file diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity new file mode 100644 index 000000000..bfd459b99 --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.3731196, g: 0.38074002, b: 0.35872707, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &335183607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 335183609} + - component: {fileID: 335183608} + m_Layer: 0 + m_Name: Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &335183608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 335183607} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af88d9eb7bda418db410c5a1d92d419b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &335183609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 335183607} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity.meta b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity.meta new file mode 100644 index 000000000..192901bb5 --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/Reactive System Exception Scene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a15993e3c6d0c42ca90a69ab47e5418e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs new file mode 100644 index 000000000..17752b246 --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using Entitas; +using UnityEngine; +using Random = UnityEngine.Random; + +public class ReactiveSystemExceptionController : MonoBehaviour { + + GameEntity _entity; + ExceptionReactiveSystem _system; + + void Start() { + var contexts = Contexts.sharedInstance; + _entity = contexts.game.CreateEntity(); + _system = new ExceptionReactiveSystem(contexts); + } + + void Update() { + _entity.ReplaceMyString(Random.value.ToString()); + _system.Execute(); + } +} + +public class ExceptionReactiveSystem : ReactiveSystem { + + public ExceptionReactiveSystem(Contexts contexts) : base(contexts.game) { } + + protected override ICollector GetTrigger(IContext context) { + return context.CreateCollector(GameMatcher.MyString); + } + + protected override bool Filter(GameEntity entity) { + return true; + } + + protected override void Execute(List entities) { + if (Random.value > 0.99f) { + throw new Exception("ExceptionReactiveSystem Exception!"); + } + } +} diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs.meta b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs.meta new file mode 100644 index 000000000..06916b8ab --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Reactive System Exception/ReactiveSystemExceptionController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: af88d9eb7bda418db410c5a1d92d419b +timeCreated: 1539714679 \ No newline at end of file From 372193340d00503ac601a2aa0eb6770e1ec81a3b Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Tue, 16 Oct 2018 23:05:51 +0200 Subject: [PATCH 09/27] Update travis.yml --- .travis.yml | 4 +++- bee.sh | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a24481fb..400302487 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ language: csharp +install: +- bash -c "$(curl -fsSL https://raw.githubusercontent.com/sschmid/bee/master/install)" script: -- ./Scripts/bee tests +- bee dotnet::tests diff --git a/bee.sh b/bee.sh index 6bea52145..91eecb28e 100644 --- a/bee.sh +++ b/bee.sh @@ -2,7 +2,7 @@ PROJECT="Entitas" PLUGINS=(changelog dotnet doxygen git github tree utils version) -# changelog +# changelog => version CHANGELOG_PATH=CHANGELOG.md CHANGELOG_CHANGES=CHANGES.md @@ -11,7 +11,7 @@ DOTNET_SOLUTION="${PROJECT}.sln" DOTNET_TESTS_PROJECT=Tests/Tests/Tests.csproj DOTNET_TESTS_RUNNER=Tests/Tests/bin/Release/Tests.exe -# doxygen +# doxygen => utils version DOXYGEN_EXPORT_PATH=docs DOXYGEN_DOXY_FILES=(bee/docs/html.doxyfile) DOXYGEN_DOCSET_NAME="${PROJECT}.docset" @@ -19,11 +19,11 @@ DOXYGEN_DOCSET="com.desperatedevs.${PROJECT}.docset" DOXYGEN_DOCSET_KEY="$(echo "${PROJECT}" | tr "[:upper:]" "[:lower:]")" DOXYGEN_DOCSET_ICONS=(bee/docs/icon.png bee/docs/icon@2x.png) -# github +# github => version GITHUB_CHANGES=CHANGES.md GITHUB_RELEASE_PREFIX="${PROJECT} " GITHUB_REPO="sschmid/Entitas-CSharp" -GITHUB_ATTACHMENTS_ZIP=(Build/dist/${PROJECT}.zip) +GITHUB_ATTACHMENTS_ZIP=("Build/dist/${PROJECT}.zip") source "${HOME}/.bee/github" # tree From 74bd1e91a6d53e68b89abde4602bfb5428589a7d Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 17 Oct 2018 20:15:20 +0200 Subject: [PATCH 10/27] Update travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 400302487..239de9147 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: csharp +sudo: required install: - bash -c "$(curl -fsSL https://raw.githubusercontent.com/sschmid/bee/master/install)" script: From 542dcd72a8c05fcc0eed18d71b43dbbe8369864b Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 17 Oct 2018 21:19:33 +0200 Subject: [PATCH 11/27] Update travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 239de9147..ecc50fa2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: csharp sudo: required install: -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/sschmid/bee/master/install)" +- sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/sschmid/bee/master/install)" script: - bee dotnet::tests From e7ed7ed6807860acc8b7f4cfa42d2417388d8ccf Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 17 Oct 2018 21:34:15 +0200 Subject: [PATCH 12/27] Update travis.yml --- .travis.yml | 2 ++ bee.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ecc50fa2a..24172f1cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: csharp sudo: required +before_install: + - sudo apt-get update install: - sudo bash -c "$(curl -fsSL https://raw.githubusercontent.com/sschmid/bee/master/install)" script: diff --git a/bee.sh b/bee.sh index 91eecb28e..1675d51c4 100644 --- a/bee.sh +++ b/bee.sh @@ -24,7 +24,9 @@ GITHUB_CHANGES=CHANGES.md GITHUB_RELEASE_PREFIX="${PROJECT} " GITHUB_REPO="sschmid/Entitas-CSharp" GITHUB_ATTACHMENTS_ZIP=("Build/dist/${PROJECT}.zip") -source "${HOME}/.bee/github" +if [[ -f "${HOME}/.bee/github" ]]; then + source "${HOME}/.bee/github" +fi # tree TREE_IGNORE="bin|obj|Library|Libraries|*Tests|Readme|ProjectSettings|Build|docs|Temp|Examples|*.csproj|*.meta|*.sln|*.userprefs|*.properties|tree.txt" From 25df7675cfff6bcbe13c91261dacdb47df2d05d7 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Mon, 22 Oct 2018 18:55:04 +0200 Subject: [PATCH 13/27] Using latest bee --- {bee => .bee}/docs/docs-logo.png | Bin {bee => .bee}/docs/docset.doxyfile | 0 {bee => .bee}/docs/html.doxyfile | 0 {bee => .bee}/docs/icon.png | Bin {bee => .bee}/docs/icon@2x.png | Bin {bee => .bee}/entitas.sh | 30 +++++++++++++------------- {bee => .bee}/utils/rsync_exclude.txt | 0 {bee => .bee}/utils/rsync_include.txt | 0 CHANGELOG.md | 8 ------- bee.sh | 14 ++++++------ 10 files changed, 22 insertions(+), 30 deletions(-) rename {bee => .bee}/docs/docs-logo.png (100%) rename {bee => .bee}/docs/docset.doxyfile (100%) rename {bee => .bee}/docs/html.doxyfile (100%) rename {bee => .bee}/docs/icon.png (100%) rename {bee => .bee}/docs/icon@2x.png (100%) rename {bee => .bee}/entitas.sh (86%) rename {bee => .bee}/utils/rsync_exclude.txt (100%) rename {bee => .bee}/utils/rsync_include.txt (100%) diff --git a/bee/docs/docs-logo.png b/.bee/docs/docs-logo.png similarity index 100% rename from bee/docs/docs-logo.png rename to .bee/docs/docs-logo.png diff --git a/bee/docs/docset.doxyfile b/.bee/docs/docset.doxyfile similarity index 100% rename from bee/docs/docset.doxyfile rename to .bee/docs/docset.doxyfile diff --git a/bee/docs/html.doxyfile b/.bee/docs/html.doxyfile similarity index 100% rename from bee/docs/html.doxyfile rename to .bee/docs/html.doxyfile diff --git a/bee/docs/icon.png b/.bee/docs/icon.png similarity index 100% rename from bee/docs/icon.png rename to .bee/docs/icon.png diff --git a/bee/docs/icon@2x.png b/.bee/docs/icon@2x.png similarity index 100% rename from bee/docs/icon@2x.png rename to .bee/docs/icon@2x.png diff --git a/bee/entitas.sh b/.bee/entitas.sh similarity index 86% rename from bee/entitas.sh rename to .bee/entitas.sh index aa0aacbdf..21ec1d972 100644 --- a/bee/entitas.sh +++ b/.bee/entitas.sh @@ -85,7 +85,7 @@ entitas::update() { log_func utils::clean_dir "${DEPS_DIR}" for d in "${DEPS[@]}"; do - utils::sync_files "${d}" "${DEPS_DIR}" + utils::sync "${d}" "${DEPS_DIR}" done } @@ -116,11 +116,11 @@ entitas::collect_entitas_unity() { utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \ "${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}" - for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync_files "${p}/bin/Release/" "${entitas_dir}"; done - utils::sync_files "${DEPS_DIR}/" "${entitas_dir}" + for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync "${p}/bin/Release/" "${entitas_dir}"; done + utils::sync "${DEPS_DIR}/" "${entitas_dir}" for f in "${ENTITAS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${entitas_editor_dir}"; done for f in "${ENTITAS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${entitas_plugins_dir}"; done - for f in "${IMAGES[@]}"; do utils::sync_files "${f}" "${images_dir}"; done + for f in "${IMAGES[@]}"; do utils::sync "${f}" "${images_dir}"; done for f in "${DESPERATEDEVS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_dir}"; done for f in "${DESPERATEDEVS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}"; done for f in "${DESPERATEDEVS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}"; done @@ -138,14 +138,14 @@ entitas::collect_entitas_with_blueprints_unity() { utils::clean_dir "${entitas_dir}" "${entitas_editor_dir}" "${entitas_plugins_dir}" "${images_dir}" \ "${desperatedevs_dir}" "${desperatedevs_editor_dir}" "${desperatedevs_plugins_dir}" - for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync_files "${p}/bin/Release/" "${entitas_dir}"; done - for p in "${BLUEPRINTS_PROJECTS[@]}"; do utils::sync_files "${p}/bin/Release/" "${entitas_dir}"; done - utils::sync_files "${DEPS_DIR}/" "${entitas_dir}" + for p in "${ENTITAS_PROJECTS[@]}"; do utils::sync "${p}/bin/Release/" "${entitas_dir}"; done + for p in "${BLUEPRINTS_PROJECTS[@]}"; do utils::sync "${p}/bin/Release/" "${entitas_dir}"; done + utils::sync "${DEPS_DIR}/" "${entitas_dir}" for f in "${ENTITAS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${entitas_editor_dir}"; done for f in "${BLUEPRINTS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${entitas_editor_dir}"; done for f in "${ENTITAS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${entitas_plugins_dir}"; done for f in "${BLUEPRINTS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${entitas_plugins_dir}"; done - for d in "${IMAGES[@]}"; do utils::sync_files "${d}" "${images_dir}"; done + for d in "${IMAGES[@]}"; do utils::sync "${d}" "${images_dir}"; done for f in "${DESPERATEDEVS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_dir}"; done for f in "${DESPERATEDEVS_EDITOR[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_editor_dir}"; done for f in "${DESPERATEDEVS_PLUGINS[@]}"; do mv "${entitas_dir}/${f}" "${desperatedevs_plugins_dir}"; done @@ -155,7 +155,7 @@ entitas::collect_files() { log_func utils::clean_dir "${BUILD_FILES}" for f in "${FILES[@]}"; do - utils::sync_files "${f}" "${BUILD_FILES}/${f}" + utils::sync "${f}" "${BUILD_FILES}/${f}" done } @@ -164,8 +164,8 @@ entitas::sync_unity_visualdebugging() { entitas::collect_entitas_unity local unity_libs="Tests/Unity/VisualDebugging/Assets/Libraries" utils::clean_dir "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/Entitas" "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" + utils::sync "${BUILD_SRC}/Unity/Entitas/Assets/Entitas" "${unity_libs}" + utils::sync "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" } entitas::sync_unity_blueprints() { @@ -173,8 +173,8 @@ entitas::sync_unity_blueprints() { entitas::collect_entitas_with_blueprints_unity local unity_libs="Tests/Unity/Blueprints/Assets/Libraries" utils::clean_dir "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/Entitas-Blueprints" "${unity_libs}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" + utils::sync "${BUILD_SRC}/Unity/Entitas/Assets/Entitas-Blueprints" "${unity_libs}" + utils::sync "${BUILD_SRC}/Unity/Entitas/Assets/DesperateDevs" "${unity_libs}" } entitas::sync() { @@ -189,8 +189,8 @@ entitas::pack_entitas_unity() { local tmp_dir="${BUILD}/tmp" utils::clean_dir "${tmp_dir}" - utils::sync_files "${BUILD_SRC}/Unity/Entitas/Assets" "${tmp_dir}" - utils::sync_files "${BUILD_FILES}/" "${tmp_dir}/Assets/Entitas" + utils::sync "${BUILD_SRC}/Unity/Entitas/Assets" "${tmp_dir}" + utils::sync "${BUILD_FILES}/" "${tmp_dir}/Assets/Entitas" pushd "${tmp_dir}" > /dev/null zip -rq "$BUILD_DIST/${PROJECT_NAME}.zip" ./ diff --git a/bee/utils/rsync_exclude.txt b/.bee/utils/rsync_exclude.txt similarity index 100% rename from bee/utils/rsync_exclude.txt rename to .bee/utils/rsync_exclude.txt diff --git a/bee/utils/rsync_include.txt b/.bee/utils/rsync_include.txt similarity index 100% rename from bee/utils/rsync_include.txt rename to .bee/utils/rsync_include.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 87b3219de..f677db861 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,3 @@ -# 1.8.3 - -Ignore - this is an automated debug test release - -# 1.8.3 - -Ignore - this is an automated debug test release - # 1.8.2 As always, the Unity Asset Store version might take a few days to be processed diff --git a/bee.sh b/bee.sh index 1675d51c4..c0b9d432c 100644 --- a/bee.sh +++ b/bee.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash PROJECT="Entitas" PLUGINS=(changelog dotnet doxygen git github tree utils version) +RESOURCES=.bee + +source "${RESOURCES}"/entitas.sh # changelog => version CHANGELOG_PATH=CHANGELOG.md @@ -13,11 +16,11 @@ DOTNET_TESTS_RUNNER=Tests/Tests/bin/Release/Tests.exe # doxygen => utils version DOXYGEN_EXPORT_PATH=docs -DOXYGEN_DOXY_FILES=(bee/docs/html.doxyfile) +DOXYGEN_DOXY_FILES=("${RESOURCES}"/docs/html.doxyfile) DOXYGEN_DOCSET_NAME="${PROJECT}.docset" DOXYGEN_DOCSET="com.desperatedevs.${PROJECT}.docset" DOXYGEN_DOCSET_KEY="$(echo "${PROJECT}" | tr "[:upper:]" "[:lower:]")" -DOXYGEN_DOCSET_ICONS=(bee/docs/icon.png bee/docs/icon@2x.png) +DOXYGEN_DOCSET_ICONS=("${RESOURCES}"/docs/icon.png "${RESOURCES}"/docs/icon@2x.png) # github => version GITHUB_CHANGES=CHANGES.md @@ -33,11 +36,8 @@ TREE_IGNORE="bin|obj|Library|Libraries|*Tests|Readme|ProjectSettings|Build|docs| TREE_PATH=tree.txt # utils -UTILS_RSYNC_INCLUDE=bee/utils/rsync_include.txt -UTILS_RSYNC_EXCLUDE=bee/utils/rsync_exclude.txt +UTILS_RSYNC_INCLUDE="${RESOURCES}"/utils/rsync_include.txt +UTILS_RSYNC_EXCLUDE="${RESOURCES}"/utils/rsync_exclude.txt # version VERSION_PATH=version.txt - -# entitas -source bee/entitas.sh From 53fa40a693539ea4c2f418316e9e97c8189a75a9 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Mon, 22 Oct 2018 18:59:32 +0200 Subject: [PATCH 14/27] Update Unity projects --- .../VisualDebugging/Packages/manifest.json | 39 ++++++++++++++++++- .../ProjectSettings/EditorSettings.asset | 9 ++++- .../ProjectSettings/ProjectVersion.txt | 2 +- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Tests/Unity/VisualDebugging/Packages/manifest.json b/Tests/Unity/VisualDebugging/Packages/manifest.json index 526aca605..1342d0a7e 100644 --- a/Tests/Unity/VisualDebugging/Packages/manifest.json +++ b/Tests/Unity/VisualDebugging/Packages/manifest.json @@ -1,4 +1,39 @@ { - "dependencies": { - } + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "2.0.16", + "com.unity.package-manager-ui": "1.9.11", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.2.4", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } } diff --git a/Tests/Unity/VisualDebugging/ProjectSettings/EditorSettings.asset b/Tests/Unity/VisualDebugging/ProjectSettings/EditorSettings.asset index 93caa7bbb..364853f81 100644 --- a/Tests/Unity/VisualDebugging/ProjectSettings/EditorSettings.asset +++ b/Tests/Unity/VisualDebugging/ProjectSettings/EditorSettings.asset @@ -3,13 +3,18 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 4 + serializedVersion: 7 m_ExternalVersionControlSupport: Hidden Meta Files m_SerializationMode: 2 + m_LineEndingsForNewScripts: 1 m_DefaultBehaviorMode: 0 m_SpritePackerMode: 2 m_SpritePackerPaddingPower: 1 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_EtcTextureCompressorBehavior: 0 + m_EtcTextureFastCompressor: 2 + m_EtcTextureNormalCompressor: 2 + m_EtcTextureBestCompressor: 5 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef m_ProjectGenerationRootNamespace: m_UserGeneratedProjectSuffix: m_CollabEditorSettings: diff --git a/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt b/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt index 9788b3ac5..2ee2c93ad 100644 --- a/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt +++ b/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.1f1 +m_EditorVersion: 2018.2.11f1 From 520e179191a6666710d6e3bfaa99a74d153edf5b Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Mon, 22 Oct 2018 19:54:25 +0200 Subject: [PATCH 15/27] Using latest bee --- .bee/docs/docset.doxyfile | 2 +- .bee/docs/html.doxyfile | 4 ++-- .bee/entitas.sh | 13 +++++++++---- bee.sh | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.bee/docs/docset.doxyfile b/.bee/docs/docset.doxyfile index f79edfa8e..a710cf8f2 100644 --- a/.bee/docs/docset.doxyfile +++ b/.bee/docs/docset.doxyfile @@ -7,7 +7,7 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Entitas" PROJECT_NUMBER = 1.8.2 PROJECT_BRIEF = "Entitas is a super fast Entity Component System (ECS) Framework specifically made for C# and Unity" -PROJECT_LOGO = "Scripts/res/docs-logo.png" +PROJECT_LOGO = ".bee/docs/docs-logo.png" OUTPUT_DIRECTORY = "Build/docs" CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO diff --git a/.bee/docs/html.doxyfile b/.bee/docs/html.doxyfile index c507cee5c..ea6129f3c 100644 --- a/.bee/docs/html.doxyfile +++ b/.bee/docs/html.doxyfile @@ -5,9 +5,9 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Entitas" -PROJECT_NUMBER = 1.8.3 +PROJECT_NUMBER = 1.8.2 PROJECT_BRIEF = "Entitas is a super fast Entity Component System (ECS) Framework specifically made for C# and Unity" -PROJECT_LOGO = "Scripts/res/docs-logo.png" +PROJECT_LOGO = ".bee/docs/docs-logo.png" OUTPUT_DIRECTORY = "Build/docs" CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO diff --git a/.bee/entitas.sh b/.bee/entitas.sh index 21ec1d972..8ed4a35d0 100644 --- a/.bee/entitas.sh +++ b/.bee/entitas.sh @@ -3,6 +3,7 @@ BUILD="Build" BUILD_SRC="${BUILD}/src" BUILD_FILES="${BUILD_SRC}/files" +BUILD_DIST="${BUILD}/dist" DEPS_DIR="Libraries/Dependencies/DesperateDevs" DEPS=( @@ -192,8 +193,12 @@ entitas::pack_entitas_unity() { utils::sync "${BUILD_SRC}/Unity/Entitas/Assets" "${tmp_dir}" utils::sync "${BUILD_FILES}/" "${tmp_dir}/Assets/Entitas" + pushd "${BUILD_DIST}" > /dev/null + local abs_build_dist="$(pwd)" + popd > /dev/null + pushd "${tmp_dir}" > /dev/null - zip -rq "$BUILD_DIST/${PROJECT_NAME}.zip" ./ + zip -rq "${abs_build_dist}/${PROJECT}.zip" ./ popd > /dev/null rm -rf "${tmp_dir}" } @@ -201,15 +206,15 @@ entitas::pack_entitas_unity() { entitas::pack() { log_func entitas::update - dotnet::clean_build + dotnet::rebuild dotnet::tests utils::clean_dir "${BUILD_SRC}" "${BUILD_DIST}" - docs::generate + doxygen::generate # create docset tgz # pushd "${DOCS_BUILD}/docset" > /dev/null -# tar --exclude='.DS_Store' -czf "${BUILD_DIST}/${PROJECT_NAME}.docset.tgz" "${PROJECT_NAME}.docset" +# tar --exclude='.DS_Store' -czf "${BUILD_DIST}/${PROJECT_NAME}.docset.tgz" "${PROJECT}.docset" # popd > /dev/null entitas::pack_entitas_unity diff --git a/bee.sh b/bee.sh index c0b9d432c..44efce39b 100644 --- a/bee.sh +++ b/bee.sh @@ -40,4 +40,4 @@ UTILS_RSYNC_INCLUDE="${RESOURCES}"/utils/rsync_include.txt UTILS_RSYNC_EXCLUDE="${RESOURCES}"/utils/rsync_exclude.txt # version -VERSION_PATH=version.txt +VERSION_PATH="${PROJECT}/${PROJECT}"/version.txt From 529816fb307ac071e2ca031606144eb8377e523b Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 19:50:27 +0200 Subject: [PATCH 16/27] Fix generated code spelling mistake. Closes #796 --- .../ContextObserverGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Addons/Entitas.VisualDebugging.CodeGeneration.Plugins/Entitas.VisualDebugging.CodeGeneration.Plugins/ContextObserverGenerator.cs b/Addons/Entitas.VisualDebugging.CodeGeneration.Plugins/Entitas.VisualDebugging.CodeGeneration.Plugins/ContextObserverGenerator.cs index d9fa2b391..fe5002744 100644 --- a/Addons/Entitas.VisualDebugging.CodeGeneration.Plugins/Entitas.VisualDebugging.CodeGeneration.Plugins/ContextObserverGenerator.cs +++ b/Addons/Entitas.VisualDebugging.CodeGeneration.Plugins/Entitas.VisualDebugging.CodeGeneration.Plugins/ContextObserverGenerator.cs @@ -17,7 +17,7 @@ public class ContextObserverGenerator : ICodeGenerator { #if (!ENTITAS_DISABLE_VISUAL_DEBUGGING && UNITY_EDITOR) [Entitas.CodeGeneration.Attributes.PostConstructor] - public void InitializeContexObservers() { + public void InitializeContextObservers() { try { ${contextObservers} } catch(System.Exception) { From 98dab1f48d93fbbaeb9850ccef2897affcb63544 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 20:08:18 +0200 Subject: [PATCH 17/27] Generate XML documentation. Closes #792 --- Entitas/Entitas.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Entitas/Entitas.csproj b/Entitas/Entitas.csproj index 42afe42ae..60d50e8d7 100644 --- a/Entitas/Entitas.csproj +++ b/Entitas/Entitas.csproj @@ -27,6 +27,7 @@ prompt 4 false + bin\Release\Entitas.xml From 6a777858195b8e23954c353329dcf1c7ed51b9e0 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 20:30:00 +0200 Subject: [PATCH 18/27] Optimize generated code. Closes #780 --- .../Component/CodeGenerators/ComponentEntityApiGenerator.cs | 4 ++-- .../PerformanceTests/Entity/EntityAddComponent.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Component/CodeGenerators/ComponentEntityApiGenerator.cs b/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Component/CodeGenerators/ComponentEntityApiGenerator.cs index fb50aa625..8807afcba 100644 --- a/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Component/CodeGenerators/ComponentEntityApiGenerator.cs +++ b/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Component/CodeGenerators/ComponentEntityApiGenerator.cs @@ -17,14 +17,14 @@ public class ComponentEntityApiGenerator : AbstractGenerator { public void Add${ComponentName}(${newMethodParameters}) { var index = ${Index}; - var component = CreateComponent<${ComponentType}>(index); + var component = (${ComponentType})CreateComponent(index, typeof(${ComponentType})); ${memberAssignmentList} AddComponent(index, component); } public void Replace${ComponentName}(${newMethodParameters}) { var index = ${Index}; - var component = CreateComponent<${ComponentType}>(index); + var component = (${ComponentType})CreateComponent(index, typeof(${ComponentType})); ${memberAssignmentList} ReplaceComponent(index, component); } diff --git a/Tests/PerformanceTests/PerformanceTests/Entity/EntityAddComponent.cs b/Tests/PerformanceTests/PerformanceTests/Entity/EntityAddComponent.cs index 398a5664f..806a53518 100644 --- a/Tests/PerformanceTests/PerformanceTests/Entity/EntityAddComponent.cs +++ b/Tests/PerformanceTests/PerformanceTests/Entity/EntityAddComponent.cs @@ -15,7 +15,7 @@ public void Before() { public void Run() { for (int i = 0; i < n; i++) { - _e.AddComponent(CP.ComponentA, _e.CreateComponent(CP.ComponentA)); + _e.AddComponent(CP.ComponentA, _e.CreateComponent(CP.ComponentA, typeof(ComponentA))); _e.RemoveComponent(CP.ComponentA); } } From 6a1691b2fc270e59c47ec345fb5b8446f90802c5 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 20:30:32 +0200 Subject: [PATCH 19/27] Generated --- Readme/Readme/Generated/Contexts.cs | 2 +- Readme/Readme/Generated/Game/Components/GameAssetComponent.cs | 4 ++-- .../Readme/Generated/Game/Components/GameHealthComponent.cs | 4 ++-- .../Generated/Game/Components/GameHighscoreComponent.cs | 4 ++-- .../Readme/Generated/Game/Components/GamePositionComponent.cs | 4 ++-- Readme/Readme/Generated/Game/Components/GameUserComponent.cs | 4 ++-- .../Readme/Generated/Game/Components/GameVelocityComponent.cs | 4 ++-- Readme/Readme/Generated/Game/Components/GameViewComponent.cs | 4 ++-- .../Generated/GameState/Components/GameStateScoreComponent.cs | 4 ++-- .../Readme/Generated/Input/Components/InputInputComponent.cs | 4 ++-- .../Generated/Game/Components/GameArray3dComponent.cs | 4 ++-- .../Generated/Game/Components/GameInheritedComponent.cs | 4 ++-- .../Components/GameMultiplePrimaryEntityIndicesComponent.cs | 4 ++-- .../GameMyNamespaceEntityIndexNoContextComponent.cs | 4 ++-- .../Generated/Game/Components/GameParentComponent.cs | 4 ++-- .../Game/Components/GamePrimaryEntityIndexComponent.cs | 4 ++-- .../Generated/Test/Components/TestBaseComponent.cs | 4 ++-- .../Generated/Test/Components/TestBaseListenerComponent.cs | 4 ++-- .../Generated/Test/Components/TestClassToGenerateComponent.cs | 4 ++-- .../Components/TestClassWithEntitIndexAttributeComponent.cs | 4 ++-- .../TestComponentWithFieldsAndPropertiesComponent.cs | 4 ++-- .../Test/Components/TestComponentWithFieldsComponent.cs | 4 ++-- .../Test/Components/TestComponentWithPropertiesComponent.cs | 4 ++-- .../Generated/Test/Components/TestEventToGenerateComponent.cs | 4 ++-- .../Test/Components/TestFlagEntityEventListenerComponent.cs | 4 ++-- .../Test/Components/TestFlagEventRemovedListenerComponent.cs | 4 ++-- .../Test/Components/TestInterfaceToGenerateComponent.cs | 4 ++-- .../Components/TestMultipleContextStandardEventComponent.cs | 4 ++-- .../Components/TestMultipleEventsStandardEventComponent.cs | 4 ++-- .../Test/Components/TestMyNamespaceEntityIndexComponent.cs | 4 ++-- .../TestMyNamespaceMultipleEntityIndicesComponent.cs | 4 ++-- .../Test/Components/TestMyNamespaceMyNamespaceComponent.cs | 4 ++-- .../Components/TestMyNamespaceUniqueMyNamespaceComponent.cs | 4 ++-- .../Generated/Test/Components/TestNameAgeComponent.cs | 4 ++-- .../Test/Components/TestNewCustomNameComponent1Component.cs | 4 ++-- .../Test/Components/TestNewCustomNameComponent2Component.cs | 4 ++-- .../Generated/Test/Components/TestPositionComponent.cs | 4 ++-- .../Generated/Test/Components/TestSizeComponent.cs | 4 ++-- .../Generated/Test/Components/TestStandardComponent.cs | 4 ++-- .../Test/Components/TestStandardEntityEventComponent.cs | 4 ++-- .../TestStandardEntityEventRemovedListenerComponent.cs | 4 ++-- .../Generated/Test/Components/TestStandardEventComponent.cs | 4 ++-- .../Test/Components/TestStandardEventListenerComponent.cs | 4 ++-- .../Test/Components/TestStructToGenerateComponent.cs | 4 ++-- .../Generated/Test/Components/TestTest2ContextComponent.cs | 4 ++-- .../Components/TestTestEventToGenerateListenerComponent.cs | 4 ++-- .../TestTestMultipleContextStandardEventListenerComponent.cs | 4 ++-- .../TestTestMultipleEventsStandardEventListenerComponent.cs | 4 ++-- ...TestMultipleEventsStandardEventRemovedListenerComponent.cs | 4 ++-- .../Test/Components/TestUniqueClassToGenerateComponent.cs | 4 ++-- .../Generated/Test/Components/TestUniqueEventComponent.cs | 4 ++-- .../Test/Components/TestUniqueEventListenerComponent.cs | 4 ++-- .../Generated/Test/Components/TestUniqueStandardComponent.cs | 4 ++-- .../Test2/Components/Test2ClassToGenerateComponent.cs | 4 ++-- .../Test2/Components/Test2EventToGenerateComponent.cs | 4 ++-- .../Components/Test2MultipleContextStandardEventComponent.cs | 4 ++-- .../Components/Test2MultipleEventsStandardEventComponent.cs | 4 ++-- .../Test2/Components/Test2MyNamespaceEntityIndexComponent.cs | 4 ++-- .../Test2MyNamespaceMultipleEntityIndicesComponent.cs | 4 ++-- .../Test2/Components/Test2MyNamespaceMyNamespaceComponent.cs | 4 ++-- .../Generated/Test2/Components/Test2NameAgeComponent.cs | 4 ++-- .../Generated/Test2/Components/Test2Test2ContextComponent.cs | 4 ++-- .../Components/Test2Test2EventToGenerateListenerComponent.cs | 4 ++-- ...Test2Test2MultipleContextStandardEventListenerComponent.cs | 4 ++-- .../Test2Test2MultipleEventsStandardEventListenerComponent.cs | 4 ++-- ...est2MultipleEventsStandardEventRemovedListenerComponent.cs | 4 ++-- .../Test2/Components/Test2UniqueClassToGenerateComponent.cs | 4 ++-- 67 files changed, 133 insertions(+), 133 deletions(-) diff --git a/Readme/Readme/Generated/Contexts.cs b/Readme/Readme/Generated/Contexts.cs index 48a80f47b..7bb2dda4c 100644 --- a/Readme/Readme/Generated/Contexts.cs +++ b/Readme/Readme/Generated/Contexts.cs @@ -63,7 +63,7 @@ public partial class Contexts { #if (!ENTITAS_DISABLE_VISUAL_DEBUGGING && UNITY_EDITOR) [Entitas.CodeGeneration.Attributes.PostConstructor] - public void InitializeContexObservers() { + public void InitializeContextObservers() { try { CreateContextObserver(game); CreateContextObserver(gameState); diff --git a/Readme/Readme/Generated/Game/Components/GameAssetComponent.cs b/Readme/Readme/Generated/Game/Components/GameAssetComponent.cs index e25aa1ce4..ea00c110d 100644 --- a/Readme/Readme/Generated/Game/Components/GameAssetComponent.cs +++ b/Readme/Readme/Generated/Game/Components/GameAssetComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddAsset(string newName) { var index = GameComponentsLookup.Asset; - var component = CreateComponent(index); + var component = (AssetComponent)CreateComponent(index, typeof(AssetComponent)); component.name = newName; AddComponent(index, component); } public void ReplaceAsset(string newName) { var index = GameComponentsLookup.Asset; - var component = CreateComponent(index); + var component = (AssetComponent)CreateComponent(index, typeof(AssetComponent)); component.name = newName; ReplaceComponent(index, component); } diff --git a/Readme/Readme/Generated/Game/Components/GameHealthComponent.cs b/Readme/Readme/Generated/Game/Components/GameHealthComponent.cs index ca3187a1d..40ddde202 100644 --- a/Readme/Readme/Generated/Game/Components/GameHealthComponent.cs +++ b/Readme/Readme/Generated/Game/Components/GameHealthComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddHealth(int newValue) { var index = GameComponentsLookup.Health; - var component = CreateComponent(index); + var component = (HealthComponent)CreateComponent(index, typeof(HealthComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceHealth(int newValue) { var index = GameComponentsLookup.Health; - var component = CreateComponent(index); + var component = (HealthComponent)CreateComponent(index, typeof(HealthComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Readme/Readme/Generated/Game/Components/GameHighscoreComponent.cs b/Readme/Readme/Generated/Game/Components/GameHighscoreComponent.cs index 34be3223b..3a3b1aa5b 100644 --- a/Readme/Readme/Generated/Game/Components/GameHighscoreComponent.cs +++ b/Readme/Readme/Generated/Game/Components/GameHighscoreComponent.cs @@ -51,14 +51,14 @@ public partial class GameEntity { public void AddHighscore(int newValue) { var index = GameComponentsLookup.Highscore; - var component = CreateComponent(index); + var component = (HighscoreComponent)CreateComponent(index, typeof(HighscoreComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceHighscore(int newValue) { var index = GameComponentsLookup.Highscore; - var component = CreateComponent(index); + var component = (HighscoreComponent)CreateComponent(index, typeof(HighscoreComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Readme/Readme/Generated/Game/Components/GamePositionComponent.cs b/Readme/Readme/Generated/Game/Components/GamePositionComponent.cs index 11f1cf378..052d9c6e6 100644 --- a/Readme/Readme/Generated/Game/Components/GamePositionComponent.cs +++ b/Readme/Readme/Generated/Game/Components/GamePositionComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddPosition(UnityEngine.Vector3 newValue) { var index = GameComponentsLookup.Position; - var component = CreateComponent(index); + var component = (PositionComponent)CreateComponent(index, typeof(PositionComponent)); component.value = newValue; AddComponent(index, component); } public void ReplacePosition(UnityEngine.Vector3 newValue) { var index = GameComponentsLookup.Position; - var component = CreateComponent(index); + var component = (PositionComponent)CreateComponent(index, typeof(PositionComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Readme/Readme/Generated/Game/Components/GameUserComponent.cs b/Readme/Readme/Generated/Game/Components/GameUserComponent.cs index 52a9c34af..5908148be 100644 --- a/Readme/Readme/Generated/Game/Components/GameUserComponent.cs +++ b/Readme/Readme/Generated/Game/Components/GameUserComponent.cs @@ -51,7 +51,7 @@ public partial class GameEntity { public void AddUser(string newName, int newAge) { var index = GameComponentsLookup.User; - var component = CreateComponent(index); + var component = (UserComponent)CreateComponent(index, typeof(UserComponent)); component.name = newName; component.age = newAge; AddComponent(index, component); @@ -59,7 +59,7 @@ public void AddUser(string newName, int newAge) { public void ReplaceUser(string newName, int newAge) { var index = GameComponentsLookup.User; - var component = CreateComponent(index); + var component = (UserComponent)CreateComponent(index, typeof(UserComponent)); component.name = newName; component.age = newAge; ReplaceComponent(index, component); diff --git a/Readme/Readme/Generated/Game/Components/GameVelocityComponent.cs b/Readme/Readme/Generated/Game/Components/GameVelocityComponent.cs index 6c3eebe85..045a62230 100644 --- a/Readme/Readme/Generated/Game/Components/GameVelocityComponent.cs +++ b/Readme/Readme/Generated/Game/Components/GameVelocityComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddVelocity(UnityEngine.Vector3 newValue) { var index = GameComponentsLookup.Velocity; - var component = CreateComponent(index); + var component = (VelocityComponent)CreateComponent(index, typeof(VelocityComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceVelocity(UnityEngine.Vector3 newValue) { var index = GameComponentsLookup.Velocity; - var component = CreateComponent(index); + var component = (VelocityComponent)CreateComponent(index, typeof(VelocityComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Readme/Readme/Generated/Game/Components/GameViewComponent.cs b/Readme/Readme/Generated/Game/Components/GameViewComponent.cs index a9fa93e5e..46247f1cd 100644 --- a/Readme/Readme/Generated/Game/Components/GameViewComponent.cs +++ b/Readme/Readme/Generated/Game/Components/GameViewComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddView(UnityEngine.GameObject newGameObject) { var index = GameComponentsLookup.View; - var component = CreateComponent(index); + var component = (ViewComponent)CreateComponent(index, typeof(ViewComponent)); component.gameObject = newGameObject; AddComponent(index, component); } public void ReplaceView(UnityEngine.GameObject newGameObject) { var index = GameComponentsLookup.View; - var component = CreateComponent(index); + var component = (ViewComponent)CreateComponent(index, typeof(ViewComponent)); component.gameObject = newGameObject; ReplaceComponent(index, component); } diff --git a/Readme/Readme/Generated/GameState/Components/GameStateScoreComponent.cs b/Readme/Readme/Generated/GameState/Components/GameStateScoreComponent.cs index a608bc23b..8505659ff 100644 --- a/Readme/Readme/Generated/GameState/Components/GameStateScoreComponent.cs +++ b/Readme/Readme/Generated/GameState/Components/GameStateScoreComponent.cs @@ -51,14 +51,14 @@ public partial class GameStateEntity { public void AddScore(int newValue) { var index = GameStateComponentsLookup.Score; - var component = CreateComponent(index); + var component = (ScoreComponent)CreateComponent(index, typeof(ScoreComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceScore(int newValue) { var index = GameStateComponentsLookup.Score; - var component = CreateComponent(index); + var component = (ScoreComponent)CreateComponent(index, typeof(ScoreComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Readme/Readme/Generated/Input/Components/InputInputComponent.cs b/Readme/Readme/Generated/Input/Components/InputInputComponent.cs index 73a540223..a366ce7a1 100644 --- a/Readme/Readme/Generated/Input/Components/InputInputComponent.cs +++ b/Readme/Readme/Generated/Input/Components/InputInputComponent.cs @@ -13,14 +13,14 @@ public partial class InputEntity { public void AddInput(UnityEngine.Vector2 newPosition) { var index = InputComponentsLookup.Input; - var component = CreateComponent(index); + var component = (InputComponent)CreateComponent(index, typeof(InputComponent)); component.position = newPosition; AddComponent(index, component); } public void ReplaceInput(UnityEngine.Vector2 newPosition) { var index = InputComponentsLookup.Input; - var component = CreateComponent(index); + var component = (InputComponent)CreateComponent(index, typeof(InputComponent)); component.position = newPosition; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Game/Components/GameArray3dComponent.cs b/Tests/TestFixtures/Generated/Game/Components/GameArray3dComponent.cs index 3d60779db..76ab8bb27 100644 --- a/Tests/TestFixtures/Generated/Game/Components/GameArray3dComponent.cs +++ b/Tests/TestFixtures/Generated/Game/Components/GameArray3dComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddArray3d(int[,,] newValue) { var index = GameComponentsLookup.Array3d; - var component = CreateComponent(index); + var component = (Array3dComponent)CreateComponent(index, typeof(Array3dComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceArray3d(int[,,] newValue) { var index = GameComponentsLookup.Array3d; - var component = CreateComponent(index); + var component = (Array3dComponent)CreateComponent(index, typeof(Array3dComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Game/Components/GameInheritedComponent.cs b/Tests/TestFixtures/Generated/Game/Components/GameInheritedComponent.cs index d94f4da0b..daf06fb35 100644 --- a/Tests/TestFixtures/Generated/Game/Components/GameInheritedComponent.cs +++ b/Tests/TestFixtures/Generated/Game/Components/GameInheritedComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddInherited(float newValue) { var index = GameComponentsLookup.Inherited; - var component = CreateComponent(index); + var component = (InheritedComponent)CreateComponent(index, typeof(InheritedComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceInherited(float newValue) { var index = GameComponentsLookup.Inherited; - var component = CreateComponent(index); + var component = (InheritedComponent)CreateComponent(index, typeof(InheritedComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Game/Components/GameMultiplePrimaryEntityIndicesComponent.cs b/Tests/TestFixtures/Generated/Game/Components/GameMultiplePrimaryEntityIndicesComponent.cs index cde63f89e..f8284e5a0 100644 --- a/Tests/TestFixtures/Generated/Game/Components/GameMultiplePrimaryEntityIndicesComponent.cs +++ b/Tests/TestFixtures/Generated/Game/Components/GameMultiplePrimaryEntityIndicesComponent.cs @@ -13,7 +13,7 @@ public partial class GameEntity { public void AddMultiplePrimaryEntityIndices(string newValue, string newValue2) { var index = GameComponentsLookup.MultiplePrimaryEntityIndices; - var component = CreateComponent(index); + var component = (MultiplePrimaryEntityIndicesComponent)CreateComponent(index, typeof(MultiplePrimaryEntityIndicesComponent)); component.value = newValue; component.value2 = newValue2; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddMultiplePrimaryEntityIndices(string newValue, string newValue2) { public void ReplaceMultiplePrimaryEntityIndices(string newValue, string newValue2) { var index = GameComponentsLookup.MultiplePrimaryEntityIndices; - var component = CreateComponent(index); + var component = (MultiplePrimaryEntityIndicesComponent)CreateComponent(index, typeof(MultiplePrimaryEntityIndicesComponent)); component.value = newValue; component.value2 = newValue2; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Game/Components/GameMyNamespaceEntityIndexNoContextComponent.cs b/Tests/TestFixtures/Generated/Game/Components/GameMyNamespaceEntityIndexNoContextComponent.cs index 36662291a..8e8abc83f 100644 --- a/Tests/TestFixtures/Generated/Game/Components/GameMyNamespaceEntityIndexNoContextComponent.cs +++ b/Tests/TestFixtures/Generated/Game/Components/GameMyNamespaceEntityIndexNoContextComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyNamespaceEntityIndexNoContext(string newValue) { var index = GameComponentsLookup.MyNamespaceEntityIndexNoContext; - var component = CreateComponent(index); + var component = (My.Namespace.EntityIndexNoContextComponent)CreateComponent(index, typeof(My.Namespace.EntityIndexNoContextComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyNamespaceEntityIndexNoContext(string newValue) { var index = GameComponentsLookup.MyNamespaceEntityIndexNoContext; - var component = CreateComponent(index); + var component = (My.Namespace.EntityIndexNoContextComponent)CreateComponent(index, typeof(My.Namespace.EntityIndexNoContextComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Game/Components/GameParentComponent.cs b/Tests/TestFixtures/Generated/Game/Components/GameParentComponent.cs index 43cbf1979..59a521b81 100644 --- a/Tests/TestFixtures/Generated/Game/Components/GameParentComponent.cs +++ b/Tests/TestFixtures/Generated/Game/Components/GameParentComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddParent(float newValue) { var index = GameComponentsLookup.Parent; - var component = CreateComponent(index); + var component = (ParentComponent)CreateComponent(index, typeof(ParentComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceParent(float newValue) { var index = GameComponentsLookup.Parent; - var component = CreateComponent(index); + var component = (ParentComponent)CreateComponent(index, typeof(ParentComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Game/Components/GamePrimaryEntityIndexComponent.cs b/Tests/TestFixtures/Generated/Game/Components/GamePrimaryEntityIndexComponent.cs index 305ddf784..73d4f5814 100644 --- a/Tests/TestFixtures/Generated/Game/Components/GamePrimaryEntityIndexComponent.cs +++ b/Tests/TestFixtures/Generated/Game/Components/GamePrimaryEntityIndexComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddPrimaryEntityIndex(string newValue) { var index = GameComponentsLookup.PrimaryEntityIndex; - var component = CreateComponent(index); + var component = (PrimaryEntityIndexComponent)CreateComponent(index, typeof(PrimaryEntityIndexComponent)); component.value = newValue; AddComponent(index, component); } public void ReplacePrimaryEntityIndex(string newValue) { var index = GameComponentsLookup.PrimaryEntityIndex; - var component = CreateComponent(index); + var component = (PrimaryEntityIndexComponent)CreateComponent(index, typeof(PrimaryEntityIndexComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestBaseComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestBaseComponent.cs index 72c13539e..f050602b1 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestBaseComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestBaseComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddBase(int newValue) { var index = TestComponentsLookup.Base; - var component = CreateComponent(index); + var component = (BaseComponent)CreateComponent(index, typeof(BaseComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceBase(int newValue) { var index = TestComponentsLookup.Base; - var component = CreateComponent(index); + var component = (BaseComponent)CreateComponent(index, typeof(BaseComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestBaseListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestBaseListenerComponent.cs index a9ecd2ad5..8583ca88f 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestBaseListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestBaseListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddBaseListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.BaseListener; - var component = CreateComponent(index); + var component = (BaseListenerComponent)CreateComponent(index, typeof(BaseListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceBaseListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.BaseListener; - var component = CreateComponent(index); + var component = (BaseListenerComponent)CreateComponent(index, typeof(BaseListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestClassToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestClassToGenerateComponent.cs index 8f9bc0194..b28376635 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestClassToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestClassToGenerateComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddClassToGenerate(My.Namespace.ClassToGenerate newValue) { var index = TestComponentsLookup.ClassToGenerate; - var component = CreateComponent(index); + var component = (ClassToGenerateComponent)CreateComponent(index, typeof(ClassToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceClassToGenerate(My.Namespace.ClassToGenerate newValue) { var index = TestComponentsLookup.ClassToGenerate; - var component = CreateComponent(index); + var component = (ClassToGenerateComponent)CreateComponent(index, typeof(ClassToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestClassWithEntitIndexAttributeComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestClassWithEntitIndexAttributeComponent.cs index 2e9dfbc99..589a267a9 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestClassWithEntitIndexAttributeComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestClassWithEntitIndexAttributeComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddClassWithEntitIndexAttribute(ClassWithEntitIndexAttribute newValue) { var index = TestComponentsLookup.ClassWithEntitIndexAttribute; - var component = CreateComponent(index); + var component = (ClassWithEntitIndexAttributeComponent)CreateComponent(index, typeof(ClassWithEntitIndexAttributeComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceClassWithEntitIndexAttribute(ClassWithEntitIndexAttribute newValue) { var index = TestComponentsLookup.ClassWithEntitIndexAttribute; - var component = CreateComponent(index); + var component = (ClassWithEntitIndexAttributeComponent)CreateComponent(index, typeof(ClassWithEntitIndexAttributeComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsAndPropertiesComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsAndPropertiesComponent.cs index c9e3afa21..80c2bdfb2 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsAndPropertiesComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsAndPropertiesComponent.cs @@ -13,7 +13,7 @@ public partial class TestEntity { public void AddComponentWithFieldsAndProperties(string newPublicField, string newPublicProperty) { var index = TestComponentsLookup.ComponentWithFieldsAndProperties; - var component = CreateComponent(index); + var component = (ComponentWithFieldsAndProperties)CreateComponent(index, typeof(ComponentWithFieldsAndProperties)); component.publicField = newPublicField; component.publicProperty = newPublicProperty; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddComponentWithFieldsAndProperties(string newPublicField, string ne public void ReplaceComponentWithFieldsAndProperties(string newPublicField, string newPublicProperty) { var index = TestComponentsLookup.ComponentWithFieldsAndProperties; - var component = CreateComponent(index); + var component = (ComponentWithFieldsAndProperties)CreateComponent(index, typeof(ComponentWithFieldsAndProperties)); component.publicField = newPublicField; component.publicProperty = newPublicProperty; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsComponent.cs index 55a9945af..2b0ce2aed 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestComponentWithFieldsComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddComponentWithFields(string newPublicField) { var index = TestComponentsLookup.ComponentWithFields; - var component = CreateComponent(index); + var component = (ComponentWithFields)CreateComponent(index, typeof(ComponentWithFields)); component.publicField = newPublicField; AddComponent(index, component); } public void ReplaceComponentWithFields(string newPublicField) { var index = TestComponentsLookup.ComponentWithFields; - var component = CreateComponent(index); + var component = (ComponentWithFields)CreateComponent(index, typeof(ComponentWithFields)); component.publicField = newPublicField; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestComponentWithPropertiesComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestComponentWithPropertiesComponent.cs index e153c5213..ab2426cee 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestComponentWithPropertiesComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestComponentWithPropertiesComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddComponentWithProperties(string newPublicProperty) { var index = TestComponentsLookup.ComponentWithProperties; - var component = CreateComponent(index); + var component = (ComponentWithProperties)CreateComponent(index, typeof(ComponentWithProperties)); component.publicProperty = newPublicProperty; AddComponent(index, component); } public void ReplaceComponentWithProperties(string newPublicProperty) { var index = TestComponentsLookup.ComponentWithProperties; - var component = CreateComponent(index); + var component = (ComponentWithProperties)CreateComponent(index, typeof(ComponentWithProperties)); component.publicProperty = newPublicProperty; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestEventToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestEventToGenerateComponent.cs index 458f398ff..d419b8afd 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestEventToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestEventToGenerateComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddEventToGenerate(My.Namespace.EventToGenerate newValue) { var index = TestComponentsLookup.EventToGenerate; - var component = CreateComponent(index); + var component = (EventToGenerateComponent)CreateComponent(index, typeof(EventToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceEventToGenerate(My.Namespace.EventToGenerate newValue) { var index = TestComponentsLookup.EventToGenerate; - var component = CreateComponent(index); + var component = (EventToGenerateComponent)CreateComponent(index, typeof(EventToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestFlagEntityEventListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestFlagEntityEventListenerComponent.cs index 559822941..8a5d6acf6 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestFlagEntityEventListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestFlagEntityEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddFlagEntityEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.FlagEntityEventListener; - var component = CreateComponent(index); + var component = (FlagEntityEventListenerComponent)CreateComponent(index, typeof(FlagEntityEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceFlagEntityEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.FlagEntityEventListener; - var component = CreateComponent(index); + var component = (FlagEntityEventListenerComponent)CreateComponent(index, typeof(FlagEntityEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestFlagEventRemovedListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestFlagEventRemovedListenerComponent.cs index c05585f9d..594626a6b 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestFlagEventRemovedListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestFlagEventRemovedListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddFlagEventRemovedListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.FlagEventRemovedListener; - var component = CreateComponent(index); + var component = (FlagEventRemovedListenerComponent)CreateComponent(index, typeof(FlagEventRemovedListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceFlagEventRemovedListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.FlagEventRemovedListener; - var component = CreateComponent(index); + var component = (FlagEventRemovedListenerComponent)CreateComponent(index, typeof(FlagEventRemovedListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestInterfaceToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestInterfaceToGenerateComponent.cs index e6eb7c26e..ce11e7d7d 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestInterfaceToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestInterfaceToGenerateComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddInterfaceToGenerate(My.Namespace.InterfaceToGenerate newValue) { var index = TestComponentsLookup.InterfaceToGenerate; - var component = CreateComponent(index); + var component = (InterfaceToGenerateComponent)CreateComponent(index, typeof(InterfaceToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceInterfaceToGenerate(My.Namespace.InterfaceToGenerate newValue) { var index = TestComponentsLookup.InterfaceToGenerate; - var component = CreateComponent(index); + var component = (InterfaceToGenerateComponent)CreateComponent(index, typeof(InterfaceToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestMultipleContextStandardEventComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestMultipleContextStandardEventComponent.cs index f5e461a4e..f87d63751 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestMultipleContextStandardEventComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestMultipleContextStandardEventComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddMultipleContextStandardEvent(string newValue) { var index = TestComponentsLookup.MultipleContextStandardEvent; - var component = CreateComponent(index); + var component = (MultipleContextStandardEventComponent)CreateComponent(index, typeof(MultipleContextStandardEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMultipleContextStandardEvent(string newValue) { var index = TestComponentsLookup.MultipleContextStandardEvent; - var component = CreateComponent(index); + var component = (MultipleContextStandardEventComponent)CreateComponent(index, typeof(MultipleContextStandardEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestMultipleEventsStandardEventComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestMultipleEventsStandardEventComponent.cs index 4569e9213..4225e4467 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestMultipleEventsStandardEventComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestMultipleEventsStandardEventComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddMultipleEventsStandardEvent(string newValue) { var index = TestComponentsLookup.MultipleEventsStandardEvent; - var component = CreateComponent(index); + var component = (MultipleEventsStandardEventComponent)CreateComponent(index, typeof(MultipleEventsStandardEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMultipleEventsStandardEvent(string newValue) { var index = TestComponentsLookup.MultipleEventsStandardEvent; - var component = CreateComponent(index); + var component = (MultipleEventsStandardEventComponent)CreateComponent(index, typeof(MultipleEventsStandardEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceEntityIndexComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceEntityIndexComponent.cs index 018d160e3..827941693 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceEntityIndexComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceEntityIndexComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddMyNamespaceEntityIndex(string newValue) { var index = TestComponentsLookup.MyNamespaceEntityIndex; - var component = CreateComponent(index); + var component = (My.Namespace.EntityIndexComponent)CreateComponent(index, typeof(My.Namespace.EntityIndexComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyNamespaceEntityIndex(string newValue) { var index = TestComponentsLookup.MyNamespaceEntityIndex; - var component = CreateComponent(index); + var component = (My.Namespace.EntityIndexComponent)CreateComponent(index, typeof(My.Namespace.EntityIndexComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMultipleEntityIndicesComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMultipleEntityIndicesComponent.cs index fd904c0f6..4af2c9f74 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMultipleEntityIndicesComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMultipleEntityIndicesComponent.cs @@ -13,7 +13,7 @@ public partial class TestEntity { public void AddMyNamespaceMultipleEntityIndices(string newValue, string newValue2) { var index = TestComponentsLookup.MyNamespaceMultipleEntityIndices; - var component = CreateComponent(index); + var component = (My.Namespace.MultipleEntityIndicesComponent)CreateComponent(index, typeof(My.Namespace.MultipleEntityIndicesComponent)); component.value = newValue; component.value2 = newValue2; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddMyNamespaceMultipleEntityIndices(string newValue, string newValue public void ReplaceMyNamespaceMultipleEntityIndices(string newValue, string newValue2) { var index = TestComponentsLookup.MyNamespaceMultipleEntityIndices; - var component = CreateComponent(index); + var component = (My.Namespace.MultipleEntityIndicesComponent)CreateComponent(index, typeof(My.Namespace.MultipleEntityIndicesComponent)); component.value = newValue; component.value2 = newValue2; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMyNamespaceComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMyNamespaceComponent.cs index c2645594f..20ae7f404 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMyNamespaceComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceMyNamespaceComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddMyNamespaceMyNamespace(string newValue) { var index = TestComponentsLookup.MyNamespaceMyNamespace; - var component = CreateComponent(index); + var component = (My.Namespace.MyNamespaceComponent)CreateComponent(index, typeof(My.Namespace.MyNamespaceComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyNamespaceMyNamespace(string newValue) { var index = TestComponentsLookup.MyNamespaceMyNamespace; - var component = CreateComponent(index); + var component = (My.Namespace.MyNamespaceComponent)CreateComponent(index, typeof(My.Namespace.MyNamespaceComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceUniqueMyNamespaceComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceUniqueMyNamespaceComponent.cs index f1add3e7b..5c7ba98b9 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceUniqueMyNamespaceComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestMyNamespaceUniqueMyNamespaceComponent.cs @@ -51,14 +51,14 @@ public partial class TestEntity { public void AddMyNamespaceUniqueMyNamespace(string newValue) { var index = TestComponentsLookup.MyNamespaceUniqueMyNamespace; - var component = CreateComponent(index); + var component = (My.Namespace.UniqueMyNamespaceComponent)CreateComponent(index, typeof(My.Namespace.UniqueMyNamespaceComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyNamespaceUniqueMyNamespace(string newValue) { var index = TestComponentsLookup.MyNamespaceUniqueMyNamespace; - var component = CreateComponent(index); + var component = (My.Namespace.UniqueMyNamespaceComponent)CreateComponent(index, typeof(My.Namespace.UniqueMyNamespaceComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestNameAgeComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestNameAgeComponent.cs index 4dc89d168..2bf581d8a 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestNameAgeComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestNameAgeComponent.cs @@ -13,7 +13,7 @@ public partial class TestEntity { public void AddNameAge(string newName, int newAge) { var index = TestComponentsLookup.NameAge; - var component = CreateComponent(index); + var component = (NameAgeComponent)CreateComponent(index, typeof(NameAgeComponent)); component.name = newName; component.age = newAge; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddNameAge(string newName, int newAge) { public void ReplaceNameAge(string newName, int newAge) { var index = TestComponentsLookup.NameAge; - var component = CreateComponent(index); + var component = (NameAgeComponent)CreateComponent(index, typeof(NameAgeComponent)); component.name = newName; component.age = newAge; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent1Component.cs b/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent1Component.cs index 4de4f0040..03e13470a 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent1Component.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent1Component.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddNewCustomNameComponent1(CustomName newValue) { var index = TestComponentsLookup.NewCustomNameComponent1; - var component = CreateComponent(index); + var component = (NewCustomNameComponent1Component)CreateComponent(index, typeof(NewCustomNameComponent1Component)); component.value = newValue; AddComponent(index, component); } public void ReplaceNewCustomNameComponent1(CustomName newValue) { var index = TestComponentsLookup.NewCustomNameComponent1; - var component = CreateComponent(index); + var component = (NewCustomNameComponent1Component)CreateComponent(index, typeof(NewCustomNameComponent1Component)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent2Component.cs b/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent2Component.cs index f8381cacb..87aea4b1d 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent2Component.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestNewCustomNameComponent2Component.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddNewCustomNameComponent2(CustomName newValue) { var index = TestComponentsLookup.NewCustomNameComponent2; - var component = CreateComponent(index); + var component = (NewCustomNameComponent2Component)CreateComponent(index, typeof(NewCustomNameComponent2Component)); component.value = newValue; AddComponent(index, component); } public void ReplaceNewCustomNameComponent2(CustomName newValue) { var index = TestComponentsLookup.NewCustomNameComponent2; - var component = CreateComponent(index); + var component = (NewCustomNameComponent2Component)CreateComponent(index, typeof(NewCustomNameComponent2Component)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestPositionComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestPositionComponent.cs index f1d1f59a6..d6f2a3269 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestPositionComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestPositionComponent.cs @@ -13,7 +13,7 @@ public partial class TestEntity { public void AddPosition(int newX, int newY) { var index = TestComponentsLookup.Position; - var component = CreateComponent(index); + var component = (PositionComponent)CreateComponent(index, typeof(PositionComponent)); component.x = newX; component.y = newY; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddPosition(int newX, int newY) { public void ReplacePosition(int newX, int newY) { var index = TestComponentsLookup.Position; - var component = CreateComponent(index); + var component = (PositionComponent)CreateComponent(index, typeof(PositionComponent)); component.x = newX; component.y = newY; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Test/Components/TestSizeComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestSizeComponent.cs index d70309a00..2f09ee273 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestSizeComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestSizeComponent.cs @@ -13,7 +13,7 @@ public partial class TestEntity { public void AddSize(int newWidth, int newHeight) { var index = TestComponentsLookup.Size; - var component = CreateComponent(index); + var component = (SizeComponent)CreateComponent(index, typeof(SizeComponent)); component.width = newWidth; component.height = newHeight; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddSize(int newWidth, int newHeight) { public void ReplaceSize(int newWidth, int newHeight) { var index = TestComponentsLookup.Size; - var component = CreateComponent(index); + var component = (SizeComponent)CreateComponent(index, typeof(SizeComponent)); component.width = newWidth; component.height = newHeight; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Test/Components/TestStandardComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestStandardComponent.cs index fd76bf06d..b8ab44e32 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestStandardComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestStandardComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddStandard(string newValue) { var index = TestComponentsLookup.Standard; - var component = CreateComponent(index); + var component = (StandardComponent)CreateComponent(index, typeof(StandardComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceStandard(string newValue) { var index = TestComponentsLookup.Standard; - var component = CreateComponent(index); + var component = (StandardComponent)CreateComponent(index, typeof(StandardComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventComponent.cs index ea726e154..565ad0c45 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddStandardEntityEvent(string newValue) { var index = TestComponentsLookup.StandardEntityEvent; - var component = CreateComponent(index); + var component = (StandardEntityEventComponent)CreateComponent(index, typeof(StandardEntityEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceStandardEntityEvent(string newValue) { var index = TestComponentsLookup.StandardEntityEvent; - var component = CreateComponent(index); + var component = (StandardEntityEventComponent)CreateComponent(index, typeof(StandardEntityEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventRemovedListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventRemovedListenerComponent.cs index d96b929a7..e23e64de4 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventRemovedListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestStandardEntityEventRemovedListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddStandardEntityEventRemovedListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.StandardEntityEventRemovedListener; - var component = CreateComponent(index); + var component = (StandardEntityEventRemovedListenerComponent)CreateComponent(index, typeof(StandardEntityEventRemovedListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceStandardEntityEventRemovedListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.StandardEntityEventRemovedListener; - var component = CreateComponent(index); + var component = (StandardEntityEventRemovedListenerComponent)CreateComponent(index, typeof(StandardEntityEventRemovedListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestStandardEventComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestStandardEventComponent.cs index a13b47e89..0d35502de 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestStandardEventComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestStandardEventComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddStandardEvent(string newValue) { var index = TestComponentsLookup.StandardEvent; - var component = CreateComponent(index); + var component = (StandardEventComponent)CreateComponent(index, typeof(StandardEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceStandardEvent(string newValue) { var index = TestComponentsLookup.StandardEvent; - var component = CreateComponent(index); + var component = (StandardEventComponent)CreateComponent(index, typeof(StandardEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestStandardEventListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestStandardEventListenerComponent.cs index f19ee4bc8..0971e6b9d 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestStandardEventListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestStandardEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddStandardEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.StandardEventListener; - var component = CreateComponent(index); + var component = (StandardEventListenerComponent)CreateComponent(index, typeof(StandardEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceStandardEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.StandardEventListener; - var component = CreateComponent(index); + var component = (StandardEventListenerComponent)CreateComponent(index, typeof(StandardEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestStructToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestStructToGenerateComponent.cs index 01f02bfef..90842f9ff 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestStructToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestStructToGenerateComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddStructToGenerate(My.Namespace.StructToGenerate newValue) { var index = TestComponentsLookup.StructToGenerate; - var component = CreateComponent(index); + var component = (StructToGenerateComponent)CreateComponent(index, typeof(StructToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceStructToGenerate(My.Namespace.StructToGenerate newValue) { var index = TestComponentsLookup.StructToGenerate; - var component = CreateComponent(index); + var component = (StructToGenerateComponent)CreateComponent(index, typeof(StructToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestTest2ContextComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestTest2ContextComponent.cs index bf8d4362b..1e7aa6d22 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestTest2ContextComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestTest2ContextComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddTest2Context(string newValue) { var index = TestComponentsLookup.Test2Context; - var component = CreateComponent(index); + var component = (Test2ContextComponent)CreateComponent(index, typeof(Test2ContextComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTest2Context(string newValue) { var index = TestComponentsLookup.Test2Context; - var component = CreateComponent(index); + var component = (Test2ContextComponent)CreateComponent(index, typeof(Test2ContextComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestTestEventToGenerateListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestTestEventToGenerateListenerComponent.cs index 91a6d747e..b10e4eeb7 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestTestEventToGenerateListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestTestEventToGenerateListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddTestEventToGenerateListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestEventToGenerateListener; - var component = CreateComponent(index); + var component = (TestEventToGenerateListenerComponent)CreateComponent(index, typeof(TestEventToGenerateListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTestEventToGenerateListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestEventToGenerateListener; - var component = CreateComponent(index); + var component = (TestEventToGenerateListenerComponent)CreateComponent(index, typeof(TestEventToGenerateListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleContextStandardEventListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleContextStandardEventListenerComponent.cs index 389644d3a..0d0dc6f32 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleContextStandardEventListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleContextStandardEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddTestMultipleContextStandardEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestMultipleContextStandardEventListener; - var component = CreateComponent(index); + var component = (TestMultipleContextStandardEventListenerComponent)CreateComponent(index, typeof(TestMultipleContextStandardEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTestMultipleContextStandardEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestMultipleContextStandardEventListener; - var component = CreateComponent(index); + var component = (TestMultipleContextStandardEventListenerComponent)CreateComponent(index, typeof(TestMultipleContextStandardEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventListenerComponent.cs index 650592b4c..b75323f9f 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddTestMultipleEventsStandardEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestMultipleEventsStandardEventListener; - var component = CreateComponent(index); + var component = (TestMultipleEventsStandardEventListenerComponent)CreateComponent(index, typeof(TestMultipleEventsStandardEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTestMultipleEventsStandardEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestMultipleEventsStandardEventListener; - var component = CreateComponent(index); + var component = (TestMultipleEventsStandardEventListenerComponent)CreateComponent(index, typeof(TestMultipleEventsStandardEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventRemovedListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventRemovedListenerComponent.cs index 72379f5d8..d2c69b6d5 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventRemovedListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestTestMultipleEventsStandardEventRemovedListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddTestMultipleEventsStandardEventRemovedListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestMultipleEventsStandardEventRemovedListener; - var component = CreateComponent(index); + var component = (TestMultipleEventsStandardEventRemovedListenerComponent)CreateComponent(index, typeof(TestMultipleEventsStandardEventRemovedListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTestMultipleEventsStandardEventRemovedListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.TestMultipleEventsStandardEventRemovedListener; - var component = CreateComponent(index); + var component = (TestMultipleEventsStandardEventRemovedListenerComponent)CreateComponent(index, typeof(TestMultipleEventsStandardEventRemovedListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestUniqueClassToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestUniqueClassToGenerateComponent.cs index d43b8636d..4feeffd72 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestUniqueClassToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestUniqueClassToGenerateComponent.cs @@ -51,14 +51,14 @@ public partial class TestEntity { public void AddUniqueClassToGenerate(My.Namespace.UniqueClassToGenerate newValue) { var index = TestComponentsLookup.UniqueClassToGenerate; - var component = CreateComponent(index); + var component = (UniqueClassToGenerateComponent)CreateComponent(index, typeof(UniqueClassToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceUniqueClassToGenerate(My.Namespace.UniqueClassToGenerate newValue) { var index = TestComponentsLookup.UniqueClassToGenerate; - var component = CreateComponent(index); + var component = (UniqueClassToGenerateComponent)CreateComponent(index, typeof(UniqueClassToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventComponent.cs index ac38a584b..35ebb9c50 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventComponent.cs @@ -51,14 +51,14 @@ public partial class TestEntity { public void AddUniqueEvent(string newValue) { var index = TestComponentsLookup.UniqueEvent; - var component = CreateComponent(index); + var component = (UniqueEventComponent)CreateComponent(index, typeof(UniqueEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceUniqueEvent(string newValue) { var index = TestComponentsLookup.UniqueEvent; - var component = CreateComponent(index); + var component = (UniqueEventComponent)CreateComponent(index, typeof(UniqueEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventListenerComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventListenerComponent.cs index 7c75dffae..6c1b73ad1 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestUniqueEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class TestEntity { public void AddUniqueEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.UniqueEventListener; - var component = CreateComponent(index); + var component = (UniqueEventListenerComponent)CreateComponent(index, typeof(UniqueEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceUniqueEventListener(System.Collections.Generic.List newValue) { var index = TestComponentsLookup.UniqueEventListener; - var component = CreateComponent(index); + var component = (UniqueEventListenerComponent)CreateComponent(index, typeof(UniqueEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test/Components/TestUniqueStandardComponent.cs b/Tests/TestFixtures/Generated/Test/Components/TestUniqueStandardComponent.cs index ee56299af..15d234d79 100644 --- a/Tests/TestFixtures/Generated/Test/Components/TestUniqueStandardComponent.cs +++ b/Tests/TestFixtures/Generated/Test/Components/TestUniqueStandardComponent.cs @@ -51,14 +51,14 @@ public partial class TestEntity { public void AddUniqueStandard(string newValue) { var index = TestComponentsLookup.UniqueStandard; - var component = CreateComponent(index); + var component = (UniqueStandardComponent)CreateComponent(index, typeof(UniqueStandardComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceUniqueStandard(string newValue) { var index = TestComponentsLookup.UniqueStandard; - var component = CreateComponent(index); + var component = (UniqueStandardComponent)CreateComponent(index, typeof(UniqueStandardComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2ClassToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2ClassToGenerateComponent.cs index 5df320136..708f9b3a3 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2ClassToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2ClassToGenerateComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddClassToGenerate(My.Namespace.ClassToGenerate newValue) { var index = Test2ComponentsLookup.ClassToGenerate; - var component = CreateComponent(index); + var component = (ClassToGenerateComponent)CreateComponent(index, typeof(ClassToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceClassToGenerate(My.Namespace.ClassToGenerate newValue) { var index = Test2ComponentsLookup.ClassToGenerate; - var component = CreateComponent(index); + var component = (ClassToGenerateComponent)CreateComponent(index, typeof(ClassToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2EventToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2EventToGenerateComponent.cs index 1182e480d..6e537719b 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2EventToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2EventToGenerateComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddEventToGenerate(My.Namespace.EventToGenerate newValue) { var index = Test2ComponentsLookup.EventToGenerate; - var component = CreateComponent(index); + var component = (EventToGenerateComponent)CreateComponent(index, typeof(EventToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceEventToGenerate(My.Namespace.EventToGenerate newValue) { var index = Test2ComponentsLookup.EventToGenerate; - var component = CreateComponent(index); + var component = (EventToGenerateComponent)CreateComponent(index, typeof(EventToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleContextStandardEventComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleContextStandardEventComponent.cs index 3589beda6..b58cbee45 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleContextStandardEventComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleContextStandardEventComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddMultipleContextStandardEvent(string newValue) { var index = Test2ComponentsLookup.MultipleContextStandardEvent; - var component = CreateComponent(index); + var component = (MultipleContextStandardEventComponent)CreateComponent(index, typeof(MultipleContextStandardEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMultipleContextStandardEvent(string newValue) { var index = Test2ComponentsLookup.MultipleContextStandardEvent; - var component = CreateComponent(index); + var component = (MultipleContextStandardEventComponent)CreateComponent(index, typeof(MultipleContextStandardEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleEventsStandardEventComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleEventsStandardEventComponent.cs index 79778183b..c929173b6 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleEventsStandardEventComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2MultipleEventsStandardEventComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddMultipleEventsStandardEvent(string newValue) { var index = Test2ComponentsLookup.MultipleEventsStandardEvent; - var component = CreateComponent(index); + var component = (MultipleEventsStandardEventComponent)CreateComponent(index, typeof(MultipleEventsStandardEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMultipleEventsStandardEvent(string newValue) { var index = Test2ComponentsLookup.MultipleEventsStandardEvent; - var component = CreateComponent(index); + var component = (MultipleEventsStandardEventComponent)CreateComponent(index, typeof(MultipleEventsStandardEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceEntityIndexComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceEntityIndexComponent.cs index 06177370f..5c0ada19e 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceEntityIndexComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceEntityIndexComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddMyNamespaceEntityIndex(string newValue) { var index = Test2ComponentsLookup.MyNamespaceEntityIndex; - var component = CreateComponent(index); + var component = (My.Namespace.EntityIndexComponent)CreateComponent(index, typeof(My.Namespace.EntityIndexComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyNamespaceEntityIndex(string newValue) { var index = Test2ComponentsLookup.MyNamespaceEntityIndex; - var component = CreateComponent(index); + var component = (My.Namespace.EntityIndexComponent)CreateComponent(index, typeof(My.Namespace.EntityIndexComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMultipleEntityIndicesComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMultipleEntityIndicesComponent.cs index 7aedf021a..69d8997f3 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMultipleEntityIndicesComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMultipleEntityIndicesComponent.cs @@ -13,7 +13,7 @@ public partial class Test2Entity { public void AddMyNamespaceMultipleEntityIndices(string newValue, string newValue2) { var index = Test2ComponentsLookup.MyNamespaceMultipleEntityIndices; - var component = CreateComponent(index); + var component = (My.Namespace.MultipleEntityIndicesComponent)CreateComponent(index, typeof(My.Namespace.MultipleEntityIndicesComponent)); component.value = newValue; component.value2 = newValue2; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddMyNamespaceMultipleEntityIndices(string newValue, string newValue public void ReplaceMyNamespaceMultipleEntityIndices(string newValue, string newValue2) { var index = Test2ComponentsLookup.MyNamespaceMultipleEntityIndices; - var component = CreateComponent(index); + var component = (My.Namespace.MultipleEntityIndicesComponent)CreateComponent(index, typeof(My.Namespace.MultipleEntityIndicesComponent)); component.value = newValue; component.value2 = newValue2; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMyNamespaceComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMyNamespaceComponent.cs index 5938d56f3..216ee0c0b 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMyNamespaceComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2MyNamespaceMyNamespaceComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddMyNamespaceMyNamespace(string newValue) { var index = Test2ComponentsLookup.MyNamespaceMyNamespace; - var component = CreateComponent(index); + var component = (My.Namespace.MyNamespaceComponent)CreateComponent(index, typeof(My.Namespace.MyNamespaceComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyNamespaceMyNamespace(string newValue) { var index = Test2ComponentsLookup.MyNamespaceMyNamespace; - var component = CreateComponent(index); + var component = (My.Namespace.MyNamespaceComponent)CreateComponent(index, typeof(My.Namespace.MyNamespaceComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2NameAgeComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2NameAgeComponent.cs index c460f69e3..654f7fffb 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2NameAgeComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2NameAgeComponent.cs @@ -13,7 +13,7 @@ public partial class Test2Entity { public void AddNameAge(string newName, int newAge) { var index = Test2ComponentsLookup.NameAge; - var component = CreateComponent(index); + var component = (NameAgeComponent)CreateComponent(index, typeof(NameAgeComponent)); component.name = newName; component.age = newAge; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddNameAge(string newName, int newAge) { public void ReplaceNameAge(string newName, int newAge) { var index = Test2ComponentsLookup.NameAge; - var component = CreateComponent(index); + var component = (NameAgeComponent)CreateComponent(index, typeof(NameAgeComponent)); component.name = newName; component.age = newAge; ReplaceComponent(index, component); diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2ContextComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2ContextComponent.cs index da882f685..e14bd5876 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2ContextComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2ContextComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddTest2Context(string newValue) { var index = Test2ComponentsLookup.Test2Context; - var component = CreateComponent(index); + var component = (Test2ContextComponent)CreateComponent(index, typeof(Test2ContextComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTest2Context(string newValue) { var index = Test2ComponentsLookup.Test2Context; - var component = CreateComponent(index); + var component = (Test2ContextComponent)CreateComponent(index, typeof(Test2ContextComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2EventToGenerateListenerComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2EventToGenerateListenerComponent.cs index 168149621..bec67d13a 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2EventToGenerateListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2EventToGenerateListenerComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddTest2EventToGenerateListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2EventToGenerateListener; - var component = CreateComponent(index); + var component = (Test2EventToGenerateListenerComponent)CreateComponent(index, typeof(Test2EventToGenerateListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTest2EventToGenerateListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2EventToGenerateListener; - var component = CreateComponent(index); + var component = (Test2EventToGenerateListenerComponent)CreateComponent(index, typeof(Test2EventToGenerateListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleContextStandardEventListenerComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleContextStandardEventListenerComponent.cs index 38e607da8..e1e21c433 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleContextStandardEventListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleContextStandardEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddTest2MultipleContextStandardEventListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2MultipleContextStandardEventListener; - var component = CreateComponent(index); + var component = (Test2MultipleContextStandardEventListenerComponent)CreateComponent(index, typeof(Test2MultipleContextStandardEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTest2MultipleContextStandardEventListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2MultipleContextStandardEventListener; - var component = CreateComponent(index); + var component = (Test2MultipleContextStandardEventListenerComponent)CreateComponent(index, typeof(Test2MultipleContextStandardEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventListenerComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventListenerComponent.cs index d733aa2fe..c71cf1d14 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddTest2MultipleEventsStandardEventListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2MultipleEventsStandardEventListener; - var component = CreateComponent(index); + var component = (Test2MultipleEventsStandardEventListenerComponent)CreateComponent(index, typeof(Test2MultipleEventsStandardEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTest2MultipleEventsStandardEventListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2MultipleEventsStandardEventListener; - var component = CreateComponent(index); + var component = (Test2MultipleEventsStandardEventListenerComponent)CreateComponent(index, typeof(Test2MultipleEventsStandardEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventRemovedListenerComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventRemovedListenerComponent.cs index 7489d5521..86b1d5b1e 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventRemovedListenerComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2Test2MultipleEventsStandardEventRemovedListenerComponent.cs @@ -13,14 +13,14 @@ public partial class Test2Entity { public void AddTest2MultipleEventsStandardEventRemovedListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2MultipleEventsStandardEventRemovedListener; - var component = CreateComponent(index); + var component = (Test2MultipleEventsStandardEventRemovedListenerComponent)CreateComponent(index, typeof(Test2MultipleEventsStandardEventRemovedListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceTest2MultipleEventsStandardEventRemovedListener(System.Collections.Generic.List newValue) { var index = Test2ComponentsLookup.Test2MultipleEventsStandardEventRemovedListener; - var component = CreateComponent(index); + var component = (Test2MultipleEventsStandardEventRemovedListenerComponent)CreateComponent(index, typeof(Test2MultipleEventsStandardEventRemovedListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/TestFixtures/Generated/Test2/Components/Test2UniqueClassToGenerateComponent.cs b/Tests/TestFixtures/Generated/Test2/Components/Test2UniqueClassToGenerateComponent.cs index c19a9cc80..fecbc381e 100644 --- a/Tests/TestFixtures/Generated/Test2/Components/Test2UniqueClassToGenerateComponent.cs +++ b/Tests/TestFixtures/Generated/Test2/Components/Test2UniqueClassToGenerateComponent.cs @@ -51,14 +51,14 @@ public partial class Test2Entity { public void AddUniqueClassToGenerate(My.Namespace.UniqueClassToGenerate newValue) { var index = Test2ComponentsLookup.UniqueClassToGenerate; - var component = CreateComponent(index); + var component = (UniqueClassToGenerateComponent)CreateComponent(index, typeof(UniqueClassToGenerateComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceUniqueClassToGenerate(My.Namespace.UniqueClassToGenerate newValue) { var index = Test2ComponentsLookup.UniqueClassToGenerate; - var component = CreateComponent(index); + var component = (UniqueClassToGenerateComponent)CreateComponent(index, typeof(UniqueClassToGenerateComponent)); component.value = newValue; ReplaceComponent(index, component); } From f7aee352458a30efeb36be73561317713dcd90c8 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 20:47:00 +0200 Subject: [PATCH 20/27] Optimize context entity creation in #780 --- .../Context/CodeGenerators/ContextGenerator.cs | 6 +++--- Entitas/Entitas/Context/Context.cs | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Context/CodeGenerators/ContextGenerator.cs b/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Context/CodeGenerators/ContextGenerator.cs index 47be8ae92..a9c490615 100644 --- a/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Context/CodeGenerators/ContextGenerator.cs +++ b/Addons/Entitas.CodeGeneration.Plugins/Entitas.CodeGeneration.Plugins/Context/CodeGenerators/ContextGenerator.cs @@ -25,11 +25,11 @@ public class ContextGenerator : ICodeGenerator { (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new ${EntityType}() ) { } } diff --git a/Entitas/Entitas/Context/Context.cs b/Entitas/Entitas/Context/Context.cs index 5e52d488b..1fee1e660 100644 --- a/Entitas/Entitas/Context/Context.cs +++ b/Entitas/Entitas/Context/Context.cs @@ -55,6 +55,7 @@ public class Context : IContext where TEntity : class, IEntity readonly Stack[] _componentPools; readonly ContextInfo _contextInfo; readonly Func _aercFactory; + readonly Func _entityFactory; readonly HashSet _entities = new HashSet(EntityEqualityComparer.comparer); readonly Stack _reusableEntities = new Stack(); @@ -78,12 +79,12 @@ public class Context : IContext where TEntity : class, IEntity /// The prefered way to create a context is to use the generated methods /// from the code generator, e.g. var context = new GameContext(); - public Context(int totalComponents) : this(totalComponents, 0, null, null) { + public Context(int totalComponents, Func entityFactory) : this(totalComponents, 0, null, null, entityFactory) { } /// The prefered way to create a context is to use the generated methods /// from the code generator, e.g. var context = new GameContext(); - public Context(int totalComponents, int startCreationIndex, ContextInfo contextInfo, Func aercFactory) { + public Context(int totalComponents, int startCreationIndex, ContextInfo contextInfo, Func aercFactory, Func entityFactory) { _totalComponents = totalComponents; _creationIndex = startCreationIndex; @@ -97,6 +98,7 @@ public Context(int totalComponents, int startCreationIndex, ContextInfo contextI } _aercFactory = aercFactory ?? (entity => new SafeAERC(entity)); + _entityFactory = entityFactory; _groupsForIndex = new List>[totalComponents]; _componentPools = new Stack[totalComponents]; @@ -132,7 +134,7 @@ public TEntity CreateEntity() { entity = _reusableEntities.Pop(); entity.Reactivate(_creationIndex++); } else { - entity = (TEntity)Activator.CreateInstance(typeof(TEntity)); + entity = _entityFactory(); entity.Initialize(_creationIndex++, _totalComponents, _componentPools, _contextInfo, _aercFactory(entity)); } From 25c859a6023d7604b957b239787d57e161cdee97 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 20:47:47 +0200 Subject: [PATCH 21/27] Migrated code and generated --- Readme/Readme/Generated/Game/GameContext.cs | 6 +++--- Readme/Readme/Generated/GameState/GameStateContext.cs | 6 +++--- Readme/Readme/Generated/Input/InputContext.cs | 6 +++--- .../PerformanceTests/Entity/ObjectGetProperty.cs | 2 +- Tests/PerformanceTests/PerformanceTests/Helper.cs | 8 +++++++- Tests/TestFixtures/Generated/Game/GameContext.cs | 6 +++--- Tests/TestFixtures/Generated/Test/TestContext.cs | 6 +++--- Tests/TestFixtures/Generated/Test2/Test2Context.cs | 6 +++--- Tests/Tests/Fixtures/MyTestContext.cs | 4 ++-- 9 files changed, 28 insertions(+), 22 deletions(-) diff --git a/Readme/Readme/Generated/Game/GameContext.cs b/Readme/Readme/Generated/Game/GameContext.cs index f502c2b08..ceeb5e5cf 100644 --- a/Readme/Readme/Generated/Game/GameContext.cs +++ b/Readme/Readme/Generated/Game/GameContext.cs @@ -20,11 +20,11 @@ public GameContext() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new GameEntity() ) { } } diff --git a/Readme/Readme/Generated/GameState/GameStateContext.cs b/Readme/Readme/Generated/GameState/GameStateContext.cs index 750aa61aa..5d791c227 100644 --- a/Readme/Readme/Generated/GameState/GameStateContext.cs +++ b/Readme/Readme/Generated/GameState/GameStateContext.cs @@ -20,11 +20,11 @@ public GameStateContext() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new GameStateEntity() ) { } } diff --git a/Readme/Readme/Generated/Input/InputContext.cs b/Readme/Readme/Generated/Input/InputContext.cs index c852c0760..dab8da75f 100644 --- a/Readme/Readme/Generated/Input/InputContext.cs +++ b/Readme/Readme/Generated/Input/InputContext.cs @@ -20,11 +20,11 @@ public InputContext() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new InputEntity() ) { } } diff --git a/Tests/PerformanceTests/PerformanceTests/Entity/ObjectGetProperty.cs b/Tests/PerformanceTests/PerformanceTests/Entity/ObjectGetProperty.cs index 8d5829e02..8824f95b7 100644 --- a/Tests/PerformanceTests/PerformanceTests/Entity/ObjectGetProperty.cs +++ b/Tests/PerformanceTests/PerformanceTests/Entity/ObjectGetProperty.cs @@ -6,7 +6,7 @@ public class ObjectGetProperty : IPerformanceTest { IContext _context; public void Before() { - _context = new Context(1); + _context = new Context(1, () => new Entity()); } public void Run() { diff --git a/Tests/PerformanceTests/PerformanceTests/Helper.cs b/Tests/PerformanceTests/PerformanceTests/Helper.cs index d7753b894..85b424ced 100644 --- a/Tests/PerformanceTests/PerformanceTests/Helper.cs +++ b/Tests/PerformanceTests/PerformanceTests/Helper.cs @@ -3,6 +3,12 @@ public static class Helper { public static IContext CreateContext() { - return new Context(CP.NumComponents, 0, new ContextInfo("Test Context", new string[CP.NumComponents], null), (entity) => new SafeAERC(entity)); + return new Context( + CP.NumComponents, + 0, + new ContextInfo("Test Context", new string[CP.NumComponents], null), + entity => new SafeAERC(entity), + () => new Entity() + ); } } diff --git a/Tests/TestFixtures/Generated/Game/GameContext.cs b/Tests/TestFixtures/Generated/Game/GameContext.cs index f502c2b08..ceeb5e5cf 100644 --- a/Tests/TestFixtures/Generated/Game/GameContext.cs +++ b/Tests/TestFixtures/Generated/Game/GameContext.cs @@ -20,11 +20,11 @@ public GameContext() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new GameEntity() ) { } } diff --git a/Tests/TestFixtures/Generated/Test/TestContext.cs b/Tests/TestFixtures/Generated/Test/TestContext.cs index 5082f5d35..fdc4366c8 100644 --- a/Tests/TestFixtures/Generated/Test/TestContext.cs +++ b/Tests/TestFixtures/Generated/Test/TestContext.cs @@ -20,11 +20,11 @@ public TestContext() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new TestEntity() ) { } } diff --git a/Tests/TestFixtures/Generated/Test2/Test2Context.cs b/Tests/TestFixtures/Generated/Test2/Test2Context.cs index 4e8fe1325..f02264828 100644 --- a/Tests/TestFixtures/Generated/Test2/Test2Context.cs +++ b/Tests/TestFixtures/Generated/Test2/Test2Context.cs @@ -20,11 +20,11 @@ public Test2Context() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new Test2Entity() ) { } } diff --git a/Tests/Tests/Fixtures/MyTestContext.cs b/Tests/Tests/Fixtures/MyTestContext.cs index 0a245bea2..dfdbaa581 100644 --- a/Tests/Tests/Fixtures/MyTestContext.cs +++ b/Tests/Tests/Fixtures/MyTestContext.cs @@ -2,10 +2,10 @@ public sealed class MyTestContext : Context { - public MyTestContext() : base(CID.TotalComponents) { + public MyTestContext() : base(CID.TotalComponents, () => new TestEntity()) { } public MyTestContext(int totalComponents, int startCreationIndex, ContextInfo contextInfo) - : base(totalComponents, startCreationIndex, contextInfo, (entity) => new SafeAERC(entity)) { + : base(totalComponents, startCreationIndex, contextInfo, (entity) => new SafeAERC(entity), () => new TestEntity()) { } } From 9b5d8413af3031ab53ee63cd688cb8297b4fa80e Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 21:46:57 +0200 Subject: [PATCH 22/27] Added Entity Stress Test Scene --- .../Manual Tests/Entity Stress Test.meta | 8 + .../Entity Stress Test Scene.unity | 156 ++++++++++++++++++ .../Entity Stress Test Scene.unity.meta | 7 + .../EntityStressTestController.cs | 28 ++++ .../EntityStressTestController.cs.meta | 11 ++ 5 files changed, 210 insertions(+) create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test.meta create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity.meta create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs create mode 100644 Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs.meta diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test.meta b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test.meta new file mode 100644 index 000000000..7b5f62f9b --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 716397237436b4443bd27b1266b106cf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity new file mode 100644 index 000000000..678fb0ee1 --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.3731196, g: 0.38074002, b: 0.35872707, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &619302619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 619302621} + - component: {fileID: 619302620} + m_Layer: 0 + m_Name: Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &619302620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 619302619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 285cc2b6c9e60419fb51e48c0011bb12, type: 3} + m_Name: + m_EditorClassIdentifier: + count: 1000 +--- !u!4 &619302621 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 619302619} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity.meta b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity.meta new file mode 100644 index 000000000..26b67a570 --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/Entity Stress Test Scene.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9693b73c9c95a4c2e951176a1fb5b355 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs new file mode 100644 index 000000000..e711c6d14 --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs @@ -0,0 +1,28 @@ +using UnityEngine; + +public class EntityStressTestController : MonoBehaviour +{ + public int count; + + Contexts _contexts; + + void Start() + { + _contexts = Contexts.sharedInstance; + + for (int i = 0; i < count; i++) + { + var e = _contexts.game.CreateEntity(); + e.AddMyInt(i); + e.AddMyString(i.ToString()); + } + } + + void Update() + { + foreach (var e in _contexts.game.GetEntities()) + { + e.ReplaceMyInt(e.myInt.myInt + 1); + } + } +} diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs.meta b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs.meta new file mode 100644 index 000000000..1025b9bd7 --- /dev/null +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 285cc2b6c9e60419fb51e48c0011bb12 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From c175e5b40c9101a9ee896605a98979b5fb200368 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 21:47:29 +0200 Subject: [PATCH 23/27] Generated --- .../Assets/Sources/Generated/Contexts.cs | 2 +- .../Game/Components/GameAnArrayComponent.cs | 4 +-- .../Components/GameAnimationCurveComponent.cs | 4 +-- .../Game/Components/GameArray2DComponent.cs | 4 +-- .../Game/Components/GameArray3DComponent.cs | 4 +-- .../Game/Components/GameBoundsComponent.cs | 4 +-- .../Game/Components/GameColorComponent.cs | 4 +-- .../Game/Components/GameCoolNameComponent.cs | 4 +-- .../Components/GameCustomObjectComponent.cs | 4 +-- .../Game/Components/GameDateTimeComponent.cs | 4 +-- .../Game/Components/GameDictArrayComponent.cs | 4 +-- .../Components/GameDictionaryComponent.cs | 4 +-- .../GameDontDrawSimpleObjectComponent.cs | 4 +-- .../Components/GameGameObjectComponent.cs | 4 +-- .../Game/Components/GameHashSetComponent.cs | 4 +-- .../Components/GameISomeInterfaceComponent.cs | 4 +-- .../Components/GameJaggedArrayComponent.cs | 4 +-- .../Game/Components/GameListArrayComponent.cs | 4 +-- .../Game/Components/GameListComponent.cs | 4 +-- .../Components/GameManyMembersComponent.cs | 4 +-- .../GameMonoBehaviourSubClassComponent.cs | 4 +-- .../Game/Components/GameMyBoolComponent.cs | 4 +-- .../Game/Components/GameMyCharComponent.cs | 4 +-- .../Game/Components/GameMyDoubleComponent.cs | 4 +-- .../Game/Components/GameMyEnumComponent.cs | 4 +-- .../Components/GameMyEventClassComponent.cs | 4 +-- .../GameMyEventClassListenerComponent.cs | 4 +-- .../Game/Components/GameMyEventComponent.cs | 4 +-- .../GameMyEventListenerComponent.cs | 4 +-- .../Game/Components/GameMyFlagsComponent.cs | 4 +-- .../Game/Components/GameMyFloatComponent.cs | 4 +-- .../Components/GameMyHiddenIntComponent.cs | 4 +-- .../Game/Components/GameMyIntComponent.cs | 4 +-- .../Game/Components/GameMyStringComponent.cs | 4 +-- .../Game/Components/GamePersonComponent.cs | 4 +-- .../Game/Components/GamePositionComponent.cs | 4 +-- .../Game/Components/GamePropertyComponent.cs | 4 +-- .../Game/Components/GameRectComponent.cs | 4 +-- .../Components/GameSimpleObjectComponent.cs | 4 +-- .../Game/Components/GameSomeClassComponent.cs | 4 +-- .../Components/GameSomeOtherClassComponent.cs | 4 +-- .../Components/GameSomeStructComponent.cs | 4 +-- .../Components/GameSystemObjectComponent.cs | 4 +-- .../Game/Components/GameTexture2DComponent.cs | 4 +-- .../Game/Components/GameTextureComponent.cs | 4 +-- .../Game/Components/GameUniqueComponent.cs | 4 +-- .../Components/GameUnityObjectComponent.cs | 4 +-- .../GameUnsupportedObjectComponent.cs | 4 +-- .../Game/Components/GameVector2Component.cs | 4 +-- .../Game/Components/GameVector3Component.cs | 4 +-- .../Game/Components/GameVector4Component.cs | 4 +-- .../Game/Components/GameVelocityComponent.cs | 4 +-- .../Sources/Generated/Game/GameContext.cs | 6 ++--- .../Components/InputMyStringComponent.cs | 4 +-- .../Sources/Generated/Input/InputContext.cs | 6 ++--- .../Assets/Tests/Editor/Tests/ContextTests.cs | 2 +- .../MultipleContextsController.cs | 25 ++++++++++++++----- 57 files changed, 131 insertions(+), 118 deletions(-) diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Contexts.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Contexts.cs index d058da4a6..6f25fbaac 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Contexts.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Contexts.cs @@ -61,7 +61,7 @@ public partial class Contexts { #if (!ENTITAS_DISABLE_VISUAL_DEBUGGING && UNITY_EDITOR) [Entitas.CodeGeneration.Attributes.PostConstructor] - public void InitializeContexObservers() { + public void InitializeContextObservers() { try { CreateContextObserver(game); CreateContextObserver(input); diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnArrayComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnArrayComponent.cs index b1e55186e..7718f4aec 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnArrayComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnArrayComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddAnArray(string[] newArray) { var index = GameComponentsLookup.AnArray; - var component = CreateComponent(index); + var component = (AnArrayComponent)CreateComponent(index, typeof(AnArrayComponent)); component.array = newArray; AddComponent(index, component); } public void ReplaceAnArray(string[] newArray) { var index = GameComponentsLookup.AnArray; - var component = CreateComponent(index); + var component = (AnArrayComponent)CreateComponent(index, typeof(AnArrayComponent)); component.array = newArray; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnimationCurveComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnimationCurveComponent.cs index ccc9c10d9..44e31ebd3 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnimationCurveComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameAnimationCurveComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddAnimationCurve(UnityEngine.AnimationCurve newAnimationCurve) { var index = GameComponentsLookup.AnimationCurve; - var component = CreateComponent(index); + var component = (AnimationCurveComponent)CreateComponent(index, typeof(AnimationCurveComponent)); component.animationCurve = newAnimationCurve; AddComponent(index, component); } public void ReplaceAnimationCurve(UnityEngine.AnimationCurve newAnimationCurve) { var index = GameComponentsLookup.AnimationCurve; - var component = CreateComponent(index); + var component = (AnimationCurveComponent)CreateComponent(index, typeof(AnimationCurveComponent)); component.animationCurve = newAnimationCurve; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray2DComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray2DComponent.cs index 3bb55f846..a747452e1 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray2DComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray2DComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddArray2D(string[,] newArray2d) { var index = GameComponentsLookup.Array2D; - var component = CreateComponent(index); + var component = (Array2DComponent)CreateComponent(index, typeof(Array2DComponent)); component.array2d = newArray2d; AddComponent(index, component); } public void ReplaceArray2D(string[,] newArray2d) { var index = GameComponentsLookup.Array2D; - var component = CreateComponent(index); + var component = (Array2DComponent)CreateComponent(index, typeof(Array2DComponent)); component.array2d = newArray2d; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray3DComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray3DComponent.cs index 1fde2adf3..70d528d3f 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray3DComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameArray3DComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddArray3D(string[,,] newArray3d) { var index = GameComponentsLookup.Array3D; - var component = CreateComponent(index); + var component = (Array3DComponent)CreateComponent(index, typeof(Array3DComponent)); component.array3d = newArray3d; AddComponent(index, component); } public void ReplaceArray3D(string[,,] newArray3d) { var index = GameComponentsLookup.Array3D; - var component = CreateComponent(index); + var component = (Array3DComponent)CreateComponent(index, typeof(Array3DComponent)); component.array3d = newArray3d; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameBoundsComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameBoundsComponent.cs index d8771b04d..354efab03 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameBoundsComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameBoundsComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddBounds(UnityEngine.Bounds newBounds) { var index = GameComponentsLookup.Bounds; - var component = CreateComponent(index); + var component = (BoundsComponent)CreateComponent(index, typeof(BoundsComponent)); component.bounds = newBounds; AddComponent(index, component); } public void ReplaceBounds(UnityEngine.Bounds newBounds) { var index = GameComponentsLookup.Bounds; - var component = CreateComponent(index); + var component = (BoundsComponent)CreateComponent(index, typeof(BoundsComponent)); component.bounds = newBounds; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameColorComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameColorComponent.cs index 0bb79b350..eb628c0ab 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameColorComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameColorComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddColor(UnityEngine.Color newColor) { var index = GameComponentsLookup.Color; - var component = CreateComponent(index); + var component = (ColorComponent)CreateComponent(index, typeof(ColorComponent)); component.color = newColor; AddComponent(index, component); } public void ReplaceColor(UnityEngine.Color newColor) { var index = GameComponentsLookup.Color; - var component = CreateComponent(index); + var component = (ColorComponent)CreateComponent(index, typeof(ColorComponent)); component.color = newColor; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCoolNameComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCoolNameComponent.cs index 684130443..e1808ce98 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCoolNameComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCoolNameComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddCoolName(BadName newValue) { var index = GameComponentsLookup.CoolName; - var component = CreateComponent(index); + var component = (CoolNameComponent)CreateComponent(index, typeof(CoolNameComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceCoolName(BadName newValue) { var index = GameComponentsLookup.CoolName; - var component = CreateComponent(index); + var component = (CoolNameComponent)CreateComponent(index, typeof(CoolNameComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCustomObjectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCustomObjectComponent.cs index 32e854d28..df8befd65 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCustomObjectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameCustomObjectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddCustomObject(CustomObject newCustomObject) { var index = GameComponentsLookup.CustomObject; - var component = CreateComponent(index); + var component = (CustomObjectComponent)CreateComponent(index, typeof(CustomObjectComponent)); component.customObject = newCustomObject; AddComponent(index, component); } public void ReplaceCustomObject(CustomObject newCustomObject) { var index = GameComponentsLookup.CustomObject; - var component = CreateComponent(index); + var component = (CustomObjectComponent)CreateComponent(index, typeof(CustomObjectComponent)); component.customObject = newCustomObject; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDateTimeComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDateTimeComponent.cs index a4a9bc951..c8a019561 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDateTimeComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDateTimeComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddDateTime(System.DateTime newDate) { var index = GameComponentsLookup.DateTime; - var component = CreateComponent(index); + var component = (DateTimeComponent)CreateComponent(index, typeof(DateTimeComponent)); component.date = newDate; AddComponent(index, component); } public void ReplaceDateTime(System.DateTime newDate) { var index = GameComponentsLookup.DateTime; - var component = CreateComponent(index); + var component = (DateTimeComponent)CreateComponent(index, typeof(DateTimeComponent)); component.date = newDate; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictArrayComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictArrayComponent.cs index 735ad94f6..4604d8ee5 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictArrayComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictArrayComponent.cs @@ -13,7 +13,7 @@ public partial class GameEntity { public void AddDictArray(System.Collections.Generic.Dictionary newDict, System.Collections.Generic.Dictionary[] newDictArray) { var index = GameComponentsLookup.DictArray; - var component = CreateComponent(index); + var component = (DictArrayComponent)CreateComponent(index, typeof(DictArrayComponent)); component.dict = newDict; component.dictArray = newDictArray; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddDictArray(System.Collections.Generic.Dictionary ne public void ReplaceDictArray(System.Collections.Generic.Dictionary newDict, System.Collections.Generic.Dictionary[] newDictArray) { var index = GameComponentsLookup.DictArray; - var component = CreateComponent(index); + var component = (DictArrayComponent)CreateComponent(index, typeof(DictArrayComponent)); component.dict = newDict; component.dictArray = newDictArray; ReplaceComponent(index, component); diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictionaryComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictionaryComponent.cs index bc75be81c..49b61a5ee 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictionaryComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDictionaryComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddDictionary(System.Collections.Generic.Dictionary newDict) { var index = GameComponentsLookup.Dictionary; - var component = CreateComponent(index); + var component = (DictionaryComponent)CreateComponent(index, typeof(DictionaryComponent)); component.dict = newDict; AddComponent(index, component); } public void ReplaceDictionary(System.Collections.Generic.Dictionary newDict) { var index = GameComponentsLookup.Dictionary; - var component = CreateComponent(index); + var component = (DictionaryComponent)CreateComponent(index, typeof(DictionaryComponent)); component.dict = newDict; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDontDrawSimpleObjectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDontDrawSimpleObjectComponent.cs index 0f5b72a59..d1151bfb5 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDontDrawSimpleObjectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameDontDrawSimpleObjectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddDontDrawSimpleObject(SimpleObject newSimpleObject) { var index = GameComponentsLookup.DontDrawSimpleObject; - var component = CreateComponent(index); + var component = (DontDrawSimpleObjectComponent)CreateComponent(index, typeof(DontDrawSimpleObjectComponent)); component.simpleObject = newSimpleObject; AddComponent(index, component); } public void ReplaceDontDrawSimpleObject(SimpleObject newSimpleObject) { var index = GameComponentsLookup.DontDrawSimpleObject; - var component = CreateComponent(index); + var component = (DontDrawSimpleObjectComponent)CreateComponent(index, typeof(DontDrawSimpleObjectComponent)); component.simpleObject = newSimpleObject; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameGameObjectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameGameObjectComponent.cs index 9f09a5fba..f6eb5862d 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameGameObjectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameGameObjectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddGameObject(UnityEngine.GameObject newGameObject) { var index = GameComponentsLookup.GameObject; - var component = CreateComponent(index); + var component = (GameObjectComponent)CreateComponent(index, typeof(GameObjectComponent)); component.gameObject = newGameObject; AddComponent(index, component); } public void ReplaceGameObject(UnityEngine.GameObject newGameObject) { var index = GameComponentsLookup.GameObject; - var component = CreateComponent(index); + var component = (GameObjectComponent)CreateComponent(index, typeof(GameObjectComponent)); component.gameObject = newGameObject; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameHashSetComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameHashSetComponent.cs index 7eb2463ed..698319612 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameHashSetComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameHashSetComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddHashSet(System.Collections.Generic.HashSet newHashset) { var index = GameComponentsLookup.HashSet; - var component = CreateComponent(index); + var component = (HashSetComponent)CreateComponent(index, typeof(HashSetComponent)); component.hashset = newHashset; AddComponent(index, component); } public void ReplaceHashSet(System.Collections.Generic.HashSet newHashset) { var index = GameComponentsLookup.HashSet; - var component = CreateComponent(index); + var component = (HashSetComponent)CreateComponent(index, typeof(HashSetComponent)); component.hashset = newHashset; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameISomeInterfaceComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameISomeInterfaceComponent.cs index 4ef8632ea..6a2f37206 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameISomeInterfaceComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameISomeInterfaceComponent.cs @@ -51,14 +51,14 @@ public partial class GameEntity { public void AddISomeInterface(ISomeInterface newValue) { var index = GameComponentsLookup.ISomeInterface; - var component = CreateComponent(index); + var component = (ISomeInterfaceComponent)CreateComponent(index, typeof(ISomeInterfaceComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceISomeInterface(ISomeInterface newValue) { var index = GameComponentsLookup.ISomeInterface; - var component = CreateComponent(index); + var component = (ISomeInterfaceComponent)CreateComponent(index, typeof(ISomeInterfaceComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameJaggedArrayComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameJaggedArrayComponent.cs index f10ad9752..56fef8ce2 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameJaggedArrayComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameJaggedArrayComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddJaggedArray(string[][] newJaggedArray) { var index = GameComponentsLookup.JaggedArray; - var component = CreateComponent(index); + var component = (JaggedArrayComponent)CreateComponent(index, typeof(JaggedArrayComponent)); component.jaggedArray = newJaggedArray; AddComponent(index, component); } public void ReplaceJaggedArray(string[][] newJaggedArray) { var index = GameComponentsLookup.JaggedArray; - var component = CreateComponent(index); + var component = (JaggedArrayComponent)CreateComponent(index, typeof(JaggedArrayComponent)); component.jaggedArray = newJaggedArray; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListArrayComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListArrayComponent.cs index 473c6c4ce..583347c44 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListArrayComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListArrayComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddListArray(System.Collections.Generic.List[] newListArray) { var index = GameComponentsLookup.ListArray; - var component = CreateComponent(index); + var component = (ListArrayComponent)CreateComponent(index, typeof(ListArrayComponent)); component.listArray = newListArray; AddComponent(index, component); } public void ReplaceListArray(System.Collections.Generic.List[] newListArray) { var index = GameComponentsLookup.ListArray; - var component = CreateComponent(index); + var component = (ListArrayComponent)CreateComponent(index, typeof(ListArrayComponent)); component.listArray = newListArray; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListComponent.cs index 54714912c..0bebd206f 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameListComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddList(System.Collections.Generic.List newList) { var index = GameComponentsLookup.List; - var component = CreateComponent(index); + var component = (ListComponent)CreateComponent(index, typeof(ListComponent)); component.list = newList; AddComponent(index, component); } public void ReplaceList(System.Collections.Generic.List newList) { var index = GameComponentsLookup.List; - var component = CreateComponent(index); + var component = (ListComponent)CreateComponent(index, typeof(ListComponent)); component.list = newList; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameManyMembersComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameManyMembersComponent.cs index 59e443368..a3aacfcbf 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameManyMembersComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameManyMembersComponent.cs @@ -13,7 +13,7 @@ public partial class GameEntity { public void AddManyMembers(string newField1, string newField2, string newField3, string newField4, string newField5, string newField6, string newField7, string newField8, string newField9, string newField10, string newField11, string newField12) { var index = GameComponentsLookup.ManyMembers; - var component = CreateComponent(index); + var component = (ManyMembersComponent)CreateComponent(index, typeof(ManyMembersComponent)); component.field1 = newField1; component.field2 = newField2; component.field3 = newField3; @@ -31,7 +31,7 @@ public void AddManyMembers(string newField1, string newField2, string newField3, public void ReplaceManyMembers(string newField1, string newField2, string newField3, string newField4, string newField5, string newField6, string newField7, string newField8, string newField9, string newField10, string newField11, string newField12) { var index = GameComponentsLookup.ManyMembers; - var component = CreateComponent(index); + var component = (ManyMembersComponent)CreateComponent(index, typeof(ManyMembersComponent)); component.field1 = newField1; component.field2 = newField2; component.field3 = newField3; diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMonoBehaviourSubClassComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMonoBehaviourSubClassComponent.cs index 49645478f..656875ec9 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMonoBehaviourSubClassComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMonoBehaviourSubClassComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMonoBehaviourSubClass(MonoBehaviourSubClass newMonoBehaviour) { var index = GameComponentsLookup.MonoBehaviourSubClass; - var component = CreateComponent(index); + var component = (MonoBehaviourSubClassComponent)CreateComponent(index, typeof(MonoBehaviourSubClassComponent)); component.monoBehaviour = newMonoBehaviour; AddComponent(index, component); } public void ReplaceMonoBehaviourSubClass(MonoBehaviourSubClass newMonoBehaviour) { var index = GameComponentsLookup.MonoBehaviourSubClass; - var component = CreateComponent(index); + var component = (MonoBehaviourSubClassComponent)CreateComponent(index, typeof(MonoBehaviourSubClassComponent)); component.monoBehaviour = newMonoBehaviour; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyBoolComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyBoolComponent.cs index 90442a90a..07d0d181f 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyBoolComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyBoolComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyBool(bool newMyBool) { var index = GameComponentsLookup.MyBool; - var component = CreateComponent(index); + var component = (MyBoolComponent)CreateComponent(index, typeof(MyBoolComponent)); component.myBool = newMyBool; AddComponent(index, component); } public void ReplaceMyBool(bool newMyBool) { var index = GameComponentsLookup.MyBool; - var component = CreateComponent(index); + var component = (MyBoolComponent)CreateComponent(index, typeof(MyBoolComponent)); component.myBool = newMyBool; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyCharComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyCharComponent.cs index 5621c8a8d..dd894bb8d 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyCharComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyCharComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyChar(char newMyChar) { var index = GameComponentsLookup.MyChar; - var component = CreateComponent(index); + var component = (MyCharComponent)CreateComponent(index, typeof(MyCharComponent)); component.myChar = newMyChar; AddComponent(index, component); } public void ReplaceMyChar(char newMyChar) { var index = GameComponentsLookup.MyChar; - var component = CreateComponent(index); + var component = (MyCharComponent)CreateComponent(index, typeof(MyCharComponent)); component.myChar = newMyChar; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyDoubleComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyDoubleComponent.cs index dabf42d2e..8c47d470c 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyDoubleComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyDoubleComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyDouble(double newMyDouble) { var index = GameComponentsLookup.MyDouble; - var component = CreateComponent(index); + var component = (MyDoubleComponent)CreateComponent(index, typeof(MyDoubleComponent)); component.myDouble = newMyDouble; AddComponent(index, component); } public void ReplaceMyDouble(double newMyDouble) { var index = GameComponentsLookup.MyDouble; - var component = CreateComponent(index); + var component = (MyDoubleComponent)CreateComponent(index, typeof(MyDoubleComponent)); component.myDouble = newMyDouble; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEnumComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEnumComponent.cs index 44b548f93..eb2e6e11c 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEnumComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEnumComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyEnum(MyEnumComponent.MyEnum newMyEnum) { var index = GameComponentsLookup.MyEnum; - var component = CreateComponent(index); + var component = (MyEnumComponent)CreateComponent(index, typeof(MyEnumComponent)); component.myEnum = newMyEnum; AddComponent(index, component); } public void ReplaceMyEnum(MyEnumComponent.MyEnum newMyEnum) { var index = GameComponentsLookup.MyEnum; - var component = CreateComponent(index); + var component = (MyEnumComponent)CreateComponent(index, typeof(MyEnumComponent)); component.myEnum = newMyEnum; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassComponent.cs index 1269e4536..163d48bf4 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyEventClass(MyEventClass newValue) { var index = GameComponentsLookup.MyEventClass; - var component = CreateComponent(index); + var component = (MyEventClassComponent)CreateComponent(index, typeof(MyEventClassComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyEventClass(MyEventClass newValue) { var index = GameComponentsLookup.MyEventClass; - var component = CreateComponent(index); + var component = (MyEventClassComponent)CreateComponent(index, typeof(MyEventClassComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassListenerComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassListenerComponent.cs index 65986a62c..b3452c751 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassListenerComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventClassListenerComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyEventClassListener(System.Collections.Generic.List newValue) { var index = GameComponentsLookup.MyEventClassListener; - var component = CreateComponent(index); + var component = (MyEventClassListenerComponent)CreateComponent(index, typeof(MyEventClassListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyEventClassListener(System.Collections.Generic.List newValue) { var index = GameComponentsLookup.MyEventClassListener; - var component = CreateComponent(index); + var component = (MyEventClassListenerComponent)CreateComponent(index, typeof(MyEventClassListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventComponent.cs index 8a36f2269..a6c0e9263 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyEvent(string newValue) { var index = GameComponentsLookup.MyEvent; - var component = CreateComponent(index); + var component = (MyEventComponent)CreateComponent(index, typeof(MyEventComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyEvent(string newValue) { var index = GameComponentsLookup.MyEvent; - var component = CreateComponent(index); + var component = (MyEventComponent)CreateComponent(index, typeof(MyEventComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventListenerComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventListenerComponent.cs index a54c5e325..a1ac31616 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventListenerComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyEventListenerComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyEventListener(System.Collections.Generic.List newValue) { var index = GameComponentsLookup.MyEventListener; - var component = CreateComponent(index); + var component = (MyEventListenerComponent)CreateComponent(index, typeof(MyEventListenerComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceMyEventListener(System.Collections.Generic.List newValue) { var index = GameComponentsLookup.MyEventListener; - var component = CreateComponent(index); + var component = (MyEventListenerComponent)CreateComponent(index, typeof(MyEventListenerComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFlagsComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFlagsComponent.cs index 8cbb27116..e0b5ec24c 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFlagsComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFlagsComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyFlags(MyFlagsComponent.MyFlags newMyFlags) { var index = GameComponentsLookup.MyFlags; - var component = CreateComponent(index); + var component = (MyFlagsComponent)CreateComponent(index, typeof(MyFlagsComponent)); component.myFlags = newMyFlags; AddComponent(index, component); } public void ReplaceMyFlags(MyFlagsComponent.MyFlags newMyFlags) { var index = GameComponentsLookup.MyFlags; - var component = CreateComponent(index); + var component = (MyFlagsComponent)CreateComponent(index, typeof(MyFlagsComponent)); component.myFlags = newMyFlags; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFloatComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFloatComponent.cs index 07b8a62b1..a7ed8fe57 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFloatComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyFloatComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyFloat(float newMyFloat) { var index = GameComponentsLookup.MyFloat; - var component = CreateComponent(index); + var component = (MyFloatComponent)CreateComponent(index, typeof(MyFloatComponent)); component.myFloat = newMyFloat; AddComponent(index, component); } public void ReplaceMyFloat(float newMyFloat) { var index = GameComponentsLookup.MyFloat; - var component = CreateComponent(index); + var component = (MyFloatComponent)CreateComponent(index, typeof(MyFloatComponent)); component.myFloat = newMyFloat; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyHiddenIntComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyHiddenIntComponent.cs index 1ca5f8066..c4da8c277 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyHiddenIntComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyHiddenIntComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyHiddenInt(int newMyInt) { var index = GameComponentsLookup.MyHiddenInt; - var component = CreateComponent(index); + var component = (MyHiddenIntComponent)CreateComponent(index, typeof(MyHiddenIntComponent)); component.myInt = newMyInt; AddComponent(index, component); } public void ReplaceMyHiddenInt(int newMyInt) { var index = GameComponentsLookup.MyHiddenInt; - var component = CreateComponent(index); + var component = (MyHiddenIntComponent)CreateComponent(index, typeof(MyHiddenIntComponent)); component.myInt = newMyInt; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyIntComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyIntComponent.cs index b719a56f8..42eba3b4d 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyIntComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyIntComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyInt(int newMyInt) { var index = GameComponentsLookup.MyInt; - var component = CreateComponent(index); + var component = (MyIntComponent)CreateComponent(index, typeof(MyIntComponent)); component.myInt = newMyInt; AddComponent(index, component); } public void ReplaceMyInt(int newMyInt) { var index = GameComponentsLookup.MyInt; - var component = CreateComponent(index); + var component = (MyIntComponent)CreateComponent(index, typeof(MyIntComponent)); component.myInt = newMyInt; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyStringComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyStringComponent.cs index abb703225..e86460a0c 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyStringComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameMyStringComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddMyString(string newMyString) { var index = GameComponentsLookup.MyString; - var component = CreateComponent(index); + var component = (MyStringComponent)CreateComponent(index, typeof(MyStringComponent)); component.myString = newMyString; AddComponent(index, component); } public void ReplaceMyString(string newMyString) { var index = GameComponentsLookup.MyString; - var component = CreateComponent(index); + var component = (MyStringComponent)CreateComponent(index, typeof(MyStringComponent)); component.myString = newMyString; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePersonComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePersonComponent.cs index 7dda30b2a..fe8b0eec3 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePersonComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePersonComponent.cs @@ -13,7 +13,7 @@ public partial class GameEntity { public void AddPerson(string newName, string newGender) { var index = GameComponentsLookup.Person; - var component = CreateComponent(index); + var component = (PersonComponent)CreateComponent(index, typeof(PersonComponent)); component.name = newName; component.gender = newGender; AddComponent(index, component); @@ -21,7 +21,7 @@ public void AddPerson(string newName, string newGender) { public void ReplacePerson(string newName, string newGender) { var index = GameComponentsLookup.Person; - var component = CreateComponent(index); + var component = (PersonComponent)CreateComponent(index, typeof(PersonComponent)); component.name = newName; component.gender = newGender; ReplaceComponent(index, component); diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePositionComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePositionComponent.cs index 9eb26f1ae..e3433b2c8 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePositionComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePositionComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddPosition(IntVector2 newValue) { var index = GameComponentsLookup.Position; - var component = CreateComponent(index); + var component = (PositionComponent)CreateComponent(index, typeof(PositionComponent)); component.value = newValue; AddComponent(index, component); } public void ReplacePosition(IntVector2 newValue) { var index = GameComponentsLookup.Position; - var component = CreateComponent(index); + var component = (PositionComponent)CreateComponent(index, typeof(PositionComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePropertyComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePropertyComponent.cs index cd1b2419b..03b2c009b 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePropertyComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GamePropertyComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddProperty(string newValue) { var index = GameComponentsLookup.Property; - var component = CreateComponent(index); + var component = (PropertyComponent)CreateComponent(index, typeof(PropertyComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceProperty(string newValue) { var index = GameComponentsLookup.Property; - var component = CreateComponent(index); + var component = (PropertyComponent)CreateComponent(index, typeof(PropertyComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameRectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameRectComponent.cs index c2e7d2cbf..70da5cdc3 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameRectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameRectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddRect(UnityEngine.Rect newRect) { var index = GameComponentsLookup.Rect; - var component = CreateComponent(index); + var component = (RectComponent)CreateComponent(index, typeof(RectComponent)); component.rect = newRect; AddComponent(index, component); } public void ReplaceRect(UnityEngine.Rect newRect) { var index = GameComponentsLookup.Rect; - var component = CreateComponent(index); + var component = (RectComponent)CreateComponent(index, typeof(RectComponent)); component.rect = newRect; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSimpleObjectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSimpleObjectComponent.cs index 85d634192..fa5e8895e 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSimpleObjectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSimpleObjectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddSimpleObject(SimpleObject newSimpleObject) { var index = GameComponentsLookup.SimpleObject; - var component = CreateComponent(index); + var component = (SimpleObjectComponent)CreateComponent(index, typeof(SimpleObjectComponent)); component.simpleObject = newSimpleObject; AddComponent(index, component); } public void ReplaceSimpleObject(SimpleObject newSimpleObject) { var index = GameComponentsLookup.SimpleObject; - var component = CreateComponent(index); + var component = (SimpleObjectComponent)CreateComponent(index, typeof(SimpleObjectComponent)); component.simpleObject = newSimpleObject; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeClassComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeClassComponent.cs index 0780854df..bc3a0b98c 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeClassComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeClassComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddSomeClass(SomeClass newValue) { var index = GameComponentsLookup.SomeClass; - var component = CreateComponent(index); + var component = (SomeClassComponent)CreateComponent(index, typeof(SomeClassComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceSomeClass(SomeClass newValue) { var index = GameComponentsLookup.SomeClass; - var component = CreateComponent(index); + var component = (SomeClassComponent)CreateComponent(index, typeof(SomeClassComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeOtherClassComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeOtherClassComponent.cs index 6ce6a97d3..64bf324a1 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeOtherClassComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeOtherClassComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddSomeOtherClass(SomeNamespace.SomeOtherClass newValue) { var index = GameComponentsLookup.SomeOtherClass; - var component = CreateComponent(index); + var component = (SomeOtherClassComponent)CreateComponent(index, typeof(SomeOtherClassComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceSomeOtherClass(SomeNamespace.SomeOtherClass newValue) { var index = GameComponentsLookup.SomeOtherClass; - var component = CreateComponent(index); + var component = (SomeOtherClassComponent)CreateComponent(index, typeof(SomeOtherClassComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeStructComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeStructComponent.cs index adb6e774f..14fda320b 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeStructComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSomeStructComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddSomeStruct(SomeStruct newValue) { var index = GameComponentsLookup.SomeStruct; - var component = CreateComponent(index); + var component = (SomeStructComponent)CreateComponent(index, typeof(SomeStructComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceSomeStruct(SomeStruct newValue) { var index = GameComponentsLookup.SomeStruct; - var component = CreateComponent(index); + var component = (SomeStructComponent)CreateComponent(index, typeof(SomeStructComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSystemObjectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSystemObjectComponent.cs index e089bc7ca..d775ec729 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSystemObjectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameSystemObjectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddSystemObject(object newSystemObject) { var index = GameComponentsLookup.SystemObject; - var component = CreateComponent(index); + var component = (SystemObjectComponent)CreateComponent(index, typeof(SystemObjectComponent)); component.systemObject = newSystemObject; AddComponent(index, component); } public void ReplaceSystemObject(object newSystemObject) { var index = GameComponentsLookup.SystemObject; - var component = CreateComponent(index); + var component = (SystemObjectComponent)CreateComponent(index, typeof(SystemObjectComponent)); component.systemObject = newSystemObject; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTexture2DComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTexture2DComponent.cs index 32707fe12..f8236ce28 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTexture2DComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTexture2DComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddTexture2D(UnityEngine.Texture2D newTexture2D) { var index = GameComponentsLookup.Texture2D; - var component = CreateComponent(index); + var component = (Texture2DComponent)CreateComponent(index, typeof(Texture2DComponent)); component.texture2D = newTexture2D; AddComponent(index, component); } public void ReplaceTexture2D(UnityEngine.Texture2D newTexture2D) { var index = GameComponentsLookup.Texture2D; - var component = CreateComponent(index); + var component = (Texture2DComponent)CreateComponent(index, typeof(Texture2DComponent)); component.texture2D = newTexture2D; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTextureComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTextureComponent.cs index d3a02da76..b6ffd1606 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTextureComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameTextureComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddTexture(UnityEngine.Texture newTexture) { var index = GameComponentsLookup.Texture; - var component = CreateComponent(index); + var component = (TextureComponent)CreateComponent(index, typeof(TextureComponent)); component.texture = newTexture; AddComponent(index, component); } public void ReplaceTexture(UnityEngine.Texture newTexture) { var index = GameComponentsLookup.Texture; - var component = CreateComponent(index); + var component = (TextureComponent)CreateComponent(index, typeof(TextureComponent)); component.texture = newTexture; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUniqueComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUniqueComponent.cs index ccced66c3..863d975de 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUniqueComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUniqueComponent.cs @@ -51,14 +51,14 @@ public partial class GameEntity { public void AddUnique(string newValue) { var index = GameComponentsLookup.Unique; - var component = CreateComponent(index); + var component = (UniqueComponent)CreateComponent(index, typeof(UniqueComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceUnique(string newValue) { var index = GameComponentsLookup.Unique; - var component = CreateComponent(index); + var component = (UniqueComponent)CreateComponent(index, typeof(UniqueComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnityObjectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnityObjectComponent.cs index 0b12199ec..3b0b98d92 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnityObjectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnityObjectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddUnityObject(UnityEngine.Object newUnityObject) { var index = GameComponentsLookup.UnityObject; - var component = CreateComponent(index); + var component = (UnityObjectComponent)CreateComponent(index, typeof(UnityObjectComponent)); component.unityObject = newUnityObject; AddComponent(index, component); } public void ReplaceUnityObject(UnityEngine.Object newUnityObject) { var index = GameComponentsLookup.UnityObject; - var component = CreateComponent(index); + var component = (UnityObjectComponent)CreateComponent(index, typeof(UnityObjectComponent)); component.unityObject = newUnityObject; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnsupportedObjectComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnsupportedObjectComponent.cs index 66aeceacc..7707f9987 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnsupportedObjectComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameUnsupportedObjectComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddUnsupportedObject(UnsupportedObject newUnsupportedObject) { var index = GameComponentsLookup.UnsupportedObject; - var component = CreateComponent(index); + var component = (UnsupportedObjectComponent)CreateComponent(index, typeof(UnsupportedObjectComponent)); component.unsupportedObject = newUnsupportedObject; AddComponent(index, component); } public void ReplaceUnsupportedObject(UnsupportedObject newUnsupportedObject) { var index = GameComponentsLookup.UnsupportedObject; - var component = CreateComponent(index); + var component = (UnsupportedObjectComponent)CreateComponent(index, typeof(UnsupportedObjectComponent)); component.unsupportedObject = newUnsupportedObject; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector2Component.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector2Component.cs index 1d2582ea4..6269c2bf9 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector2Component.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector2Component.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddVector2(UnityEngine.Vector2 newVector2) { var index = GameComponentsLookup.Vector2; - var component = CreateComponent(index); + var component = (Vector2Component)CreateComponent(index, typeof(Vector2Component)); component.vector2 = newVector2; AddComponent(index, component); } public void ReplaceVector2(UnityEngine.Vector2 newVector2) { var index = GameComponentsLookup.Vector2; - var component = CreateComponent(index); + var component = (Vector2Component)CreateComponent(index, typeof(Vector2Component)); component.vector2 = newVector2; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector3Component.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector3Component.cs index d157c6538..fd25f5573 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector3Component.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector3Component.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddVector3(UnityEngine.Vector3 newVector3) { var index = GameComponentsLookup.Vector3; - var component = CreateComponent(index); + var component = (Vector3Component)CreateComponent(index, typeof(Vector3Component)); component.vector3 = newVector3; AddComponent(index, component); } public void ReplaceVector3(UnityEngine.Vector3 newVector3) { var index = GameComponentsLookup.Vector3; - var component = CreateComponent(index); + var component = (Vector3Component)CreateComponent(index, typeof(Vector3Component)); component.vector3 = newVector3; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector4Component.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector4Component.cs index 5a0f285e6..74704b8e8 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector4Component.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVector4Component.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddVector4(UnityEngine.Vector4 newVector4) { var index = GameComponentsLookup.Vector4; - var component = CreateComponent(index); + var component = (Vector4Component)CreateComponent(index, typeof(Vector4Component)); component.vector4 = newVector4; AddComponent(index, component); } public void ReplaceVector4(UnityEngine.Vector4 newVector4) { var index = GameComponentsLookup.Vector4; - var component = CreateComponent(index); + var component = (Vector4Component)CreateComponent(index, typeof(Vector4Component)); component.vector4 = newVector4; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVelocityComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVelocityComponent.cs index 6c62e77f5..35d843a66 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVelocityComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/Components/GameVelocityComponent.cs @@ -13,14 +13,14 @@ public partial class GameEntity { public void AddVelocity(IntVector2 newValue) { var index = GameComponentsLookup.Velocity; - var component = CreateComponent(index); + var component = (VelocityComponent)CreateComponent(index, typeof(VelocityComponent)); component.value = newValue; AddComponent(index, component); } public void ReplaceVelocity(IntVector2 newValue) { var index = GameComponentsLookup.Velocity; - var component = CreateComponent(index); + var component = (VelocityComponent)CreateComponent(index, typeof(VelocityComponent)); component.value = newValue; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/GameContext.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/GameContext.cs index f502c2b08..ceeb5e5cf 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/GameContext.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Game/GameContext.cs @@ -20,11 +20,11 @@ public GameContext() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new GameEntity() ) { } } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/Components/InputMyStringComponent.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/Components/InputMyStringComponent.cs index fc7ebe59f..931f4ed5f 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/Components/InputMyStringComponent.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/Components/InputMyStringComponent.cs @@ -13,14 +13,14 @@ public partial class InputEntity { public void AddMyString(string newMyString) { var index = InputComponentsLookup.MyString; - var component = CreateComponent(index); + var component = (MyStringComponent)CreateComponent(index, typeof(MyStringComponent)); component.myString = newMyString; AddComponent(index, component); } public void ReplaceMyString(string newMyString) { var index = InputComponentsLookup.MyString; - var component = CreateComponent(index); + var component = (MyStringComponent)CreateComponent(index, typeof(MyStringComponent)); component.myString = newMyString; ReplaceComponent(index, component); } diff --git a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/InputContext.cs b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/InputContext.cs index c852c0760..dab8da75f 100644 --- a/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/InputContext.cs +++ b/Tests/Unity/VisualDebugging/Assets/Sources/Generated/Input/InputContext.cs @@ -20,11 +20,11 @@ public InputContext() (entity) => #if (ENTITAS_FAST_AND_UNSAFE) - new Entitas.UnsafeAERC() + new Entitas.UnsafeAERC(), #else - new Entitas.SafeAERC(entity) + new Entitas.SafeAERC(entity), #endif - + () => new InputEntity() ) { } } diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Editor/Tests/ContextTests.cs b/Tests/Unity/VisualDebugging/Assets/Tests/Editor/Tests/ContextTests.cs index 0a74ee7d5..d474112dc 100644 --- a/Tests/Unity/VisualDebugging/Assets/Tests/Editor/Tests/ContextTests.cs +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Editor/Tests/ContextTests.cs @@ -11,7 +11,7 @@ public void BeforeEach() { [Test] public void ensures_same_deterministic_order_when_getting_entities_after_DestroyAllEntities() { - var context = new Context(1); + var context = new Context(1, () => new GameEntity()); const int numEntities = 10; for (int i = 0; i < numEntities; i++) { diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Multiple Contexts/MultipleContextsController.cs b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Multiple Contexts/MultipleContextsController.cs index c49f0db2f..a5f85d655 100644 --- a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Multiple Contexts/MultipleContextsController.cs +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Multiple Contexts/MultipleContextsController.cs @@ -1,19 +1,32 @@ using UnityEngine; using Entitas; -public class MultipleContextsController : MonoBehaviour { - +public class MultipleContextsController : MonoBehaviour +{ IContext _contextA; IContext _contextB; - void Start() { + void Start() + { + _contextA = new Context( + GameComponentsLookup.TotalComponents, + 0, + new ContextInfo("Context A", GameComponentsLookup.componentNames, GameComponentsLookup.componentTypes), + entity => new SafeAERC(entity), + () => new GameEntity() + ); - _contextA = new Context(GameComponentsLookup.TotalComponents, 0, new ContextInfo("Context A", GameComponentsLookup.componentNames, GameComponentsLookup.componentTypes), (entity) => new SafeAERC(entity)); new Entitas.VisualDebugging.Unity.ContextObserver(_contextA); - _contextB = new Context(GameComponentsLookup.TotalComponents, 0, new ContextInfo("Context B", GameComponentsLookup.componentNames, GameComponentsLookup.componentTypes), (entity) => new SafeAERC(entity)); - new Entitas.VisualDebugging.Unity.ContextObserver(_contextB); + _contextB = new Context( + GameComponentsLookup.TotalComponents, + 0, + new ContextInfo("Context B", GameComponentsLookup.componentNames, GameComponentsLookup.componentTypes), + entity => new SafeAERC(entity), + () => new GameEntity() + ); + new Entitas.VisualDebugging.Unity.ContextObserver(_contextB); _contextA.OnEntityCreated += (context, entity) => ((GameEntity)entity).AddMyInt(42); } From 0a551ea39acec3d6b66e453d667a4fb1a9c4a1c2 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 21:49:15 +0200 Subject: [PATCH 24/27] Reduce entity ToString() cache invalidation Always use component.ToString() in entity description --- Entitas/Entitas/Entity/Entity.cs | 45 +++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/Entitas/Entitas/Entity/Entity.cs b/Entitas/Entitas/Entity/Entity.cs index baf05e86b..d5da530f2 100644 --- a/Entitas/Entitas/Entity/Entity.cs +++ b/Entitas/Entitas/Entity/Entity.cs @@ -180,7 +180,9 @@ public void ReplaceComponent(int index, IComponent component) { } void replaceComponent(int index, IComponent replacement) { - _toStringCache = null; + // TODO VD PERFORMANCE + // _toStringCache = null; + var previousComponent = _components[index]; if (replacement != previousComponent) { _components[index] = replacement; @@ -193,6 +195,10 @@ void replaceComponent(int index, IComponent replacement) { } } else { _componentIndicesCache = null; + + // TODO VD PERFORMANCE + _toStringCache = null; + if (OnComponentRemoved != null) { OnComponentRemoved(this, index, previousComponent); } @@ -347,7 +353,9 @@ public IComponent CreateComponent(int index, Type type) { /// release it manually at some point. public void Retain(object owner) { _aerc.Retain(owner); - _toStringCache = null; + + // TODO VD PERFORMANCE + // _toStringCache = null; } /// Releases the entity. An owner can only release an entity @@ -358,7 +366,9 @@ public void Retain(object owner) { /// release it manually at some point. public void Release(object owner) { _aerc.Release(owner); - _toStringCache = null; + + // TODO VD PERFORMANCE + // _toStringCache = null; if (_aerc.retainCount == 0) { if (OnEntityReleased != null) { @@ -406,9 +416,12 @@ public override string ToString() { _toStringBuilder .Append("Entity_") .Append(_creationIndex) - .Append("(*") - .Append(retainCount) - .Append(")") + + // TODO VD PERFORMANCE +// .Append("(*") +// .Append(retainCount) +// .Append(")") + .Append("("); const string separator = ", "; @@ -417,13 +430,19 @@ public override string ToString() { for (int i = 0; i < components.Length; i++) { var component = components[i]; var type = component.GetType(); - var implementsToString = type.GetMethod("ToString") - .DeclaringType.ImplementsInterface(); - _toStringBuilder.Append( - implementsToString - ? component.ToString() - : type.ToCompilableString().RemoveComponentSuffix() - ); + + // TODO VD PERFORMANCE + _toStringCache = null; + +// var implementsToString = type.GetMethod("ToString") +// .DeclaringType.ImplementsInterface(); +// _toStringBuilder.Append( +// implementsToString +// ? component.ToString() +// : type.ToCompilableString().RemoveComponentSuffix() +// ); + + _toStringBuilder.Append(component.ToString()); if (i < lastSeparator) { _toStringBuilder.Append(separator); From abd436fd5c5c5360719e105896157b49f4145652 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 24 Oct 2018 23:08:25 +0200 Subject: [PATCH 25/27] Add object pool for EntityBehaviour --- .../EntitasHierarchyIcon.cs | 17 +++++++--- .../ContextObserver/ContextObserver.cs | 8 +++-- .../Entity/EntityBehaviour.cs | 14 ++++++-- .../EntityStressTestController.cs | 34 ++++++++++++++----- 4 files changed, 56 insertions(+), 17 deletions(-) diff --git a/Addons/Entitas.VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/EntitasHierarchyIcon.cs b/Addons/Entitas.VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/EntitasHierarchyIcon.cs index 54913bfce..9a7526e74 100644 --- a/Addons/Entitas.VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/EntitasHierarchyIcon.cs +++ b/Addons/Entitas.VisualDebugging.Unity.Editor/Entitas.VisualDebugging.Unity.Editor/EntitasHierarchyIcon.cs @@ -92,22 +92,29 @@ static void onHierarchyWindowItemOnGUI(int instanceID, Rect selectionRect) { var rect = new Rect(selectionRect.x + selectionRect.width - iconOffset, selectionRect.y, iconSize, iconSize); var contextObserver = gameObject.GetComponent(); - var entityBehaviour = gameObject.GetComponent(); - var debugSystemsBehaviour = gameObject.GetComponent(); - if (contextObserver != null) { if (contextObserver.contextObserver.context.retainedEntitiesCount != 0) { GUI.DrawTexture(rect, contextErrorHierarchyIcon); } else { GUI.DrawTexture(rect, contextHierarchyIcon); } - } else if (entityBehaviour != null) { + + return; + } + + var entityBehaviour = gameObject.GetComponent(); + if (entityBehaviour != null) { if (entityBehaviour.entity.isEnabled) { GUI.DrawTexture(rect, entityHierarchyIcon); } else { GUI.DrawTexture(rect, entityErrorHierarchyIcon); } - } else if (debugSystemsBehaviour != null) { + + return; + } + + var debugSystemsBehaviour = gameObject.GetComponent(); + if (debugSystemsBehaviour != null) { if (debugSystemsBehaviour.systems.executeDuration < _systemWarningThreshold) { GUI.DrawTexture(rect, systemsHierarchyIcon); } else { diff --git a/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/ContextObserver/ContextObserver.cs b/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/ContextObserver/ContextObserver.cs index fa359886c..b7312f375 100644 --- a/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/ContextObserver/ContextObserver.cs +++ b/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/ContextObserver/ContextObserver.cs @@ -13,6 +13,7 @@ public class ContextObserver { readonly IContext _context; readonly List _groups; readonly GameObject _gameObject; + readonly Stack _entityBehaviourPool = new Stack(); StringBuilder _toStringBuilder = new StringBuilder(); @@ -32,8 +33,11 @@ public void Deactivate() { } void onEntityCreated(IContext context, IEntity entity) { - var entityBehaviour = new GameObject().AddComponent(); - entityBehaviour.Init(context, entity); + var entityBehaviour = _entityBehaviourPool.Count > 0 + ? _entityBehaviourPool.Pop() + : new GameObject().AddComponent(); + + entityBehaviour.Init(context, entity, _entityBehaviourPool); entityBehaviour.transform.SetParent(_gameObject.transform, false); } diff --git a/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/Entity/EntityBehaviour.cs b/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/Entity/EntityBehaviour.cs index eebe89f0b..6842082be 100644 --- a/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/Entity/EntityBehaviour.cs +++ b/Addons/Entitas.VisualDebugging.Unity/Entitas.VisualDebugging.Unity/Entity/EntityBehaviour.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using UnityEngine; namespace Entitas.VisualDebugging.Unity { @@ -10,17 +11,26 @@ public class EntityBehaviour : MonoBehaviour { IContext _context; IEntity _entity; + Stack _entityBehaviourPool; string _cachedName; - public void Init(IContext context, IEntity entity) { + public void Init(IContext context, IEntity entity, Stack entityBehaviourPool) { _context = context; _entity = entity; + _entityBehaviourPool = entityBehaviourPool; _entity.OnEntityReleased += onEntityReleased; + gameObject.hideFlags = HideFlags.None; + gameObject.SetActive(true); Update(); } void onEntityReleased(IEntity e) { - gameObject.DestroyGameObject(); + _entity.OnEntityReleased -= onEntityReleased; + gameObject.SetActive(false); + gameObject.hideFlags = HideFlags.HideInHierarchy; + _entityBehaviourPool.Push(this); + _cachedName = null; + name = string.Empty; } void Update() { diff --git a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs index e711c6d14..33d74b7da 100644 --- a/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs +++ b/Tests/Unity/VisualDebugging/Assets/Tests/Manual Tests/Entity Stress Test/EntityStressTestController.cs @@ -6,23 +6,41 @@ public class EntityStressTestController : MonoBehaviour Contexts _contexts; + bool _flag; + void Start() { _contexts = Contexts.sharedInstance; - for (int i = 0; i < count; i++) - { - var e = _contexts.game.CreateEntity(); - e.AddMyInt(i); - e.AddMyString(i.ToString()); - } +// for (int i = 0; i < count; i++) +// { +// var e = _contexts.game.CreateEntity(); +// e.AddMyInt(i); +// e.AddMyString(i.ToString()); +// } } void Update() { - foreach (var e in _contexts.game.GetEntities()) +// foreach (var e in _contexts.game.GetEntities()) +// { +// e.ReplaceMyInt(e.myInt.myInt + 1); +// } + + if (Time.frameCount % 60 == 0) { - e.ReplaceMyInt(e.myInt.myInt + 1); + _flag = !_flag; + + if (_flag) + { + for (int i = 0; i < count; i++) + _contexts.game.CreateEntity().AddMyInt(i); + } + else + { + foreach (var e in _contexts.game.GetEntities()) + e.Destroy(); + } } } } From d2f167bdaf87567ac7d63a8b2c94a89eca687b52 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Thu, 25 Oct 2018 18:26:57 +0200 Subject: [PATCH 26/27] Update e.ToString() tests --- Entitas/Entitas/Entity/Entity.cs | 1 - Tests/Tests/Tests/Entitas/describe_Entity.cs | 26 ++++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Entitas/Entitas/Entity/Entity.cs b/Entitas/Entitas/Entity/Entity.cs index d5da530f2..cbe66af1d 100644 --- a/Entitas/Entitas/Entity/Entity.cs +++ b/Entitas/Entitas/Entity/Entity.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Text; -using DesperateDevs.Utils; namespace Entitas { diff --git a/Tests/Tests/Tests/Entitas/describe_Entity.cs b/Tests/Tests/Tests/Entitas/describe_Entity.cs index a302b9b12..48691695c 100644 --- a/Tests/Tests/Tests/Entitas/describe_Entity.cs +++ b/Tests/Tests/Tests/Entitas/describe_Entity.cs @@ -196,20 +196,20 @@ void when_created() { e.GetComponentIndices().should_be_empty(); }; - it["can ToString and removes *Component suffix"] = () => { + it["can ToString and doesn't removes *Component suffix"] = () => { e.AddComponent(0, new StandardComponent()); e.Retain(this); - e.ToString().should_be("Entity_0(*1)(Standard, ComponentA, ComponentB)"); + e.ToString().should_be("Entity_0(StandardComponent, ComponentA, ComponentB)"); }; it["uses component.ToString()"] = () => { e.AddComponent(0, new NameAgeComponent { name = "Max", age = 42 }); - e.ToString().should_be("Entity_0(*0)(NameAge(Max, 42), ComponentA, ComponentB)"); + e.ToString().should_be("Entity_0(NameAge(Max, 42), ComponentA, ComponentB)"); }; it["uses full component name with namespace if ToString is not implemented"] = () => { e.AddComponent(0, new MyNamespaceComponent()); - e.ToString().should_be("Entity_0(*0)(My.Namespace.MyNamespace, ComponentA, ComponentB)"); + e.ToString().should_be("Entity_0(My.Namespace.MyNamespaceComponent, ComponentA, ComponentB)"); }; }; }; @@ -586,9 +586,9 @@ void when_created() { e.ToString().should_not_be_same(cache); }; - it["updates cache when a component was replaced"] = () => { + it["doesn't update cache when a component was replaced"] = () => { e.ReplaceComponentA(new ComponentA()); - e.ToString().should_not_be_same(cache); + e.ToString().should_be_same(cache); }; it["updates cache when all components were removed"] = () => { @@ -596,24 +596,24 @@ void when_created() { e.ToString().should_not_be_same(cache); }; - it["updates cache when entity gets retained"] = () => { + it["doesn't update cache when entity gets retained"] = () => { e.Retain(this); - e.ToString().should_not_be_same(cache); + e.ToString().should_be_same(cache); }; - it["updates cache when entity gets released"] = () => { + it["doesn't update cache when entity gets released"] = () => { e.Retain(this); e.Retain(new object()); cache = e.ToString(); e.Release(this); - e.ToString().should_not_be_same(cache); + e.ToString().should_be_same(cache); }; - it["released entity has updated cache"] = () => { + it["released entity doesn't have updated cache"] = () => { e.Retain(this); cache = e.ToString(); - e.OnEntityReleased += (entity) => { - e.ToString().should_not_be_same(cache); + e.OnEntityReleased += entity => { + e.ToString().should_be_same(cache); }; e.Release(this); }; From 8b2c6f88a6023a833078395a8053eced48a82e07 Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Sat, 3 Nov 2018 22:14:58 +0100 Subject: [PATCH 27/27] Release 1.9.0 --- .bee/docs/html.doxyfile | 2 +- CHANGELOG.md | 12 ++++ Entitas/Entitas/version.txt | 2 +- .../DesperateDevs/DesperateDevs.Analytics.dll | Bin 6144 -> 6144 bytes ...eGeneration.CodeGenerator.Unity.Editor.dll | Bin 14848 -> 14848 bytes ...erateDevs.CodeGeneration.CodeGenerator.dll | Bin 16384 -> 16384 bytes .../DesperateDevs.CodeGeneration.Plugins.dll | Bin 13312 -> 13312 bytes ...erateDevs.CodeGeneration.Unity.Plugins.dll | Bin 8192 -> 8192 bytes .../DesperateDevs.CodeGeneration.dll | Bin 5632 -> 5632 bytes .../DesperateDevs/DesperateDevs.Logging.dll | Bin 6144 -> 6144 bytes .../DesperateDevs.Networking.dll | Bin 13312 -> 13312 bytes .../DesperateDevs.Serialization.dll | Bin 11776 -> 11776 bytes .../DesperateDevs.Unity.Editor.dll | Bin 15872 -> 15872 bytes .../DesperateDevs/DesperateDevs.Utils.dll | Bin 19456 -> 19456 bytes docs/_abstract_entity_index_8cs_source.html | 2 +- docs/_collection_extension_8cs_source.html | 2 +- docs/_collector_8cs_source.html | 2 +- ...ollector_context_extension_8cs_source.html | 2 +- docs/_collector_exception_8cs_source.html | 2 +- docs/_context_8cs_source.html | 32 +++++----- ...t_contain_entity_exception_8cs_source.html | 2 +- ...es_already_exist_exception_8cs_source.html | 2 +- ...x_does_not_exist_exception_8cs_source.html | 2 +- docs/_context_extension_8cs_source.html | 2 +- docs/_context_info_8cs_source.html | 2 +- docs/_context_info_exception_8cs_source.html | 2 +- ...etained_entities_exception_8cs_source.html | 4 +- docs/_entitas_cache_8cs_source.html | 2 +- docs/_entitas_exception_8cs_source.html | 2 +- docs/_entitas_resources_8cs_source.html | 4 +- .../_entitas_string_extension_8cs_source.html | 2 +- docs/_entity_8cs_source.html | 60 +++++++++--------- ...dy_has_component_exception_8cs_source.html | 2 +- ...t_have_component_exception_8cs_source.html | 2 +- .../_entity_equality_comparer_8cs_source.html | 2 +- docs/_entity_index_8cs_source.html | 2 +- docs/_entity_index_exception_8cs_source.html | 2 +- ...etained_by_owner_exception_8cs_source.html | 2 +- ...is_not_destroyed_exception_8cs_source.html | 2 +- ...y_is_not_enabled_exception_8cs_source.html | 2 +- ...etained_by_owner_exception_8cs_source.html | 2 +- docs/_group_8cs_source.html | 2 +- docs/_group_event_8cs_source.html | 2 +- docs/_group_extension_8cs_source.html | 2 +- ...up_single_entity_exception_8cs_source.html | 2 +- docs/_i_a_e_r_c_8cs_source.html | 2 +- docs/_i_all_of_matcher_8cs_source.html | 2 +- docs/_i_any_of_matcher_8cs_source.html | 2 +- docs/_i_cleanup_system_8cs_source.html | 2 +- docs/_i_collector_8cs_source.html | 2 +- docs/_i_component_8cs_source.html | 2 +- docs/_i_compound_matcher_8cs_source.html | 2 +- docs/_i_context_8cs_source.html | 2 +- docs/_i_contexts_8cs_source.html | 2 +- docs/_i_entity_8cs_source.html | 2 +- docs/_i_entity_index_8cs_source.html | 2 +- docs/_i_execute_system_8cs_source.html | 2 +- docs/_i_group_8cs_source.html | 2 +- docs/_i_initialize_system_8cs_source.html | 2 +- docs/_i_matcher_8cs_source.html | 2 +- docs/_i_none_of_matcher_8cs_source.html | 2 +- docs/_i_reactive_system_8cs_source.html | 2 +- docs/_i_system_8cs_source.html | 2 +- docs/_i_tear_down_system_8cs_source.html | 2 +- docs/_job_system_8cs_source.html | 2 +- docs/_matcher_8cs_source.html | 2 +- docs/_matcher_equals_8cs_source.html | 2 +- docs/_matcher_exception_8cs_source.html | 2 +- docs/_matcher_static_8cs_source.html | 2 +- docs/_matcher_to_string_8cs_source.html | 2 +- docs/_multi_reactive_system_8cs_source.html | 4 +- docs/_primary_entity_index_8cs_source.html | 2 +- ...mber_info_entity_extension_8cs_source.html | 2 +- docs/_reactive_system_8cs_source.html | 4 +- docs/_safe_a_e_r_c_8cs_source.html | 2 +- docs/_systems_8cs_source.html | 2 +- docs/_trigger_on_event_8cs_source.html | 2 +- ...on_event_matcher_extension_8cs_source.html | 2 +- docs/_unsafe_a_e_r_c_8cs_source.html | 2 +- docs/annotated.html | 2 +- ...tas_1_1_abstract_entity_index-members.html | 2 +- ...ass_entitas_1_1_abstract_entity_index.html | 2 +- ...itas_1_1_collection_extension-members.html | 2 +- ...lass_entitas_1_1_collection_extension.html | 2 +- docs/class_entitas_1_1_collector-members.html | 2 +- docs/class_entitas_1_1_collector.html | 2 +- ...1_collector_context_extension-members.html | 2 +- ...titas_1_1_collector_context_extension.html | 2 +- ...titas_1_1_collector_exception-members.html | 2 +- ...class_entitas_1_1_collector_exception.html | 2 +- docs/class_entitas_1_1_context-members.html | 6 +- docs/class_entitas_1_1_context.html | 54 ++++++++++------ docs/class_entitas_1_1_context.js | 4 +- ..._not_contain_entity_exception-members.html | 2 +- ...ext_does_not_contain_entity_exception.html | 2 +- ..._does_already_exist_exception-members.html | 2 +- ...ty_index_does_already_exist_exception.html | 2 +- ...ndex_does_not_exist_exception-members.html | 2 +- ...entity_index_does_not_exist_exception.html | 2 +- ...entitas_1_1_context_extension-members.html | 2 +- docs/class_entitas_1_1_context_extension.html | 2 +- ...lass_entitas_1_1_context_info-members.html | 2 +- docs/class_entitas_1_1_context_info.html | 2 +- ...as_1_1_context_info_exception-members.html | 2 +- ...ss_entitas_1_1_context_info_exception.html | 2 +- ...s_retained_entities_exception-members.html | 2 +- ...still_has_retained_entities_exception.html | 2 +- ...ass_entitas_1_1_entitas_cache-members.html | 2 +- docs/class_entitas_1_1_entitas_cache.html | 2 +- ...entitas_1_1_entitas_exception-members.html | 2 +- docs/class_entitas_1_1_entitas_exception.html | 2 +- ...entitas_1_1_entitas_resources-members.html | 2 +- docs/class_entitas_1_1_entitas_resources.html | 2 +- ..._1_1_entitas_string_extension-members.html | 2 +- ..._entitas_1_1_entitas_string_extension.html | 2 +- docs/class_entitas_1_1_entity-members.html | 2 +- docs/class_entitas_1_1_entity.html | 50 +++++++-------- ...ready_has_component_exception-members.html | 2 +- ...ntity_already_has_component_exception.html | 2 +- ..._not_have_component_exception-members.html | 2 +- ...ity_does_not_have_component_exception.html | 2 +- ..._1_1_entity_equality_comparer-members.html | 2 +- ..._entitas_1_1_entity_equality_comparer.html | 2 +- ...lass_entitas_1_1_entity_index-members.html | 2 +- docs/class_entitas_1_1_entity_index.html | 2 +- ...as_1_1_entity_index_exception-members.html | 2 +- ...ss_entitas_1_1_entity_index_exception.html | 2 +- ...y_retained_by_owner_exception-members.html | 2 +- ...s_already_retained_by_owner_exception.html | 2 +- ...ty_is_not_destroyed_exception-members.html | 2 +- ...1_1_entity_is_not_destroyed_exception.html | 2 +- ...tity_is_not_enabled_exception-members.html | 2 +- ...s_1_1_entity_is_not_enabled_exception.html | 2 +- ...t_retained_by_owner_exception-members.html | 2 +- ...ty_is_not_retained_by_owner_exception.html | 2 +- docs/class_entitas_1_1_group-members.html | 2 +- docs/class_entitas_1_1_group.html | 2 +- ...s_entitas_1_1_group_extension-members.html | 2 +- docs/class_entitas_1_1_group_extension.html | 2 +- ...group_single_entity_exception-members.html | 2 +- ...tas_1_1_group_single_entity_exception.html | 2 +- docs/class_entitas_1_1_job-members.html | 2 +- docs/class_entitas_1_1_job.html | 2 +- .../class_entitas_1_1_job_system-members.html | 2 +- docs/class_entitas_1_1_job_system.html | 2 +- docs/class_entitas_1_1_matcher.html | 2 +- ...entitas_1_1_matcher_exception-members.html | 2 +- docs/class_entitas_1_1_matcher_exception.html | 2 +- ...tas_1_1_multi_reactive_system-members.html | 2 +- ...ass_entitas_1_1_multi_reactive_system.html | 2 +- ...itas_1_1_primary_entity_index-members.html | 2 +- ...lass_entitas_1_1_primary_entity_index.html | 2 +- ..._member_info_entity_extension-members.html | 2 +- ...1_public_member_info_entity_extension.html | 2 +- ...s_entitas_1_1_reactive_system-members.html | 2 +- docs/class_entitas_1_1_reactive_system.html | 2 +- ...lass_entitas_1_1_safe_a_e_r_c-members.html | 2 +- docs/class_entitas_1_1_safe_a_e_r_c.html | 2 +- ...s_1_1_single_entity_exception-members.html | 2 +- ...s_entitas_1_1_single_entity_exception.html | 2 +- docs/class_entitas_1_1_systems-members.html | 2 +- docs/class_entitas_1_1_systems.html | 2 +- ...er_on_event_matcher_extension-members.html | 2 +- ..._1_trigger_on_event_matcher_extension.html | 2 +- ...ss_entitas_1_1_unsafe_a_e_r_c-members.html | 2 +- docs/class_entitas_1_1_unsafe_a_e_r_c.html | 2 +- docs/classes.html | 2 +- .../dir_18d0583636d1f7adc70f46fa7dc6fd22.html | 2 +- .../dir_1efbe5ff38eb8fbf4811d1cf1d3b68b8.html | 2 +- .../dir_2445fa600638ca0377a838c43b60c5d0.html | 2 +- .../dir_5543b9a49e90eab7737309dc8736a9ee.html | 2 +- .../dir_55c21c1f668bdbeef61d727804a0de12.html | 2 +- .../dir_5b9febb0a1643b31f73c828c94068ca9.html | 2 +- .../dir_9e7c286d682d7af5dbfd2e28444afa0c.html | 2 +- .../dir_aabce02430428d6c26c4e027d3d4d2b3.html | 2 +- .../dir_b3f9a997fe54a4a772f0ea0f564b8f92.html | 2 +- .../dir_b66aff62175c1fa76326b7c826193591.html | 2 +- .../dir_c24dc4174e7c7059cccc145355bad325.html | 2 +- .../dir_c99a51b1778bc6979b97974e60b03bb4.html | 2 +- .../dir_cc33cbba43a8be20769b8bcf8ee101fd.html | 2 +- .../dir_d865313b948675f0b99a1fc8314c30f0.html | 2 +- docs/files.html | 2 +- docs/functions.html | 4 +- docs/functions_evnt.html | 2 +- docs/functions_func.html | 4 +- docs/functions_prop.html | 2 +- docs/hierarchy.html | 2 +- docs/index.html | 2 +- ...terface_entitas_1_1_i_a_e_r_c-members.html | 2 +- docs/interface_entitas_1_1_i_a_e_r_c.html | 2 +- ..._entitas_1_1_i_all_of_matcher-members.html | 2 +- ...nterface_entitas_1_1_i_all_of_matcher.html | 2 +- ..._entitas_1_1_i_any_of_matcher-members.html | 2 +- ...nterface_entitas_1_1_i_any_of_matcher.html | 2 +- ..._entitas_1_1_i_cleanup_system-members.html | 2 +- ...nterface_entitas_1_1_i_cleanup_system.html | 2 +- docs/interface_entitas_1_1_i_collector.html | 2 +- docs/interface_entitas_1_1_i_component.html | 2 +- ...ntitas_1_1_i_compound_matcher-members.html | 2 +- ...erface_entitas_1_1_i_compound_matcher.html | 2 +- docs/interface_entitas_1_1_i_context.html | 2 +- ...erface_entitas_1_1_i_contexts-members.html | 2 +- docs/interface_entitas_1_1_i_contexts.html | 2 +- ...nterface_entitas_1_1_i_entity-members.html | 2 +- docs/interface_entitas_1_1_i_entity.html | 2 +- ...ce_entitas_1_1_i_entity_index-members.html | 2 +- .../interface_entitas_1_1_i_entity_index.html | 2 +- ..._entitas_1_1_i_execute_system-members.html | 2 +- ...nterface_entitas_1_1_i_execute_system.html | 2 +- docs/interface_entitas_1_1_i_group.html | 2 +- ...titas_1_1_i_initialize_system-members.html | 2 +- ...rface_entitas_1_1_i_initialize_system.html | 2 +- ...terface_entitas_1_1_i_matcher-members.html | 2 +- docs/interface_entitas_1_1_i_matcher.html | 2 +- ...entitas_1_1_i_none_of_matcher-members.html | 2 +- ...terface_entitas_1_1_i_none_of_matcher.html | 2 +- ...entitas_1_1_i_reactive_system-members.html | 2 +- ...terface_entitas_1_1_i_reactive_system.html | 2 +- docs/interface_entitas_1_1_i_system.html | 2 +- ...ntitas_1_1_i_tear_down_system-members.html | 2 +- ...erface_entitas_1_1_i_tear_down_system.html | 2 +- docs/namespace_entitas.html | 2 +- docs/namespaces.html | 2 +- docs/navtreeindex0.js | 4 +- docs/navtreeindex1.js | 2 +- docs/search/all_1.js | 2 +- docs/search/functions_1.js | 2 +- ..._entitas_1_1_trigger_on_event-members.html | 2 +- docs/struct_entitas_1_1_trigger_on_event.html | 2 +- tree.txt | 47 ++++++-------- 230 files changed, 359 insertions(+), 342 deletions(-) diff --git a/.bee/docs/html.doxyfile b/.bee/docs/html.doxyfile index ea6129f3c..44b1e9520 100644 --- a/.bee/docs/html.doxyfile +++ b/.bee/docs/html.doxyfile @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Entitas" -PROJECT_NUMBER = 1.8.2 +PROJECT_NUMBER = 1.9.0 PROJECT_BRIEF = "Entitas is a super fast Entity Component System (ECS) Framework specifically made for C# and Unity" PROJECT_LOGO = ".bee/docs/docs-logo.png" OUTPUT_DIRECTORY = "Build/docs" diff --git a/CHANGELOG.md b/CHANGELOG.md index f677db861..bfc009e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## [1.9.0] - 2018-11-03 +### Added +- Optimize generated code #780 + - This increases entity and component creation performance +- Optimize Visual Debugging performance #799 + - This increases the performance especially when having thousands of entities +- Generate XML documentation #792 +- Using latest bee + +### Changed +- Release retained entities when ReactiveSystem.Execute() has an exception #812 + - This fixes spamming the Unity console with error messages # 1.8.2 As always, the Unity Asset Store version might take a few days to be processed diff --git a/Entitas/Entitas/version.txt b/Entitas/Entitas/version.txt index 53adb84c8..f8e233b27 100644 --- a/Entitas/Entitas/version.txt +++ b/Entitas/Entitas/version.txt @@ -1 +1 @@ -1.8.2 +1.9.0 diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Analytics.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Analytics.dll index 80ad79c17bb617d38ba20d15296f07c1ada4e23a..9c959378bf747b1bffd1fcf7e8d26f5f26f796ae 100644 GIT binary patch delta 36 ucmV+<0Nek7Fn}RsP$_f%UY+;4cM`=^_1EwF z-s{(|f2NbHUX80);}ef+JMzwSZiwN`&X?!mcOGH}XM1ZfQ&cq%)Xxk;20C0w0)#67 z(3?^}Av>F$Wtj9*`Vby99K&nYOUgy1>xgtIK#)Bo0C;*BnWPj`m;Cfh*b!C25#AGe zv1JxS1C?_e(+O;k2EBwa-0RhY6NBk83KdI@r8lM-fZ+twBV>xe;Q7&j6L8GOmW+Mr z-g1({dNd?c%yU9AMVL|~o5H^uZaU%gND5Am`el+3CE0Z^EhK1}>Cx0hxy_@N%+}^u zGMg<6y6!gscaIt_N7}#28*prgrz^>ou9E)#@+``{Gmxfz3PyEXkLJmotxlfI8BvR@ z6v6t)ud+E2M^BGYV+JziQKsFFPSpWMj9HZG@djVp^tB-ummYLotr`)^2`7Eyu0${-!h(K1@!JE7$_m7pmdMV5g zpCzmbe@eJJ{5fHJ_)EgSg!%}#@Nad5FGQdBqg$Ift8*2}RU}uD9124}=_xoA;Kq2U z)=Z-S5W<9wIEe6G7ANdsBMFB~jT;VvT#kNWI1F$)goSmE`-Zo`H@)5WJqxG&ISL}3-3 zjbtC`k{woT4IB)eBvwVY3SbR6k7`+xQikW zWqf)aE*JF!&UW^om^i>rvDM;AIOa!|!8$Q%fc+jfipc|PE88rt8em_rr^VIqt{Rss ztpR>nOat^*Wn|rJ;SP94G(du0F3Fz67sM1O_t`(-6>$xW@mUS*6H{Tl&sN}@Vj9fw z+5ebejRUM$6YN@OR=(Wy(=VHTI?PMb2P-Fh6h33qVX>cPA8OhRc<>hkn=TvJ1nd0B z*Fn=R_sxXuzVB<8ug$z{Tr(W-eR2;3N5P(x4|^M8|OeaY`}7mx4I23X-9E6+{1ftl~R_& zOI9!5LXX48q~vs|EP+Ge^Vp$cI-s2Yh;P8jpvI2F1XHjj*rbIC=W1?-qz1E){Q-~b zal&Pyn?mJe2k6t0DD9Q_lwL=XuUm~Qg=ejqY@;fAiz@mgJgYBbrzx_Xu#|TY{x-Cp zHQ}|P$Jq|juZB__W3v~^!UuVz+|D<2b!y#ynp;zTJy<$=Lm~bed z`K;0pEBr*EhB9)v!l?>xQ@B>)ZiR0vJZDr=WCSk4H!vNCv)Sw(HceZswQHv|yv}J%idNWjAOe$eu}U1T<(@LmTPa zDdq+3uh2uhL3>-}0)89@^G#4jtw*D;P8&@9Pt+r{&>v-tue^0XLhmlc#owDidtD5SS~K<_bJtTZ>AO|YJ_8&gWN`Rn-ort zxlJ*buw{@t1>HGb-PkMgTjca}DDi!{PB|VLy8st?AB-)I^`1wDag6jUgAX^RN^gKToz15Ue0O}F| zlbcX>VHxtfnk5u+yrwLl3U9aNLA2W((6(hc9@Z9wZn3olRVA3)k{wo?#mp_5;TGpA zaVz|i==gjk)o;}H8x_oVCHsw3zfsF5S0bR6E;q&xY++VTTB6R`9tdcsfRMZ(?Y7(| zs(-@6GZvY^kWRy0Bp}xZ=v-oPAkCDPO-3k!EGNb6ptPkJvn`-=qN^mCH=?dN(BiJ7 ty`{B!E9(|n3ICr#`3J&8?_%9htnvc&7qj-nA2c>=Le{zJOYE!`{|8#fp;iC@ delta 3797 zcmZ8k3vg7`8UD_>=RS7t-ka>*BqWf{0|F9~U^Wj45eO6l1VKz3Bq+8rx@sz8P+%lV z*knL76|nIlKE@WT50KI-T?WSbD6NkY!CD`6M43uQK+Sv9*G*2Ceb+2V`58( zzNMqxCE4yuEu3eIn3)%|Dq5pv)Os`)@?X-c8bh6B6mH&P+;UAP2aIT_bF9p2jcAWq zQ7dY0>8RPcavYf=dMqrvFOHJ;(U?u$$6Q$ttQbE=cCdet$Rf){-xU2cYY{?l(2H!OO*g#6 zzt+2_;(fgo?U4@&>mnZ$J`p)V*d6&N;S2U4;Z|`*XBadG{j6Ah>O)@1flYP38&jkDZ9wSBoZgvCnVZEx|v zj}@f08Jark8eV6=7QZlzVfMJ#W!Si)L>e|)Z$y4;L~w7wjuLZlFvIfO!ut#tyXXo~ zBvyxBGh$dvTO!#%bjc1X){7VI!^A4-Xac?XTz@BJhVAB8Mk)3ywn6#E;h68N%*J8%H-4viDSj73mZ8U-GR$sf8_lW1Y#ZNXP8()}`~kBG zzgPV-rA^2A#Z1Sc%9N~oJ#NCo=5$2pv6AdTw%wcoFJSNEDf34d8L&D$XU@dvfURK% z%vq=l*mqp;=3!Q-2|gQ>lrJ;=x7+3{)s+Zu5_9wOqw~Iq; zt+K4bPUk3FMvueCWXag2r2{WVK4TkH%m$1T|6$MI?J)QsG076VgSBWO!mG5b6q%-5 zx%@UZppPP4ZXTdeIoMvhIufPc#U9dYDDqjSi6_``XBOY2ir%VFkw-L_?@h7$ z#4fFm8O|HpQ7qLz(pp%feNy|Ma+k7lhY7*t4Eot>vrI&kolI%5F9g|;1rR*bnlbE9PSxn9^ zhb(QHi!wYXT#U!Ngq0X1tVXWxq7G9C8;~TNlEM}e)3I0QXu*4WDaJrp6X{iXmtL_L zjuDQ+f6X1reo)~j3N$E$x zx3uOKq0x6ba6Do`D9x~6GJ#*(uM>)h#3c&r6+WqOox-0whsnFvdCLzK^-X?+?O-pk zci0)$&VRyv{sKS5PjOAF(B^3ET8Fkm>(TDf&S-g}TvUq=u|lj9cZ)~F4*zh`7`D^@ zvgjhVGd-eMXQ}&HEw-{d&`9_9Hq6HcY7bG{O~06~%7G^xKPu|9E0yJYi;AR<75~ zycUI1<6a8|Umb8${m*0z8~U7Zoi@j%T|w#@&srf_7`G`#G%S04AO;$9-| z)pIkO(ImZP{`lGi1zlY`LC&N;4f|4Ch0Jx!(Cm7CV>(#>&QRiF|*cQe-n^SYuvZ|Wqkb+r;I+~i&| zJ*7U)QrBvRSC}c54o9F=4JnBsrG7{$=R+|=N@7T<=aj1?qz0F37X&7`lQDIuL*fnx zbW?yWPgl1qSCS?)Y2Dmq7C4=Tq_>R9Rx(6e7cTL9%eBs;9Rk@G(?QWONI_g(=05{PPvH$=8 delta 36 scmZq3Xvmn*!Cd{Wdt>)RHG%CS_TLEh}C&onEo|j~ELl04zojivR!s diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.dll index 73e43045b0616b8744c1717b14919f6f278d319f..642d54ea72f4610a0e236fe44ab854c177b6d58b 100644 GIT binary patch delta 36 scmZqBY0#O_!90uq-p1~iJOVZIeHYy@f8o{M{bWaTsMfvBExa`x05RJT-2eap delta 36 scmZqBY0#O_!CdmLdt>)Y9)UkUJx;|3UU1+1>wd{>k?97TTX<_Y084fet^fc4 diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Logging.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Logging.dll index 0cefd3f717af29ad25372bdd0bb13467f852563b..1db03ed11e4ceb5eab7c5bed494371a5a0554fe8 100644 GIT binary patch delta 36 scmZoLXfT-2!90!s-p1}wet{m2oJ-~jeZF(II84jj;XSb+(6F<#B1{V~F%ZH4 delta 36 scmZpOX^5H7!Cd;TdtywX=i@{G=j+RZa;Gxz{M77!o+ delta 38 wcmV+>0NMY5m;r#80g#9TZtjb*i~T$h60r%@(V#^^hY}>F