From 1e19b7b3ddbaa2255444e9840b28f85cb53a6f70 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 11:53:34 +0200 Subject: [PATCH 01/13] First steps of C++ codegen --- .gitignore | 4 +- Cargo.lock | 10 ++ crates/re_types/build.rs | 3 + crates/re_types/source_hash.txt | 2 +- crates/re_types_builder/Cargo.toml | 1 + crates/re_types_builder/src/codegen/cpp.rs | 144 ++++++++++++++++++ crates/re_types_builder/src/codegen/mod.rs | 2 + crates/re_types_builder/src/codegen/python.rs | 10 +- crates/re_types_builder/src/lib.rs | 29 +++- crates/re_types_builder/src/objects.rs | 25 +++ rerun_cpp/build_and_run.sh | 3 +- rerun_cpp/example/main.cpp | 4 - rerun_cpp/src/CMakeLists.txt | 6 +- rerun_cpp/src/archetypes/fuzzy.cpp | 3 + rerun_cpp/src/archetypes/fuzzy.hpp | 9 ++ rerun_cpp/src/archetypes/points2d.cpp | 3 + rerun_cpp/src/archetypes/points2d.hpp | 9 ++ rerun_cpp/src/archetypes/transform3d.cpp | 3 + rerun_cpp/src/archetypes/transform3d.hpp | 9 ++ rerun_cpp/src/components/class_id.cpp | 3 + rerun_cpp/src/components/class_id.hpp | 9 ++ rerun_cpp/src/components/color.cpp | 3 + rerun_cpp/src/components/color.hpp | 9 ++ rerun_cpp/src/components/draw_order.cpp | 3 + rerun_cpp/src/components/draw_order.hpp | 9 ++ rerun_cpp/src/components/fuzzy.cpp | 3 + rerun_cpp/src/components/fuzzy.hpp | 9 ++ rerun_cpp/src/components/instance_key.cpp | 3 + rerun_cpp/src/components/instance_key.hpp | 9 ++ rerun_cpp/src/components/keypoint_id.cpp | 3 + rerun_cpp/src/components/keypoint_id.hpp | 9 ++ rerun_cpp/src/components/label.cpp | 3 + rerun_cpp/src/components/label.hpp | 9 ++ rerun_cpp/src/components/point2d.cpp | 3 + rerun_cpp/src/components/point2d.hpp | 9 ++ rerun_cpp/src/components/radius.cpp | 3 + rerun_cpp/src/components/radius.hpp | 9 ++ rerun_cpp/src/components/transform3d.cpp | 3 + rerun_cpp/src/components/transform3d.hpp | 9 ++ rerun_cpp/src/datatypes/angle.cpp | 3 + rerun_cpp/src/datatypes/angle.hpp | 9 ++ rerun_cpp/src/datatypes/fuzzy.cpp | 3 + rerun_cpp/src/datatypes/fuzzy.hpp | 9 ++ rerun_cpp/src/datatypes/mat3x3.cpp | 3 + rerun_cpp/src/datatypes/mat3x3.hpp | 9 ++ rerun_cpp/src/datatypes/mat4x4.cpp | 3 + rerun_cpp/src/datatypes/mat4x4.hpp | 9 ++ rerun_cpp/src/datatypes/point2d.cpp | 3 + rerun_cpp/src/datatypes/point2d.hpp | 9 ++ rerun_cpp/src/datatypes/quaternion.cpp | 3 + rerun_cpp/src/datatypes/quaternion.hpp | 9 ++ rerun_cpp/src/datatypes/rotation3d.cpp | 3 + rerun_cpp/src/datatypes/rotation3d.hpp | 9 ++ .../src/datatypes/rotation_axis_angle.cpp | 3 + .../src/datatypes/rotation_axis_angle.hpp | 9 ++ rerun_cpp/src/datatypes/scale3d.cpp | 3 + rerun_cpp/src/datatypes/scale3d.hpp | 9 ++ rerun_cpp/src/datatypes/transform3d.cpp | 3 + rerun_cpp/src/datatypes/transform3d.hpp | 9 ++ .../src/datatypes/translation_and_mat3x3.cpp | 3 + .../src/datatypes/translation_and_mat3x3.hpp | 9 ++ .../translation_rotation_scale3d.cpp | 3 + .../translation_rotation_scale3d.hpp | 9 ++ rerun_cpp/src/datatypes/vec2d.cpp | 3 + rerun_cpp/src/datatypes/vec2d.hpp | 9 ++ rerun_cpp/src/datatypes/vec3d.cpp | 3 + rerun_cpp/src/datatypes/vec3d.hpp | 9 ++ rerun_cpp/src/datatypes/vec4d.cpp | 3 + rerun_cpp/src/datatypes/vec4d.hpp | 9 ++ 69 files changed, 566 insertions(+), 13 deletions(-) create mode 100644 crates/re_types_builder/src/codegen/cpp.rs create mode 100644 rerun_cpp/src/archetypes/fuzzy.cpp create mode 100644 rerun_cpp/src/archetypes/fuzzy.hpp create mode 100644 rerun_cpp/src/archetypes/points2d.cpp create mode 100644 rerun_cpp/src/archetypes/points2d.hpp create mode 100644 rerun_cpp/src/archetypes/transform3d.cpp create mode 100644 rerun_cpp/src/archetypes/transform3d.hpp create mode 100644 rerun_cpp/src/components/class_id.cpp create mode 100644 rerun_cpp/src/components/class_id.hpp create mode 100644 rerun_cpp/src/components/color.cpp create mode 100644 rerun_cpp/src/components/color.hpp create mode 100644 rerun_cpp/src/components/draw_order.cpp create mode 100644 rerun_cpp/src/components/draw_order.hpp create mode 100644 rerun_cpp/src/components/fuzzy.cpp create mode 100644 rerun_cpp/src/components/fuzzy.hpp create mode 100644 rerun_cpp/src/components/instance_key.cpp create mode 100644 rerun_cpp/src/components/instance_key.hpp create mode 100644 rerun_cpp/src/components/keypoint_id.cpp create mode 100644 rerun_cpp/src/components/keypoint_id.hpp create mode 100644 rerun_cpp/src/components/label.cpp create mode 100644 rerun_cpp/src/components/label.hpp create mode 100644 rerun_cpp/src/components/point2d.cpp create mode 100644 rerun_cpp/src/components/point2d.hpp create mode 100644 rerun_cpp/src/components/radius.cpp create mode 100644 rerun_cpp/src/components/radius.hpp create mode 100644 rerun_cpp/src/components/transform3d.cpp create mode 100644 rerun_cpp/src/components/transform3d.hpp create mode 100644 rerun_cpp/src/datatypes/angle.cpp create mode 100644 rerun_cpp/src/datatypes/angle.hpp create mode 100644 rerun_cpp/src/datatypes/fuzzy.cpp create mode 100644 rerun_cpp/src/datatypes/fuzzy.hpp create mode 100644 rerun_cpp/src/datatypes/mat3x3.cpp create mode 100644 rerun_cpp/src/datatypes/mat3x3.hpp create mode 100644 rerun_cpp/src/datatypes/mat4x4.cpp create mode 100644 rerun_cpp/src/datatypes/mat4x4.hpp create mode 100644 rerun_cpp/src/datatypes/point2d.cpp create mode 100644 rerun_cpp/src/datatypes/point2d.hpp create mode 100644 rerun_cpp/src/datatypes/quaternion.cpp create mode 100644 rerun_cpp/src/datatypes/quaternion.hpp create mode 100644 rerun_cpp/src/datatypes/rotation3d.cpp create mode 100644 rerun_cpp/src/datatypes/rotation3d.hpp create mode 100644 rerun_cpp/src/datatypes/rotation_axis_angle.cpp create mode 100644 rerun_cpp/src/datatypes/rotation_axis_angle.hpp create mode 100644 rerun_cpp/src/datatypes/scale3d.cpp create mode 100644 rerun_cpp/src/datatypes/scale3d.hpp create mode 100644 rerun_cpp/src/datatypes/transform3d.cpp create mode 100644 rerun_cpp/src/datatypes/transform3d.hpp create mode 100644 rerun_cpp/src/datatypes/translation_and_mat3x3.cpp create mode 100644 rerun_cpp/src/datatypes/translation_and_mat3x3.hpp create mode 100644 rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp create mode 100644 rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp create mode 100644 rerun_cpp/src/datatypes/vec2d.cpp create mode 100644 rerun_cpp/src/datatypes/vec2d.hpp create mode 100644 rerun_cpp/src/datatypes/vec3d.cpp create mode 100644 rerun_cpp/src/datatypes/vec3d.hpp create mode 100644 rerun_cpp/src/datatypes/vec4d.cpp create mode 100644 rerun_cpp/src/datatypes/vec4d.hpp diff --git a/.gitignore b/.gitignore index 2e5a0c07c1d8..b51c3736e608 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ .DS_Store # C++ and CMake stuff: -**/CMakeFiles/ +*.bin +*.o **/build/ +**/CMakeFiles/ # Rust compile target directory: **/target diff --git a/Cargo.lock b/Cargo.lock index aef883418f89..fcd6dff7dd48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -792,6 +792,15 @@ dependencies = [ "half 1.8.2", ] +[[package]] +name = "clang-format" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c6a49aa81aee4ac71d780395eb37788414b1fdb85033b52b5f13e80cd6b9f4a" +dependencies = [ + "once_cell", +] + [[package]] name = "clap" version = "4.3.0" @@ -4535,6 +4544,7 @@ dependencies = [ "anyhow", "arrow2", "camino", + "clang-format", "convert_case", "flatbuffers", "indent", diff --git a/crates/re_types/build.rs b/crates/re_types/build.rs index 431aeba6c0af..3184f6c9eb08 100644 --- a/crates/re_types/build.rs +++ b/crates/re_types/build.rs @@ -18,6 +18,7 @@ const SOURCE_HASH_PATH: &str = "./source_hash.txt"; const DEFINITIONS_DIR_PATH: &str = "./definitions"; const ENTRYPOINT_PATH: &str = "./definitions/rerun/archetypes.fbs"; const DOC_EXAMPLES_DIR_PATH: &str = "../../docs/code-examples"; +const CPP_OUTPUT_DIR_PATH: &str = "../../rerun_cpp/src"; const RUST_OUTPUT_DIR_PATH: &str = "."; const PYTHON_OUTPUT_DIR_PATH: &str = "../../rerun_py/rerun_sdk/rerun/_rerun2"; @@ -106,6 +107,8 @@ fn main() { let (objects, arrow_registry) = re_types_builder::generate_lang_agnostic(DEFINITIONS_DIR_PATH, ENTRYPOINT_PATH); + re_types_builder::generate_cpp_code(CPP_OUTPUT_DIR_PATH, &objects, &arrow_registry); + re_types_builder::generate_rust_code(RUST_OUTPUT_DIR_PATH, &objects, &arrow_registry); // We need to run `cago fmt` several times because it is not idempotent! diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index d0337024e624..a37cc9c3e2e0 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -7b07a9ead58634313a05cbe4384f177af85241e46701dea4e14fa46ac85916a3 +08ff48565c52ba1b521525e867d963c674d5c61a097d529c0751f1ec08c154ce diff --git a/crates/re_types_builder/Cargo.toml b/crates/re_types_builder/Cargo.toml index d3886bd206db..a0b7596e4fdd 100644 --- a/crates/re_types_builder/Cargo.toml +++ b/crates/re_types_builder/Cargo.toml @@ -23,6 +23,7 @@ all-features = true anyhow.workspace = true arrow2.workspace = true camino.workspace = true +clang-format = "0.1" convert_case = "0.6" flatbuffers = "23.0" indent = "0.1" diff --git a/crates/re_types_builder/src/codegen/cpp.rs b/crates/re_types_builder/src/codegen/cpp.rs new file mode 100644 index 000000000000..1dd988be1575 --- /dev/null +++ b/crates/re_types_builder/src/codegen/cpp.rs @@ -0,0 +1,144 @@ +use std::collections::BTreeSet; + +use anyhow::Context as _; +use camino::Utf8PathBuf; +use proc_macro2::TokenStream; +use quote::{format_ident, quote}; + +use crate::{codegen::AUTOGEN_WARNING, ArrowRegistry, Object, ObjectKind, Objects}; + +const NEWLINE_TOKEN: &str = "RE_TOKEN_NEWLINE"; + +pub struct CppCodeGenerator { + output_path: Utf8PathBuf, +} + +impl CppCodeGenerator { + pub fn new(output_path: impl Into) -> Self { + Self { + output_path: output_path.into(), + } + } + + fn generate_folder( + &mut self, + objects: &Objects, + arrow_registry: &ArrowRegistry, + object_kind: ObjectKind, + folder_name: &str, + ) -> BTreeSet { + let mut filepaths = BTreeSet::default(); + + let folder_path = self.output_path.join(folder_name); + std::fs::create_dir_all(&folder_path) + .with_context(|| format!("{folder_path:?}")) + .unwrap(); + for obj in objects.ordered_objects(object_kind.into()) { + let filename = obj.snake_case_name(); + let (hpp, cpp) = generate_hpp_cpp(objects, arrow_registry, obj); + for (extension, tokens) in [("hpp", hpp), ("cpp", cpp)] { + let string = string_from_token_stream(obj, &tokens); + let filepath = folder_path.join(format!("{filename}.{extension}")); + write_file(&filepath, string); + filepaths.insert(filepath); + } + } + + // Clean up old files: + for entry in std::fs::read_dir(folder_path).unwrap().flatten() { + let filepath = Utf8PathBuf::try_from(entry.path()).unwrap(); + if !filepaths.contains(&filepath) { + std::fs::remove_file(filepath).ok(); + } + } + + filepaths + } +} + +impl crate::CodeGenerator for CppCodeGenerator { + fn generate( + &mut self, + objects: &Objects, + arrow_registry: &ArrowRegistry, + ) -> BTreeSet { + let mut filepaths = BTreeSet::new(); + + for object_kind in ObjectKind::ALL { + let folder_name = object_kind.plural_snake_case(); + filepaths.extend(self.generate_folder( + objects, + arrow_registry, + object_kind, + folder_name, + )); + } + + filepaths + } +} + +fn string_from_token_stream(obj: &Object, token_stream: &TokenStream) -> String { + let mut code = String::new(); + code.push_str(&format!("// {AUTOGEN_WARNING}\n")); + if let Some(relative_path) = obj.relative_filepath() { + code.push_str(&format!("// Based on {relative_path:?}")); + } + + code.push('\n'); + code.push_str( + &token_stream + .to_string() + .replace(&format!("{NEWLINE_TOKEN:?}"), "\n"), + ); + code.push('\n'); + + // clang_format has a bit of an ugly API: https://github.com/KDAB/clang-format-rs/issues/3 + clang_format::CLANG_FORMAT_STYLE + .set(clang_format::ClangFormatStyle::File) + .ok(); + code = clang_format::clang_format(&code).expect("Failed to run clang-format"); + + code +} + +fn write_file(filepath: &Utf8PathBuf, code: String) { + if let Ok(existing) = std::fs::read_to_string(filepath) { + if existing == code { + // Don't touch the timestamp unnecessarily + return; + } + } + + std::fs::write(filepath, code) + .with_context(|| format!("{filepath}")) + .unwrap(); +} + +fn generate_hpp_cpp( + _objects: &Objects, + _arrow_registry: &ArrowRegistry, + obj: &crate::Object, +) -> (TokenStream, TokenStream) { + let obj_kind_ident = format_ident!("{}", obj.kind.plural_snake_case()); + + let pascal_case_name = &obj.name; + let pascal_case_ident = format_ident!("{pascal_case_name}"); + let snake_case_name = obj.snake_case_name(); + + let hash = quote! { # }; + let header_file_name = format!("{snake_case_name}.hpp"); + + let hpp = quote! { + #hash pragma once #NEWLINE_TOKEN #NEWLINE_TOKEN + + namespace rr { + namespace #obj_kind_ident { + struct #pascal_case_ident { }; + } + } + }; + let cpp = quote! { #hash include #header_file_name }; + + (hpp, cpp) +} diff --git a/crates/re_types_builder/src/codegen/mod.rs b/crates/re_types_builder/src/codegen/mod.rs index 0608ace21379..f46cb55ff185 100644 --- a/crates/re_types_builder/src/codegen/mod.rs +++ b/crates/re_types_builder/src/codegen/mod.rs @@ -20,8 +20,10 @@ pub const AUTOGEN_WARNING: &str = mod common; use self::common::{get_documentation, StringExt}; +mod cpp; mod python; mod rust; +pub use self::cpp::CppCodeGenerator; pub use self::python::PythonCodeGenerator; pub use self::rust::RustCodeGenerator; diff --git a/crates/re_types_builder/src/codegen/python.rs b/crates/re_types_builder/src/codegen/python.rs index 0e73c65e3aae..e79287432134 100644 --- a/crates/re_types_builder/src/codegen/python.rs +++ b/crates/re_types_builder/src/codegen/python.rs @@ -92,7 +92,7 @@ impl CodeGenerator for PythonCodeGenerator { ) -> BTreeSet { let mut filepaths = BTreeSet::new(); - let datatypes_path = self.pkg_path.join("datatypes"); + let datatypes_path = self.pkg_path.join(ObjectKind::Datatype.plural_snake_case()); let datatype_overrides = load_overrides(&datatypes_path); std::fs::create_dir_all(&datatypes_path) .with_context(|| format!("{datatypes_path:?}")) @@ -109,7 +109,9 @@ impl CodeGenerator for PythonCodeGenerator { .0, ); - let components_path = self.pkg_path.join("components"); + let components_path = self + .pkg_path + .join(ObjectKind::Component.plural_snake_case()); let component_overrides = load_overrides(&components_path); std::fs::create_dir_all(&components_path) .with_context(|| format!("{components_path:?}")) @@ -126,7 +128,9 @@ impl CodeGenerator for PythonCodeGenerator { .0, ); - let archetypes_path = self.pkg_path.join("archetypes"); + let archetypes_path = self + .pkg_path + .join(ObjectKind::Archetype.plural_snake_case()); let archetype_overrides = load_overrides(&archetypes_path); std::fs::create_dir_all(&archetypes_path) .with_context(|| format!("{archetypes_path:?}")) diff --git a/crates/re_types_builder/src/lib.rs b/crates/re_types_builder/src/lib.rs index c4b509d9e1d7..055308e00fa2 100644 --- a/crates/re_types_builder/src/lib.rs +++ b/crates/re_types_builder/src/lib.rs @@ -131,7 +131,7 @@ mod codegen; mod objects; pub use self::arrow_registry::{ArrowRegistry, LazyDatatype, LazyField}; -pub use self::codegen::{CodeGenerator, PythonCodeGenerator, RustCodeGenerator}; +pub use self::codegen::{CodeGenerator, CppCodeGenerator, PythonCodeGenerator, RustCodeGenerator}; pub use self::objects::{ Attributes, Docs, ElementType, Object, ObjectField, ObjectKind, Objects, Type, }; @@ -252,6 +252,33 @@ pub fn generate_lang_agnostic( (objects, arrow_registry) } +/// Generates C++ code. +/// +/// Panics on error. +/// +/// - `output_path`: path to the root of the output. +/// +/// E.g.: +/// ```no_run +/// let (objects, arrow_registry) = re_types_builder::generate_lang_agnostic( +/// "./definitions", +/// "./definitions/rerun/archetypes.fbs", +/// ); +/// re_types_builder::generate_cpp_code( +/// ".", +/// &objects, +/// &arrow_registry, +/// ); +/// ``` +pub fn generate_cpp_code( + output_path: impl AsRef, + objects: &Objects, + arrow_registry: &ArrowRegistry, +) { + let mut gen = CppCodeGenerator::new(output_path.as_ref()); + let _filepaths = gen.generate(objects, arrow_registry); +} + /// Generates Rust code. /// /// Panics on error. diff --git a/crates/re_types_builder/src/objects.rs b/crates/re_types_builder/src/objects.rs index e9be98b443f6..79c6559083e6 100644 --- a/crates/re_types_builder/src/objects.rs +++ b/crates/re_types_builder/src/objects.rs @@ -207,6 +207,8 @@ pub enum ObjectKind { } impl ObjectKind { + pub const ALL: [Self; 3] = [Self::Datatype, Self::Component, Self::Archetype]; + // TODO(#2364): use an attr instead of the path pub fn from_pkg_name(pkg_name: impl AsRef) -> Self { let pkg_name = pkg_name.as_ref().replace(".testing", ""); @@ -220,6 +222,14 @@ impl ObjectKind { panic!("unknown package {pkg_name:?}"); } } + + pub fn plural_snake_case(&self) -> &'static str { + match self { + ObjectKind::Datatype => "datatypes", + ObjectKind::Component => "components", + ObjectKind::Archetype => "archetypes", + } + } } /// A high-level representation of a flatbuffers object's documentation. @@ -596,6 +606,21 @@ impl Object { .try_get::(&self.fqname, crate::ATTR_TRANSPARENT) .is_some() } + + /// Try to find the relative file path of the `.fbs` source file. + pub fn relative_filepath(&self) -> Option<&Utf8Path> { + std::env::var("CARGO_MANIFEST_DIR") + .ok() + .and_then(|manifest_dir| self.filepath.strip_prefix(manifest_dir).ok()) + } + + /// The snake-case filename of the object, e.g. `point2d`. + pub fn snake_case_name(&self) -> String { + Utf8PathBuf::from(&self.virtpath) + .file_stem() + .unwrap() + .to_owned() + } } /// Properties specific to either structs or unions, but not both. diff --git a/rerun_cpp/build_and_run.sh b/rerun_cpp/build_and_run.sh index 58ef0b2e04bf..4c0091909a54 100755 --- a/rerun_cpp/build_and_run.sh +++ b/rerun_cpp/build_and_run.sh @@ -7,9 +7,8 @@ set -x mkdir -p build pushd build - cargo build -p rerun_c # TODO(emilk): add this to CMakelists.txt instead? cmake -DCMAKE_BUILD_TYPE=Debug .. - make # VERBOSE=1 + make -j8 # VERBOSE=1 popd ./build/example/rerun_example diff --git a/rerun_cpp/example/main.cpp b/rerun_cpp/example/main.cpp index 2570abbb4fed..232fb5346720 100644 --- a/rerun_cpp/example/main.cpp +++ b/rerun_cpp/example/main.cpp @@ -1,7 +1,3 @@ -#include - -#define RERUN_WITH_ARROW 1 - #include #include diff --git a/rerun_cpp/src/CMakeLists.txt b/rerun_cpp/src/CMakeLists.txt index 2687315aa452..d91df4649d8f 100644 --- a/rerun_cpp/src/CMakeLists.txt +++ b/rerun_cpp/src/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) # manually listing all the files, like it's 1972. # However, that won't work for use since we auto-generate the source tree. # See https://cmake.org/cmake/help/latest/command/file.html#glob -file(GLOB rerun_sdk_SRC CONFIGURE_DEPENDS +file(GLOB_RECURSE rerun_sdk_SRC CONFIGURE_DEPENDS "*.hpp" "*.cpp" ) @@ -37,6 +37,10 @@ FetchContent_MakeAvailable(LoguruGitRepo) # defines target 'loguru::loguru' target_link_libraries(rerun_sdk PRIVATE loguru::loguru) +# ------------------------------------------------------------------------------ +execute_process(COMMAND cargo build -p re_types) # Generates most of the C++ source files +execute_process(COMMAND cargo build -p rerun_c) # We link against this, so must be up-to-date + # ------------------------------------------------------------------------------ if(APPLE) target_link_libraries(rerun_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/librerun_c.a) diff --git a/rerun_cpp/src/archetypes/fuzzy.cpp b/rerun_cpp/src/archetypes/fuzzy.cpp new file mode 100644 index 000000000000..da958e692679 --- /dev/null +++ b/rerun_cpp/src/archetypes/fuzzy.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/archetypes/fuzzy.fbs" +#include "fuzzy.hpp" diff --git a/rerun_cpp/src/archetypes/fuzzy.hpp b/rerun_cpp/src/archetypes/fuzzy.hpp new file mode 100644 index 000000000000..e54c76f206ca --- /dev/null +++ b/rerun_cpp/src/archetypes/fuzzy.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/archetypes/fuzzy.fbs" +#pragma once + +namespace rr { + namespace archetypes { + struct AffixFuzzer1 {}; + } // namespace archetypes +} // namespace rr diff --git a/rerun_cpp/src/archetypes/points2d.cpp b/rerun_cpp/src/archetypes/points2d.cpp new file mode 100644 index 000000000000..c5ccc29a7da4 --- /dev/null +++ b/rerun_cpp/src/archetypes/points2d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/archetypes/points2d.fbs" +#include "points2d.hpp" diff --git a/rerun_cpp/src/archetypes/points2d.hpp b/rerun_cpp/src/archetypes/points2d.hpp new file mode 100644 index 000000000000..0a071bdd9500 --- /dev/null +++ b/rerun_cpp/src/archetypes/points2d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/archetypes/points2d.fbs" +#pragma once + +namespace rr { + namespace archetypes { + struct Points2D {}; + } // namespace archetypes +} // namespace rr diff --git a/rerun_cpp/src/archetypes/transform3d.cpp b/rerun_cpp/src/archetypes/transform3d.cpp new file mode 100644 index 000000000000..8ff520f73ff4 --- /dev/null +++ b/rerun_cpp/src/archetypes/transform3d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/archetypes/transform3d.fbs" +#include "transform3d.hpp" diff --git a/rerun_cpp/src/archetypes/transform3d.hpp b/rerun_cpp/src/archetypes/transform3d.hpp new file mode 100644 index 000000000000..c216f0883f20 --- /dev/null +++ b/rerun_cpp/src/archetypes/transform3d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/archetypes/transform3d.fbs" +#pragma once + +namespace rr { + namespace archetypes { + struct Transform3D {}; + } // namespace archetypes +} // namespace rr diff --git a/rerun_cpp/src/components/class_id.cpp b/rerun_cpp/src/components/class_id.cpp new file mode 100644 index 000000000000..6b427c4a9378 --- /dev/null +++ b/rerun_cpp/src/components/class_id.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/class_id.fbs" +#include "class_id.hpp" diff --git a/rerun_cpp/src/components/class_id.hpp b/rerun_cpp/src/components/class_id.hpp new file mode 100644 index 000000000000..c38fffc165b9 --- /dev/null +++ b/rerun_cpp/src/components/class_id.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/class_id.fbs" +#pragma once + +namespace rr { + namespace components { + struct ClassId {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/color.cpp b/rerun_cpp/src/components/color.cpp new file mode 100644 index 000000000000..bda6f5ec6124 --- /dev/null +++ b/rerun_cpp/src/components/color.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/color.fbs" +#include "color.hpp" diff --git a/rerun_cpp/src/components/color.hpp b/rerun_cpp/src/components/color.hpp new file mode 100644 index 000000000000..9d98846d7033 --- /dev/null +++ b/rerun_cpp/src/components/color.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/color.fbs" +#pragma once + +namespace rr { + namespace components { + struct Color {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/draw_order.cpp b/rerun_cpp/src/components/draw_order.cpp new file mode 100644 index 000000000000..89375dc5bf51 --- /dev/null +++ b/rerun_cpp/src/components/draw_order.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/draw_order.fbs" +#include "draw_order.hpp" diff --git a/rerun_cpp/src/components/draw_order.hpp b/rerun_cpp/src/components/draw_order.hpp new file mode 100644 index 000000000000..0703cf5064c4 --- /dev/null +++ b/rerun_cpp/src/components/draw_order.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/draw_order.fbs" +#pragma once + +namespace rr { + namespace components { + struct DrawOrder {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/fuzzy.cpp b/rerun_cpp/src/components/fuzzy.cpp new file mode 100644 index 000000000000..a06ff0287561 --- /dev/null +++ b/rerun_cpp/src/components/fuzzy.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "fuzzy.hpp" diff --git a/rerun_cpp/src/components/fuzzy.hpp b/rerun_cpp/src/components/fuzzy.hpp new file mode 100644 index 000000000000..e97507fcbc55 --- /dev/null +++ b/rerun_cpp/src/components/fuzzy.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer19 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/instance_key.cpp b/rerun_cpp/src/components/instance_key.cpp new file mode 100644 index 000000000000..7ad1f2bdbff3 --- /dev/null +++ b/rerun_cpp/src/components/instance_key.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/instance_key.fbs" +#include "instance_key.hpp" diff --git a/rerun_cpp/src/components/instance_key.hpp b/rerun_cpp/src/components/instance_key.hpp new file mode 100644 index 000000000000..21a86338095b --- /dev/null +++ b/rerun_cpp/src/components/instance_key.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/instance_key.fbs" +#pragma once + +namespace rr { + namespace components { + struct InstanceKey {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/keypoint_id.cpp b/rerun_cpp/src/components/keypoint_id.cpp new file mode 100644 index 000000000000..b85c481ae94b --- /dev/null +++ b/rerun_cpp/src/components/keypoint_id.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/keypoint_id.fbs" +#include "keypoint_id.hpp" diff --git a/rerun_cpp/src/components/keypoint_id.hpp b/rerun_cpp/src/components/keypoint_id.hpp new file mode 100644 index 000000000000..b426e3b1ed69 --- /dev/null +++ b/rerun_cpp/src/components/keypoint_id.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/keypoint_id.fbs" +#pragma once + +namespace rr { + namespace components { + struct KeypointId {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/label.cpp b/rerun_cpp/src/components/label.cpp new file mode 100644 index 000000000000..a1e153a8d45b --- /dev/null +++ b/rerun_cpp/src/components/label.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/label.fbs" +#include "label.hpp" diff --git a/rerun_cpp/src/components/label.hpp b/rerun_cpp/src/components/label.hpp new file mode 100644 index 000000000000..ddb0a1f536bb --- /dev/null +++ b/rerun_cpp/src/components/label.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/label.fbs" +#pragma once + +namespace rr { + namespace components { + struct Label {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/point2d.cpp b/rerun_cpp/src/components/point2d.cpp new file mode 100644 index 000000000000..c920df549054 --- /dev/null +++ b/rerun_cpp/src/components/point2d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/point2d.fbs" +#include "point2d.hpp" diff --git a/rerun_cpp/src/components/point2d.hpp b/rerun_cpp/src/components/point2d.hpp new file mode 100644 index 000000000000..03a1d36c6e8e --- /dev/null +++ b/rerun_cpp/src/components/point2d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/point2d.fbs" +#pragma once + +namespace rr { + namespace components { + struct Point2D {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/radius.cpp b/rerun_cpp/src/components/radius.cpp new file mode 100644 index 000000000000..3b0dea8d0108 --- /dev/null +++ b/rerun_cpp/src/components/radius.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/radius.fbs" +#include "radius.hpp" diff --git a/rerun_cpp/src/components/radius.hpp b/rerun_cpp/src/components/radius.hpp new file mode 100644 index 000000000000..4b5e38a442e4 --- /dev/null +++ b/rerun_cpp/src/components/radius.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/radius.fbs" +#pragma once + +namespace rr { + namespace components { + struct Radius {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/transform3d.cpp b/rerun_cpp/src/components/transform3d.cpp new file mode 100644 index 000000000000..87697a5c7b1b --- /dev/null +++ b/rerun_cpp/src/components/transform3d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/transform3d.fbs" +#include "transform3d.hpp" diff --git a/rerun_cpp/src/components/transform3d.hpp b/rerun_cpp/src/components/transform3d.hpp new file mode 100644 index 000000000000..fa7efba851d7 --- /dev/null +++ b/rerun_cpp/src/components/transform3d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/components/transform3d.fbs" +#pragma once + +namespace rr { + namespace components { + struct Transform3D {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/datatypes/angle.cpp b/rerun_cpp/src/datatypes/angle.cpp new file mode 100644 index 000000000000..d5fd07d3eacd --- /dev/null +++ b/rerun_cpp/src/datatypes/angle.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/angle.fbs" +#include "angle.hpp" diff --git a/rerun_cpp/src/datatypes/angle.hpp b/rerun_cpp/src/datatypes/angle.hpp new file mode 100644 index 000000000000..900675576bca --- /dev/null +++ b/rerun_cpp/src/datatypes/angle.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/angle.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Angle {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/fuzzy.cpp b/rerun_cpp/src/datatypes/fuzzy.cpp new file mode 100644 index 000000000000..81fc90794535 --- /dev/null +++ b/rerun_cpp/src/datatypes/fuzzy.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#include "fuzzy.hpp" diff --git a/rerun_cpp/src/datatypes/fuzzy.hpp b/rerun_cpp/src/datatypes/fuzzy.hpp new file mode 100644 index 000000000000..7cbd8c65fdf4 --- /dev/null +++ b/rerun_cpp/src/datatypes/fuzzy.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct AffixFuzzer5 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/mat3x3.cpp b/rerun_cpp/src/datatypes/mat3x3.cpp new file mode 100644 index 000000000000..3c2a0f900732 --- /dev/null +++ b/rerun_cpp/src/datatypes/mat3x3.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/mat3x3.fbs" +#include "mat3x3.hpp" diff --git a/rerun_cpp/src/datatypes/mat3x3.hpp b/rerun_cpp/src/datatypes/mat3x3.hpp new file mode 100644 index 000000000000..bff38c587680 --- /dev/null +++ b/rerun_cpp/src/datatypes/mat3x3.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/mat3x3.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Mat3x3 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/mat4x4.cpp b/rerun_cpp/src/datatypes/mat4x4.cpp new file mode 100644 index 000000000000..fa00854a9c00 --- /dev/null +++ b/rerun_cpp/src/datatypes/mat4x4.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/mat4x4.fbs" +#include "mat4x4.hpp" diff --git a/rerun_cpp/src/datatypes/mat4x4.hpp b/rerun_cpp/src/datatypes/mat4x4.hpp new file mode 100644 index 000000000000..ee8c8d054678 --- /dev/null +++ b/rerun_cpp/src/datatypes/mat4x4.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/mat4x4.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Mat4x4 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/point2d.cpp b/rerun_cpp/src/datatypes/point2d.cpp new file mode 100644 index 000000000000..2573a2ac3bd2 --- /dev/null +++ b/rerun_cpp/src/datatypes/point2d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/point2d.fbs" +#include "point2d.hpp" diff --git a/rerun_cpp/src/datatypes/point2d.hpp b/rerun_cpp/src/datatypes/point2d.hpp new file mode 100644 index 000000000000..90fa7b5a194e --- /dev/null +++ b/rerun_cpp/src/datatypes/point2d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/point2d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Point2D {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/quaternion.cpp b/rerun_cpp/src/datatypes/quaternion.cpp new file mode 100644 index 000000000000..bd044e78087c --- /dev/null +++ b/rerun_cpp/src/datatypes/quaternion.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/quaternion.fbs" +#include "quaternion.hpp" diff --git a/rerun_cpp/src/datatypes/quaternion.hpp b/rerun_cpp/src/datatypes/quaternion.hpp new file mode 100644 index 000000000000..d18a28ff780d --- /dev/null +++ b/rerun_cpp/src/datatypes/quaternion.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/quaternion.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Quaternion {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/rotation3d.cpp b/rerun_cpp/src/datatypes/rotation3d.cpp new file mode 100644 index 000000000000..bbb0c7de72dd --- /dev/null +++ b/rerun_cpp/src/datatypes/rotation3d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/rotation3d.fbs" +#include "rotation3d.hpp" diff --git a/rerun_cpp/src/datatypes/rotation3d.hpp b/rerun_cpp/src/datatypes/rotation3d.hpp new file mode 100644 index 000000000000..71e26757a43b --- /dev/null +++ b/rerun_cpp/src/datatypes/rotation3d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/rotation3d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Rotation3D {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/rotation_axis_angle.cpp b/rerun_cpp/src/datatypes/rotation_axis_angle.cpp new file mode 100644 index 000000000000..92ea21ec034d --- /dev/null +++ b/rerun_cpp/src/datatypes/rotation_axis_angle.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/rotation_axis_angle.fbs" +#include "rotation_axis_angle.hpp" diff --git a/rerun_cpp/src/datatypes/rotation_axis_angle.hpp b/rerun_cpp/src/datatypes/rotation_axis_angle.hpp new file mode 100644 index 000000000000..6ba99ec1ebf5 --- /dev/null +++ b/rerun_cpp/src/datatypes/rotation_axis_angle.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/rotation_axis_angle.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct RotationAxisAngle {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/scale3d.cpp b/rerun_cpp/src/datatypes/scale3d.cpp new file mode 100644 index 000000000000..fc6f95c6e34a --- /dev/null +++ b/rerun_cpp/src/datatypes/scale3d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/scale3d.fbs" +#include "scale3d.hpp" diff --git a/rerun_cpp/src/datatypes/scale3d.hpp b/rerun_cpp/src/datatypes/scale3d.hpp new file mode 100644 index 000000000000..9ac1a15270b2 --- /dev/null +++ b/rerun_cpp/src/datatypes/scale3d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/scale3d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Scale3D {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/transform3d.cpp b/rerun_cpp/src/datatypes/transform3d.cpp new file mode 100644 index 000000000000..e0c756f48219 --- /dev/null +++ b/rerun_cpp/src/datatypes/transform3d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/transform3d.fbs" +#include "transform3d.hpp" diff --git a/rerun_cpp/src/datatypes/transform3d.hpp b/rerun_cpp/src/datatypes/transform3d.hpp new file mode 100644 index 000000000000..e841b68cd114 --- /dev/null +++ b/rerun_cpp/src/datatypes/transform3d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/transform3d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Transform3D {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/translation_and_mat3x3.cpp b/rerun_cpp/src/datatypes/translation_and_mat3x3.cpp new file mode 100644 index 000000000000..bbc5b2b74117 --- /dev/null +++ b/rerun_cpp/src/datatypes/translation_and_mat3x3.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/translation_and_mat3x3.fbs" +#include "translation_and_mat3x3.hpp" diff --git a/rerun_cpp/src/datatypes/translation_and_mat3x3.hpp b/rerun_cpp/src/datatypes/translation_and_mat3x3.hpp new file mode 100644 index 000000000000..3309bcdcc83c --- /dev/null +++ b/rerun_cpp/src/datatypes/translation_and_mat3x3.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/translation_and_mat3x3.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct TranslationAndMat3x3 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp b/rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp new file mode 100644 index 000000000000..092b56a07fd5 --- /dev/null +++ b/rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/translation_rotation_scale3d.fbs" +#include "translation_rotation_scale3d.hpp" diff --git a/rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp b/rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp new file mode 100644 index 000000000000..dac0069ab9e3 --- /dev/null +++ b/rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/translation_rotation_scale3d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct TranslationRotationScale3D {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/vec2d.cpp b/rerun_cpp/src/datatypes/vec2d.cpp new file mode 100644 index 000000000000..fa3f1312da8c --- /dev/null +++ b/rerun_cpp/src/datatypes/vec2d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/vec2d.fbs" +#include "vec2d.hpp" diff --git a/rerun_cpp/src/datatypes/vec2d.hpp b/rerun_cpp/src/datatypes/vec2d.hpp new file mode 100644 index 000000000000..8911d4fb106a --- /dev/null +++ b/rerun_cpp/src/datatypes/vec2d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/vec2d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Vec2D {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/vec3d.cpp b/rerun_cpp/src/datatypes/vec3d.cpp new file mode 100644 index 000000000000..0ee1c9bf0a4e --- /dev/null +++ b/rerun_cpp/src/datatypes/vec3d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/vec3d.fbs" +#include "vec3d.hpp" diff --git a/rerun_cpp/src/datatypes/vec3d.hpp b/rerun_cpp/src/datatypes/vec3d.hpp new file mode 100644 index 000000000000..9a8ff11a2091 --- /dev/null +++ b/rerun_cpp/src/datatypes/vec3d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/vec3d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Vec3D {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/vec4d.cpp b/rerun_cpp/src/datatypes/vec4d.cpp new file mode 100644 index 000000000000..fd7dbbe208c0 --- /dev/null +++ b/rerun_cpp/src/datatypes/vec4d.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/vec4d.fbs" +#include "vec4d.hpp" diff --git a/rerun_cpp/src/datatypes/vec4d.hpp b/rerun_cpp/src/datatypes/vec4d.hpp new file mode 100644 index 000000000000..2689ad7bff48 --- /dev/null +++ b/rerun_cpp/src/datatypes/vec4d.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/datatypes/vec4d.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct Vec4D {}; + } // namespace datatypes +} // namespace rr From 8a60fd1c24a48bb84cbacf9189ade9c3a2429ec9 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 16:43:16 +0200 Subject: [PATCH 02/13] Move C and C++ examples to examples/ folder --- CMakeLists.txt | 6 ++ crates/rerun_c/run_examples.sh | 7 -- examples/c/README.md | 1 + .../example => examples/c/minimal}/.gitignore | 0 .../example => examples/c/minimal}/Makefile | 2 +- .../example => examples/c/minimal}/README.md | 0 .../example => examples/c/minimal}/main.c | 0 examples/cpp/README.md | 1 + .../cpp/minimal}/CMakeLists.txt | 2 +- examples/cpp/minimal/README.md | 5 ++ .../cpp/minimal}/build_and_run.sh | 5 +- .../example => examples/cpp/minimal}/main.cpp | 0 rerun_cpp/CMakeLists.txt | 71 ++++++++++++++++++- rerun_cpp/README.md | 2 +- rerun_cpp/example/README.md | 5 -- rerun_cpp/src/CMakeLists.txt | 71 ------------------- 16 files changed, 86 insertions(+), 92 deletions(-) create mode 100644 CMakeLists.txt delete mode 100755 crates/rerun_c/run_examples.sh create mode 100644 examples/c/README.md rename {crates/rerun_c/example => examples/c/minimal}/.gitignore (100%) rename {crates/rerun_c/example => examples/c/minimal}/Makefile (93%) rename {crates/rerun_c/example => examples/c/minimal}/README.md (100%) rename {crates/rerun_c/example => examples/c/minimal}/main.c (100%) create mode 100644 examples/cpp/README.md rename {rerun_cpp/example => examples/cpp/minimal}/CMakeLists.txt (88%) create mode 100644 examples/cpp/minimal/README.md rename {rerun_cpp => examples/cpp/minimal}/build_and_run.sh (73%) rename {rerun_cpp/example => examples/cpp/minimal}/main.cpp (100%) delete mode 100644 rerun_cpp/example/README.md delete mode 100644 rerun_cpp/src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 000000000000..2cf3cd01cdca --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.16) + +project(rerun_cpp_proj LANGUAGES CXX) + +add_subdirectory(rerun_cpp) # The Rerun C++ SDK library +add_subdirectory(examples/cpp/minimal) diff --git a/crates/rerun_c/run_examples.sh b/crates/rerun_c/run_examples.sh deleted file mode 100755 index e4a3770cf04c..000000000000 --- a/crates/rerun_c/run_examples.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -eu -script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) -set -x - -(cd "$script_path/example" && make run) diff --git a/examples/c/README.md b/examples/c/README.md new file mode 100644 index 000000000000..1bacc94d5a08 --- /dev/null +++ b/examples/c/README.md @@ -0,0 +1 @@ +The Rerun C SDK is in its infancy, and not ready for production. diff --git a/crates/rerun_c/example/.gitignore b/examples/c/minimal/.gitignore similarity index 100% rename from crates/rerun_c/example/.gitignore rename to examples/c/minimal/.gitignore diff --git a/crates/rerun_c/example/Makefile b/examples/c/minimal/Makefile similarity index 93% rename from crates/rerun_c/example/Makefile rename to examples/c/minimal/Makefile index 4e00643d109e..4b10ddf20e6b 100644 --- a/crates/rerun_c/example/Makefile +++ b/examples/c/minimal/Makefile @@ -1,7 +1,7 @@ CC = gcc CFLAGS = --std=c99 -O2 -g -DNDEBUG CFLAGS += -Wall -Wextra -Wpedantic -Wcast-align -Wcast-qual -Wformat=2 -Wmissing-include-dirs -Wnull-dereference -Woverloaded-virtual -Wpointer-arith -Wshadow -Wswitch-enum -Wvla -Wno-sign-compare -Wconversion -Wunused -Wold-style-cast -Wno-missing-braces -CFLAGS += -I ../src # Make sure rerun.h is found +CFLAGS += -I ../../../crates/rerun_c/src # Make sure rerun.h is found LDLIBS = OBJECTS = main.o diff --git a/crates/rerun_c/example/README.md b/examples/c/minimal/README.md similarity index 100% rename from crates/rerun_c/example/README.md rename to examples/c/minimal/README.md diff --git a/crates/rerun_c/example/main.c b/examples/c/minimal/main.c similarity index 100% rename from crates/rerun_c/example/main.c rename to examples/c/minimal/main.c diff --git a/examples/cpp/README.md b/examples/cpp/README.md new file mode 100644 index 000000000000..555ca37bda36 --- /dev/null +++ b/examples/cpp/README.md @@ -0,0 +1 @@ +The Rerun C++ SDK is in its infancy, and not ready for production. diff --git a/rerun_cpp/example/CMakeLists.txt b/examples/cpp/minimal/CMakeLists.txt similarity index 88% rename from rerun_cpp/example/CMakeLists.txt rename to examples/cpp/minimal/CMakeLists.txt index af764b822b9c..2dedec771f0f 100644 --- a/rerun_cpp/example/CMakeLists.txt +++ b/examples/cpp/minimal/CMakeLists.txt @@ -21,6 +21,6 @@ else() target_compile_options(rerun_example PRIVATE -Wall -Wextra -Wpedantic -Wcast-align -Wcast-qual -Wformat=2 -Wmissing-include-dirs -Wnull-dereference -Woverloaded-virtual -Wpointer-arith -Wshadow -Wswitch-enum -Wvla -Wno-sign-compare -Wconversion -Wunused -Wold-style-cast -Wno-missing-braces) endif() -include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../src) # For rerun.hpp (Rerun C++ SDK) +include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../../../rerun_cpp/src) # For rerun.hpp (Rerun C++ SDK) target_link_libraries(rerun_example PRIVATE loguru::loguru rerun_sdk) diff --git a/examples/cpp/minimal/README.md b/examples/cpp/minimal/README.md new file mode 100644 index 000000000000..5041110c8676 --- /dev/null +++ b/examples/cpp/minimal/README.md @@ -0,0 +1,5 @@ +# Example of using the Rerun C SDK + +``` +make run +``` diff --git a/rerun_cpp/build_and_run.sh b/examples/cpp/minimal/build_and_run.sh similarity index 73% rename from rerun_cpp/build_and_run.sh rename to examples/cpp/minimal/build_and_run.sh index 4c0091909a54..b19b24164e42 100755 --- a/rerun_cpp/build_and_run.sh +++ b/examples/cpp/minimal/build_and_run.sh @@ -2,7 +2,7 @@ set -eu script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P ) -cd "$script_path" +cd "$script_path/../../.." set -x mkdir -p build @@ -11,5 +11,4 @@ pushd build make -j8 # VERBOSE=1 popd -./build/example/rerun_example - +./build/examples/cpp/minimal/rerun_example diff --git a/rerun_cpp/example/main.cpp b/examples/cpp/minimal/main.cpp similarity index 100% rename from rerun_cpp/example/main.cpp rename to examples/cpp/minimal/main.cpp diff --git a/rerun_cpp/CMakeLists.txt b/rerun_cpp/CMakeLists.txt index 13f41954602f..a937d45ba0c4 100644 --- a/rerun_cpp/CMakeLists.txt +++ b/rerun_cpp/CMakeLists.txt @@ -1,6 +1,71 @@ cmake_minimum_required(VERSION 3.16) -project(rerun_cpp_proj LANGUAGES CXX) +# NOTE: CMake docs strongly discourages using GLOB, and instead suggests +# manually listing all the files, like it's 1972. +# However, that won't work for use since we auto-generate the source tree. +# See https://cmake.org/cmake/help/latest/command/file.html#glob +file(GLOB_RECURSE rerun_sdk_SRC CONFIGURE_DEPENDS + "*.hpp" + "*.cpp" +) -add_subdirectory(src) # The Rerun C++ SDK library -add_subdirectory(example) +add_library(rerun_sdk ${rerun_sdk_SRC}) + +# ------------------------------------------------------------------------------ + +# For rerun.h (Rerun C SDK): +include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../crates/rerun_c/src) + +# Make sure the compiler can find include files for rerun +# when other libraries or executables link to rerun: +target_include_directories(rerun_sdk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +# ------------------------------------------------------------------------------ +# Loguru logging library (https://github.com/emilk/loguru): +set(CMAKE_DL_LIBS "dl") # Required by Loguru for backtraces + +# Loguru, see https://github.com/emilk/loguru/blob/master/loguru_cmake_example/CMakeLists.txt +include(FetchContent) +FetchContent_Declare(LoguruGitRepo + GIT_REPOSITORY "https://github.com/emilk/loguru" # can be a filesystem path + GIT_TAG "master" +) + +# set any loguru compile-time flags before calling MakeAvailable() +set(LOGURU_STACKTRACES 1) +FetchContent_MakeAvailable(LoguruGitRepo) # defines target 'loguru::loguru' + +target_link_libraries(rerun_sdk PRIVATE loguru::loguru) + +# ------------------------------------------------------------------------------ +execute_process(COMMAND cargo build -p re_types) # Generates most of the C++ source files +execute_process(COMMAND cargo build -p rerun_c) # We link against this, so must be up-to-date + +# ------------------------------------------------------------------------------ +if(APPLE) + target_link_libraries(rerun_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../target/debug/librerun_c.a) + target_link_libraries(rerun_sdk PRIVATE "-framework CoreFoundation" "-framework IOKit") +endif() + +if(LINUX) + target_link_libraries(rerun_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../target/debug/librerun_c.a) + target_link_libraries(rerun_sdk PRIVATE "-lm") +endif() + +# ----------------------------------------------------------------------------- +# Arrow: +option(ARROW_LINK_SHARED "Link to the Arrow shared library" ON) + +find_package(Arrow REQUIRED) + +# Arrow requires a C++17 compliant compiler +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +message(STATUS "Arrow version: ${ARROW_VERSION}") +message(STATUS "Arrow SO version: ${ARROW_FULL_SO_VERSION}") + +if(ARROW_LINK_SHARED) + target_link_libraries(rerun_sdk PRIVATE Arrow::arrow_shared) +else() + target_link_libraries(rerun_sdk PRIVATE Arrow::arrow_static) +endif() diff --git a/rerun_cpp/README.md b/rerun_cpp/README.md index e27e375d5287..a86ff38dd4aa 100644 --- a/rerun_cpp/README.md +++ b/rerun_cpp/README.md @@ -6,7 +6,7 @@ This is not yet ready to be used. Run `scripts/setup.sh`. ## Test it -rerun_cpp/example/build_and_run.sh +`examples/cpp/minimal/build_and_run.sh`` # To do: * CI diff --git a/rerun_cpp/example/README.md b/rerun_cpp/example/README.md deleted file mode 100644 index adb11aefbb05..000000000000 --- a/rerun_cpp/example/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Example of using the Rerun C++ SDK - -``` -make run -``` diff --git a/rerun_cpp/src/CMakeLists.txt b/rerun_cpp/src/CMakeLists.txt deleted file mode 100644 index d91df4649d8f..000000000000 --- a/rerun_cpp/src/CMakeLists.txt +++ /dev/null @@ -1,71 +0,0 @@ -cmake_minimum_required(VERSION 3.16) - -# NOTE: CMake docs strongly discourages using GLOB, and instead suggests -# manually listing all the files, like it's 1972. -# However, that won't work for use since we auto-generate the source tree. -# See https://cmake.org/cmake/help/latest/command/file.html#glob -file(GLOB_RECURSE rerun_sdk_SRC CONFIGURE_DEPENDS - "*.hpp" - "*.cpp" -) - -add_library(rerun_sdk ${rerun_sdk_SRC}) - -# ------------------------------------------------------------------------------ - -# For rerun.h (Rerun C SDK): -include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/../../crates/rerun_c/src) - -# Make sure the compiler can find include files for rerun -# when other libraries or executables link to rerun: -target_include_directories(rerun_sdk PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) - -# ------------------------------------------------------------------------------ -# Loguru logging library (https://github.com/emilk/loguru): -set(CMAKE_DL_LIBS "dl") # Required by Loguru for backtraces - -# Loguru, see https://github.com/emilk/loguru/blob/master/loguru_cmake_example/CMakeLists.txt -include(FetchContent) -FetchContent_Declare(LoguruGitRepo - GIT_REPOSITORY "https://github.com/emilk/loguru" # can be a filesystem path - GIT_TAG "master" -) - -# set any loguru compile-time flags before calling MakeAvailable() -set(LOGURU_STACKTRACES 1) -FetchContent_MakeAvailable(LoguruGitRepo) # defines target 'loguru::loguru' - -target_link_libraries(rerun_sdk PRIVATE loguru::loguru) - -# ------------------------------------------------------------------------------ -execute_process(COMMAND cargo build -p re_types) # Generates most of the C++ source files -execute_process(COMMAND cargo build -p rerun_c) # We link against this, so must be up-to-date - -# ------------------------------------------------------------------------------ -if(APPLE) - target_link_libraries(rerun_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/librerun_c.a) - target_link_libraries(rerun_sdk PRIVATE "-framework CoreFoundation" "-framework IOKit") -endif() - -if(LINUX) - target_link_libraries(rerun_sdk PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../target/debug/librerun_c.a) - target_link_libraries(rerun_sdk PRIVATE "-lm") -endif() - -# ----------------------------------------------------------------------------- -# Arrow: -option(ARROW_LINK_SHARED "Link to the Arrow shared library" ON) - -find_package(Arrow REQUIRED) - -# Arrow requires a C++17 compliant compiler -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -message(STATUS "Arrow version: ${ARROW_VERSION}") -message(STATUS "Arrow SO version: ${ARROW_FULL_SO_VERSION}") - -if(ARROW_LINK_SHARED) - target_link_libraries(rerun_sdk PRIVATE Arrow::arrow_shared) -else() - target_link_libraries(rerun_sdk PRIVATE Arrow::arrow_static) -endif() From 4826c5e59cbe2686722663978a937fd52929ef5d Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 17:04:04 +0200 Subject: [PATCH 03/13] Write module files and include it in the top-level --- crates/re_types/source_hash.txt | 2 +- crates/re_types_builder/src/codegen/cpp.rs | 52 +++++++++++++++++----- rerun_cpp/src/archetypes.hpp | 7 +++ rerun_cpp/src/components.hpp | 14 ++++++ rerun_cpp/src/datatypes.hpp | 19 ++++++++ rerun_cpp/src/rerun.hpp | 6 +++ 6 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 rerun_cpp/src/archetypes.hpp create mode 100644 rerun_cpp/src/components.hpp create mode 100644 rerun_cpp/src/datatypes.hpp diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index a37cc9c3e2e0..43d55f642898 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -08ff48565c52ba1b521525e867d963c674d5c61a097d529c0751f1ec08c154ce +6d6e6a58aed84a5b4282f17bacbd5c0dc0553798d35a9d61898feb77eee342da diff --git a/crates/re_types_builder/src/codegen/cpp.rs b/crates/re_types_builder/src/codegen/cpp.rs index 1dd988be1575..0f05965512de 100644 --- a/crates/re_types_builder/src/codegen/cpp.rs +++ b/crates/re_types_builder/src/codegen/cpp.rs @@ -1,11 +1,11 @@ use std::collections::BTreeSet; use anyhow::Context as _; -use camino::Utf8PathBuf; +use camino::{Utf8Path, Utf8PathBuf}; use proc_macro2::TokenStream; use quote::{format_ident, quote}; -use crate::{codegen::AUTOGEN_WARNING, ArrowRegistry, Object, ObjectKind, Objects}; +use crate::{codegen::AUTOGEN_WARNING, ArrowRegistry, ObjectKind, Objects}; const NEWLINE_TOKEN: &str = "RE_TOKEN_NEWLINE"; @@ -27,23 +27,46 @@ impl CppCodeGenerator { object_kind: ObjectKind, folder_name: &str, ) -> BTreeSet { - let mut filepaths = BTreeSet::default(); - let folder_path = self.output_path.join(folder_name); std::fs::create_dir_all(&folder_path) .with_context(|| format!("{folder_path:?}")) .unwrap(); - for obj in objects.ordered_objects(object_kind.into()) { + + let mut filepaths = BTreeSet::default(); + + // Generate folder contents: + let ordered_objects = objects.ordered_objects(object_kind.into()); + for &obj in &ordered_objects { let filename = obj.snake_case_name(); let (hpp, cpp) = generate_hpp_cpp(objects, arrow_registry, obj); for (extension, tokens) in [("hpp", hpp), ("cpp", cpp)] { - let string = string_from_token_stream(obj, &tokens); + let string = string_from_token_stream(&tokens, obj.relative_filepath()); let filepath = folder_path.join(format!("{filename}.{extension}")); write_file(&filepath, string); filepaths.insert(filepath); } } + { + // Generate module file that includes all the headers: + let hash = quote! { # }; + let pragma_once = pragma_once(); + let header_file_names = ordered_objects + .iter() + .map(|obj| format!("{folder_name}/{}.hpp", obj.snake_case_name())); + let tokens = quote! { + #pragma_once + #(#hash include #header_file_names "RE_TOKEN_NEWLINE")* + }; + let filepath = folder_path + .parent() + .unwrap() + .join(format!("{folder_name}.hpp")); + let string = string_from_token_stream(&tokens, None); + write_file(&filepath, string); + filepaths.insert(filepath); + } + // Clean up old files: for entry in std::fs::read_dir(folder_path).unwrap().flatten() { let filepath = Utf8PathBuf::try_from(entry.path()).unwrap(); @@ -78,11 +101,11 @@ impl crate::CodeGenerator for CppCodeGenerator { } } -fn string_from_token_stream(obj: &Object, token_stream: &TokenStream) -> String { +fn string_from_token_stream(token_stream: &TokenStream, source_path: Option<&Utf8Path>) -> String { let mut code = String::new(); code.push_str(&format!("// {AUTOGEN_WARNING}\n")); - if let Some(relative_path) = obj.relative_filepath() { - code.push_str(&format!("// Based on {relative_path:?}")); + if let Some(source_path) = source_path { + code.push_str(&format!("// Based on {source_path:?}")); } code.push('\n'); @@ -127,11 +150,11 @@ fn generate_hpp_cpp( let snake_case_name = obj.snake_case_name(); let hash = quote! { # }; + let pragma_once = pragma_once(); let header_file_name = format!("{snake_case_name}.hpp"); let hpp = quote! { - #hash pragma once #NEWLINE_TOKEN #NEWLINE_TOKEN - + #pragma_once namespace rr { namespace #obj_kind_ident { struct #pascal_case_ident { }; @@ -142,3 +165,10 @@ fn generate_hpp_cpp( (hpp, cpp) } + +fn pragma_once() -> TokenStream { + let hash = quote! { # }; + quote! { + #hash pragma once #NEWLINE_TOKEN #NEWLINE_TOKEN + } +} diff --git a/rerun_cpp/src/archetypes.hpp b/rerun_cpp/src/archetypes.hpp new file mode 100644 index 000000000000..ea2f4b62387e --- /dev/null +++ b/rerun_cpp/src/archetypes.hpp @@ -0,0 +1,7 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. + +#pragma once + +#include "archetypes/fuzzy.hpp" +#include "archetypes/points2d.hpp" +#include "archetypes/transform3d.hpp" diff --git a/rerun_cpp/src/components.hpp b/rerun_cpp/src/components.hpp new file mode 100644 index 000000000000..f4c9ad2bbebc --- /dev/null +++ b/rerun_cpp/src/components.hpp @@ -0,0 +1,14 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. + +#pragma once + +#include "components/class_id.hpp" +#include "components/color.hpp" +#include "components/draw_order.hpp" +#include "components/fuzzy.hpp" +#include "components/instance_key.hpp" +#include "components/keypoint_id.hpp" +#include "components/label.hpp" +#include "components/point2d.hpp" +#include "components/radius.hpp" +#include "components/transform3d.hpp" diff --git a/rerun_cpp/src/datatypes.hpp b/rerun_cpp/src/datatypes.hpp new file mode 100644 index 000000000000..84f71f6dc827 --- /dev/null +++ b/rerun_cpp/src/datatypes.hpp @@ -0,0 +1,19 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. + +#pragma once + +#include "datatypes/angle.hpp" +#include "datatypes/fuzzy.hpp" +#include "datatypes/mat3x3.hpp" +#include "datatypes/mat4x4.hpp" +#include "datatypes/point2d.hpp" +#include "datatypes/quaternion.hpp" +#include "datatypes/rotation3d.hpp" +#include "datatypes/rotation_axis_angle.hpp" +#include "datatypes/scale3d.hpp" +#include "datatypes/transform3d.hpp" +#include "datatypes/translation_and_mat3x3.hpp" +#include "datatypes/translation_rotation_scale3d.hpp" +#include "datatypes/vec2d.hpp" +#include "datatypes/vec3d.hpp" +#include "datatypes/vec4d.hpp" diff --git a/rerun_cpp/src/rerun.hpp b/rerun_cpp/src/rerun.hpp index adb28a7d1ef4..a8e8c27a99c0 100644 --- a/rerun_cpp/src/rerun.hpp +++ b/rerun_cpp/src/rerun.hpp @@ -1,6 +1,12 @@ // The Rerun C++ SDK. #pragma once +// Auto-generated: +#include "archetypes.hpp" +#include "components.hpp" +#include "datatypes.hpp" + +// Manually written: #include "recording_stream.hpp" namespace rr { From c046f6d0036224000e6ae016cb0683703cd094e5 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 21:40:47 +0200 Subject: [PATCH 04/13] One .hpp/.cpp pair per type --- Cargo.lock | 8 +++++ crates/re_types/source_hash.txt | 2 +- crates/re_types_builder/Cargo.toml | 2 ++ crates/re_types_builder/src/codegen/cpp.rs | 7 +++- crates/re_types_builder/src/objects.rs | 34 ++++++++++++++++--- rerun_cpp/README.md | 2 +- rerun_cpp/src/archetypes.hpp | 2 +- .../{fuzzy.cpp => affix_fuzzer1.cpp} | 2 +- .../{fuzzy.hpp => affix_fuzzer1.hpp} | 0 rerun_cpp/src/components.hpp | 19 ++++++++++- .../{fuzzy.cpp => affix_fuzzer1.cpp} | 2 +- rerun_cpp/src/components/affix_fuzzer1.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer10.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer10.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer11.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer11.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer12.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer12.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer13.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer13.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer14.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer14.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer16.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer16.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer17.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer17.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer18.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer18.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer19.cpp | 3 ++ .../{fuzzy.hpp => affix_fuzzer19.hpp} | 0 rerun_cpp/src/components/affix_fuzzer2.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer2.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer3.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer3.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer4.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer4.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer5.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer5.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer6.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer6.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer7.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer7.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer8.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer8.hpp | 9 +++++ rerun_cpp/src/components/affix_fuzzer9.cpp | 3 ++ rerun_cpp/src/components/affix_fuzzer9.hpp | 9 +++++ rerun_cpp/src/datatypes.hpp | 7 +++- .../{fuzzy.cpp => affix_fuzzer1.cpp} | 2 +- rerun_cpp/src/datatypes/affix_fuzzer1.hpp | 9 +++++ rerun_cpp/src/datatypes/affix_fuzzer2.cpp | 3 ++ rerun_cpp/src/datatypes/affix_fuzzer2.hpp | 9 +++++ rerun_cpp/src/datatypes/affix_fuzzer3.cpp | 3 ++ rerun_cpp/src/datatypes/affix_fuzzer3.hpp | 9 +++++ rerun_cpp/src/datatypes/affix_fuzzer4.cpp | 3 ++ rerun_cpp/src/datatypes/affix_fuzzer4.hpp | 9 +++++ rerun_cpp/src/datatypes/affix_fuzzer5.cpp | 3 ++ .../{fuzzy.hpp => affix_fuzzer5.hpp} | 0 rerun_cpp/src/datatypes/flattened_scalar.cpp | 3 ++ rerun_cpp/src/datatypes/flattened_scalar.hpp | 9 +++++ 59 files changed, 339 insertions(+), 14 deletions(-) rename rerun_cpp/src/archetypes/{fuzzy.cpp => affix_fuzzer1.cpp} (81%) rename rerun_cpp/src/archetypes/{fuzzy.hpp => affix_fuzzer1.hpp} (100%) rename rerun_cpp/src/components/{fuzzy.cpp => affix_fuzzer1.cpp} (81%) create mode 100644 rerun_cpp/src/components/affix_fuzzer1.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer10.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer10.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer11.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer11.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer12.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer12.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer13.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer13.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer14.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer14.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer16.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer16.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer17.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer17.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer18.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer18.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer19.cpp rename rerun_cpp/src/components/{fuzzy.hpp => affix_fuzzer19.hpp} (100%) create mode 100644 rerun_cpp/src/components/affix_fuzzer2.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer2.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer3.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer3.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer4.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer4.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer5.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer5.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer6.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer6.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer7.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer7.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer8.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer8.hpp create mode 100644 rerun_cpp/src/components/affix_fuzzer9.cpp create mode 100644 rerun_cpp/src/components/affix_fuzzer9.hpp rename rerun_cpp/src/datatypes/{fuzzy.cpp => affix_fuzzer1.cpp} (81%) create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer1.hpp create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer2.cpp create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer2.hpp create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer3.cpp create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer3.hpp create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer4.cpp create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer4.hpp create mode 100644 rerun_cpp/src/datatypes/affix_fuzzer5.cpp rename rerun_cpp/src/datatypes/{fuzzy.hpp => affix_fuzzer5.hpp} (100%) create mode 100644 rerun_cpp/src/datatypes/flattened_scalar.cpp create mode 100644 rerun_cpp/src/datatypes/flattened_scalar.hpp diff --git a/Cargo.lock b/Cargo.lock index fcd6dff7dd48..3fd2711c4c5d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -722,6 +722,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "case" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c" + [[package]] name = "cast" version = "0.3.0" @@ -4544,9 +4550,11 @@ dependencies = [ "anyhow", "arrow2", "camino", + "case", "clang-format", "convert_case", "flatbuffers", + "heck 0.4.1", "indent", "itertools 0.11.0", "proc-macro2", diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index 43d55f642898..92af17c14f62 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -6d6e6a58aed84a5b4282f17bacbd5c0dc0553798d35a9d61898feb77eee342da +c4331690bf167b4c39e35398361a34ed8790b14af59570ae195dc5d0f0820652 diff --git a/crates/re_types_builder/Cargo.toml b/crates/re_types_builder/Cargo.toml index a0b7596e4fdd..cdf5e01d89e1 100644 --- a/crates/re_types_builder/Cargo.toml +++ b/crates/re_types_builder/Cargo.toml @@ -24,6 +24,8 @@ anyhow.workspace = true arrow2.workspace = true camino.workspace = true clang-format = "0.1" +case = "1" +heck = "0.4" convert_case = "0.6" flatbuffers = "23.0" indent = "0.1" diff --git a/crates/re_types_builder/src/codegen/cpp.rs b/crates/re_types_builder/src/codegen/cpp.rs index 0f05965512de..2ca1869133bd 100644 --- a/crates/re_types_builder/src/codegen/cpp.rs +++ b/crates/re_types_builder/src/codegen/cpp.rs @@ -43,7 +43,12 @@ impl CppCodeGenerator { let string = string_from_token_stream(&tokens, obj.relative_filepath()); let filepath = folder_path.join(format!("{filename}.{extension}")); write_file(&filepath, string); - filepaths.insert(filepath); + let inserted = filepaths.insert(filepath); + assert!( + inserted, + "Multiple objects with the same name: {:?}", + obj.name + ); } } diff --git a/crates/re_types_builder/src/objects.rs b/crates/re_types_builder/src/objects.rs index 79c6559083e6..01d19d7dff36 100644 --- a/crates/re_types_builder/src/objects.rs +++ b/crates/re_types_builder/src/objects.rs @@ -614,13 +614,37 @@ impl Object { .and_then(|manifest_dir| self.filepath.strip_prefix(manifest_dir).ok()) } - /// The snake-case filename of the object, e.g. `point2d`. + /// The snake_case name of the object, e.g. `translation_and_mat3x3`. pub fn snake_case_name(&self) -> String { - Utf8PathBuf::from(&self.virtpath) - .file_stem() - .unwrap() - .to_owned() + to_snake_case(&self.name) + } +} + +fn to_snake_case(s: &str) -> String { + // Other crates (convert_case, case, heck, …) all get this wrong. See unit test. + let mut last_char: Option = None; + + let mut out = String::new(); + for c in s.chars() { + if let Some(last_char) = last_char { + if last_char.is_lowercase() && c.is_uppercase() { + out.push('_'); + } + } + out.push(c.to_ascii_lowercase()); + last_char = Some(c); } + + out +} + +#[test] +fn test_snake_case() { + assert_eq!(to_snake_case("Point2D"), "point2d"); + assert_eq!( + to_snake_case("TranslationAndMat3x3"), + "translation_and_mat3x3" + ); } /// Properties specific to either structs or unions, but not both. diff --git a/rerun_cpp/README.md b/rerun_cpp/README.md index a86ff38dd4aa..634458e4b160 100644 --- a/rerun_cpp/README.md +++ b/rerun_cpp/README.md @@ -6,7 +6,7 @@ This is not yet ready to be used. Run `scripts/setup.sh`. ## Test it -`examples/cpp/minimal/build_and_run.sh`` +`examples/cpp/minimal/build_and_run.sh` # To do: * CI diff --git a/rerun_cpp/src/archetypes.hpp b/rerun_cpp/src/archetypes.hpp index ea2f4b62387e..e69cd7d5414f 100644 --- a/rerun_cpp/src/archetypes.hpp +++ b/rerun_cpp/src/archetypes.hpp @@ -2,6 +2,6 @@ #pragma once -#include "archetypes/fuzzy.hpp" +#include "archetypes/affix_fuzzer1.hpp" #include "archetypes/points2d.hpp" #include "archetypes/transform3d.hpp" diff --git a/rerun_cpp/src/archetypes/fuzzy.cpp b/rerun_cpp/src/archetypes/affix_fuzzer1.cpp similarity index 81% rename from rerun_cpp/src/archetypes/fuzzy.cpp rename to rerun_cpp/src/archetypes/affix_fuzzer1.cpp index da958e692679..727d7a86c431 100644 --- a/rerun_cpp/src/archetypes/fuzzy.cpp +++ b/rerun_cpp/src/archetypes/affix_fuzzer1.cpp @@ -1,3 +1,3 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/archetypes/fuzzy.fbs" -#include "fuzzy.hpp" +#include "affix_fuzzer1.hpp" diff --git a/rerun_cpp/src/archetypes/fuzzy.hpp b/rerun_cpp/src/archetypes/affix_fuzzer1.hpp similarity index 100% rename from rerun_cpp/src/archetypes/fuzzy.hpp rename to rerun_cpp/src/archetypes/affix_fuzzer1.hpp diff --git a/rerun_cpp/src/components.hpp b/rerun_cpp/src/components.hpp index f4c9ad2bbebc..7ee5874c31a7 100644 --- a/rerun_cpp/src/components.hpp +++ b/rerun_cpp/src/components.hpp @@ -2,10 +2,27 @@ #pragma once +#include "components/affix_fuzzer1.hpp" +#include "components/affix_fuzzer10.hpp" +#include "components/affix_fuzzer11.hpp" +#include "components/affix_fuzzer12.hpp" +#include "components/affix_fuzzer13.hpp" +#include "components/affix_fuzzer14.hpp" +#include "components/affix_fuzzer16.hpp" +#include "components/affix_fuzzer17.hpp" +#include "components/affix_fuzzer18.hpp" +#include "components/affix_fuzzer19.hpp" +#include "components/affix_fuzzer2.hpp" +#include "components/affix_fuzzer3.hpp" +#include "components/affix_fuzzer4.hpp" +#include "components/affix_fuzzer5.hpp" +#include "components/affix_fuzzer6.hpp" +#include "components/affix_fuzzer7.hpp" +#include "components/affix_fuzzer8.hpp" +#include "components/affix_fuzzer9.hpp" #include "components/class_id.hpp" #include "components/color.hpp" #include "components/draw_order.hpp" -#include "components/fuzzy.hpp" #include "components/instance_key.hpp" #include "components/keypoint_id.hpp" #include "components/label.hpp" diff --git a/rerun_cpp/src/components/fuzzy.cpp b/rerun_cpp/src/components/affix_fuzzer1.cpp similarity index 81% rename from rerun_cpp/src/components/fuzzy.cpp rename to rerun_cpp/src/components/affix_fuzzer1.cpp index a06ff0287561..17e8a2d53b6a 100644 --- a/rerun_cpp/src/components/fuzzy.cpp +++ b/rerun_cpp/src/components/affix_fuzzer1.cpp @@ -1,3 +1,3 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" -#include "fuzzy.hpp" +#include "affix_fuzzer1.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer1.hpp b/rerun_cpp/src/components/affix_fuzzer1.hpp new file mode 100644 index 000000000000..4fed2b1b0d2d --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer1.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer1 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer10.cpp b/rerun_cpp/src/components/affix_fuzzer10.cpp new file mode 100644 index 000000000000..9e6d0cfaff6c --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer10.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer10.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer10.hpp b/rerun_cpp/src/components/affix_fuzzer10.hpp new file mode 100644 index 000000000000..41c5f12ec20c --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer10.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer10 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer11.cpp b/rerun_cpp/src/components/affix_fuzzer11.cpp new file mode 100644 index 000000000000..5de501b9d989 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer11.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer11.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer11.hpp b/rerun_cpp/src/components/affix_fuzzer11.hpp new file mode 100644 index 000000000000..23b52111596a --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer11.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer11 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer12.cpp b/rerun_cpp/src/components/affix_fuzzer12.cpp new file mode 100644 index 000000000000..62f564018b63 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer12.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer12.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer12.hpp b/rerun_cpp/src/components/affix_fuzzer12.hpp new file mode 100644 index 000000000000..412bea6923cc --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer12.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer12 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer13.cpp b/rerun_cpp/src/components/affix_fuzzer13.cpp new file mode 100644 index 000000000000..a17e976c4e18 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer13.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer13.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer13.hpp b/rerun_cpp/src/components/affix_fuzzer13.hpp new file mode 100644 index 000000000000..322733b739a0 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer13.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer13 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer14.cpp b/rerun_cpp/src/components/affix_fuzzer14.cpp new file mode 100644 index 000000000000..6776c24067b0 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer14.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer14.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer14.hpp b/rerun_cpp/src/components/affix_fuzzer14.hpp new file mode 100644 index 000000000000..2e62c9271b30 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer14.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer14 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer16.cpp b/rerun_cpp/src/components/affix_fuzzer16.cpp new file mode 100644 index 000000000000..c8e6d1f046d3 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer16.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer16.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer16.hpp b/rerun_cpp/src/components/affix_fuzzer16.hpp new file mode 100644 index 000000000000..f28fdaad4123 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer16.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer16 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer17.cpp b/rerun_cpp/src/components/affix_fuzzer17.cpp new file mode 100644 index 000000000000..96a9062f9110 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer17.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer17.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer17.hpp b/rerun_cpp/src/components/affix_fuzzer17.hpp new file mode 100644 index 000000000000..6ea6487850cf --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer17.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer17 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer18.cpp b/rerun_cpp/src/components/affix_fuzzer18.cpp new file mode 100644 index 000000000000..3f02974bfe6c --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer18.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer18.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer18.hpp b/rerun_cpp/src/components/affix_fuzzer18.hpp new file mode 100644 index 000000000000..64d2d1c05593 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer18.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer18 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer19.cpp b/rerun_cpp/src/components/affix_fuzzer19.cpp new file mode 100644 index 000000000000..56128f701be9 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer19.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer19.hpp" diff --git a/rerun_cpp/src/components/fuzzy.hpp b/rerun_cpp/src/components/affix_fuzzer19.hpp similarity index 100% rename from rerun_cpp/src/components/fuzzy.hpp rename to rerun_cpp/src/components/affix_fuzzer19.hpp diff --git a/rerun_cpp/src/components/affix_fuzzer2.cpp b/rerun_cpp/src/components/affix_fuzzer2.cpp new file mode 100644 index 000000000000..08415b477557 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer2.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer2.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer2.hpp b/rerun_cpp/src/components/affix_fuzzer2.hpp new file mode 100644 index 000000000000..df864d1e9332 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer2.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer2 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer3.cpp b/rerun_cpp/src/components/affix_fuzzer3.cpp new file mode 100644 index 000000000000..1ee2667c9c29 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer3.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer3.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer3.hpp b/rerun_cpp/src/components/affix_fuzzer3.hpp new file mode 100644 index 000000000000..d8999c0cbc0c --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer3.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer3 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer4.cpp b/rerun_cpp/src/components/affix_fuzzer4.cpp new file mode 100644 index 000000000000..bbbd041a9623 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer4.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer4.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer4.hpp b/rerun_cpp/src/components/affix_fuzzer4.hpp new file mode 100644 index 000000000000..cb35c0d1e9ac --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer4.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer4 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer5.cpp b/rerun_cpp/src/components/affix_fuzzer5.cpp new file mode 100644 index 000000000000..d9bb3711f0f2 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer5.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer5.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer5.hpp b/rerun_cpp/src/components/affix_fuzzer5.hpp new file mode 100644 index 000000000000..7c0b60d90d8f --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer5.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer5 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer6.cpp b/rerun_cpp/src/components/affix_fuzzer6.cpp new file mode 100644 index 000000000000..a10e5cacbddc --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer6.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer6.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer6.hpp b/rerun_cpp/src/components/affix_fuzzer6.hpp new file mode 100644 index 000000000000..b1b1cdbe8bee --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer6.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer6 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer7.cpp b/rerun_cpp/src/components/affix_fuzzer7.cpp new file mode 100644 index 000000000000..51847d79e3fd --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer7.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer7.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer7.hpp b/rerun_cpp/src/components/affix_fuzzer7.hpp new file mode 100644 index 000000000000..705e42781220 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer7.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer7 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer8.cpp b/rerun_cpp/src/components/affix_fuzzer8.cpp new file mode 100644 index 000000000000..7d5fbd421628 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer8.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer8.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer8.hpp b/rerun_cpp/src/components/affix_fuzzer8.hpp new file mode 100644 index 000000000000..cfc0aed6e625 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer8.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer8 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/components/affix_fuzzer9.cpp b/rerun_cpp/src/components/affix_fuzzer9.cpp new file mode 100644 index 000000000000..fee7db2bf244 --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer9.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#include "affix_fuzzer9.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer9.hpp b/rerun_cpp/src/components/affix_fuzzer9.hpp new file mode 100644 index 000000000000..c5b6cd1cd28d --- /dev/null +++ b/rerun_cpp/src/components/affix_fuzzer9.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/components/fuzzy.fbs" +#pragma once + +namespace rr { + namespace components { + struct AffixFuzzer9 {}; + } // namespace components +} // namespace rr diff --git a/rerun_cpp/src/datatypes.hpp b/rerun_cpp/src/datatypes.hpp index 84f71f6dc827..65bfaa796e8e 100644 --- a/rerun_cpp/src/datatypes.hpp +++ b/rerun_cpp/src/datatypes.hpp @@ -2,8 +2,13 @@ #pragma once +#include "datatypes/affix_fuzzer1.hpp" +#include "datatypes/affix_fuzzer2.hpp" +#include "datatypes/affix_fuzzer3.hpp" +#include "datatypes/affix_fuzzer4.hpp" +#include "datatypes/affix_fuzzer5.hpp" #include "datatypes/angle.hpp" -#include "datatypes/fuzzy.hpp" +#include "datatypes/flattened_scalar.hpp" #include "datatypes/mat3x3.hpp" #include "datatypes/mat4x4.hpp" #include "datatypes/point2d.hpp" diff --git a/rerun_cpp/src/datatypes/fuzzy.cpp b/rerun_cpp/src/datatypes/affix_fuzzer1.cpp similarity index 81% rename from rerun_cpp/src/datatypes/fuzzy.cpp rename to rerun_cpp/src/datatypes/affix_fuzzer1.cpp index 81fc90794535..532fa3403c14 100644 --- a/rerun_cpp/src/datatypes/fuzzy.cpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer1.cpp @@ -1,3 +1,3 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" -#include "fuzzy.hpp" +#include "affix_fuzzer1.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer1.hpp b/rerun_cpp/src/datatypes/affix_fuzzer1.hpp new file mode 100644 index 000000000000..83b0d89e54ef --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer1.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct AffixFuzzer1 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/affix_fuzzer2.cpp b/rerun_cpp/src/datatypes/affix_fuzzer2.cpp new file mode 100644 index 000000000000..ca858a3efa6d --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer2.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#include "affix_fuzzer2.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer2.hpp b/rerun_cpp/src/datatypes/affix_fuzzer2.hpp new file mode 100644 index 000000000000..0156ddd2defb --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer2.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct AffixFuzzer2 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/affix_fuzzer3.cpp b/rerun_cpp/src/datatypes/affix_fuzzer3.cpp new file mode 100644 index 000000000000..2888b4519a39 --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer3.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#include "affix_fuzzer3.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer3.hpp b/rerun_cpp/src/datatypes/affix_fuzzer3.hpp new file mode 100644 index 000000000000..07dca3d33b57 --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer3.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct AffixFuzzer3 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/affix_fuzzer4.cpp b/rerun_cpp/src/datatypes/affix_fuzzer4.cpp new file mode 100644 index 000000000000..8bb17d8b05a6 --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer4.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#include "affix_fuzzer4.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer4.hpp b/rerun_cpp/src/datatypes/affix_fuzzer4.hpp new file mode 100644 index 000000000000..90f5d096580b --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer4.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct AffixFuzzer4 {}; + } // namespace datatypes +} // namespace rr diff --git a/rerun_cpp/src/datatypes/affix_fuzzer5.cpp b/rerun_cpp/src/datatypes/affix_fuzzer5.cpp new file mode 100644 index 000000000000..a8f5056a6b34 --- /dev/null +++ b/rerun_cpp/src/datatypes/affix_fuzzer5.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#include "affix_fuzzer5.hpp" diff --git a/rerun_cpp/src/datatypes/fuzzy.hpp b/rerun_cpp/src/datatypes/affix_fuzzer5.hpp similarity index 100% rename from rerun_cpp/src/datatypes/fuzzy.hpp rename to rerun_cpp/src/datatypes/affix_fuzzer5.hpp diff --git a/rerun_cpp/src/datatypes/flattened_scalar.cpp b/rerun_cpp/src/datatypes/flattened_scalar.cpp new file mode 100644 index 000000000000..164f92096ad3 --- /dev/null +++ b/rerun_cpp/src/datatypes/flattened_scalar.cpp @@ -0,0 +1,3 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#include "flattened_scalar.hpp" diff --git a/rerun_cpp/src/datatypes/flattened_scalar.hpp b/rerun_cpp/src/datatypes/flattened_scalar.hpp new file mode 100644 index 000000000000..8f9f5383314e --- /dev/null +++ b/rerun_cpp/src/datatypes/flattened_scalar.hpp @@ -0,0 +1,9 @@ +// NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. +// Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" +#pragma once + +namespace rr { + namespace datatypes { + struct FlattenedScalar {}; + } // namespace datatypes +} // namespace rr From 8705307f7305bd109013a20d40500fd8d6ade69f Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 21:45:18 +0200 Subject: [PATCH 05/13] fixup --- Cargo.lock | 8 -------- crates/re_types/source_hash.txt | 2 +- crates/re_types_builder/Cargo.toml | 2 -- crates/re_types_builder/src/objects.rs | 2 +- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3fd2711c4c5d..fcd6dff7dd48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -722,12 +722,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "case" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c" - [[package]] name = "cast" version = "0.3.0" @@ -4550,11 +4544,9 @@ dependencies = [ "anyhow", "arrow2", "camino", - "case", "clang-format", "convert_case", "flatbuffers", - "heck 0.4.1", "indent", "itertools 0.11.0", "proc-macro2", diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index 92af17c14f62..0090188ab6c1 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -c4331690bf167b4c39e35398361a34ed8790b14af59570ae195dc5d0f0820652 +0d6db9bd2fbe55977cbb89426276796b9cee53b524d22c624cbf22b6a817153f diff --git a/crates/re_types_builder/Cargo.toml b/crates/re_types_builder/Cargo.toml index cdf5e01d89e1..a0b7596e4fdd 100644 --- a/crates/re_types_builder/Cargo.toml +++ b/crates/re_types_builder/Cargo.toml @@ -24,8 +24,6 @@ anyhow.workspace = true arrow2.workspace = true camino.workspace = true clang-format = "0.1" -case = "1" -heck = "0.4" convert_case = "0.6" flatbuffers = "23.0" indent = "0.1" diff --git a/crates/re_types_builder/src/objects.rs b/crates/re_types_builder/src/objects.rs index 01d19d7dff36..feb73f69b116 100644 --- a/crates/re_types_builder/src/objects.rs +++ b/crates/re_types_builder/src/objects.rs @@ -614,7 +614,7 @@ impl Object { .and_then(|manifest_dir| self.filepath.strip_prefix(manifest_dir).ok()) } - /// The snake_case name of the object, e.g. `translation_and_mat3x3`. + /// The `snake_case` name of the object, e.g. `translation_and_mat3x3`. pub fn snake_case_name(&self) -> String { to_snake_case(&self.name) } From 82f515a66b7ba017e0d9217a8e34d5b755bf7d37 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 21:53:13 +0200 Subject: [PATCH 06/13] Do the formatting of the rust code as a function instead of syscall --- Cargo.lock | 7 ++++ crates/re_types/build.rs | 12 ------- crates/re_types/source_hash.txt | 2 +- crates/re_types_builder/Cargo.toml | 1 + crates/re_types_builder/src/codegen/rust.rs | 37 +++++++++++++++++---- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fcd6dff7dd48..d01743187eb3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4552,6 +4552,7 @@ dependencies = [ "proc-macro2", "quote", "re_build_tools", + "rust-format", "syn 2.0.16", "unindent", "xshell", @@ -4983,6 +4984,12 @@ dependencies = [ "webbrowser", ] +[[package]] +name = "rust-format" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60e7c00b6c3bf5e38a880eec01d7e829d12ca682079f8238a464def3c4b31627" + [[package]] name = "rustc-demangle" version = "0.1.23" diff --git a/crates/re_types/build.rs b/crates/re_types/build.rs index 3184f6c9eb08..78451d22d3e3 100644 --- a/crates/re_types/build.rs +++ b/crates/re_types/build.rs @@ -111,18 +111,6 @@ fn main() { re_types_builder::generate_rust_code(RUST_OUTPUT_DIR_PATH, &objects, &arrow_registry); - // We need to run `cago fmt` several times because it is not idempotent! - // See https://github.com/rust-lang/rustfmt/issues/5824 - for _ in 0..2 { - // NOTE: We're purposefully ignoring the error here. - // - // In the very unlikely chance that the user doesn't have the `fmt` component installed, - // there's still no good reason to fail the build. - // - // The CI will catch the unformatted file at PR time and complain appropriately anyhow. - cmd!(sh, "cargo fmt -p re_types").run().ok(); - } - re_types_builder::generate_python_code(PYTHON_OUTPUT_DIR_PATH, &objects, &arrow_registry); let pyproject_path = PathBuf::from(PYTHON_OUTPUT_DIR_PATH) diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index 0090188ab6c1..23a92cb5d595 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -0d6db9bd2fbe55977cbb89426276796b9cee53b524d22c624cbf22b6a817153f +b1ccd551f87ba68638a0c829d3830c2b8a44985d3f01e29a3b1c0dbfa3ee8d48 diff --git a/crates/re_types_builder/Cargo.toml b/crates/re_types_builder/Cargo.toml index a0b7596e4fdd..fc52ad3e5a70 100644 --- a/crates/re_types_builder/Cargo.toml +++ b/crates/re_types_builder/Cargo.toml @@ -30,6 +30,7 @@ indent = "0.1" itertools.workspace = true proc-macro2 = { version = "1.0", default-features = false } quote = "1.0" +rust-format = "0.3" syn = "2.0" unindent.workspace = true xshell = "0.2" diff --git a/crates/re_types_builder/src/codegen/rust.rs b/crates/re_types_builder/src/codegen/rust.rs index bb7854bb36bf..b12caf92bb8b 100644 --- a/crates/re_types_builder/src/codegen/rust.rs +++ b/crates/re_types_builder/src/codegen/rust.rs @@ -184,9 +184,7 @@ fn create_files( code = replace_doc_attrb_with_doc_comment(&code); - file.write_all(code.as_bytes()) - .with_context(|| format!("{filepath:?}")) - .unwrap(); + write_file(&filepath, code); } // src/{datatypes|components|archetypes}/mod.rs @@ -217,14 +215,41 @@ fn create_files( } filepaths.insert(path.clone()); - std::fs::write(&path, code) - .with_context(|| format!("{path:?}")) - .unwrap(); + write_file(&path, code); } filepaths } +fn write_file(filepath: &Utf8PathBuf, mut code: String) { + // We need to run `cago fmt` several times because it is not idempotent! + // See https://github.com/rust-lang/rustfmt/issues/5824 + for _ in 0..2 { + // NOTE: We're purposefully ignoring the error here. + // + // In the very unlikely chance that the user doesn't have the `fmt` component installed, + // there's still no good reason to fail the build. + // + // The CI will catch the unformatted file at PR time and complain appropriately anyhow. + + use rust_format::Formatter as _; + if let Ok(formatted) = rust_format::RustFmt::default().format_str(&code) { + code = formatted; + } + } + + if let Ok(existing) = std::fs::read_to_string(filepath) { + if existing == code { + // Don't touch the timestamp unnecessarily + return; + } + } + + std::fs::write(filepath, code) + .with_context(|| format!("{filepath}")) + .unwrap(); +} + /// Replace `#[doc = "…"]` attributes with `/// …` doc comments, /// while also removing trailing whitespace. fn replace_doc_attrb_with_doc_comment(code: &String) -> String { From 8d79b7cef2964cc328e44732f38f1dde63770fc6 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 21:56:20 +0200 Subject: [PATCH 07/13] Add a TODO --- crates/re_types/build.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/crates/re_types/build.rs b/crates/re_types/build.rs index 78451d22d3e3..20eade742f53 100644 --- a/crates/re_types/build.rs +++ b/crates/re_types/build.rs @@ -124,6 +124,13 @@ fn main() { .to_string_lossy() .to_string(); + // TODO(emilk): format the python code _before_ writing them to file instead, + // just like we do with C++ and Rust. + // This should be doable py piping the code of each file to black/ruff via stdin. + // Why? Right now the python code is written once, then changed, which means + // it is in flux while building, which creates weird phantom git diffs for a few seconds, + // and also update the modified file stamps. + // NOTE: This requires both `black` and `ruff` to be in $PATH, but only for contributors, // not end users. // Even for contributors, `black` and `ruff` won't be needed unless they edit some of the From 72c9a6c4efaf4fb9ad1db6c9d0886280ed08d933 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 22:09:30 +0200 Subject: [PATCH 08/13] Parallelize C++ codegen --- Cargo.lock | 1 + crates/re_types/source_hash.txt | 2 +- crates/re_types_builder/Cargo.toml | 1 + crates/re_types_builder/src/codegen/cpp.rs | 24 +++++++++------------ crates/re_types_builder/src/codegen/rust.rs | 11 ++-------- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d01743187eb3..1bc03a9f581e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4551,6 +4551,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", + "rayon", "re_build_tools", "rust-format", "syn 2.0.16", diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index 23a92cb5d595..68af9332cb77 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -b1ccd551f87ba68638a0c829d3830c2b8a44985d3f01e29a3b1c0dbfa3ee8d48 +54b33c245a99e47b8654214636115db3a0377836d6c11a11cb306daf37ca709a diff --git a/crates/re_types_builder/Cargo.toml b/crates/re_types_builder/Cargo.toml index fc52ad3e5a70..77bb97ace330 100644 --- a/crates/re_types_builder/Cargo.toml +++ b/crates/re_types_builder/Cargo.toml @@ -30,6 +30,7 @@ indent = "0.1" itertools.workspace = true proc-macro2 = { version = "1.0", default-features = false } quote = "1.0" +rayon.workspace = true rust-format = "0.3" syn = "2.0" unindent.workspace = true diff --git a/crates/re_types_builder/src/codegen/cpp.rs b/crates/re_types_builder/src/codegen/cpp.rs index 2ca1869133bd..33e343556936 100644 --- a/crates/re_types_builder/src/codegen/cpp.rs +++ b/crates/re_types_builder/src/codegen/cpp.rs @@ -4,6 +4,7 @@ use anyhow::Context as _; use camino::{Utf8Path, Utf8PathBuf}; use proc_macro2::TokenStream; use quote::{format_ident, quote}; +use rayon::prelude::*; use crate::{codegen::AUTOGEN_WARNING, ArrowRegistry, ObjectKind, Objects}; @@ -21,7 +22,7 @@ impl CppCodeGenerator { } fn generate_folder( - &mut self, + &self, objects: &Objects, arrow_registry: &ArrowRegistry, object_kind: ObjectKind, @@ -90,19 +91,14 @@ impl crate::CodeGenerator for CppCodeGenerator { objects: &Objects, arrow_registry: &ArrowRegistry, ) -> BTreeSet { - let mut filepaths = BTreeSet::new(); - - for object_kind in ObjectKind::ALL { - let folder_name = object_kind.plural_snake_case(); - filepaths.extend(self.generate_folder( - objects, - arrow_registry, - object_kind, - folder_name, - )); - } - - filepaths + ObjectKind::ALL + .par_iter() + .map(|object_kind| { + let folder_name = object_kind.plural_snake_case(); + self.generate_folder(objects, arrow_registry, *object_kind, folder_name) + }) + .flatten() + .collect() } } diff --git a/crates/re_types_builder/src/codegen/rust.rs b/crates/re_types_builder/src/codegen/rust.rs index b12caf92bb8b..21f5ec23b1d7 100644 --- a/crates/re_types_builder/src/codegen/rust.rs +++ b/crates/re_types_builder/src/codegen/rust.rs @@ -1,9 +1,6 @@ //! Implements the Rust codegen pass. -use std::{ - collections::{BTreeSet, HashMap}, - io::Write, -}; +use std::collections::{BTreeSet, HashMap}; use anyhow::Context as _; use arrow2::datatypes::DataType; @@ -119,11 +116,6 @@ fn create_files( .or_default() .extend(names); - filepaths.insert(filepath.clone()); - let mut file = std::fs::File::create(&filepath) - .with_context(|| format!("{filepath:?}")) - .unwrap(); - let mut code = String::new(); #[rustfmt::skip] { @@ -185,6 +177,7 @@ fn create_files( code = replace_doc_attrb_with_doc_comment(&code); write_file(&filepath, code); + filepaths.insert(filepath.clone()); } // src/{datatypes|components|archetypes}/mod.rs From b605088aa93dbeaff7e7e4fd85058c1e3c8324be Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Wed, 12 Jul 2023 22:26:06 +0200 Subject: [PATCH 09/13] Parallelize codegen of Rust, Python, C++ --- Cargo.lock | 1 + crates/re_types/Cargo.toml | 1 + crates/re_types/build.rs | 23 +++++++++++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1bc03a9f581e..44ae562e9e3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4530,6 +4530,7 @@ dependencies = [ "glam", "itertools 0.11.0", "macaw", + "rayon", "re_build_tools", "re_types_builder", "similar-asserts", diff --git a/crates/re_types/Cargo.toml b/crates/re_types/Cargo.toml index e3abc22738eb..38757582e846 100644 --- a/crates/re_types/Cargo.toml +++ b/crates/re_types/Cargo.toml @@ -62,4 +62,5 @@ re_build_tools.workspace = true re_types_builder.workspace = true # External +rayon.workspace = true xshell = "0.2" diff --git a/crates/re_types/build.rs b/crates/re_types/build.rs index 714177faaa1a..97897f52916a 100644 --- a/crates/re_types/build.rs +++ b/crates/re_types/build.rs @@ -101,17 +101,24 @@ fn main() { panic!("re_types' fbs definitions and generated code are out-of-sync!"); } - let sh = Shell::new().unwrap(); - // passes 1 through 3: bfbs, semantic, arrow registry let (objects, arrow_registry) = re_types_builder::generate_lang_agnostic(DEFINITIONS_DIR_PATH, ENTRYPOINT_PATH); - re_types_builder::generate_cpp_code(CPP_OUTPUT_DIR_PATH, &objects, &arrow_registry); + join3( + || re_types_builder::generate_cpp_code(CPP_OUTPUT_DIR_PATH, &objects, &arrow_registry), + || re_types_builder::generate_rust_code(RUST_OUTPUT_DIR_PATH, &objects, &arrow_registry), + || generate_and_format_python_code(&objects, &arrow_registry), + ); - re_types_builder::generate_rust_code(RUST_OUTPUT_DIR_PATH, &objects, &arrow_registry); + write_versioning_hash(SOURCE_HASH_PATH, new_hash); +} - re_types_builder::generate_python_code(PYTHON_OUTPUT_DIR_PATH, &objects, &arrow_registry); +fn generate_and_format_python_code( + objects: &re_types_builder::Objects, + arrow_registry: &re_types_builder::ArrowRegistry, +) { + re_types_builder::generate_python_code(PYTHON_OUTPUT_DIR_PATH, objects, arrow_registry); let pyproject_path = PathBuf::from(PYTHON_OUTPUT_DIR_PATH) .parent() @@ -144,11 +151,15 @@ fn main() { // 2) Call ruff, which requires line-lengths to be correct // 3) Call black again to cleanup some whitespace issues ruff might introduce + let sh = Shell::new().unwrap(); call_black(&sh, &pyproject_path); call_ruff(&sh, &pyproject_path); call_black(&sh, &pyproject_path); +} - write_versioning_hash(SOURCE_HASH_PATH, new_hash); +// Do 3 things in parallel +fn join3(a: impl FnOnce() + Send, b: impl FnOnce() + Send, c: impl FnOnce() + Send) { + rayon::join(a, || rayon::join(b, c)); } fn call_black(sh: &Shell, pyproject_path: &String) { From a3ee0ad7446d48c1d18dc963afd83599797c1639 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Thu, 13 Jul 2023 12:43:20 +0200 Subject: [PATCH 10/13] add cmake and cpp tooling to recommended extensions --- .vscode/extensions.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index fbfebbbfbbd6..c70dfaf8f8c6 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -5,7 +5,10 @@ "charliermarsh.ruff", "gaborv.flatbuffers", "github.vscode-github-actions", + "josetr.cmake-language-support-vscode", "ms-python.python", + "ms-vscode.cmake-tools", + "ms-vscode.cpptools-extension-pack", "ms-vsliveshare.vsliveshare", "polymeilex.wgsl", "rust-lang.rust-analyzer", @@ -15,7 +18,7 @@ "vadimcn.vscode-lldb", "wayou.vscode-todo-highlight", "webfreak.debug", - "xaver.clang-format", // C++ formatter + "xaver.clang-format", // C++ formatter "zxh404.vscode-proto3", ] } From 64b98673226a56d464f97b9674735011bc6ceeb6 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Thu, 13 Jul 2023 14:46:26 +0200 Subject: [PATCH 11/13] add missing cmake related gitignore entries --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index b51c3736e608..3cbc2d380cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,10 @@ *.o **/build/ **/CMakeFiles/ +**/CMakeCache.txt +**/Makefile +**/cmake_install.cmake +_deps # Rust compile target directory: **/target From a6ea573222715489b8d79788be0a5c1ebde037f8 Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Thu, 13 Jul 2023 15:14:02 +0200 Subject: [PATCH 12/13] fix missing newline --- crates/re_types/source_hash.txt | 2 +- crates/re_types_builder/src/codegen/cpp.rs | 2 +- rerun_cpp/src/archetypes/affix_fuzzer1.cpp | 1 + rerun_cpp/src/archetypes/affix_fuzzer1.hpp | 1 + rerun_cpp/src/archetypes/points2d.cpp | 1 + rerun_cpp/src/archetypes/points2d.hpp | 1 + rerun_cpp/src/archetypes/transform3d.cpp | 1 + rerun_cpp/src/archetypes/transform3d.hpp | 1 + rerun_cpp/src/components/affix_fuzzer1.cpp | 1 + rerun_cpp/src/components/affix_fuzzer1.hpp | 1 + rerun_cpp/src/components/affix_fuzzer10.cpp | 1 + rerun_cpp/src/components/affix_fuzzer10.hpp | 1 + rerun_cpp/src/components/affix_fuzzer11.cpp | 1 + rerun_cpp/src/components/affix_fuzzer11.hpp | 1 + rerun_cpp/src/components/affix_fuzzer12.cpp | 1 + rerun_cpp/src/components/affix_fuzzer12.hpp | 1 + rerun_cpp/src/components/affix_fuzzer13.cpp | 1 + rerun_cpp/src/components/affix_fuzzer13.hpp | 1 + rerun_cpp/src/components/affix_fuzzer14.cpp | 1 + rerun_cpp/src/components/affix_fuzzer14.hpp | 1 + rerun_cpp/src/components/affix_fuzzer16.cpp | 1 + rerun_cpp/src/components/affix_fuzzer16.hpp | 1 + rerun_cpp/src/components/affix_fuzzer17.cpp | 1 + rerun_cpp/src/components/affix_fuzzer17.hpp | 1 + rerun_cpp/src/components/affix_fuzzer18.cpp | 1 + rerun_cpp/src/components/affix_fuzzer18.hpp | 1 + rerun_cpp/src/components/affix_fuzzer19.cpp | 1 + rerun_cpp/src/components/affix_fuzzer19.hpp | 1 + rerun_cpp/src/components/affix_fuzzer2.cpp | 1 + rerun_cpp/src/components/affix_fuzzer2.hpp | 1 + rerun_cpp/src/components/affix_fuzzer3.cpp | 1 + rerun_cpp/src/components/affix_fuzzer3.hpp | 1 + rerun_cpp/src/components/affix_fuzzer4.cpp | 1 + rerun_cpp/src/components/affix_fuzzer4.hpp | 1 + rerun_cpp/src/components/affix_fuzzer5.cpp | 1 + rerun_cpp/src/components/affix_fuzzer5.hpp | 1 + rerun_cpp/src/components/affix_fuzzer6.cpp | 1 + rerun_cpp/src/components/affix_fuzzer6.hpp | 1 + rerun_cpp/src/components/affix_fuzzer7.cpp | 1 + rerun_cpp/src/components/affix_fuzzer7.hpp | 1 + rerun_cpp/src/components/affix_fuzzer8.cpp | 1 + rerun_cpp/src/components/affix_fuzzer8.hpp | 1 + rerun_cpp/src/components/affix_fuzzer9.cpp | 1 + rerun_cpp/src/components/affix_fuzzer9.hpp | 1 + rerun_cpp/src/components/class_id.cpp | 1 + rerun_cpp/src/components/class_id.hpp | 1 + rerun_cpp/src/components/color.cpp | 1 + rerun_cpp/src/components/color.hpp | 1 + rerun_cpp/src/components/draw_order.cpp | 1 + rerun_cpp/src/components/draw_order.hpp | 1 + rerun_cpp/src/components/instance_key.cpp | 1 + rerun_cpp/src/components/instance_key.hpp | 1 + rerun_cpp/src/components/keypoint_id.cpp | 1 + rerun_cpp/src/components/keypoint_id.hpp | 1 + rerun_cpp/src/components/label.cpp | 1 + rerun_cpp/src/components/label.hpp | 1 + rerun_cpp/src/components/point2d.cpp | 1 + rerun_cpp/src/components/point2d.hpp | 1 + rerun_cpp/src/components/radius.cpp | 1 + rerun_cpp/src/components/radius.hpp | 1 + rerun_cpp/src/components/transform3d.cpp | 1 + rerun_cpp/src/components/transform3d.hpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer1.cpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer1.hpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer2.cpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer2.hpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer3.cpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer3.hpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer4.cpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer4.hpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer5.cpp | 1 + rerun_cpp/src/datatypes/affix_fuzzer5.hpp | 1 + rerun_cpp/src/datatypes/angle.cpp | 1 + rerun_cpp/src/datatypes/angle.hpp | 1 + rerun_cpp/src/datatypes/flattened_scalar.cpp | 1 + rerun_cpp/src/datatypes/flattened_scalar.hpp | 1 + rerun_cpp/src/datatypes/mat3x3.cpp | 1 + rerun_cpp/src/datatypes/mat3x3.hpp | 1 + rerun_cpp/src/datatypes/mat4x4.cpp | 1 + rerun_cpp/src/datatypes/mat4x4.hpp | 1 + rerun_cpp/src/datatypes/point2d.cpp | 1 + rerun_cpp/src/datatypes/point2d.hpp | 1 + rerun_cpp/src/datatypes/quaternion.cpp | 1 + rerun_cpp/src/datatypes/quaternion.hpp | 1 + rerun_cpp/src/datatypes/rotation3d.cpp | 1 + rerun_cpp/src/datatypes/rotation3d.hpp | 1 + rerun_cpp/src/datatypes/rotation_axis_angle.cpp | 1 + rerun_cpp/src/datatypes/rotation_axis_angle.hpp | 1 + rerun_cpp/src/datatypes/scale3d.cpp | 1 + rerun_cpp/src/datatypes/scale3d.hpp | 1 + rerun_cpp/src/datatypes/transform3d.cpp | 1 + rerun_cpp/src/datatypes/transform3d.hpp | 1 + rerun_cpp/src/datatypes/translation_and_mat3x3.cpp | 1 + rerun_cpp/src/datatypes/translation_and_mat3x3.hpp | 1 + rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp | 1 + rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp | 1 + rerun_cpp/src/datatypes/vec2d.cpp | 1 + rerun_cpp/src/datatypes/vec2d.hpp | 1 + rerun_cpp/src/datatypes/vec3d.cpp | 1 + rerun_cpp/src/datatypes/vec3d.hpp | 1 + rerun_cpp/src/datatypes/vec4d.cpp | 1 + rerun_cpp/src/datatypes/vec4d.hpp | 1 + 102 files changed, 102 insertions(+), 2 deletions(-) diff --git a/crates/re_types/source_hash.txt b/crates/re_types/source_hash.txt index 68af9332cb77..83f10cf132d3 100644 --- a/crates/re_types/source_hash.txt +++ b/crates/re_types/source_hash.txt @@ -1,4 +1,4 @@ # This is a sha256 hash for all direct and indirect dependencies of this crate's build script. # It can be safely removed at anytime to force the build script to run again. # Check out build.rs to see how it's computed. -54b33c245a99e47b8654214636115db3a0377836d6c11a11cb306daf37ca709a +48b1929d5cb17125eaae7733df116017fed8e27f5202d2365146e68e9a1a5b16 diff --git a/crates/re_types_builder/src/codegen/cpp.rs b/crates/re_types_builder/src/codegen/cpp.rs index 33e343556936..9d3e1c074bf5 100644 --- a/crates/re_types_builder/src/codegen/cpp.rs +++ b/crates/re_types_builder/src/codegen/cpp.rs @@ -106,7 +106,7 @@ fn string_from_token_stream(token_stream: &TokenStream, source_path: Option<&Utf let mut code = String::new(); code.push_str(&format!("// {AUTOGEN_WARNING}\n")); if let Some(source_path) = source_path { - code.push_str(&format!("// Based on {source_path:?}")); + code.push_str(&format!("// Based on {source_path:?}\n")); } code.push('\n'); diff --git a/rerun_cpp/src/archetypes/affix_fuzzer1.cpp b/rerun_cpp/src/archetypes/affix_fuzzer1.cpp index 727d7a86c431..01cdfb4917c4 100644 --- a/rerun_cpp/src/archetypes/affix_fuzzer1.cpp +++ b/rerun_cpp/src/archetypes/affix_fuzzer1.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/archetypes/fuzzy.fbs" + #include "affix_fuzzer1.hpp" diff --git a/rerun_cpp/src/archetypes/affix_fuzzer1.hpp b/rerun_cpp/src/archetypes/affix_fuzzer1.hpp index e54c76f206ca..d282d2639d9d 100644 --- a/rerun_cpp/src/archetypes/affix_fuzzer1.hpp +++ b/rerun_cpp/src/archetypes/affix_fuzzer1.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/archetypes/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/archetypes/points2d.cpp b/rerun_cpp/src/archetypes/points2d.cpp index c5ccc29a7da4..60b131e73a41 100644 --- a/rerun_cpp/src/archetypes/points2d.cpp +++ b/rerun_cpp/src/archetypes/points2d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/archetypes/points2d.fbs" + #include "points2d.hpp" diff --git a/rerun_cpp/src/archetypes/points2d.hpp b/rerun_cpp/src/archetypes/points2d.hpp index 0a071bdd9500..8914b4f1e9ec 100644 --- a/rerun_cpp/src/archetypes/points2d.hpp +++ b/rerun_cpp/src/archetypes/points2d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/archetypes/points2d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/archetypes/transform3d.cpp b/rerun_cpp/src/archetypes/transform3d.cpp index 8ff520f73ff4..dfe591cc2888 100644 --- a/rerun_cpp/src/archetypes/transform3d.cpp +++ b/rerun_cpp/src/archetypes/transform3d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/archetypes/transform3d.fbs" + #include "transform3d.hpp" diff --git a/rerun_cpp/src/archetypes/transform3d.hpp b/rerun_cpp/src/archetypes/transform3d.hpp index c216f0883f20..828d211ca89e 100644 --- a/rerun_cpp/src/archetypes/transform3d.hpp +++ b/rerun_cpp/src/archetypes/transform3d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/archetypes/transform3d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer1.cpp b/rerun_cpp/src/components/affix_fuzzer1.cpp index 17e8a2d53b6a..b2c9f2ab67f8 100644 --- a/rerun_cpp/src/components/affix_fuzzer1.cpp +++ b/rerun_cpp/src/components/affix_fuzzer1.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer1.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer1.hpp b/rerun_cpp/src/components/affix_fuzzer1.hpp index 4fed2b1b0d2d..ee862c698948 100644 --- a/rerun_cpp/src/components/affix_fuzzer1.hpp +++ b/rerun_cpp/src/components/affix_fuzzer1.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer10.cpp b/rerun_cpp/src/components/affix_fuzzer10.cpp index 9e6d0cfaff6c..c1d8f9fe8970 100644 --- a/rerun_cpp/src/components/affix_fuzzer10.cpp +++ b/rerun_cpp/src/components/affix_fuzzer10.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer10.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer10.hpp b/rerun_cpp/src/components/affix_fuzzer10.hpp index 41c5f12ec20c..3f118b2d83ff 100644 --- a/rerun_cpp/src/components/affix_fuzzer10.hpp +++ b/rerun_cpp/src/components/affix_fuzzer10.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer11.cpp b/rerun_cpp/src/components/affix_fuzzer11.cpp index 5de501b9d989..dc1275432f7a 100644 --- a/rerun_cpp/src/components/affix_fuzzer11.cpp +++ b/rerun_cpp/src/components/affix_fuzzer11.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer11.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer11.hpp b/rerun_cpp/src/components/affix_fuzzer11.hpp index 23b52111596a..cc38f30d352a 100644 --- a/rerun_cpp/src/components/affix_fuzzer11.hpp +++ b/rerun_cpp/src/components/affix_fuzzer11.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer12.cpp b/rerun_cpp/src/components/affix_fuzzer12.cpp index 62f564018b63..7e71b62dd4f4 100644 --- a/rerun_cpp/src/components/affix_fuzzer12.cpp +++ b/rerun_cpp/src/components/affix_fuzzer12.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer12.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer12.hpp b/rerun_cpp/src/components/affix_fuzzer12.hpp index 412bea6923cc..8023e1b383fd 100644 --- a/rerun_cpp/src/components/affix_fuzzer12.hpp +++ b/rerun_cpp/src/components/affix_fuzzer12.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer13.cpp b/rerun_cpp/src/components/affix_fuzzer13.cpp index a17e976c4e18..406ea79af0e3 100644 --- a/rerun_cpp/src/components/affix_fuzzer13.cpp +++ b/rerun_cpp/src/components/affix_fuzzer13.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer13.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer13.hpp b/rerun_cpp/src/components/affix_fuzzer13.hpp index 322733b739a0..23c044603713 100644 --- a/rerun_cpp/src/components/affix_fuzzer13.hpp +++ b/rerun_cpp/src/components/affix_fuzzer13.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer14.cpp b/rerun_cpp/src/components/affix_fuzzer14.cpp index 6776c24067b0..0b92a2737aaa 100644 --- a/rerun_cpp/src/components/affix_fuzzer14.cpp +++ b/rerun_cpp/src/components/affix_fuzzer14.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer14.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer14.hpp b/rerun_cpp/src/components/affix_fuzzer14.hpp index 2e62c9271b30..27f5113528af 100644 --- a/rerun_cpp/src/components/affix_fuzzer14.hpp +++ b/rerun_cpp/src/components/affix_fuzzer14.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer16.cpp b/rerun_cpp/src/components/affix_fuzzer16.cpp index c8e6d1f046d3..a0f65983210e 100644 --- a/rerun_cpp/src/components/affix_fuzzer16.cpp +++ b/rerun_cpp/src/components/affix_fuzzer16.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer16.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer16.hpp b/rerun_cpp/src/components/affix_fuzzer16.hpp index f28fdaad4123..03e0dce624cb 100644 --- a/rerun_cpp/src/components/affix_fuzzer16.hpp +++ b/rerun_cpp/src/components/affix_fuzzer16.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer17.cpp b/rerun_cpp/src/components/affix_fuzzer17.cpp index 96a9062f9110..0e22b89254be 100644 --- a/rerun_cpp/src/components/affix_fuzzer17.cpp +++ b/rerun_cpp/src/components/affix_fuzzer17.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer17.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer17.hpp b/rerun_cpp/src/components/affix_fuzzer17.hpp index 6ea6487850cf..6949e285326d 100644 --- a/rerun_cpp/src/components/affix_fuzzer17.hpp +++ b/rerun_cpp/src/components/affix_fuzzer17.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer18.cpp b/rerun_cpp/src/components/affix_fuzzer18.cpp index 3f02974bfe6c..150c2ed65be2 100644 --- a/rerun_cpp/src/components/affix_fuzzer18.cpp +++ b/rerun_cpp/src/components/affix_fuzzer18.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer18.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer18.hpp b/rerun_cpp/src/components/affix_fuzzer18.hpp index 64d2d1c05593..e628d5c67517 100644 --- a/rerun_cpp/src/components/affix_fuzzer18.hpp +++ b/rerun_cpp/src/components/affix_fuzzer18.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer19.cpp b/rerun_cpp/src/components/affix_fuzzer19.cpp index 56128f701be9..928bbc0d83a2 100644 --- a/rerun_cpp/src/components/affix_fuzzer19.cpp +++ b/rerun_cpp/src/components/affix_fuzzer19.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer19.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer19.hpp b/rerun_cpp/src/components/affix_fuzzer19.hpp index e97507fcbc55..3a19ea5be974 100644 --- a/rerun_cpp/src/components/affix_fuzzer19.hpp +++ b/rerun_cpp/src/components/affix_fuzzer19.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer2.cpp b/rerun_cpp/src/components/affix_fuzzer2.cpp index 08415b477557..b9265e47d44e 100644 --- a/rerun_cpp/src/components/affix_fuzzer2.cpp +++ b/rerun_cpp/src/components/affix_fuzzer2.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer2.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer2.hpp b/rerun_cpp/src/components/affix_fuzzer2.hpp index df864d1e9332..9c7cfff36af5 100644 --- a/rerun_cpp/src/components/affix_fuzzer2.hpp +++ b/rerun_cpp/src/components/affix_fuzzer2.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer3.cpp b/rerun_cpp/src/components/affix_fuzzer3.cpp index 1ee2667c9c29..ed75408e61e2 100644 --- a/rerun_cpp/src/components/affix_fuzzer3.cpp +++ b/rerun_cpp/src/components/affix_fuzzer3.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer3.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer3.hpp b/rerun_cpp/src/components/affix_fuzzer3.hpp index d8999c0cbc0c..57ccadeb7ef2 100644 --- a/rerun_cpp/src/components/affix_fuzzer3.hpp +++ b/rerun_cpp/src/components/affix_fuzzer3.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer4.cpp b/rerun_cpp/src/components/affix_fuzzer4.cpp index bbbd041a9623..cb06ca6be631 100644 --- a/rerun_cpp/src/components/affix_fuzzer4.cpp +++ b/rerun_cpp/src/components/affix_fuzzer4.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer4.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer4.hpp b/rerun_cpp/src/components/affix_fuzzer4.hpp index cb35c0d1e9ac..a93c5bd001db 100644 --- a/rerun_cpp/src/components/affix_fuzzer4.hpp +++ b/rerun_cpp/src/components/affix_fuzzer4.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer5.cpp b/rerun_cpp/src/components/affix_fuzzer5.cpp index d9bb3711f0f2..f6d349c9c49b 100644 --- a/rerun_cpp/src/components/affix_fuzzer5.cpp +++ b/rerun_cpp/src/components/affix_fuzzer5.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer5.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer5.hpp b/rerun_cpp/src/components/affix_fuzzer5.hpp index 7c0b60d90d8f..8c91cd56400f 100644 --- a/rerun_cpp/src/components/affix_fuzzer5.hpp +++ b/rerun_cpp/src/components/affix_fuzzer5.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer6.cpp b/rerun_cpp/src/components/affix_fuzzer6.cpp index a10e5cacbddc..88479ef8858f 100644 --- a/rerun_cpp/src/components/affix_fuzzer6.cpp +++ b/rerun_cpp/src/components/affix_fuzzer6.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer6.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer6.hpp b/rerun_cpp/src/components/affix_fuzzer6.hpp index b1b1cdbe8bee..6bfa12e7727a 100644 --- a/rerun_cpp/src/components/affix_fuzzer6.hpp +++ b/rerun_cpp/src/components/affix_fuzzer6.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer7.cpp b/rerun_cpp/src/components/affix_fuzzer7.cpp index 51847d79e3fd..da2d7fd958f7 100644 --- a/rerun_cpp/src/components/affix_fuzzer7.cpp +++ b/rerun_cpp/src/components/affix_fuzzer7.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer7.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer7.hpp b/rerun_cpp/src/components/affix_fuzzer7.hpp index 705e42781220..76a4819c9413 100644 --- a/rerun_cpp/src/components/affix_fuzzer7.hpp +++ b/rerun_cpp/src/components/affix_fuzzer7.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer8.cpp b/rerun_cpp/src/components/affix_fuzzer8.cpp index 7d5fbd421628..ccee9bad933c 100644 --- a/rerun_cpp/src/components/affix_fuzzer8.cpp +++ b/rerun_cpp/src/components/affix_fuzzer8.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer8.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer8.hpp b/rerun_cpp/src/components/affix_fuzzer8.hpp index cfc0aed6e625..cc6216a2bc5c 100644 --- a/rerun_cpp/src/components/affix_fuzzer8.hpp +++ b/rerun_cpp/src/components/affix_fuzzer8.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/affix_fuzzer9.cpp b/rerun_cpp/src/components/affix_fuzzer9.cpp index fee7db2bf244..d8bb9a7ab769 100644 --- a/rerun_cpp/src/components/affix_fuzzer9.cpp +++ b/rerun_cpp/src/components/affix_fuzzer9.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #include "affix_fuzzer9.hpp" diff --git a/rerun_cpp/src/components/affix_fuzzer9.hpp b/rerun_cpp/src/components/affix_fuzzer9.hpp index c5b6cd1cd28d..05367dfe289d 100644 --- a/rerun_cpp/src/components/affix_fuzzer9.hpp +++ b/rerun_cpp/src/components/affix_fuzzer9.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/components/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/class_id.cpp b/rerun_cpp/src/components/class_id.cpp index 6b427c4a9378..234ddbb8082d 100644 --- a/rerun_cpp/src/components/class_id.cpp +++ b/rerun_cpp/src/components/class_id.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/class_id.fbs" + #include "class_id.hpp" diff --git a/rerun_cpp/src/components/class_id.hpp b/rerun_cpp/src/components/class_id.hpp index c38fffc165b9..0ba0aa1968dc 100644 --- a/rerun_cpp/src/components/class_id.hpp +++ b/rerun_cpp/src/components/class_id.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/class_id.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/color.cpp b/rerun_cpp/src/components/color.cpp index bda6f5ec6124..d897f50ab3cd 100644 --- a/rerun_cpp/src/components/color.cpp +++ b/rerun_cpp/src/components/color.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/color.fbs" + #include "color.hpp" diff --git a/rerun_cpp/src/components/color.hpp b/rerun_cpp/src/components/color.hpp index 9d98846d7033..8b85b790c80e 100644 --- a/rerun_cpp/src/components/color.hpp +++ b/rerun_cpp/src/components/color.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/color.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/draw_order.cpp b/rerun_cpp/src/components/draw_order.cpp index 89375dc5bf51..92f00a0992a1 100644 --- a/rerun_cpp/src/components/draw_order.cpp +++ b/rerun_cpp/src/components/draw_order.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/draw_order.fbs" + #include "draw_order.hpp" diff --git a/rerun_cpp/src/components/draw_order.hpp b/rerun_cpp/src/components/draw_order.hpp index 0703cf5064c4..d0169cf06d1d 100644 --- a/rerun_cpp/src/components/draw_order.hpp +++ b/rerun_cpp/src/components/draw_order.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/draw_order.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/instance_key.cpp b/rerun_cpp/src/components/instance_key.cpp index 7ad1f2bdbff3..8b3011b5f487 100644 --- a/rerun_cpp/src/components/instance_key.cpp +++ b/rerun_cpp/src/components/instance_key.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/instance_key.fbs" + #include "instance_key.hpp" diff --git a/rerun_cpp/src/components/instance_key.hpp b/rerun_cpp/src/components/instance_key.hpp index 21a86338095b..3fd206a0f39b 100644 --- a/rerun_cpp/src/components/instance_key.hpp +++ b/rerun_cpp/src/components/instance_key.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/instance_key.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/keypoint_id.cpp b/rerun_cpp/src/components/keypoint_id.cpp index b85c481ae94b..16daabd77f65 100644 --- a/rerun_cpp/src/components/keypoint_id.cpp +++ b/rerun_cpp/src/components/keypoint_id.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/keypoint_id.fbs" + #include "keypoint_id.hpp" diff --git a/rerun_cpp/src/components/keypoint_id.hpp b/rerun_cpp/src/components/keypoint_id.hpp index b426e3b1ed69..40b6c7b75371 100644 --- a/rerun_cpp/src/components/keypoint_id.hpp +++ b/rerun_cpp/src/components/keypoint_id.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/keypoint_id.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/label.cpp b/rerun_cpp/src/components/label.cpp index a1e153a8d45b..0ef7dd89ae23 100644 --- a/rerun_cpp/src/components/label.cpp +++ b/rerun_cpp/src/components/label.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/label.fbs" + #include "label.hpp" diff --git a/rerun_cpp/src/components/label.hpp b/rerun_cpp/src/components/label.hpp index ddb0a1f536bb..7b03bc5be817 100644 --- a/rerun_cpp/src/components/label.hpp +++ b/rerun_cpp/src/components/label.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/label.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/point2d.cpp b/rerun_cpp/src/components/point2d.cpp index c920df549054..d7d7e25c00c6 100644 --- a/rerun_cpp/src/components/point2d.cpp +++ b/rerun_cpp/src/components/point2d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/point2d.fbs" + #include "point2d.hpp" diff --git a/rerun_cpp/src/components/point2d.hpp b/rerun_cpp/src/components/point2d.hpp index 03a1d36c6e8e..36e11f7eb784 100644 --- a/rerun_cpp/src/components/point2d.hpp +++ b/rerun_cpp/src/components/point2d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/point2d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/radius.cpp b/rerun_cpp/src/components/radius.cpp index 3b0dea8d0108..669646a1b9b0 100644 --- a/rerun_cpp/src/components/radius.cpp +++ b/rerun_cpp/src/components/radius.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/radius.fbs" + #include "radius.hpp" diff --git a/rerun_cpp/src/components/radius.hpp b/rerun_cpp/src/components/radius.hpp index 4b5e38a442e4..3312c472a463 100644 --- a/rerun_cpp/src/components/radius.hpp +++ b/rerun_cpp/src/components/radius.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/radius.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/components/transform3d.cpp b/rerun_cpp/src/components/transform3d.cpp index 87697a5c7b1b..d65d87753452 100644 --- a/rerun_cpp/src/components/transform3d.cpp +++ b/rerun_cpp/src/components/transform3d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/transform3d.fbs" + #include "transform3d.hpp" diff --git a/rerun_cpp/src/components/transform3d.hpp b/rerun_cpp/src/components/transform3d.hpp index fa7efba851d7..d33f462b17a1 100644 --- a/rerun_cpp/src/components/transform3d.hpp +++ b/rerun_cpp/src/components/transform3d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/components/transform3d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/affix_fuzzer1.cpp b/rerun_cpp/src/datatypes/affix_fuzzer1.cpp index 532fa3403c14..53bcc179d50c 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer1.cpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer1.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #include "affix_fuzzer1.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer1.hpp b/rerun_cpp/src/datatypes/affix_fuzzer1.hpp index 83b0d89e54ef..05b82a9a0b9e 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer1.hpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer1.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/affix_fuzzer2.cpp b/rerun_cpp/src/datatypes/affix_fuzzer2.cpp index ca858a3efa6d..7cac9a9dfc70 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer2.cpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer2.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #include "affix_fuzzer2.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer2.hpp b/rerun_cpp/src/datatypes/affix_fuzzer2.hpp index 0156ddd2defb..8b2ebb3011fb 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer2.hpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer2.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/affix_fuzzer3.cpp b/rerun_cpp/src/datatypes/affix_fuzzer3.cpp index 2888b4519a39..1ec601b1dcd2 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer3.cpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer3.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #include "affix_fuzzer3.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer3.hpp b/rerun_cpp/src/datatypes/affix_fuzzer3.hpp index 07dca3d33b57..9a39b095893c 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer3.hpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer3.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/affix_fuzzer4.cpp b/rerun_cpp/src/datatypes/affix_fuzzer4.cpp index 8bb17d8b05a6..4eff902f8274 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer4.cpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer4.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #include "affix_fuzzer4.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer4.hpp b/rerun_cpp/src/datatypes/affix_fuzzer4.hpp index 90f5d096580b..aca90cb71cea 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer4.hpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer4.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/affix_fuzzer5.cpp b/rerun_cpp/src/datatypes/affix_fuzzer5.cpp index a8f5056a6b34..78b473585562 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer5.cpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer5.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #include "affix_fuzzer5.hpp" diff --git a/rerun_cpp/src/datatypes/affix_fuzzer5.hpp b/rerun_cpp/src/datatypes/affix_fuzzer5.hpp index 7cbd8c65fdf4..a7d1cd3c95b9 100644 --- a/rerun_cpp/src/datatypes/affix_fuzzer5.hpp +++ b/rerun_cpp/src/datatypes/affix_fuzzer5.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/angle.cpp b/rerun_cpp/src/datatypes/angle.cpp index d5fd07d3eacd..606b65de611a 100644 --- a/rerun_cpp/src/datatypes/angle.cpp +++ b/rerun_cpp/src/datatypes/angle.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/angle.fbs" + #include "angle.hpp" diff --git a/rerun_cpp/src/datatypes/angle.hpp b/rerun_cpp/src/datatypes/angle.hpp index 900675576bca..466e6aaa363b 100644 --- a/rerun_cpp/src/datatypes/angle.hpp +++ b/rerun_cpp/src/datatypes/angle.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/angle.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/flattened_scalar.cpp b/rerun_cpp/src/datatypes/flattened_scalar.cpp index 164f92096ad3..2a372b531389 100644 --- a/rerun_cpp/src/datatypes/flattened_scalar.cpp +++ b/rerun_cpp/src/datatypes/flattened_scalar.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #include "flattened_scalar.hpp" diff --git a/rerun_cpp/src/datatypes/flattened_scalar.hpp b/rerun_cpp/src/datatypes/flattened_scalar.hpp index 8f9f5383314e..f3af24ce8824 100644 --- a/rerun_cpp/src/datatypes/flattened_scalar.hpp +++ b/rerun_cpp/src/datatypes/flattened_scalar.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/testing/datatypes/fuzzy.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/mat3x3.cpp b/rerun_cpp/src/datatypes/mat3x3.cpp index 3c2a0f900732..482256c15ed7 100644 --- a/rerun_cpp/src/datatypes/mat3x3.cpp +++ b/rerun_cpp/src/datatypes/mat3x3.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/mat3x3.fbs" + #include "mat3x3.hpp" diff --git a/rerun_cpp/src/datatypes/mat3x3.hpp b/rerun_cpp/src/datatypes/mat3x3.hpp index bff38c587680..42239db4fceb 100644 --- a/rerun_cpp/src/datatypes/mat3x3.hpp +++ b/rerun_cpp/src/datatypes/mat3x3.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/mat3x3.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/mat4x4.cpp b/rerun_cpp/src/datatypes/mat4x4.cpp index fa00854a9c00..5062e861a617 100644 --- a/rerun_cpp/src/datatypes/mat4x4.cpp +++ b/rerun_cpp/src/datatypes/mat4x4.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/mat4x4.fbs" + #include "mat4x4.hpp" diff --git a/rerun_cpp/src/datatypes/mat4x4.hpp b/rerun_cpp/src/datatypes/mat4x4.hpp index ee8c8d054678..f15a57628b73 100644 --- a/rerun_cpp/src/datatypes/mat4x4.hpp +++ b/rerun_cpp/src/datatypes/mat4x4.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/mat4x4.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/point2d.cpp b/rerun_cpp/src/datatypes/point2d.cpp index 2573a2ac3bd2..917b94019e7e 100644 --- a/rerun_cpp/src/datatypes/point2d.cpp +++ b/rerun_cpp/src/datatypes/point2d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/point2d.fbs" + #include "point2d.hpp" diff --git a/rerun_cpp/src/datatypes/point2d.hpp b/rerun_cpp/src/datatypes/point2d.hpp index 90fa7b5a194e..973a22e262ae 100644 --- a/rerun_cpp/src/datatypes/point2d.hpp +++ b/rerun_cpp/src/datatypes/point2d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/point2d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/quaternion.cpp b/rerun_cpp/src/datatypes/quaternion.cpp index bd044e78087c..45556a1eb960 100644 --- a/rerun_cpp/src/datatypes/quaternion.cpp +++ b/rerun_cpp/src/datatypes/quaternion.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/quaternion.fbs" + #include "quaternion.hpp" diff --git a/rerun_cpp/src/datatypes/quaternion.hpp b/rerun_cpp/src/datatypes/quaternion.hpp index d18a28ff780d..c2409a1a74c3 100644 --- a/rerun_cpp/src/datatypes/quaternion.hpp +++ b/rerun_cpp/src/datatypes/quaternion.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/quaternion.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/rotation3d.cpp b/rerun_cpp/src/datatypes/rotation3d.cpp index bbb0c7de72dd..244f1ab8fd71 100644 --- a/rerun_cpp/src/datatypes/rotation3d.cpp +++ b/rerun_cpp/src/datatypes/rotation3d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/rotation3d.fbs" + #include "rotation3d.hpp" diff --git a/rerun_cpp/src/datatypes/rotation3d.hpp b/rerun_cpp/src/datatypes/rotation3d.hpp index 71e26757a43b..27dc63d3a713 100644 --- a/rerun_cpp/src/datatypes/rotation3d.hpp +++ b/rerun_cpp/src/datatypes/rotation3d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/rotation3d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/rotation_axis_angle.cpp b/rerun_cpp/src/datatypes/rotation_axis_angle.cpp index 92ea21ec034d..339b7dd87190 100644 --- a/rerun_cpp/src/datatypes/rotation_axis_angle.cpp +++ b/rerun_cpp/src/datatypes/rotation_axis_angle.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/rotation_axis_angle.fbs" + #include "rotation_axis_angle.hpp" diff --git a/rerun_cpp/src/datatypes/rotation_axis_angle.hpp b/rerun_cpp/src/datatypes/rotation_axis_angle.hpp index 6ba99ec1ebf5..87ee461ebb86 100644 --- a/rerun_cpp/src/datatypes/rotation_axis_angle.hpp +++ b/rerun_cpp/src/datatypes/rotation_axis_angle.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/rotation_axis_angle.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/scale3d.cpp b/rerun_cpp/src/datatypes/scale3d.cpp index fc6f95c6e34a..8731b5748400 100644 --- a/rerun_cpp/src/datatypes/scale3d.cpp +++ b/rerun_cpp/src/datatypes/scale3d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/scale3d.fbs" + #include "scale3d.hpp" diff --git a/rerun_cpp/src/datatypes/scale3d.hpp b/rerun_cpp/src/datatypes/scale3d.hpp index 9ac1a15270b2..186b029e0c77 100644 --- a/rerun_cpp/src/datatypes/scale3d.hpp +++ b/rerun_cpp/src/datatypes/scale3d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/scale3d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/transform3d.cpp b/rerun_cpp/src/datatypes/transform3d.cpp index e0c756f48219..54f042d2092e 100644 --- a/rerun_cpp/src/datatypes/transform3d.cpp +++ b/rerun_cpp/src/datatypes/transform3d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/transform3d.fbs" + #include "transform3d.hpp" diff --git a/rerun_cpp/src/datatypes/transform3d.hpp b/rerun_cpp/src/datatypes/transform3d.hpp index e841b68cd114..ac5d2f02cd27 100644 --- a/rerun_cpp/src/datatypes/transform3d.hpp +++ b/rerun_cpp/src/datatypes/transform3d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/transform3d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/translation_and_mat3x3.cpp b/rerun_cpp/src/datatypes/translation_and_mat3x3.cpp index bbc5b2b74117..65477804eaa6 100644 --- a/rerun_cpp/src/datatypes/translation_and_mat3x3.cpp +++ b/rerun_cpp/src/datatypes/translation_and_mat3x3.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/translation_and_mat3x3.fbs" + #include "translation_and_mat3x3.hpp" diff --git a/rerun_cpp/src/datatypes/translation_and_mat3x3.hpp b/rerun_cpp/src/datatypes/translation_and_mat3x3.hpp index 3309bcdcc83c..2605cc788e45 100644 --- a/rerun_cpp/src/datatypes/translation_and_mat3x3.hpp +++ b/rerun_cpp/src/datatypes/translation_and_mat3x3.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/translation_and_mat3x3.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp b/rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp index 092b56a07fd5..a73150c21254 100644 --- a/rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp +++ b/rerun_cpp/src/datatypes/translation_rotation_scale3d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/translation_rotation_scale3d.fbs" + #include "translation_rotation_scale3d.hpp" diff --git a/rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp b/rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp index dac0069ab9e3..963b061702f1 100644 --- a/rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp +++ b/rerun_cpp/src/datatypes/translation_rotation_scale3d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/translation_rotation_scale3d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/vec2d.cpp b/rerun_cpp/src/datatypes/vec2d.cpp index fa3f1312da8c..bf28aca4b742 100644 --- a/rerun_cpp/src/datatypes/vec2d.cpp +++ b/rerun_cpp/src/datatypes/vec2d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/vec2d.fbs" + #include "vec2d.hpp" diff --git a/rerun_cpp/src/datatypes/vec2d.hpp b/rerun_cpp/src/datatypes/vec2d.hpp index 8911d4fb106a..dc9c87da0c59 100644 --- a/rerun_cpp/src/datatypes/vec2d.hpp +++ b/rerun_cpp/src/datatypes/vec2d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/vec2d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/vec3d.cpp b/rerun_cpp/src/datatypes/vec3d.cpp index 0ee1c9bf0a4e..5caa1e961566 100644 --- a/rerun_cpp/src/datatypes/vec3d.cpp +++ b/rerun_cpp/src/datatypes/vec3d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/vec3d.fbs" + #include "vec3d.hpp" diff --git a/rerun_cpp/src/datatypes/vec3d.hpp b/rerun_cpp/src/datatypes/vec3d.hpp index 9a8ff11a2091..19d1f8c6a7da 100644 --- a/rerun_cpp/src/datatypes/vec3d.hpp +++ b/rerun_cpp/src/datatypes/vec3d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/vec3d.fbs" + #pragma once namespace rr { diff --git a/rerun_cpp/src/datatypes/vec4d.cpp b/rerun_cpp/src/datatypes/vec4d.cpp index fd7dbbe208c0..6babd548d1a8 100644 --- a/rerun_cpp/src/datatypes/vec4d.cpp +++ b/rerun_cpp/src/datatypes/vec4d.cpp @@ -1,3 +1,4 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/vec4d.fbs" + #include "vec4d.hpp" diff --git a/rerun_cpp/src/datatypes/vec4d.hpp b/rerun_cpp/src/datatypes/vec4d.hpp index 2689ad7bff48..51734627882c 100644 --- a/rerun_cpp/src/datatypes/vec4d.hpp +++ b/rerun_cpp/src/datatypes/vec4d.hpp @@ -1,5 +1,6 @@ // NOTE: This file was autogenerated by re_types_builder; DO NOT EDIT. // Based on "definitions/rerun/datatypes/vec4d.fbs" + #pragma once namespace rr { From 95a52f71b69a72fd47808096ff0ef54f8245514d Mon Sep 17 00:00:00 2001 From: Andreas Reich Date: Thu, 13 Jul 2023 15:14:58 +0200 Subject: [PATCH 13/13] add clang format to needed packages for development (otherwise codegen will fail) --- scripts/setup_dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup_dev.sh b/scripts/setup_dev.sh index b954dd16c098..d7dc8ebef98b 100755 --- a/scripts/setup_dev.sh +++ b/scripts/setup_dev.sh @@ -15,7 +15,7 @@ cargo install taplo-cli --locked # https://github.com/tamasfe/taplo - toml forma cargo install typos-cli # https://github.com/crate-ci/typos - typo detector -packagesNeeded='pngcrush pipx' +packagesNeeded='pngcrush pipx clang-format' if [ -x "$(command -v brew)" ]; then brew install $packagesNeeded elif [ -x "$(command -v port)" ]; then sudo port install $packagesNeeded elif [ -x "$(command -v apt-get)" ]; then sudo apt-get -y install $packagesNeeded