ernie-renderer 0.2.0.dev37__tar.gz → 0.2.0.dev43__tar.gz

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/CMakeLists.txt

@@ -15,7 +15,7 @@ project(
 )
 
 # Pre-release suffix such as .dev12, written by CI.
-set(ERNIE_VERSION_SUFFIX ".dev37" CACHE STRING "Pre-release suffix of Ernie's version")
+set(ERNIE_VERSION_SUFFIX ".dev43" CACHE STRING "Pre-release suffix of Ernie's version")
 set(ERNIE_VERSION "${PROJECT_VERSION}${ERNIE_VERSION_SUFFIX}")
 
 option(ERNIE_BUILD_TESTS "Build Ernie's tests" OFF)

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ernie-renderer
-Version: 0.2.0.dev37
+Version: 0.2.0.dev43
 Summary: Efficient Renderer for Natural and Interplanetary Environments: a physically based, spectral Vulkan ray tracer
 Author: Alex Maietta
 License-Expression: BSD-3-Clause

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/benchmarks/scene/extents.cpp

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 /// @file extents.cpp
-/// @brief Cached extents at 100,000 prims: the first update, and one edit's.
+/// @brief Scene updates at 100,000 prims: the first, one edit's, and one inherited edit's.
 #include "benchmarks/bench.h"
 #include "ernie/scene/schemas/geom.h"
 
@@ -21,20 +21,35 @@ std::unique_ptr<Scene> MakeSpheres() {
     return scene;
 }
 
