diff --git a/doc/Changelog.md b/doc/Changelog.md index f69f2ec..73c41af 100644 --- a/doc/Changelog.md +++ b/doc/Changelog.md @@ -2,15 +2,17 @@ # git master -* [35](https://github.com/HBPVIS/ZeroBuf/pull/35) - Added LookOut and Frame events +* [38](https://github.com/HBPVIS/ZeroBuf/pull/38): + Add data.Frame event +* [35](https://github.com/HBPVIS/ZeroBuf/pull/35): + Add LookOut and render.Frame events # Release 0.2 (08-03-2016) -* [32](https://github.com/HBPVIS/ZeroBuf/pull/32) - Added JSON conversion to code generator -* [30](https://github.com/HBPVIS/ZeroBuf/pull/30) - Added ImageJPEG event +* [32](https://github.com/HBPVIS/ZeroBuf/pull/32): + Add JSON conversion to code generator +* [30](https://github.com/HBPVIS/ZeroBuf/pull/30): + Add ImageJPEG event # Release 0.1 (28-01-2016) diff --git a/zerobuf/CMakeLists.txt b/zerobuf/CMakeLists.txt index 6fe72d6..93f094e 100644 --- a/zerobuf/CMakeLists.txt +++ b/zerobuf/CMakeLists.txt @@ -50,4 +50,5 @@ set(ZEROBUF_OMIT_LIBRARY_HEADER ON) common_library(ZeroBuf) target_compile_definitions(ZeroBuf PRIVATE ZEROBUF_SHARED_INL) +add_subdirectory(data) add_subdirectory(render) diff --git a/zerobuf/data/CMakeLists.txt b/zerobuf/data/CMakeLists.txt new file mode 100644 index 0000000..2e8c07f --- /dev/null +++ b/zerobuf/data/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (c) HBP 2016 Jafet Villafranca + +set(ZEROBUFDATA_INCLUDE_NAME zerobuf/data) + +include(zerobufGenerateCxx) +zerobuf_generate_cxx(ZEROBUFDATA + ${OUTPUT_INCLUDE_DIR}/${ZEROBUFDATA_INCLUDE_NAME} frame.fbs) + +set(ZEROBUFDATA_PUBLIC_HEADERS ${ZEROBUFDATA_HEADERS}) +set(ZEROBUFDATA_LINK_LIBRARIES PUBLIC ZeroBuf) + +set(ZEROBUFDATA_INCLUDE_NAME zerobuf/data) +set(ZEROBUFDATA_NAMESPACE zerobufdata) +common_library(ZeroBufData) diff --git a/zerobuf/data/frame.fbs b/zerobuf/data/frame.fbs new file mode 100644 index 0000000..34a0ac2 --- /dev/null +++ b/zerobuf/data/frame.fbs @@ -0,0 +1,19 @@ +// Copyright (c) 2016, Human Brain Project +// Jafet.VillafrancaDiaz@epfl.ch +// +namespace zerobuf.data; + +// Event containing the data frame range information. It is based on the same +// units as the zerobuf.render.Frame, i.e. number of frames. +// It may be used as a base event that defines the available range of frames +// coming from a certain data source, being also possible to use the +// zerobuf.render.Frame event at the same time, which would define the frame +// subrange used by a rendering animation to loop within. + +table Frame +{ + // starting frame number in the data frame range + start:uint; + // end frame number in the data frame range + end:uint; +}