diff --git a/.gitignore b/.gitignore index eb3cbdcd..5525b9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ +.DS_Store .vscode/c_cpp_properties.json .vscode/settings.json build/ +Builds/ +JuceLibraryCode/ # Prerequisites *.d diff --git a/jive_core/values/jive_Object.cpp b/jive_core/values/jive_Object.cpp index 06cde07b..e1d4f668 100644 --- a/jive_core/values/jive_Object.cpp +++ b/jive_core/values/jive_Object.cpp @@ -117,7 +117,7 @@ namespace jive replaceDynamicObjectsWithJiveObjects(*dynamicObject->getProperties().getVarPointerAt(i)); Object::ReferenceCountedPointer object = new Object{ std::move(*dynamicObject) }; - value = object; + value = object.get(); } if (auto* array = value.getArray()) @@ -156,7 +156,7 @@ namespace juce var VariantConverter::toVar(jive::Object::ReferenceCountedPointer object) { - return var{ object }; + return var{ object.get() }; } } // namespace juce diff --git a/runners/benchmarking/benchmarking.jucer b/runners/benchmarking/benchmarking.jucer new file mode 100644 index 00000000..44c97c2f --- /dev/null +++ b/runners/benchmarking/benchmarking.jucer @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/runners/demo-runner/CMakeLists.txt b/runners/demo-runner/CMakeLists.txt index 4895d5f8..f2f1cdd5 100644 --- a/runners/demo-runner/CMakeLists.txt +++ b/runners/demo-runner/CMakeLists.txt @@ -1,20 +1,15 @@ add_library(jive-demo INTERFACE) juce_add_binary_data(jive-demo-resources - HEADER_NAME "binary_data.h" NAMESPACE "binary_data" SOURCES resources/icons/back-small.svg resources/icons/build-large.svg - resources/icons/build-small.svg resources/icons/code-large.svg - resources/icons/code-small.svg resources/icons/layout-large.svg - resources/icons/layout-small.svg resources/icons/next-small.svg resources/icons/palette-large.svg - resources/icons/palette-small.svg resources/rubik-mono-one.ttf resources/rubik.ttf resources/source-code-pro.ttf diff --git a/runners/demo-runner/demo-app.jucer b/runners/demo-runner/demo-app.jucer new file mode 100644 index 00000000..8b253b01 --- /dev/null +++ b/runners/demo-runner/demo-app.jucer @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/runners/demo-runner/demo-plugin.jucer b/runners/demo-runner/demo-plugin.jucer new file mode 100644 index 00000000..05061d45 --- /dev/null +++ b/runners/demo-runner/demo-plugin.jucer @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/runners/demo-runner/resources/icons/build-small.svg b/runners/demo-runner/resources/icons/build-small.svg deleted file mode 100644 index fd4e410b..00000000 --- a/runners/demo-runner/resources/icons/build-small.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/runners/demo-runner/resources/icons/code-small.svg b/runners/demo-runner/resources/icons/code-small.svg deleted file mode 100644 index f27f21c4..00000000 --- a/runners/demo-runner/resources/icons/code-small.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/runners/demo-runner/resources/icons/layout-small.svg b/runners/demo-runner/resources/icons/layout-small.svg deleted file mode 100644 index 2a447d7e..00000000 --- a/runners/demo-runner/resources/icons/layout-small.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/runners/demo-runner/resources/icons/palette-small.svg b/runners/demo-runner/resources/icons/palette-small.svg deleted file mode 100644 index a85f472c..00000000 --- a/runners/demo-runner/resources/icons/palette-small.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/runners/demo-runner/source/jive_demo/gui/tokens/Typography.h b/runners/demo-runner/source/jive_demo/gui/tokens/Typography.h index c5558b54..1eb1f4c3 100644 --- a/runners/demo-runner/source/jive_demo/gui/tokens/Typography.h +++ b/runners/demo-runner/source/jive_demo/gui/tokens/Typography.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace jive_demo::typography diff --git a/runners/demo-runner/source/jive_demo/gui/views/Icons.h b/runners/demo-runner/source/jive_demo/gui/views/Icons.h index 7c12c82b..8505f845 100644 --- a/runners/demo-runner/source/jive_demo/gui/views/Icons.h +++ b/runners/demo-runner/source/jive_demo/gui/views/Icons.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include namespace jive_demo::icons @@ -13,35 +13,11 @@ namespace jive_demo::icons binary_data::backsmall_svgSize); } - // [[nodiscard]] static auto build() - // { - // return jive::parseXML(binary_data::buildsmall_svg, - // binary_data::buildsmall_svgSize); - // } - - // [[nodiscard]] static auto code() - // { - // return jive::parseXML(binary_data::codesmall_svg, - // binary_data::codesmall_svgSize); - // } - - // [[nodiscard]] static auto layout() - // { - // return jive::parseXML(binary_data::layoutsmall_svg, - // binary_data::layoutsmall_svgSize); - // } - [[nodiscard]] static auto next() { return jive::parseXML(binary_data::nextsmall_svg, binary_data::nextsmall_svgSize); } - - // [[nodiscard]] static auto palette() - // { - // return jive::parseXML(binary_data::palettesmall_svg, - // binary_data::palettesmall_svgSize); - // } } // namespace small namespace large diff --git a/runners/test-runner/test-runner.jucer b/runners/test-runner/test-runner.jucer new file mode 100644 index 00000000..104edb6a --- /dev/null +++ b/runners/test-runner/test-runner.jucer @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +