Skip to content

Commit

Permalink
Add getters for AccessorView and AccessorWriter
Browse files Browse the repository at this point in the history
  • Loading branch information
lilleyse committed Dec 9, 2024
1 parent 7a04409 commit baea661
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 10 deletions.
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

### ? - ?

##### Additions :tada:

- Added `offset` getter to `AccessorView`.
- Added `stride`, `offset`, and `data` getters to `AccessorWriter`.
- Added `value_type` typedef to `AccessorWriter`.

##### Fixes :wrench:

- Fixed a bug in `thenPassThrough` that caused a compiler error when given a value by r-value refrence.
Expand Down
8 changes: 8 additions & 0 deletions CesiumGltf/include/CesiumGltf/AccessorView.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,14 @@ template <class T> class AccessorView final {
*/
int64_t stride() const noexcept { return this->_stride; }

/**
* @brief Returns the offset of this accessor, which is the number of bytes
* from the start of the buffer to the first element.
*
* @returns The offset.
*/
int64_t offset() const noexcept { return this->_offset; }

/**
* @brief Returns a pointer to the first byte of this accessor view's data.
* The elements are stored contiguously, so the next one starts {@link stride} bytes later.
Expand Down
16 changes: 16 additions & 0 deletions CesiumGltf/include/CesiumGltf/AccessorWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ template <class T> class AccessorWriter final {
AccessorView<T> _accessor;

public:
/**
* @brief The type of the elements in the accessor.
*/
typedef T value_type;

AccessorWriter() : _accessor() {}

/**
Expand Down Expand Up @@ -51,6 +56,17 @@ template <class T> class AccessorWriter final {
AccessorViewStatus status() const noexcept {
return this->_accessor.status();
}

/** @copydoc AccessorView::stride */
int64_t stride() const noexcept { return this->_accessor.stride(); }

/** @copydoc AccessorView::offset */
int64_t offset() const noexcept { return this->_accessor.offset(); }

/** @copydoc AccessorView::data */
std::byte* data() noexcept {
return const_cast<std::byte*>(this->_accessor.data());
}
};

} // namespace CesiumGltf
26 changes: 16 additions & 10 deletions CesiumGltf/test/TestAccessorView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,23 @@
#include <catch2/catch_test_macros.hpp>
#include <glm/vec3.hpp>

using namespace CesiumGltf;

TEST_CASE("AccessorView construct and read example") {
auto anyOldFunctionToGetAModel = []() {
CesiumGltf::Model model;
Model model;

CesiumGltf::Accessor& accessor = model.accessors.emplace_back();
Accessor& accessor = model.accessors.emplace_back();
accessor.bufferView = 0;
accessor.componentType = CesiumGltf::Accessor::ComponentType::FLOAT;
accessor.type = CesiumGltf::Accessor::Type::VEC3;
accessor.componentType = Accessor::ComponentType::FLOAT;
accessor.type = Accessor::Type::VEC3;
accessor.count = 1;

CesiumGltf::BufferView& bufferView = model.bufferViews.emplace_back();
BufferView& bufferView = model.bufferViews.emplace_back();
bufferView.buffer = 0;
bufferView.byteLength = accessor.count * int64_t(sizeof(float)) * 3;

CesiumGltf::Buffer& buffer = model.buffers.emplace_back();
Buffer& buffer = model.buffers.emplace_back();
buffer.byteLength = bufferView.byteLength;
buffer.cesium.data.resize(size_t(buffer.byteLength));

Expand All @@ -32,17 +34,21 @@ TEST_CASE("AccessorView construct and read example") {
};

//! [createFromAccessorAndRead]
CesiumGltf::Model model = anyOldFunctionToGetAModel();
CesiumGltf::AccessorView<glm::vec3> positions(model, 0);
Model model = anyOldFunctionToGetAModel();
AccessorView<glm::vec3> positions(model, 0);
glm::vec3 firstPosition = positions[0];
//! [createFromAccessorAndRead]

CHECK(firstPosition == glm::vec3(1.0f, 2.0f, 3.0f));

CHECK(positions.size() == 1);
CHECK(positions.status() == AccessorViewStatus::Valid);
CHECK(positions.stride() == 12);
CHECK(positions.offset() == 0);
CHECK(positions.data() == model.buffers[0].cesium.data.data());
}

TEST_CASE("Create AccessorView of unknown type with lambda") {
using namespace CesiumGltf;

Model model;

Buffer& buffer = model.buffers.emplace_back();
Expand Down

0 comments on commit baea661

Please sign in to comment.