From f6684418f22df4baaccdcda325cbe1beb8e6180a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 27 Mar 2023 08:59:13 +0200 Subject: editor: allow inspecting object id --- editor/inspect-types.cpp | 5 +++++ editor/inspect.cpp | 4 ++++ entity/erased-constraints.cpp | 7 +++++++ 3 files changed, 16 insertions(+) diff --git a/editor/inspect-types.cpp b/editor/inspect-types.cpp index 22944a97..5b02acde 100644 --- a/editor/inspect-types.cpp +++ b/editor/inspect-types.cpp @@ -23,6 +23,11 @@ struct entity_accessors { { using entity = Entity; return std::tuple{ + entity::type::field{"id"_s, + [](const scenery& x) { return x.id; }, + [](scenery&, uint64_t) {}, + constantly(field_status::readonly), + }, entity::type::field{"atlas"_s, [](const scenery& x) { return loader.strip_prefix(x.atlas->name()); }, [](scenery&, StringView) {}, diff --git a/editor/inspect.cpp b/editor/inspect.cpp index 415dcdff..1631f11c 100644 --- a/editor/inspect.cpp +++ b/editor/inspect.cpp @@ -34,6 +34,8 @@ template<> struct IGDT_ : std::integral_constant struct IGDT_ : std::integral_constant {}; template<> struct IGDT_ : std::integral_constant {}; template<> struct IGDT_ : std::integral_constant {}; +template<> struct IGDT_ : std::integral_constant {}; +template<> struct IGDT_ : std::integral_constant {}; template<> struct IGDT_ : std::integral_constant {}; template constexpr auto IGDT = IGDT_::value; @@ -203,6 +205,8 @@ MAKE_SPEC_REPRS2(uint16_t) MAKE_SPEC_REPRS2(int16_t) MAKE_SPEC_REPRS2(uint32_t) MAKE_SPEC_REPRS2(int32_t) +MAKE_SPEC_REPRS2(uint64_t) +MAKE_SPEC_REPRS2(int64_t) MAKE_SPEC_REPRS2(float) MAKE_SPEC(bool, field_repr::input) MAKE_SPEC(String, field_repr::input) diff --git a/entity/erased-constraints.cpp b/entity/erased-constraints.cpp index 028b4881..05cb370d 100644 --- a/entity/erased-constraints.cpp +++ b/entity/erased-constraints.cpp @@ -112,27 +112,34 @@ template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; +template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; +template pair2> range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; +template pair2> range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; +template pair2> range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; +template pair2> range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; +template pair2> range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; template pair2 range::convert() const; +template pair2> range::convert() const; template pair2 range::convert() const; bool operator==(const range& a, const range& b) -- cgit v1.2.3