From 5a0b3927a33807cca4c77c40eb873f8a3b51b0b0 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 29 Apr 2023 19:07:11 +0100 Subject: Drop .hpp for header only things Half of them acquired a .cpp part anyway --- lib/cache.h | 2 +- lib/chronology.h | 5 ++ lib/chronology.hpp | 5 -- lib/collection.h | 131 +++++++++++++++++++++++++++++++++++++++ lib/collection.hpp | 131 --------------------------------------- lib/collections.h | 159 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/collections.hpp | 159 ------------------------------------------------ lib/embed-glsl.cpp.m4 | 2 +- lib/enumDetails.h | 143 +++++++++++++++++++++++++++++++++++++++++++ lib/enumDetails.hpp | 143 ------------------------------------------- lib/filesystem.h | 4 +- lib/geometricPlane.cpp | 2 +- lib/glArrays.h | 2 +- lib/glRef.h | 62 +++++++++++++++++++ lib/glRef.hpp | 62 ------------------- lib/gl_traits.h | 77 +++++++++++++++++++++++ lib/gl_traits.hpp | 77 ----------------------- lib/location.cpp | 2 +- lib/location.h | 14 +++++ lib/location.hpp | 14 ----- lib/persistence.h | 2 +- lib/ptr.h | 67 ++++++++++++++++++++ lib/ptr.hpp | 67 -------------------- lib/ray.cpp | 2 +- lib/ray.h | 17 ++++++ lib/ray.hpp | 17 ------ lib/sorting.h | 49 +++++++++++++++ lib/sorting.hpp | 49 --------------- lib/special_members.h | 29 +++++++++ lib/special_members.hpp | 29 --------- lib/stdTypeDefs.h | 45 ++++++++++++++ lib/stdTypeDefs.hpp | 45 -------------- lib/stream_support.h | 86 ++++++++++++++++++++++++++ lib/stream_support.hpp | 86 -------------------------- lib/strings.h | 13 ++++ lib/strings.hpp | 13 ---- lib/worker.h | 2 +- 37 files changed, 907 insertions(+), 907 deletions(-) create mode 100644 lib/chronology.h delete mode 100644 lib/chronology.hpp create mode 100644 lib/collection.h delete mode 100644 lib/collection.hpp create mode 100644 lib/collections.h delete mode 100644 lib/collections.hpp create mode 100644 lib/enumDetails.h delete mode 100644 lib/enumDetails.hpp create mode 100644 lib/glRef.h delete mode 100644 lib/glRef.hpp create mode 100644 lib/gl_traits.h delete mode 100644 lib/gl_traits.hpp create mode 100644 lib/location.h delete mode 100644 lib/location.hpp create mode 100644 lib/ptr.h delete mode 100644 lib/ptr.hpp create mode 100644 lib/ray.h delete mode 100644 lib/ray.hpp create mode 100644 lib/sorting.h delete mode 100644 lib/sorting.hpp create mode 100644 lib/special_members.h delete mode 100644 lib/special_members.hpp create mode 100644 lib/stdTypeDefs.h delete mode 100644 lib/stdTypeDefs.hpp create mode 100644 lib/stream_support.h delete mode 100644 lib/stream_support.hpp create mode 100644 lib/strings.h delete mode 100644 lib/strings.hpp (limited to 'lib') diff --git a/lib/cache.h b/lib/cache.h index 5ab9469..2c3975b 100644 --- a/lib/cache.h +++ b/lib/cache.h @@ -1,6 +1,6 @@ #pragma once -#include "special_members.hpp" +#include "special_members.h" #include #include #include diff --git a/lib/chronology.h b/lib/chronology.h new file mode 100644 index 0000000..1980116 --- /dev/null +++ b/lib/chronology.h @@ -0,0 +1,5 @@ +#pragma once + +#include + +using TickDuration = std::chrono::duration; diff --git a/lib/chronology.hpp b/lib/chronology.hpp deleted file mode 100644 index 1980116..0000000 --- a/lib/chronology.hpp +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -using TickDuration = std::chrono::duration; diff --git a/lib/collection.h b/lib/collection.h new file mode 100644 index 0000000..6802bcb --- /dev/null +++ b/lib/collection.h @@ -0,0 +1,131 @@ +#pragma once + +#include +#include +#include +#include +#include + +template class Collection { +public: + virtual ~Collection() = default; + + using Ptr = std::conditional_t, std::unique_ptr>; + using Objects = std::vector; + Objects objects; + + template + auto + create(Params &&... params) + requires std::is_base_of_v + { + if constexpr (shared) { + auto obj = std::make_shared(std::forward(params)...); + objects.emplace_back(obj); + return obj; + } + else { + return static_cast(objects.emplace_back(std::make_unique(std::forward(params)...)).get()); + } + } + + template + T * + find() + { + if (auto i = std::find_if(objects.begin(), objects.end(), + [](auto && o) { + return (dynamic_cast(o.get())); + }); + i != objects.end()) { + return static_cast(i->get()); + } + return nullptr; + } + + template + auto + findOrCreate(Params &&... params) + requires std::is_base_of_v + { + if (auto o = find()) { + return o; + } + return create(std::forward(params)...).get(); + } + + template + auto + apply(const auto & m, Params &&... params) const + { + return apply_internal(objects.begin(), objects.end(), m, std::forward(params)...); + } + + template + auto + rapply(const auto & m, Params &&... params) const + { + return apply_internal(objects.rbegin(), objects.rend(), m, std::forward(params)...); + } + + template + auto + applyOne(const auto & m, Params &&... params) const + { + return applyOne_internal(objects.begin(), objects.end(), m, std::forward(params)...); + } + + template + auto + rapplyOne(const auto & m, Params &&... params) const + { + return applyOne_internal(objects.rbegin(), objects.rend(), m, std::forward(params)...); + } + + template + auto + removeAll() + { + return std::erase_if(objects, [](auto && op) { + return dynamic_cast(op.get()); + }); + } + + auto + end() const + { + return objects.end(); + } + + auto + rend() const + { + return objects.rend(); + } + +protected: + template + auto + apply_internal(const auto begin, const auto end, const auto & m, Params &&... params) const + { + return std::count_if(begin, end, [&m, ¶ms...](auto && op) { + if (auto o = dynamic_cast(op.get())) { + std::invoke(m, o, std::forward(params)...); + return true; + } + return false; + }); + } + + template + auto + applyOne_internal(const auto begin, const auto end, const auto & m, Params &&... params) const + { + return std::find_if(begin, end, [&m, ¶ms...](auto && op) { + if (auto o = dynamic_cast(op.get())) { + return std::invoke(m, o, std::forward(params)...); + } + return false; + }); + } +}; diff --git a/lib/collection.hpp b/lib/collection.hpp deleted file mode 100644 index 6802bcb..0000000 --- a/lib/collection.hpp +++ /dev/null @@ -1,131 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include - -template class Collection { -public: - virtual ~Collection() = default; - - using Ptr = std::conditional_t, std::unique_ptr>; - using Objects = std::vector; - Objects objects; - - template - auto - create(Params &&... params) - requires std::is_base_of_v - { - if constexpr (shared) { - auto obj = std::make_shared(std::forward(params)...); - objects.emplace_back(obj); - return obj; - } - else { - return static_cast(objects.emplace_back(std::make_unique(std::forward(params)...)).get()); - } - } - - template - T * - find() - { - if (auto i = std::find_if(objects.begin(), objects.end(), - [](auto && o) { - return (dynamic_cast(o.get())); - }); - i != objects.end()) { - return static_cast(i->get()); - } - return nullptr; - } - - template - auto - findOrCreate(Params &&... params) - requires std::is_base_of_v - { - if (auto o = find()) { - return o; - } - return create(std::forward(params)...).get(); - } - - template - auto - apply(const auto & m, Params &&... params) const - { - return apply_internal(objects.begin(), objects.end(), m, std::forward(params)...); - } - - template - auto - rapply(const auto & m, Params &&... params) const - { - return apply_internal(objects.rbegin(), objects.rend(), m, std::forward(params)...); - } - - template - auto - applyOne(const auto & m, Params &&... params) const - { - return applyOne_internal(objects.begin(), objects.end(), m, std::forward(params)...); - } - - template - auto - rapplyOne(const auto & m, Params &&... params) const - { - return applyOne_internal(objects.rbegin(), objects.rend(), m, std::forward(params)...); - } - - template - auto - removeAll() - { - return std::erase_if(objects, [](auto && op) { - return dynamic_cast(op.get()); - }); - } - - auto - end() const - { - return objects.end(); - } - - auto - rend() const - { - return objects.rend(); - } - -protected: - template - auto - apply_internal(const auto begin, const auto end, const auto & m, Params &&... params) const - { - return std::count_if(begin, end, [&m, ¶ms...](auto && op) { - if (auto o = dynamic_cast(op.get())) { - std::invoke(m, o, std::forward(params)...); - return true; - } - return false; - }); - } - - template - auto - applyOne_internal(const auto begin, const auto end, const auto & m, Params &&... params) const - { - return std::find_if(begin, end, [&m, ¶ms...](auto && op) { - if (auto o = dynamic_cast(op.get())) { - return std::invoke(m, o, std::forward(params)...); - } - return false; - }); - } -}; diff --git a/lib/collections.h b/lib/collections.h new file mode 100644 index 0000000..8f5a43d --- /dev/null +++ b/lib/collections.h @@ -0,0 +1,159 @@ +#pragma once + +#include +#include +#include +#include +#include + +template +concept SequentialCollection = requires(T c) { + { + c.size() + } -> std::integral; + { + c.data() + } -> std::same_as; + }; +template +concept IterableCollection = std::is_same_v().begin()), decltype(std::declval().end())>; + +template +[[nodiscard]] constexpr std::array +operator+(const std::array & a, const std::array & b) +{ + std::array r; + auto out = r.begin(); + out = std::copy(a.begin(), a.end(), out); + std::copy(b.begin(), b.end(), out); + return r; +} + +template +[[nodiscard]] constexpr std::array, first * second> +operator*(const std::array & a, const std::array & b) +{ + std::array, first * second> r; + auto out = r.begin(); + for (const auto & ae : a) { + for (const auto & be : b) { + *out++ = {ae, be}; + } + } + return r; +} + +template +[[nodiscard]] constexpr auto +operator*(const std::array & in, auto && f) +{ + std::array out; + + for (auto outitr = out.begin(); const auto & v : in) { + *outitr++ = f(v); + } + return out; +} + +constexpr auto & +operator*=(IterableCollection auto & in, auto && f) +{ + for (auto & v : in) { + f(v); + } + return in; +} + +template typename C, typename... T> + requires IterableCollection> +[[nodiscard]] constexpr auto +operator*(const C & in, auto && f) +{ + C out; + if constexpr (requires { out.reserve(in.size()); }) { + out.reserve(in.size()); + } + + std::transform(in.begin(), in.end(), std::inserter(out, out.end()), f); + return out; +} + +template +[[nodiscard]] constexpr auto +operator*(const std::span in, auto && f) +{ + std::array())), N> out; + + std::transform(in.begin(), in.end(), out.begin(), f); + return out; +} + +template +[[nodiscard]] constexpr auto +operator*(const std::span in, auto && f) +{ + std::vector()))> out; + + out.reserve(in.size()); + std::transform(in.begin(), in.end(), std::inserter(out, out.end()), f); + return out; +} + +template +constexpr auto & +operator+=(std::vector & in, std::vector && src) +{ + in.reserve(in.size() + src.size()); + std::move(src.begin(), src.end(), std::back_inserter(in)); + return in; +} + +template +[[nodiscard]] constexpr auto +operator+(const std::vector & in, Vn && vn) +{ + auto out(in); + out.emplace_back(std::forward(vn)); + return out; +} + +template typename Direction = std::plus, typename T = unsigned int> +[[nodiscard]] static auto +vectorOfN(std::integral auto N, T start = {}, T step = 1) +{ + std::vector v; + v.resize(N); + std::generate_n(v.begin(), N, [&start, step, adj = Direction {}]() { + return std::exchange(start, adj(start, step)); + }); + return v; +} + +template typename Rtn = std::vector, IterableCollection In> +[[nodiscard]] auto +materializeRange(In && in) +{ + return Rtn(in.begin(), in.end()); +} + +template typename Rtn = std::vector, typename In> +[[nodiscard]] auto +materializeRange(const std::pair & in) +{ + return Rtn(in.first, in.second); +} + +template struct pair_range { + constexpr auto & + begin() const noexcept + { + return pair.first; + } + constexpr auto & + end() const noexcept + { + return pair.second; + } + const std::pair & pair; +}; +template pair_range(std::pair) -> pair_range; diff --git a/lib/collections.hpp b/lib/collections.hpp deleted file mode 100644 index 8f5a43d..0000000 --- a/lib/collections.hpp +++ /dev/null @@ -1,159 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include - -template -concept SequentialCollection = requires(T c) { - { - c.size() - } -> std::integral; - { - c.data() - } -> std::same_as; - }; -template -concept IterableCollection = std::is_same_v().begin()), decltype(std::declval().end())>; - -template -[[nodiscard]] constexpr std::array -operator+(const std::array & a, const std::array & b) -{ - std::array r; - auto out = r.begin(); - out = std::copy(a.begin(), a.end(), out); - std::copy(b.begin(), b.end(), out); - return r; -} - -template -[[nodiscard]] constexpr std::array, first * second> -operator*(const std::array & a, const std::array & b) -{ - std::array, first * second> r; - auto out = r.begin(); - for (const auto & ae : a) { - for (const auto & be : b) { - *out++ = {ae, be}; - } - } - return r; -} - -template -[[nodiscard]] constexpr auto -operator*(const std::array & in, auto && f) -{ - std::array out; - - for (auto outitr = out.begin(); const auto & v : in) { - *outitr++ = f(v); - } - return out; -} - -constexpr auto & -operator*=(IterableCollection auto & in, auto && f) -{ - for (auto & v : in) { - f(v); - } - return in; -} - -template typename C, typename... T> - requires IterableCollection> -[[nodiscard]] constexpr auto -operator*(const C & in, auto && f) -{ - C out; - if constexpr (requires { out.reserve(in.size()); }) { - out.reserve(in.size()); - } - - std::transform(in.begin(), in.end(), std::inserter(out, out.end()), f); - return out; -} - -template -[[nodiscard]] constexpr auto -operator*(const std::span in, auto && f) -{ - std::array())), N> out; - - std::transform(in.begin(), in.end(), out.begin(), f); - return out; -} - -template -[[nodiscard]] constexpr auto -operator*(const std::span in, auto && f) -{ - std::vector()))> out; - - out.reserve(in.size()); - std::transform(in.begin(), in.end(), std::inserter(out, out.end()), f); - return out; -} - -template -constexpr auto & -operator+=(std::vector & in, std::vector && src) -{ - in.reserve(in.size() + src.size()); - std::move(src.begin(), src.end(), std::back_inserter(in)); - return in; -} - -template -[[nodiscard]] constexpr auto -operator+(const std::vector & in, Vn && vn) -{ - auto out(in); - out.emplace_back(std::forward(vn)); - return out; -} - -template typename Direction = std::plus, typename T = unsigned int> -[[nodiscard]] static auto -vectorOfN(std::integral auto N, T start = {}, T step = 1) -{ - std::vector v; - v.resize(N); - std::generate_n(v.begin(), N, [&start, step, adj = Direction {}]() { - return std::exchange(start, adj(start, step)); - }); - return v; -} - -template typename Rtn = std::vector, IterableCollection In> -[[nodiscard]] auto -materializeRange(In && in) -{ - return Rtn(in.begin(), in.end()); -} - -template typename Rtn = std::vector, typename In> -[[nodiscard]] auto -materializeRange(const std::pair & in) -{ - return Rtn(in.first, in.second); -} - -template struct pair_range { - constexpr auto & - begin() const noexcept - { - return pair.first; - } - constexpr auto & - end() const noexcept - { - return pair.second; - } - const std::pair & pair; -}; -template pair_range(std::pair) -> pair_range; diff --git a/lib/embed-glsl.cpp.m4 b/lib/embed-glsl.cpp.m4 index 5b25e0a..3503f75 100644 --- a/lib/embed-glsl.cpp.m4 +++ b/lib/embed-glsl.cpp.m4 @@ -3,7 +3,7 @@ changecom()dnl #include "substr(TYPE,1)-NAME.h" #include #include "gfx/gl/shader.h" -#include "lib/strings.hpp" +#include "lib/strings.h" constexpr const GLchar * src { R"GLSL-EMBED(dnl include(SOURCE))GLSL-EMBED" }; diff --git a/lib/enumDetails.h b/lib/enumDetails.h new file mode 100644 index 0000000..5966be2 --- /dev/null +++ b/lib/enumDetails.h @@ -0,0 +1,143 @@ +#pragma once + +#include +#include +#include +#include +#include + +/// EnumDetailsBase +// Shared helpers +struct EnumDetailsBase { + template + constexpr static auto + strArr(auto input, auto start, auto end) + { + std::array out; + input.copy(out.begin(), end - start, start); + return out; + } +}; + +/// EnumTypeDetails +// Extracts the fully qualified name of the enumeration +template struct EnumTypeDetails : EnumDetailsBase { +#ifndef ENUM_PROBE +protected: +#endif + constexpr static std::string_view SEARCH_TYPE {"E = "}; + constexpr static auto + typeraw() + { + return std::string_view {__PRETTY_FUNCTION__}; + }; + constexpr static auto typeNameStart {typeraw().find(SEARCH_TYPE) + SEARCH_TYPE.length()}; + constexpr static auto typeNameEnd {typeraw().find_first_of("];", typeNameStart)}; + constexpr static auto typeNameLen {typeNameEnd - typeNameStart}; + constexpr static auto typeNameArr {strArr(typeraw(), typeNameStart, typeNameEnd)}; + +public: + constexpr static std::string_view typeName {typeNameArr.data(), typeNameArr.size()}; +}; + +/// EnumValueDetails +// Extracts the value name and constructs string_views of the parts +template struct EnumValueDetails : public EnumTypeDetails { +#ifndef ENUM_PROBE +private: +#endif + using T = EnumTypeDetails; + constexpr static auto + raw() + { + return std::string_view {__PRETTY_FUNCTION__}; + }; + constexpr static auto nameStart {raw().find_last_of(": ") + 1}; + constexpr static auto nameEnd {raw().find_first_of("];", nameStart)}; + constexpr static auto nameLen {nameEnd - nameStart}; + constexpr static auto nameArr {EnumValueDetails::template strArr(raw(), nameStart, nameEnd)}; + +public: + constexpr static std::string_view valueName {nameArr.data(), nameArr.size()}; + constexpr static auto valid {valueName.back() < '0' || valueName.back() > '9'}; + constexpr static auto raw_value {value}; +}; + +/// EnumValueCollection +// Customisation point for specifying the range of underlying values your enum can have +template struct EnumValueCollection { + using Vs = std::make_integer_sequence; +}; + +/// EnumDetails +// Interface for lookups/checks/etc at runtime +template struct EnumDetails { +#ifndef ENUM_PROBE +private: +#endif + template + constexpr static auto + get_valids(std::integer_sequence) + { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wconversion" + return std::array {EnumValueDetails(n)>::valid...}; +#pragma GCC diagnostic pop + } + template + constexpr static auto + get_values(std::integer_sequence) + { + return std::array {EnumValueDetails(n)>::raw_value...}; + } + template + constexpr static auto + get_valueNames(std::integer_sequence) + { + return std::array {EnumValueDetails::valueName...}; + } + + using EVC = EnumValueCollection; + constexpr static auto valid_flags {get_valids(typename EVC::Vs {})}; + constexpr static auto valid_count {std::count_if(valid_flags.begin(), valid_flags.end(), std::identity {})}; + + constexpr static auto + lookup(const auto key, const auto & search, const auto & out) + -> std::optional::value_type> + { + if (const auto itr = std::find(search.begin(), search.end(), key); itr != search.end()) { + return out[static_cast(std::distance(search.begin(), itr))]; + } + return std::nullopt; + } + +public: + constexpr static auto values {[]() { + constexpr auto values {get_values(typename EVC::Vs {})}; + static_assert(std::is_sorted(values.begin(), values.end()), "Candidate values must be sorted"); + std::array out; + std::copy_if(values.begin(), values.end(), out.begin(), [valid = valid_flags.begin()](auto) mutable { + return *valid++; + }); + return out; + }()}; + constexpr static auto names {get_valueNames(std::make_integer_sequence {})}; + + constexpr static bool + is_valid(E value) noexcept + { + return std::binary_search(values.begin(), values.end(), value); + } + + constexpr static std::optional + parse(std::string_view name) noexcept + { + return lookup(name, names, values); + } + + constexpr static std::optional + to_string(E value) noexcept + { + return lookup(value, values, names); + } +}; diff --git a/lib/enumDetails.hpp b/lib/enumDetails.hpp deleted file mode 100644 index 5966be2..0000000 --- a/lib/enumDetails.hpp +++ /dev/null @@ -1,143 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include - -/// EnumDetailsBase -// Shared helpers -struct EnumDetailsBase { - template - constexpr static auto - strArr(auto input, auto start, auto end) - { - std::array out; - input.copy(out.begin(), end - start, start); - return out; - } -}; - -/// EnumTypeDetails -// Extracts the fully qualified name of the enumeration -template struct EnumTypeDetails : EnumDetailsBase { -#ifndef ENUM_PROBE -protected: -#endif - constexpr static std::string_view SEARCH_TYPE {"E = "}; - constexpr static auto - typeraw() - { - return std::string_view {__PRETTY_FUNCTION__}; - }; - constexpr static auto typeNameStart {typeraw().find(SEARCH_TYPE) + SEARCH_TYPE.length()}; - constexpr static auto typeNameEnd {typeraw().find_first_of("];", typeNameStart)}; - constexpr static auto typeNameLen {typeNameEnd - typeNameStart}; - constexpr static auto typeNameArr {strArr(typeraw(), typeNameStart, typeNameEnd)}; - -public: - constexpr static std::string_view typeName {typeNameArr.data(), typeNameArr.size()}; -}; - -/// EnumValueDetails -// Extracts the value name and constructs string_views of the parts -template struct EnumValueDetails : public EnumTypeDetails { -#ifndef ENUM_PROBE -private: -#endif - using T = EnumTypeDetails; - constexpr static auto - raw() - { - return std::string_view {__PRETTY_FUNCTION__}; - }; - constexpr static auto nameStart {raw().find_last_of(": ") + 1}; - constexpr static auto nameEnd {raw().find_first_of("];", nameStart)}; - constexpr static auto nameLen {nameEnd - nameStart}; - constexpr static auto nameArr {EnumValueDetails::template strArr(raw(), nameStart, nameEnd)}; - -public: - constexpr static std::string_view valueName {nameArr.data(), nameArr.size()}; - constexpr static auto valid {valueName.back() < '0' || valueName.back() > '9'}; - constexpr static auto raw_value {value}; -}; - -/// EnumValueCollection -// Customisation point for specifying the range of underlying values your enum can have -template struct EnumValueCollection { - using Vs = std::make_integer_sequence; -}; - -/// EnumDetails -// Interface for lookups/checks/etc at runtime -template struct EnumDetails { -#ifndef ENUM_PROBE -private: -#endif - template - constexpr static auto - get_valids(std::integer_sequence) - { -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wconversion" - return std::array {EnumValueDetails(n)>::valid...}; -#pragma GCC diagnostic pop - } - template - constexpr static auto - get_values(std::integer_sequence) - { - return std::array {EnumValueDetails(n)>::raw_value...}; - } - template - constexpr static auto - get_valueNames(std::integer_sequence) - { - return std::array {EnumValueDetails::valueName...}; - } - - using EVC = EnumValueCollection; - constexpr static auto valid_flags {get_valids(typename EVC::Vs {})}; - constexpr static auto valid_count {std::count_if(valid_flags.begin(), valid_flags.end(), std::identity {})}; - - constexpr static auto - lookup(const auto key, const auto & search, const auto & out) - -> std::optional::value_type> - { - if (const auto itr = std::find(search.begin(), search.end(), key); itr != search.end()) { - return out[static_cast(std::distance(search.begin(), itr))]; - } - return std::nullopt; - } - -public: - constexpr static auto values {[]() { - constexpr auto values {get_values(typename EVC::Vs {})}; - static_assert(std::is_sorted(values.begin(), values.end()), "Candidate values must be sorted"); - std::array out; - std::copy_if(values.begin(), values.end(), out.begin(), [valid = valid_flags.begin()](auto) mutable { - return *valid++; - }); - return out; - }()}; - constexpr static auto names {get_valueNames(std::make_integer_sequence {})}; - - constexpr static bool - is_valid(E value) noexcept - { - return std::binary_search(values.begin(), values.end(), value); - } - - constexpr static std::optional - parse(std::string_view name) noexcept - { - return lookup(name, names, values); - } - - constexpr static std::optional - to_string(E value) noexcept - { - return lookup(value, values, names); - } -}; diff --git a/lib/filesystem.h b/lib/filesystem.h index 5315183..b076f43 100644 --- a/lib/filesystem.h +++ b/lib/filesystem.h @@ -1,7 +1,7 @@ #pragma once -#include "ptr.hpp" -#include "special_members.hpp" +#include "ptr.h" +#include "special_members.h" #include #include #include diff --git a/lib/geometricPlane.cpp b/lib/geometricPlane.cpp index 71216c1..ea4f02d 100644 --- a/lib/geometricPlane.cpp +++ b/lib/geometricPlane.cpp @@ -1,5 +1,5 @@ #include "geometricPlane.h" -#include "ray.hpp" +#include "ray.h" #include #include diff --git a/lib/glArrays.h b/lib/glArrays.h index 42f1d0f..8c8c0bc 100644 --- a/lib/glArrays.h +++ b/lib/glArrays.h @@ -4,7 +4,7 @@ #include // IWYU pragma: keep #include #include -#include +#include template class glArraysBase { static_assert(N > 0); diff --git a/lib/glRef.h b/lib/glRef.h new file mode 100644 index 0000000..3031cf5 --- /dev/null +++ b/lib/glRef.h @@ -0,0 +1,62 @@ +#pragma once + +#include +#include + +template class glRef { +public: + // cppcheck-suppress redundantPointerOp + template explicit glRef(Args &&... args) : id {(*get)(fixed..., std::forward(args)...)} + { + if (!id) { + throw std::runtime_error("Get function failed"); + } + } + + glRef(glRef && other) : id {other.id} + { + other.id = {}; + } + + ~glRef() + { + if (id) { + // cppcheck-suppress redundantPointerOp + (*release)(id); + } + } + + NO_COPY(glRef); + + const auto & + operator=(glRef && other) + { + if (id) { + // cppcheck-suppress redundantPointerOp + (*release)(id); + } + id = other.id; + other.id = {}; + return *this; + } + + auto + operator*() const + { + return id; + } + + auto + operator->() const + { + return id; + } + + operator IdType() const + { + return id; + } + +private: + IdType id; +}; diff --git a/lib/glRef.hpp b/lib/glRef.hpp deleted file mode 100644 index 1ab239d..0000000 --- a/lib/glRef.hpp +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include -#include - -template class glRef { -public: - // cppcheck-suppress redundantPointerOp - template explicit glRef(Args &&... args) : id {(*get)(fixed..., std::forward(args)...)} - { - if (!id) { - throw std::runtime_error("Get function failed"); - } - } - - glRef(glRef && other) : id {other.id} - { - other.id = {}; - } - - ~glRef() - { - if (id) { - // cppcheck-suppress redundantPointerOp - (*release)(id); - } - } - - NO_COPY(glRef); - - const auto & - operator=(glRef && other) - { - if (id) { - // cppcheck-suppress redundantPointerOp - (*release)(id); - } - id = other.id; - other.id = {}; - return *this; - } - - auto - operator*() const - { - return id; - } - - auto - operator->() const - { - return id; - } - - operator IdType() const - { - return id; - } - -private: - IdType id; -}; diff --git a/lib/gl_traits.h b/lib/gl_traits.h new file mode 100644 index 0000000..6ff8905 --- /dev/null +++ b/lib/gl_traits.h @@ -0,0 +1,77 @@ +#pragma once + +#include +#include +#include +#include + +template struct gl_traits; +struct gl_traits_base { + static constexpr GLint size {1}; +}; +struct gl_traits_float : public gl_traits_base { + static constexpr auto vertexAttribFunc { + [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { + glVertexAttribPointer(index, size, type, GL_FALSE, stride, pointer); + return 1; + }}; +}; +struct gl_traits_longfloat : public gl_traits_base { + static constexpr auto vertexAttribFunc { + [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { + glVertexAttribLPointer(index, size, type, stride, pointer); + return 1; + }}; +}; +struct gl_traits_integer : public gl_traits_base { + static constexpr auto vertexAttribFunc { + [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { + glVertexAttribIPointer(index, size, type, stride, pointer); + return 1; + }}; +}; +template<> struct gl_traits : public gl_traits_float { + static constexpr GLenum type {GL_FLOAT}; +}; +template<> struct gl_traits : public gl_traits_longfloat { + static constexpr GLenum type {GL_DOUBLE}; +}; +template<> struct gl_traits : public gl_traits_integer { + static constexpr GLenum type {GL_BYTE}; +}; +template<> struct gl_traits : public gl_traits_integer { + static constexpr GLenum type {GL_SHORT}; +}; +template<> struct gl_traits : public gl_traits_integer { + static constexpr GLenum type {GL_INT}; +}; +template<> struct gl_traits : public gl_traits_integer { + static constexpr GLenum type {GL_UNSIGNED_BYTE}; +}; +template<> struct gl_traits : public gl_traits_integer { + static constexpr GLenum type {GL_UNSIGNED_SHORT}; +}; +template<> struct gl_traits : public gl_traits_integer { + static constexpr GLenum type {GL_UNSIGNED_INT}; +}; + +template struct gl_traits> : public gl_traits { + static constexpr GLint size {S * gl_traits::size}; +}; + +template struct gl_traits> : public gl_traits { + static constexpr GLint size {L}; +}; + +template +struct gl_traits> : public gl_traits { + static constexpr GLint size {C * R}; + static constexpr auto vertexAttribFunc { + [](GLuint index, GLint, GLenum type, GLsizei stride, const void * pointer) -> GLuint { + const auto base = static_cast(pointer); + for (GLuint r = 0; r < R; r++) { + glVertexAttribPointer(index + r, C, type, GL_FALSE, stride, base + (r * C)); + } + return R; + }}; +}; diff --git a/lib/gl_traits.hpp b/lib/gl_traits.hpp deleted file mode 100644 index 6ff8905..0000000 --- a/lib/gl_traits.hpp +++ /dev/null @@ -1,77 +0,0 @@ -#pragma once - -#include -#include -#include -#include - -template struct gl_traits; -struct gl_traits_base { - static constexpr GLint size {1}; -}; -struct gl_traits_float : public gl_traits_base { - static constexpr auto vertexAttribFunc { - [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { - glVertexAttribPointer(index, size, type, GL_FALSE, stride, pointer); - return 1; - }}; -}; -struct gl_traits_longfloat : public gl_traits_base { - static constexpr auto vertexAttribFunc { - [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { - glVertexAttribLPointer(index, size, type, stride, pointer); - return 1; - }}; -}; -struct gl_traits_integer : public gl_traits_base { - static constexpr auto vertexAttribFunc { - [](GLuint index, GLint size, GLenum type, GLsizei stride, const void * pointer) -> GLuint { - glVertexAttribIPointer(index, size, type, stride, pointer); - return 1; - }}; -}; -template<> struct gl_traits : public gl_traits_float { - static constexpr GLenum type {GL_FLOAT}; -}; -template<> struct gl_traits : public gl_traits_longfloat { - static constexpr GLenum type {GL_DOUBLE}; -}; -template<> struct gl_traits : public gl_traits_integer { - static constexpr GLenum type {GL_BYTE}; -}; -template<> struct gl_traits : public gl_traits_integer { - static constexpr GLenum type {GL_SHORT}; -}; -template<> struct gl_traits : public gl_traits_integer { - static constexpr GLenum type {GL_INT}; -}; -template<> struct gl_traits : public gl_traits_integer { - static constexpr GLenum type {GL_UNSIGNED_BYTE}; -}; -template<> struct gl_traits : public gl_traits_integer { - static constexpr GLenum type {GL_UNSIGNED_SHORT}; -}; -template<> struct gl_traits : public gl_traits_integer { - static constexpr GLenum type {GL_UNSIGNED_INT}; -}; - -template struct gl_traits> : public gl_traits { - static constexpr GLint size {S * gl_traits::size}; -}; - -template struct gl_traits> : public gl_traits { - static constexpr GLint size {L}; -}; - -template -struct gl_traits> : public gl_traits { - static constexpr GLint size {C * R}; - static constexpr auto vertexAttribFunc { - [](GLuint index, GLint, GLenum type, GLsizei stride, const void * pointer) -> GLuint { - const auto base = static_cast(pointer); - for (GLuint r = 0; r < R; r++) { - glVertexAttribPointer(index + r, C, type, GL_FALSE, stride, base + (r * C)); - } - return R; - }}; -}; diff --git a/lib/location.cpp b/lib/location.cpp index bff27a2..732dd6d 100644 --- a/lib/location.cpp +++ b/lib/location.cpp @@ -1,4 +1,4 @@ -#include "location.hpp" +#include "location.h" #include "maths.h" #include diff --git a/lib/location.h b/lib/location.h new file mode 100644 index 0000000..078f5d3 --- /dev/null +++ b/lib/location.h @@ -0,0 +1,14 @@ +#pragma once + +#include +#include + +class Location { +public: + explicit Location(glm::vec3 pos = {}, glm::vec3 rot = {}) : pos {pos}, rot {rot} { } + + glm::mat4 getTransform() const; + + glm::vec3 pos; + glm::vec3 rot; +}; diff --git a/lib/location.hpp b/lib/location.hpp deleted file mode 100644 index 078f5d3..0000000 --- a/lib/location.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include -#include - -class Location { -public: - explicit Location(glm::vec3 pos = {}, glm::vec3 rot = {}) : pos {pos}, rot {rot} { } - - glm::mat4 getTransform() const; - - glm::vec3 pos; - glm::vec3 rot; -}; diff --git a/lib/persistence.h b/lib/persistence.h index cc2e4e5..5d71d4c 100644 --- a/lib/persistence.h +++ b/lib/persistence.h @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/ptr.h b/lib/ptr.h new file mode 100644 index 0000000..b7d15a1 --- /dev/null +++ b/lib/ptr.h @@ -0,0 +1,67 @@ +#pragma once + +#include +#include + +template class wrapped_ptr { +public: + template + explicit wrapped_ptr(Obj * (*factory)(Params...), Args &&... args) : obj {factory(std::forward(args)...)} + { + } + + explicit wrapped_ptr(wrapped_ptr && p) : obj {p.obj} + { + p.obj = nullptr; + } + + ~wrapped_ptr() + { + if (obj) { + Destroy(obj); + } + } + + NO_COPY(wrapped_ptr); + + wrapped_ptr & + operator=(wrapped_ptr && p) + { + if (obj) { + Destroy(obj); + } + obj = p.obj; + p.obj = nullptr; + return *this; + } + + [[nodiscard]] inline + operator Obj *() const noexcept + { + return obj; + } + + [[nodiscard]] inline auto + operator->() const noexcept + { + return obj; + } + + [[nodiscard]] inline auto + get() const noexcept + { + return obj; + } + +protected: + explicit wrapped_ptr(Obj * o) : obj {o} { } + Obj * obj; +}; + +template class wrapped_ptrt : public wrapped_ptr { +public: + template + explicit wrapped_ptrt(Args &&... args) : wrapped_ptr {Create(std::forward(args)...)} + { + } +}; diff --git a/lib/ptr.hpp b/lib/ptr.hpp deleted file mode 100644 index 931df39..0000000 --- a/lib/ptr.hpp +++ /dev/null @@ -1,67 +0,0 @@ -#pragma once - -#include -#include - -template class wrapped_ptr { -public: - template - explicit wrapped_ptr(Obj * (*factory)(Params...), Args &&... args) : obj {factory(std::forward(args)...)} - { - } - - explicit wrapped_ptr(wrapped_ptr && p) : obj {p.obj} - { - p.obj = nullptr; - } - - ~wrapped_ptr() - { - if (obj) { - Destroy(obj); - } - } - - NO_COPY(wrapped_ptr); - - wrapped_ptr & - operator=(wrapped_ptr && p) - { - if (obj) { - Destroy(obj); - } - obj = p.obj; - p.obj = nullptr; - return *this; - } - - [[nodiscard]] inline - operator Obj *() const noexcept - { - return obj; - } - - [[nodiscard]] inline auto - operator->() const noexcept - { - return obj; - } - - [[nodiscard]] inline auto - get() const noexcept - { - return obj; - } - -protected: - explicit wrapped_ptr(Obj * o) : obj {o} { } - Obj * obj; -}; - -template class wrapped_ptrt : public wrapped_ptr { -public: - template - explicit wrapped_ptrt(Args &&... args) : wrapped_ptr {Create(std::forward(args)...)} - { - } -}; diff --git a/lib/ray.cpp b/lib/ray.cpp index f9e3311..c4e0d8c 100644 --- a/lib/ray.cpp +++ b/lib/ray.cpp @@ -1,4 +1,4 @@ -#include "ray.hpp" +#include "ray.h" #include Ray diff --git a/lib/ray.h b/lib/ray.h new file mode 100644 index 0000000..9bf47af --- /dev/null +++ b/lib/ray.h @@ -0,0 +1,17 @@ +#pragma once + +#include +#include + +class Ray { +public: + Ray(glm::vec3 start, glm::vec3 direction) : start {start}, direction {direction} { } + + static Ray fromPoints(glm::vec3, glm::vec3); + + glm::vec3 start; + glm::vec3 direction; + + float distanceToLine(const glm::vec3 & a, const glm::vec3 & b) const; + bool passesCloseToEdges(const std::span positions, float distance) const; +}; diff --git a/lib/ray.hpp b/lib/ray.hpp deleted file mode 100644 index 9bf47af..0000000 --- a/lib/ray.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include -#include - -class Ray { -public: - Ray(glm::vec3 start, glm::vec3 direction) : start {start}, direction {direction} { } - - static Ray fromPoints(glm::vec3, glm::vec3); - - glm::vec3 start; - glm::vec3 direction; - - float distanceToLine(const glm::vec3 & a, const glm::vec3 & b) const; - bool passesCloseToEdges(const std::span positions, float distance) const; -}; diff --git a/lib/sorting.h b/lib/sorting.h new file mode 100644 index 0000000..777de00 --- /dev/null +++ b/lib/sorting.h @@ -0,0 +1,49 @@ +#pragma once + +#include +#include + +template struct PtrSorter { + bool + operator()(const T & a, const T & b) const + { + return *a < *b; + } +}; + +template struct PtrMemberSorter : public PtrSorter { + using MT = std::decay_t; + using is_transparent = MT; + + using PtrSorter::operator(); + + bool + operator()(const MT & a, const T & b) const + { + return a < (*b).*M; + } + + bool + operator()(const T & a, const MT & b) const + { + return (*a).*M < b; + } +}; + +struct CompareBy { + glm::length_t index; + + template + auto + operator()(const T & a, const T & b) const + { + return get(a) < get(b); + } + + template + auto + get(const T & a) const + { + return a[index]; + } +}; diff --git a/lib/sorting.hpp b/lib/sorting.hpp deleted file mode 100644 index 777de00..0000000 --- a/lib/sorting.hpp +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once - -#include -#include - -template struct PtrSorter { - bool - operator()(const T & a, const T & b) const - { - return *a < *b; - } -}; - -template struct PtrMemberSorter : public PtrSorter { - using MT = std::decay_t; - using is_transparent = MT; - - using PtrSorter::operator(); - - bool - operator()(const MT & a, const T & b) const - { - return a < (*b).*M; - } - - bool - operator()(const T & a, const MT & b) const - { - return (*a).*M < b; - } -}; - -struct CompareBy { - glm::length_t index; - - template - auto - operator()(const T & a, const T & b) const - { - return get(a) < get(b); - } - - template - auto - get(const T & a) const - { - return a[index]; - } -}; diff --git a/lib/special_members.h b/lib/special_members.h new file mode 100644 index 0000000..312862b --- /dev/null +++ b/lib/special_members.h @@ -0,0 +1,29 @@ +#pragma once + +#define NO_COPY(TYPE) \ + TYPE(const TYPE &) = delete; \ + void operator=(const TYPE &) = delete + +#define NO_MOVE(TYPE) \ + TYPE(TYPE &&) = delete; \ + void operator=(TYPE &&) = delete + +#define DEFAULT_MOVE(TYPE) \ + TYPE(TYPE &&) noexcept = default; \ + TYPE & operator=(TYPE &&) noexcept = default + +#define DEFAULT_COPY(TYPE) \ + TYPE(const TYPE &) = default; \ + TYPE & operator=(const TYPE &) = default + +#define DEFAULT_MOVE_COPY(TYPE) \ + DEFAULT_MOVE(TYPE); \ + DEFAULT_COPY(TYPE) + +#define DEFAULT_MOVE_NO_COPY(TYPE) \ + DEFAULT_MOVE(TYPE); \ + NO_COPY(TYPE) + +#define CUSTOM_MOVE(TYPE) \ + TYPE(TYPE &&) noexcept; \ + TYPE & operator=(TYPE &&) noexcept diff --git a/lib/special_members.hpp b/lib/special_members.hpp deleted file mode 100644 index 312862b..0000000 --- a/lib/special_members.hpp +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#define NO_COPY(TYPE) \ - TYPE(const TYPE &) = delete; \ - void operator=(const TYPE &) = delete - -#define NO_MOVE(TYPE) \ - TYPE(TYPE &&) = delete; \ - void operator=(TYPE &&) = delete - -#define DEFAULT_MOVE(TYPE) \ - TYPE(TYPE &&) noexcept = default; \ - TYPE & operator=(TYPE &&) noexcept = default - -#define DEFAULT_COPY(TYPE) \ - TYPE(const TYPE &) = default; \ - TYPE & operator=(const TYPE &) = default - -#define DEFAULT_MOVE_COPY(TYPE) \ - DEFAULT_MOVE(TYPE); \ - DEFAULT_COPY(TYPE) - -#define DEFAULT_MOVE_NO_COPY(TYPE) \ - DEFAULT_MOVE(TYPE); \ - NO_COPY(TYPE) - -#define CUSTOM_MOVE(TYPE) \ - TYPE(TYPE &&) noexcept; \ - TYPE & operator=(TYPE &&) noexcept diff --git a/lib/stdTypeDefs.h b/lib/stdTypeDefs.h new file mode 100644 index 0000000..317cdb3 --- /dev/null +++ b/lib/stdTypeDefs.h @@ -0,0 +1,45 @@ +#pragma once + +#include +#include + +template struct AnyPtr { + // cppcheck-suppress noExplicitConstructor + AnyPtr(T * p) : ptr {p} { } + // cppcheck-suppress noExplicitConstructor + template AnyPtr(const S & p) : ptr {p.get()} { } + auto + get() const + { + return ptr; + } + auto + operator->() const + { + return ptr; + } + auto & + operator*() const + { + return *ptr; + } + +private: + T * ptr; +}; + +template struct StdTypeDefs { + using AnyPtr = ::AnyPtr; + using AnyCPtr = ::AnyPtr; + using Ptr = std::shared_ptr; + using CPtr = std::shared_ptr; + using WPtr = std::weak_ptr; + using Collection = std::vector; + using CCollection = std::vector; + using WCollection = std::vector; +}; + +template struct ConstTypeDefs { + using Ptr = std::shared_ptr; + using Collection = std::vector; +}; diff --git a/lib/stdTypeDefs.hpp b/lib/stdTypeDefs.hpp deleted file mode 100644 index 317cdb3..0000000 --- a/lib/stdTypeDefs.hpp +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -#include -#include - -template struct AnyPtr { - // cppcheck-suppress noExplicitConstructor - AnyPtr(T * p) : ptr {p} { } - // cppcheck-suppress noExplicitConstructor - template AnyPtr(const S & p) : ptr {p.get()} { } - auto - get() const - { - return ptr; - } - auto - operator->() const - { - return ptr; - } - auto & - operator*() const - { - return *ptr; - } - -private: - T * ptr; -}; - -template struct StdTypeDefs { - using AnyPtr = ::AnyPtr; - using AnyCPtr = ::AnyPtr; - using Ptr = std::shared_ptr; - using CPtr = std::shared_ptr; - using WPtr = std::weak_ptr; - using Collection = std::vector; - using CCollection = std::vector; - using WCollection = std::vector; -}; - -template struct ConstTypeDefs { - using Ptr = std::shared_ptr; - using Collection = std::vector; -}; diff --git a/lib/stream_support.h b/lib/stream_support.h new file mode 100644 index 0000000..7fb256c --- /dev/null +++ b/lib/stream_support.h @@ -0,0 +1,86 @@ +#pragma once + +#include "enumDetails.h" +#include +#include +#include +#include +#include +#include + +template +concept stringlike = requires(const S & s) { s.substr(0); }; +template +concept spanable = std::is_constructible_v, T> && ! +stringlike && !std::is_same_v, T>; + +namespace std { + template + std::ostream & + operator<<(std::ostream & s, const span v) + { + s << '('; + for (const auto & i : v) { + if (&i != &v.front()) { + s << ", "; + } + s << i; + } + return s << ')'; + } + + template + std::ostream & + operator<<(std::ostream & s, const glm::mat & m) + { + return (s << std::span {&m[0], L}); + } + + template + std::ostream & + operator<<(std::ostream & s, const glm::vec & v) + { + return (s << std::span {&v[0], L}); + } + + template + std::ostream & + operator<<(std::ostream & s, const T & v) + { + return (s << std::span {v}); + } + + template + std::ostream & + operator<<(std::ostream & s, const std::pair & v) + { + return (s << '(' << v.first << ", " << v.second << ')'); + } + + inline std::ostream & + operator<<(std::ostream & s, const Arc & arc) + { + return s << arc.first << " ↺ " << arc.second; + } + + template + concept IsEnum = std::is_enum_v; + + template + inline std::ostream & + operator<<(std::ostream & s, const E & e) + { + return s << EnumTypeDetails::typeName << "::" << EnumDetails::to_string(e).value(); + } +} + +template +std::string +streamed_string(const T & v) +{ + std::stringstream ss; + ss << v; + return std::move(ss).str(); +} + +#define CLOG(x) std::cerr << __LINE__ << " : " #x " : " << x << "\n"; diff --git a/lib/stream_support.hpp b/lib/stream_support.hpp deleted file mode 100644 index 52cc9d9..0000000 --- a/lib/stream_support.hpp +++ /dev/null @@ -1,86 +0,0 @@ -#pragma once - -#include "enumDetails.hpp" -#include -#include -#include -#include -#include -#include - -template -concept stringlike = requires(const S & s) { s.substr(0); }; -template -concept spanable = std::is_constructible_v, T> && ! -stringlike && !std::is_same_v, T>; - -namespace std { - template - std::ostream & - operator<<(std::ostream & s, const span v) - { - s << '('; - for (const auto & i : v) { - if (&i != &v.front()) { - s << ", "; - } - s << i; - } - return s << ')'; - } - - template - std::ostream & - operator<<(std::ostream & s, const glm::mat & m) - { - return (s << std::span {&m[0], L}); - } - - template - std::ostream & - operator<<(std::ostream & s, const glm::vec & v) - { - return (s << std::span {&v[0], L}); - } - - template - std::ostream & - operator<<(std::ostream & s, const T & v) - { - return (s << std::span {v}); - } - - template - std::ostream & - operator<<(std::ostream & s, const std::pair & v) - { - return (s << '(' << v.first << ", " << v.second << ')'); - } - - inline std::ostream & - operator<<(std::ostream & s, const Arc & arc) - { - return s << arc.first << " ↺ " << arc.second; - } - - template - concept IsEnum = std::is_enum_v; - - template - inline std::ostream & - operator<<(std::ostream & s, const E & e) - { - return s << EnumTypeDetails::typeName << "::" << EnumDetails::to_string(e).value(); - } -} - -template -std::string -streamed_string(const T & v) -{ - std::stringstream ss; - ss << v; - return std::move(ss).str(); -} - -#define CLOG(x) std::cerr << __LINE__ << " : " #x " : " << x << "\n"; diff --git a/lib/strings.h b/lib/strings.h new file mode 100644 index 0000000..9dca9ac --- /dev/null +++ b/lib/strings.h @@ -0,0 +1,13 @@ +#pragma once + +#include + +constexpr auto +constexpr_strlen(const GLchar * const s) +{ + std::size_t ch {}; + while (s[ch]) { + ch++; + } + return ch; +} diff --git a/lib/strings.hpp b/lib/strings.hpp deleted file mode 100644 index 9dca9ac..0000000 --- a/lib/strings.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include - -constexpr auto -constexpr_strlen(const GLchar * const s) -{ - std::size_t ch {}; - while (s[ch]) { - ch++; - } - return ch; -} diff --git a/lib/worker.h b/lib/worker.h index d9a5a6f..0d15ca2 100644 --- a/lib/worker.h +++ b/lib/worker.h @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3