-const bool kFirstUpdate = Register("scene.extents.first_update_100k", [] {
+const bool kFirstUpdate = Register("scene.update.first_100k", [] {
     std::unique_ptr<Scene> scene;
-    return Timing{Fastest([&] { scene = MakeSpheres(); }, [&] { scene->UpdateExtents(); }), 10.0};
+    return Timing{Fastest([&] { scene = MakeSpheres(); }, [&] { scene->Update(); }), 10.0};
 });
 
-const bool kOneEdit = Register("scene.extents.update_after_one_edit_of_100k", [] {
+const bool kOneEdit = Register("scene.update.after_one_edit_of_100k", [] {
     std::unique_ptr<Scene> scene = MakeSpheres();
-    scene->UpdateExtents();
+    scene->Update();
     const PrimId ball = *scene->Find("/World/Ball_54321");
     double radius = 1.0;
     const double ms = Fastest([&] { scene->Set(ball, Sphere::kRadius, radius += 1.0); },
-                              [&] { scene->UpdateExtents(); });
+                              [&] { scene->Update(); });
     return Timing{ms, 1.0};
 });
 
+const bool kInheritedEdit = Register("scene.update.after_hiding_the_parent_of_100k", [] {
+    std::unique_ptr<Scene> scene = MakeSpheres();
+    scene->Define("/World", "Xform");
+    scene->Update();
+    const PrimId world = *scene->Find("/World");
+    bool hidden = false;
+    const double ms = Fastest(
+        [&] {
+            hidden = !hidden;
+            scene->Set(world, Imageable::kVisibility, hidden ? "invisible" : "inherited");
+        },
+        [&] { scene->Update(); });
+    return Timing{ms, 10.0};
+});
+
 }  // namespace
 }  // namespace ernie::bench

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/ernie/scene/CMakeLists.txt

@@ -3,6 +3,8 @@ add_library(
     ernie_scene
     OBJECT
     extent_cache.cpp
+    holder_index.cpp
+    inherit.cpp
     path.cpp
     schema.cpp
     scene.cpp

ernie_renderer-0.2.0.dev43/ernie/scene/holder_index.cpp

@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/// @file holder_index.cpp
+/// @brief Re-indexing changed relationship cells, and finding a target's live holders.
+#include "ernie/scene/holder_index.h"
+
+#include <algorithm>
+#include <unordered_set>
+
+namespace ernie {
+namespace {
+
+bool IsRelationship(ColumnType type) {
+    return type == ColumnType::Relationship || type == ColumnType::Relationships;
+}
+
+/// @return The targets of a relationship cell, without the unset one.
+std::vector<PathId> Targets(const PrimStore& store, BucketId bucket, const Column& column,
+                            std::uint32_t row) {
+    std::vector<PathId> targets;
+    if (column.values->Type() == ColumnType::Relationship) {
+        targets.push_back(store.Read<Target>(bucket, column.attribute)[row].path);
+    } else {
+        for (const Target target : store.Read<std::vector<Target>>(bucket, column.attribute)[row]) {
+            targets.push_back(target.path);
+        }
+    }
+    std::erase(targets, kNoPath);
+    return targets;
+}
+
+}  // namespace
+
+void HolderIndex::Update(const PrimStore& store) {
+    const ChangeSet changes = store.ChangesSince(cursor_);
+    for (const ChangeSet::Values& values : changes.values) {
+        const Bucket& bucket = store.GetBucket(values.bucket);
+        const Column& column = *bucket.Find(values.attribute);
+        if (!IsRelationship(column.values->Type())) {
+            continue;
+        }
+        for (const RowRange range : values.rows) {
+            for (std::uint32_t row = range.begin; row < std::min(range.end, bucket.Rows()); ++row) {
+                Index(bucket.prims[row], values.attribute,
+                      Targets(store, values.bucket, column, row));
+            }
+        }
+    }
+    // A bucket too far behind to replay reports every row of every column, as a fresh one does.
+    for (const BucketId id : changes.resets) {
+        const Bucket& bucket = store.GetBucket(id);
+        for (const Column& column : bucket.columns) {
+            for (std::uint32_t row = 0;
+                 IsRelationship(column.values->Type()) && row < bucket.Rows(); ++row) {
+                Index(bucket.prims[row], column.attribute, Targets(store, id, column, row));
+            }
+        }
+    }
+    cursor_ = changes.version;
+}
+
+void HolderIndex::Index(PrimId prim, AttributeId attribute, std::vector<PathId> targets) {
+    const Cell cell = Key(prim, attribute);
+    const auto found = targets_.find(cell);
+    if (found != targets_.end()) {
+        for (const PathId old : found->second) {
+            holders_[old].erase(cell);
+        }
+    }
+    for (const PathId target : targets) {
+        holders_[target][cell] = prim.generation;
+    }
+    if (!targets.empty()) {
+        targets_[cell] = std::move(targets);
+    } else if (found != targets_.end()) {
+        targets_.erase(found);
+    }
+}
+
+std::vector<PrimId> HolderIndex::Find(const PrimStore& store, PathId target) const {
+    std::vector<PrimId> found;
+    const auto holders = holders_.find(target);
+    if (holders == holders_.end()) {
+        return found;
+    }
+    std::unordered_set<std::uint32_t> slots;
+    for (const auto& [cell, generation] : holders->second) {
+        const PrimId prim{static_cast<std::uint32_t>(cell >> 32), generation};
+        // Cells of removed prims, or of prims since moved to a bucket without the attribute, stay
+        // until their slot's next prim writes them.
+        if (Holds(store, prim, static_cast<AttributeId>(cell), target) &&
+            slots.insert(prim.slot).second) {
+            found.push_back(prim);
+        }
+    }
+    return found;
+}
+
+bool HolderIndex::Holds(const PrimStore& store, PrimId prim, AttributeId attribute, PathId target) {
+    if (!store.Alive(prim)) {
+        return false;
+    }
+    const BucketId bucket = store.PrimBucket(prim);
+    const Column* column = store.GetBucket(bucket).Find(attribute);
+    if (column == nullptr || !IsRelationship(column->values->Type())) {
+        return false;
+    }
+    const std::vector<PathId> targets = Targets(store, bucket, *column, store.PrimRow(prim));
+    return std::ranges::find(targets, target) != targets.end();
+}
+
+}  // namespace ernie

ernie_renderer-0.2.0.dev43/ernie/scene/holder_index.h

@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/// @file holder_index.h
+/// @brief The reverse index of relationships: which prims target each path.
+#pragma once
+
+#include "ernie/scene/storage.h"
+
+#include <cstdint>
+#include <unordered_map>
+#include <vector>
+
+namespace ernie {
+
+/// @brief Which prims' relationships target each path, kept up to date from the store's changes,
+/// so an edit to a target reaches its holders: a prototype its instancers, a material the prims
+/// bound to it (through their resolved bindings), a body its terrains.
+class HolderIndex {
+  public:
+    /// Re-indexes the relationship cells that changed since the last update.
+    void Update(const PrimStore& store);
+    /// @return The live prims with a relationship targeting `target`, each once.
+    std::vector<PrimId> Find(const PrimStore& store, PathId target) const;
+
+  private:
+    /// A relationship cell: the prim's slot and the attribute, packed.
+    using Cell = std::uint64_t;
+    static Cell Key(PrimId prim, AttributeId attribute) {
+        return (std::uint64_t{prim.slot} << 32) | attribute;
+    }
+
+    void Index(PrimId prim, AttributeId attribute, std::vector<PathId> targets);
+    /// @return Whether the prim is alive and its relationship still targets `target`.
+    static bool Holds(const PrimStore& store, PrimId prim, AttributeId attribute, PathId target);
+
+    /// Each target's holding cells, with the generation of the prim that wrote them.
+    std::unordered_map<PathId, std::unordered_map<Cell, std::uint32_t>> holders_;
+    /// Each cell's targets, to unindex them when it changes.
+    std::unordered_map<Cell, std::vector<PathId>> targets_;
+    std::uint64_t cursor_ = 0;
+};
+
+}  // namespace ernie

ernie_renderer-0.2.0.dev43/ernie/scene/inherit.cpp

@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/// @file inherit.cpp
+/// @brief Resolving inherited attributes from the nearest authoring ancestor into their resolved
+/// columns, for only the subtrees whose authored values or prims changed.
+#include "ernie/scene/convert.h"
+#include "ernie/scene/scene.h"
+
+#include <algorithm>
+#include <concepts>
+#include <limits>
+
+namespace ernie {
+
+void Scene::Resolve() {
+    const ChangeSet changes = store_.ChangesSince(resolved_);
+    for (const AttributeDef* def : InheritedAttributes()) {
+        const AttributeId attribute = store_.Tokens().Intern(def->name);
+        const AttributeId resolved = store_.Tokens().Intern(ResolvedName(def->name));
+        WithColumnType(def->type, [&]<typename T>(std::type_identity<T>) {
+            if constexpr (std::equality_comparable<T> && !std::same_as<T, Tensor>) {
+                const T fallback = ToElement<T>(store_.Paths(), def->fallback).value_or(T{});
+                BitSet roots = ResolveRoots(changes, attribute);
+                std::vector<PathId> order;
+                roots.ForEachRun([&](std::size_t begin, std::size_t end) {
+                    for (std::size_t path = begin; path < end; ++path) {
+                        order.push_back(static_cast<PathId>(path));
+                    }
+                });
+                // Ancestors intern first, so most roots are reached from one above them.
+                for (const PathId root : order) {
+                    if (roots.Test(root)) {
+                        ResolveSubtree<T>(root, attribute, resolved, fallback, roots);
+                    }
+                }
+            }
+        });
+    }
+    // Its own writes are to resolved columns, which no resolve reads.
+    resolved_ = store_.Version();
+}
+
+BitSet Scene::ResolveRoots(const ChangeSet& changes, AttributeId attribute) const {
+    BitSet roots;
+    roots.Resize(store_.Paths().Size());
+    const auto add = [&](BucketId bucket, std::uint32_t begin, std::uint32_t end) {
+        const Bucket& rows = store_.GetBucket(bucket);
+        for (std::uint32_t row = begin; row < std::min(end, rows.Rows()); ++row) {
+            roots.Set(store_.PrimPath(rows.prims[row]));
+        }
+    };
+    for (const BucketId bucket : changes.resets) {
+        add(bucket, 0, std::numeric_limits<std::uint32_t>::max());
+    }
+    for (const ChangeSet::Rows& rows : changes.rows) {
+        if (rows.change.kind == StructuralChange::Kind::Added) {
+            add(rows.bucket, rows.change.row, rows.change.row + rows.change.count);
+        }
+    }
+    for (const ChangeSet::Values& values : changes.values) {
+        if (values.attribute == attribute) {
+            for (const RowRange range : values.rows) {
+                add(values.bucket, range.begin, range.end);
+            }
+        }
+    }
+    return roots;
+}
+
+template <typename T> const T* Scene::Inheritable(PrimId prim, AttributeId attribute) const {
+    const BucketId bucket = store_.PrimBucket(prim);
+    const Column* column = store_.GetBucket(bucket).Find(attribute);
+    const std::uint32_t row = store_.PrimRow(prim);
+    if (column == nullptr || !column->authored.Test(row) ||
+        column->values->Type() != kColumnType<T>) {
+        return nullptr;
+    }
+    const T* own = &store_.Read<T>(bucket, attribute)[row];
+    if constexpr (std::same_as<T, Token>) {
+        return *own == inherited_ ? nullptr : own;
+    }
+    return own;
+}
+
+template <typename T> T Scene::Above(PathId path, AttributeId attribute, const T& fallback) const {
+    const PathTable& paths = store_.Paths();
+    for (PathId above = paths.Parent(path); above != kRootPath; above = paths.Parent(above)) {
+        const std::optional<PrimId> prim = store_.Find(above);
+        if (const T* own = prim ? Inheritable<T>(*prim, attribute) : nullptr) {
+            return *own;
+        }
+    }
+    return fallback;
+}
+
+template <typename T>
+void Scene::ResolveSubtree(PathId root, AttributeId attribute, AttributeId resolved,
+                           const T& fallback, BitSet& roots) {
+    std::vector<std::pair<PathId, T>> pending{{root, Above<T>(root, attribute, fallback)}};
+    while (!pending.empty()) {
+        const auto [path, above] = std::move(pending.back());
+        pending.pop_back();
+        const std::optional<PrimId> prim = store_.Find(path);
+        if (!prim) {
+            continue;
+        }
+        const bool isRoot = roots.Test(path);
+        roots.Set(path, false);
+        const T* own = Inheritable<T>(*prim, attribute);
+        const T value = own != nullptr ? *own : above;
+        // Prims without the column (typeless ones, materials) pass the value through.
+        const bool stored = store_.GetBucket(store_.PrimBucket(*prim)).Find(resolved) != nullptr;
+        // An unchanged prim's descendants are unchanged too, unless they are roots themselves.
+        if (store_.Derive(*prim, resolved, value) || isRoot || !stored) {
+            store_.Paths().ForEachChild(path,
+                                        [&](PathId child) { pending.emplace_back(child, value); });
+        }
+    }
+}
+
+}  // namespace ernie

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/ernie/scene/scene.cpp

@@ -38,7 +38,8 @@ std::string Describe(const Scene& scene, PrimId prim) {
 }  // namespace
 
 Scene::Scene()
-    : invisible_(store_.Tokens().Intern(tokens::kInvisible)),
+    : inherited_(store_.Tokens().Intern(tokens::kInherited)),
+      invisible_(store_.Tokens().Intern(tokens::kInvisible)),
       defaultPurpose_(store_.Tokens().Intern(tokens::kDefault)) {
     FindOrAddBucket(nullptr, {});
 }
@@ -170,15 +171,20 @@ void Scene::Write(PrimId prim, std::string_view attribute, Tensor array) {
 }
 
 const Tensor* Scene::Read(PrimId prim, std::string_view attribute) const {
-    const Column* column = AuthoredColumn(prim, attribute);
-    if (column == nullptr || column->values->Type() != ColumnType::Tensor) {
-        return nullptr;
-    }
-    return &store_.Read<Tensor>(store_.PrimBucket(prim), column->attribute)[store_.PrimRow(prim)];
+    return Authored<Tensor>(prim, attribute);
 }
 
 std::optional<Value> Scene::Get(PrimId prim, std::string_view attribute) const {
-    const Column* column = AuthoredColumn(prim, attribute);
+    return CellValue(prim, AuthoredColumn(prim, attribute));
+}
+
+std::optional<Value> Scene::GetResolved(PrimId prim, std::string_view attribute) const {
+    const std::optional<Token> token = store_.Tokens().Find(ResolvedName(attribute));
+    return CellValue(prim,
+                     token ? store_.GetBucket(store_.PrimBucket(prim)).Find(*token) : nullptr);
+}
+
+std::optional<Value> Scene::CellValue(PrimId prim, const Column* column) const {
     if (column == nullptr) {
         return std::nullopt;
     }
@@ -248,6 +254,11 @@ std::optional<Box> Scene::Extent(PrimId prim) const {
     return extent;
 }
 
+std::vector<PrimId> Scene::Holders(const Path& target) const {
+    const std::optional<PathId> id = store_.Paths().Find(target);
+    return id ? holders_.Find(store_, *id) : std::vector<PrimId>{};
+}
+
 Box Scene::WorldBounds(const Path& path) const {
     const PrimId prim = Require(path);
     const PathId id = store_.PrimPath(prim);
@@ -277,11 +288,17 @@ void Scene::AddTo(Box& bounds, PathId path, const glm::dmat4& parent, bool visib
         bounds.Extend(extent->Transformed(world));
         return;
     }
+    bool loaded = false;
     store_.Paths().ForEachChild(path, [&](PathId child) {
         if (store_.Find(child)) {
+            loaded = true;
             AddTo(bounds, child, world, visibleOnly);
         }
     });
+    // A model whose subtree isn't loaded is bounded by its hint.
+    if (!loaded) {
+        bounds.Extend(ExtentsHint(prim, !visibleOnly).Transformed(world));
+    }
 }
 
 PrimId Scene::Require(const Path& path) const {
@@ -323,6 +340,11 @@ BucketId Scene::FindOrAddBucket(const SchemaDef* schema, std::vector<Token> apis
     for (const ApiName& api : allApis) {
         add(*api.schema, api);
     }
+    if (schema != nullptr && schema->IsA(Imageable::Definition())) {
+        for (const AttributeDef* def : InheritedAttributes()) {
+            layout.push_back(MakeLayout(paths, *def, ResolvedName(def->name), def->fallback));
+        }
+    }
     const BucketId bucket = store_.AddBucket(key, layout);
     buckets_.resize(std::max<std::size_t>(buckets_.size(), bucket + 1));
     buckets_[bucket] = std::move(entry);
@@ -400,15 +422,24 @@ std::vector<std::string> Scene::AppliedApis(PrimId prim) const {
 }
 
 bool Scene::LeavesOutOfBounds(PrimId prim) const {
-    const auto token = [&](std::string_view attribute) -> std::optional<Token> {
-        const Column* column = AuthoredColumn(prim, attribute);
-        return column ? std::optional(store_.Read<Token>(store_.PrimBucket(prim),
-                                                         column->attribute)[store_.PrimRow(prim)])
-                      : std::nullopt;
-    };
+    const Token* visibility = Authored<Token>(prim, Imageable::kVisibility);
     // Purpose is inherited, so a subtree under another purpose is left out whole.
-    const std::optional<Token> purpose = token(Imageable::kPurpose);
-    return token(Imageable::kVisibility) == invisible_ || (purpose && *purpose != defaultPurpose_);
+    const Token* purpose = Authored<Token>(prim, Imageable::kPurpose);
+    return (visibility && *visibility == invisible_) || (purpose && *purpose != defaultPurpose_);
+}
+
+Box Scene::ExtentsHint(PrimId prim, bool allPurposes) const {
+    const auto* hint = Authored<std::vector<float>>(prim, GeomModelAPI::kExtentsHint);
+    if (hint == nullptr) {
+        return {};
+    }
+    // Six floats per purpose, the default purpose first.
+    const std::size_t floats = allPurposes ? hint->size() : std::min<std::size_t>(6, hint->size());
+    Box box;
+    for (std::size_t i = 0; i + 6 <= floats; i += 6) {
+        box.Extend(AuthoredExtent(std::span(*hint).subspan(i, 6)));
+    }
+    return box;
 }
 
 const Column* Scene::AuthoredColumn(PrimId prim, std::string_view attribute) const {
@@ -428,12 +459,18 @@ Dirty Scene::Classify(const ChangeSet::Values& change) const {
         return def->meta.dirty;
     }
     const std::string_view name = store_.Tokens().Text(change.attribute);
+    if (name.starts_with(tokens::kResolvedPrefix)) {
+        return FindInherited(name.substr(tokens::kResolvedPrefix.size()))->meta.dirty;
+    }
     return name.starts_with(tokens::kXformOpPrefix)    ? Dirty::Transform
            : name.starts_with(tokens::kPrimvarsPrefix) ? Dirty::Primvars
                                                        : Dirty::Params;
 }
 
 bool Scene::TakesUndeclared(PrimId prim, std::string_view attribute) const {
+    if (attribute.starts_with(tokens::kResolvedPrefix)) {
+        return false;
+    }
     const SchemaDef* schema = Schema(prim);
     return schema == nullptr || schema->IsOpen(attribute) ||
            std::ranges::any_of(AllApis(schema, Apis(prim)),

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/ernie/scene/scene.h

@@ -5,6 +5,7 @@
 
 #include "ernie/geometry/bounds.h"
 #include "ernie/scene/extent_cache.h"
+#include "ernie/scene/holder_index.h"
 #include "ernie/scene/schema.h"
 #include "ernie/scene/storage.h"
 #include "ernie/scene/value.h"
@@ -68,6 +69,10 @@ class Scene {
     /// @return The authored value, or none.
     std::optional<Value> Get(PrimId prim, std::string_view attribute) const;
     std::optional<Value> Get(const Path& path, std::string_view attribute) const;
+    /// @return An inherited attribute's value as of the last `Update`: the prim's own or its
+    /// nearest authoring ancestor's (where "inherited" isn't authoring), else the fallback; none
+    /// for a prim that isn't Imageable.
+    std::optional<Value> GetResolved(PrimId prim, std::string_view attribute) const;
     /// @brief Authors an array attribute with a tensor on the host or a device, shared, not copied.
     /// @throws std::invalid_argument for a non-array attribute, or a tensor of the wrong type or
     /// shape.
@@ -84,12 +89,20 @@ class Scene {
     glm::dmat4 LocalTransform(PrimId prim) const;
     glm::dmat4 WorldTransform(PrimId prim) const;
     /// @return The prim's extent in its own space; none when it isn't computed from attributes.
-    /// Cached since `UpdateExtents` when its bucket hasn't changed, computed otherwise.
+    /// Cached since `Update` when its bucket hasn't changed, computed otherwise.
     std::optional<Box> Extent(PrimId prim) const;
-    /// @brief Recomputes the cached extents of the rows that changed since the last update.
-    void UpdateExtents() {
+    /// @brief Brings derived data up to date with the edits since the last update, once per step
+    /// before renderers pull changes: resolves inherited attributes for the subtrees whose
+    /// authored values or prims changed, re-indexes changed relationships, then recomputes the
+    /// changed rows' cached extents.
+    void Update() {
+        Resolve();
+        holders_.Update(store_);
         extents_.Update(store_);
     }
+    /// @return The prims whose relationships target `target` as of the last `Update`, resolved
+    /// material bindings included: what an edit to `target` reaches.
+    std::vector<PrimId> Holders(const Path& target) const;
     /// @return The world box of the prim and its visible descendants of the default purpose.
     /// Prims with extents bound their own subtrees, as UsdGeomBBoxCache prunes at Boundables.
     Box WorldBounds(const Path& path) const;
@@ -126,6 +139,31 @@ class Scene {
     std::vector<ApiName> AllApis(const SchemaDef* schema, std::span<const Token> applied) const;
     /// @return The attribute's column when the prim authors it, or null.
     const Column* AuthoredColumn(PrimId prim, std::string_view attribute) const;
+    /// @return The attribute's value when the prim authors it as a `T`, or null.
+    template <typename T> const T* Authored(PrimId prim, std::string_view attribute) const {
+        const Column* column = AuthoredColumn(prim, attribute);
+        if (column == nullptr || column->values->Type() != kColumnType<T>) {
+            return nullptr;
+        }
+        return &store_.Read<T>(store_.PrimBucket(prim), column->attribute)[store_.PrimRow(prim)];
+    }
+    std::optional<Value> CellValue(PrimId prim, const Column* column) const;
+
+    /// Resolves every inherited attribute for the subtrees changed since the last resolve.
+    void Resolve();
+    /// @return The paths of the prims whose subtrees resolve `attribute` again: those added, reset
+    /// or with it changed.
+    BitSet ResolveRoots(const ChangeSet& changes, AttributeId attribute) const;
+    /// @return What `attribute` resolves to from the prim's own value: null when it doesn't
+    /// author it, or authors "inherited".
+    template <typename T> const T* Inheritable(PrimId prim, AttributeId attribute) const;
+    /// @return The value `path` inherits from its ancestors.
+    template <typename T> T Above(PathId path, AttributeId attribute, const T& fallback) const;
+    /// Resolves `attribute` over the subtree at `root`, descending past a prim only while its
+    /// resolved value changes or it is one of `roots`, which it clears as it reaches them.
+    template <typename T>
+    void ResolveSubtree(PathId root, AttributeId attribute, AttributeId resolved, const T& fallback,
+                        BitSet& roots);
     const AttributeDef* Declared(BucketId bucket, AttributeId attribute) const;
     /// @return Whether the prim's type or an applied API schema leaves the attribute's namespace
     /// open; any attribute for a prim without a type.
@@ -133,15 +171,21 @@ class Scene {
     ColumnType TypeForUndeclared(PrimId prim, std::string_view attribute, const Value& value) const;
     /// @return Whether the prim and its subtree are invisible or of a purpose bounds leave out.
     bool LeavesOutOfBounds(PrimId prim) const;
+    /// @return GeomModelAPI's extentsHint: the default purpose's box, or with `allPurposes`, all.
+    Box ExtentsHint(PrimId prim, bool allPurposes) const;
     /// Adds a subtree's extents under `parent`'s transform; with `visibleOnly`, only its visible
     /// default-purpose prims'.
     void AddTo(Box& bounds, PathId path, const glm::dmat4& parent, bool visibleOnly) const;
 
     PrimStore store_;
+    /// The store version inherited attributes were last resolved at.
+    std::uint64_t resolved_ = 0;
+    Token inherited_ = 0;
     Token invisible_ = 0;
     Token defaultPurpose_ = 0;
     std::vector<BucketSchema> buckets_;
     ExtentCache extents_;
+    HolderIndex holders_;
 };
 
 }  // namespace ernie

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/ernie/scene/schema.cpp

@@ -175,6 +175,28 @@ const SchemaDef* FindSchema(std::string_view name) {
     return found != schemas.end() ? *found : nullptr;
 }
 
+std::span<const AttributeDef* const> InheritedAttributes() {
+    static const std::vector<const AttributeDef*> kInherited = [] {
+        std::vector<const AttributeDef*> inherited;
+        for (const SchemaDef* schema : Schemas()) {
+            for (const AttributeDef& def : schema->attributes) {
+                if (def.meta.inherited) {
+                    inherited.push_back(&def);
+                }
+            }
+        }
+        return inherited;
+    }();
+    return kInherited;
+}
+
+const AttributeDef* FindInherited(std::string_view name) {
+    const std::span<const AttributeDef* const> inherited = InheritedAttributes();
+    const auto found =
+        std::ranges::find_if(inherited, [&](const AttributeDef* def) { return def->name == name; });
+    return found != inherited.end() ? *found : nullptr;
+}
+
 ApiName ApiName::Parse(std::string_view api) {
     const std::size_t colon = api.find(':');
     const std::string_view name = api.substr(0, colon);

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/ernie/scene/schema.h

@@ -5,12 +5,14 @@
 
 #include "ernie/geometry/bounds.h"
 #include "ernie/scene/storage.h"
+#include "ernie/scene/tokens.h"
 #include "ernie/scene/value.h"
 
 #include <array>
 #include <cstdint>
 #include <optional>
 #include <span>
+#include <string>
 #include <string_view>
 #include <vector>
 
@@ -87,7 +89,8 @@ struct AttributeMeta {
     /// The ranks a tensor may have, as a dense grid's 3; none for flat or vector arrays.
     std::vector<std::int64_t> ranks{};
     Dirty dirty = Dirty::Params;
-    /// Resolved from the nearest authoring ancestor.
+    /// Resolved from the nearest ancestor authoring it (other than as "inherited") into its
+    /// `ResolvedName` column.
     bool inherited = false;
 };
 
@@ -234,6 +237,15 @@ struct SchemaDef {
 std::span<const SchemaDef* const> Schemas();
 /// @return The schema named `name`, or null.
 const SchemaDef* FindSchema(std::string_view name);
+/// @return Every attribute declared inherited, once each.
+std::span<const AttributeDef* const> InheritedAttributes();
+/// @return The inherited attribute named `name`, or null.
+const AttributeDef* FindInherited(std::string_view name);
+/// @return The column holding an inherited attribute's resolved values:
+/// `ernie:resolved:visibility`.
+inline std::string ResolvedName(std::string_view attribute) {
+    return std::string(tokens::kResolvedPrefix) + std::string(attribute);
+}
 
 /// What a multiple-apply schema's attribute names hold in place of the instance's name.
 inline constexpr std::string_view kInstanceName = "__INSTANCE_NAME__";

{ernie_renderer-0.2.0.dev37 → ernie_renderer-0.2.0.dev43}/ernie/scene/schemas/geom.cpp

@@ -60,6 +60,8 @@ ERNIE_DEFINE_SCHEMA(Xform, Concrete, kDescendantsExtent, ERNIE_NO_ATTRIBUTES,
                     .openNamespaces = {"*"})
 ERNIE_DEFINE_SCHEMA(Scope, Concrete, kDescendantsExtent, ERNIE_NO_ATTRIBUTES,
                     .openNamespaces = {"*"})
+ERNIE_DEFINE_SCHEMA(GeomModelAPI, SingleApply, kInheritExtent, ERNIE_MODEL_API_ATTRIBUTES)
+ERNIE_DEFINE_SCHEMA(GeomSubset, Concrete, kNoExtent, ERNIE_SUBSET_ATTRIBUTES)
 ERNIE_DEFINE_SCHEMA(Cube, Concrete, ComputedExtent(CentredExtent<CubeHalves>),
                     ERNIE_CUBE_ATTRIBUTES)
 ERNIE_DEFINE_SCHEMA(Sphere, Concrete, ComputedExtent(CentredExtent<SphereHalves>),