Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

C++ annotation context #2948

Merged
merged 10 commits into from
Aug 10, 2023
Merged

C++ annotation context #2948

merged 10 commits into from
Aug 10, 2023

Conversation

Wumpf
Copy link
Member

@Wumpf Wumpf commented Aug 9, 2023

What

Small codegen fix for nested array serialization was required.
Adds example & test & roundtrip test for annotation context to C++

Sneaked in: Fixes a few annoyances with VSCode Cpp/CMake config.

image

Checklist

@Wumpf Wumpf added 🍏 primitives Relating to Rerun primitives codegen/idl 🌊 C++ API C/C++ API specific labels Aug 9, 2023
@teh-cmc teh-cmc self-requested a review August 10, 2023 06:54
// [CODEGEN COPY TO HEADER START]

ClassDescription(
AnnotationInfo _info, std::vector<AnnotationInfo> _keypoint_annotations = {},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AnnotationInfo _info, std::vector<AnnotationInfo> _keypoint_annotations = {},
AnnotationInfo _info,
std::vector<AnnotationInfo> _keypoint_annotations = {},

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't control the formatting, this is all clang-format's doing

tests/cpp/roundtrips/annotation_context/main.cpp Outdated Show resolved Hide resolved
rerun_cpp/src/rerun/archetypes/annotation_context.hpp Outdated Show resolved Hide resolved
@Wumpf Wumpf force-pushed the andreas/cpp/annotation-context branch from bb6ae61 to e65529a Compare August 10, 2023 09:13
@Wumpf Wumpf merged commit cdca754 into main Aug 10, 2023
23 checks passed
@Wumpf Wumpf deleted the andreas/cpp/annotation-context branch August 10, 2023 11:43
teh-cmc pushed a commit that referenced this pull request Aug 10, 2023
* Fixes #2794
* Part of #2919

Small codegen fix for nested array serialization was required.
Adds example & test & roundtrip test for annotation context to C++

Sneaked in: Fixes a few annoyances with VSCode Cpp/CMake config.

<img width="1016" alt="image"
src="https://github.com/rerun-io/rerun/assets/1220815/31a764bc-cb51-4420-a75f-0da0eb6bfd39">

* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x ] I have tested [demo.rerun.io](https://demo.rerun.io/pr/2948) (if
applicable)

- [PR Build Summary](https://build.rerun.io/pr/2948)
- [Docs
preview](https://rerun.io/preview/pr%3Aandreas%2Fcpp%2Fannotation-context/docs)
- [Examples
preview](https://rerun.io/preview/pr%3Aandreas%2Fcpp%2Fannotation-context/examples)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌊 C++ API C/C++ API specific codegen/idl 🍏 primitives Relating to Rerun primitives
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AnnotationContext migration to archetypes
2 participants