diff --git a/doc/Changelog.md b/doc/Changelog.md index 7f80b6b..8eeea9e 100644 --- a/doc/Changelog.md +++ b/doc/Changelog.md @@ -2,14 +2,20 @@ # git master -* [48](https://github.com/HBPVIS/ZeroBuf/pull/48): - Fix notifyUpdated usage. Generate doxygen documentation -* [49](https://github.com/HBPVIS/ZeroBuf/pull/49): - Added the exit event +* [58](https://github.com/HBPVIS/ZeroBuf/pull/58): + Move vocabulary to new project Lexis +* [54](https://github.com/HBPVIS/ZeroBuf/pull/54): + Remove more string-related set/get from array/vector types +* [53](https://github.com/HBPVIS/ZeroBuf/pull/53): + Remove set/getString method for non-string dynamic members * [52](https://github.com/HBPVIS/ZeroBuf/pull/52): Emit Qt signals plus their new values for PODs and strings in _fromBinary() * [51](https://github.com/HBPVIS/ZeroBuf/pull/51): Fix a bug in the Allocator with multiple reallocs +* [49](https://github.com/HBPVIS/ZeroBuf/pull/49): + Added the exit event +* [48](https://github.com/HBPVIS/ZeroBuf/pull/48): + Fix notifyUpdated usage. Generate doxygen documentation * [42](https://github.com/HBPVIS/ZeroBuf/pull/42): zerobufCxx.py can generate QObjects * [40](https://github.com/HBPVIS/ZeroBuf/pull/40): diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8eb5154..915673e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -17,6 +17,5 @@ set(TESTSCHEMA_OMIT_EXPORT ON) set(TESTSCHEMA_OMIT_INSTALL ON) common_library(testschema) -set(TEST_LIBRARIES ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} - ZeroBuf testschema ZeroBufRender ZeroBufData) +set(TEST_LIBRARIES ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ZeroBuf testschema) include(CommonCTest) diff --git a/tests/camera.cpp b/tests/camera.cpp deleted file mode 100644 index 48667bf..0000000 --- a/tests/camera.cpp +++ /dev/null @@ -1,159 +0,0 @@ - -/* Copyright (c) 2015-2016, Human Brain Project - * Daniel Nachbaur - */ - -#define BOOST_TEST_MODULE camera - -#include - -#include -#include - -BOOST_AUTO_TEST_CASE(emptyCamera) -{ - const zerobuf::render::Camera camera; - BOOST_CHECK( camera.getOrigin() == zerobuf::render::Vector3f( 0, 0, 1 )); - BOOST_CHECK( camera.getLookAt() == zerobuf::render::Vector3f( )); - BOOST_CHECK( camera.getUp() == zerobuf::render::Vector3f( 0, 1, 0 )); -} - -BOOST_AUTO_TEST_CASE(initializeCamera) -{ - const zerobuf::render::Camera camera( zerobuf::render::Vector3f( 1, 0, 0 ), - zerobuf::render::Vector3f( -1, 1, 0 ), - zerobuf::render::Vector3f( 0, 0, 1 )); - BOOST_CHECK( camera.getOrigin() == zerobuf::render::Vector3f( 1, 0, 0 )); - BOOST_CHECK( camera.getLookAt() == zerobuf::render::Vector3f( -1, 1, 0 )); - BOOST_CHECK( camera.getUp() == zerobuf::render::Vector3f( 0, 0, 1 )); -} - -BOOST_AUTO_TEST_CASE(copyConstructCamera) -{ - const zerobuf::render::Camera temporary( zerobuf::render::Vector3f( 1, 0, 0 ), - zerobuf::render::Vector3f( -1, 1, 0 ), - zerobuf::render::Vector3f( 0, 0, 1 )); - const zerobuf::render::Camera camera( temporary ); - BOOST_CHECK( camera.getOrigin() == zerobuf::render::Vector3f( 1, 0, 0 )); - BOOST_CHECK( camera.getLookAt() == zerobuf::render::Vector3f( -1, 1, 0 )); - BOOST_CHECK( camera.getUp() == zerobuf::render::Vector3f( 0, 0, 1 )); - BOOST_CHECK( camera == temporary ); -} - -BOOST_AUTO_TEST_CASE(moveConstructCamera) -{ - zerobuf::render::Camera temporary( zerobuf::render::Vector3f( 1, 0, 0 ), - zerobuf::render::Vector3f( -1, 1, 0 ), - zerobuf::render::Vector3f( 0, 0, 1 )); - const zerobuf::render::Camera camera( std::move( temporary )); - BOOST_CHECK( camera.getOrigin() == zerobuf::render::Vector3f( 1, 0, 0 )); - BOOST_CHECK( camera.getLookAt() == zerobuf::render::Vector3f( -1, 1, 0 )); - BOOST_CHECK( camera.getUp() == zerobuf::render::Vector3f( 0, 0, 1 )); - BOOST_CHECK_NE( camera, temporary ); -} - -BOOST_AUTO_TEST_CASE(moveCamera) -{ - zerobuf::render::Camera temporary; - zerobuf::render::Vector3f origin( 1, 0, 0 ); - temporary.getOrigin() = std::move( origin ); - temporary.setLookAt( std::move( zerobuf::render::Vector3f( -1, 1, 0 ))); - temporary.setUp( std::move( zerobuf::render::Vector3f( 0, 0, 1 ))); - - zerobuf::render::Camera camera; - camera = std::move( temporary ); - BOOST_CHECK( camera.getOrigin() == zerobuf::render::Vector3f( 1, 0, 0 )); - BOOST_CHECK( camera.getLookAt() == zerobuf::render::Vector3f( -1, 1, 0 )); - BOOST_CHECK( camera.getUp() == zerobuf::render::Vector3f( 0, 0, 1 )); - BOOST_CHECK_NE( camera, temporary ); -} - -BOOST_AUTO_TEST_CASE(moveVectorToCamera) -{ - zerobuf::render::Camera camera; - zerobuf::render::Vector3f vector( 1, 0, 0 ); - BOOST_CHECK_THROW( camera = std::move( vector ), std::runtime_error ); - BOOST_CHECK_THROW( vector = std::move( camera ), std::runtime_error ); -} - -BOOST_AUTO_TEST_CASE(changeCamera) -{ - zerobuf::render::Camera camera; - camera.setOrigin( zerobuf::render::Vector3f( 1.f, 0.f, 0.f )); - camera.setLookAt( zerobuf::render::Vector3f( 0.f, 1.f, 0.f )); - camera.setUp( zerobuf::render::Vector3f( 0.f, 0.f, 1.f )); - BOOST_CHECK_EQUAL( camera.getOrigin().getX(), 1.f ); - BOOST_CHECK_EQUAL( camera.getLookAt().getY(), 1.f ); - BOOST_CHECK_EQUAL( camera.getUp().getZ(), 1.f ); -} - -BOOST_AUTO_TEST_CASE(assignOther) -{ - zerobuf::render::Camera camera; - const zerobuf::render::Vector3f vector; - BOOST_CHECK_THROW( camera = vector, std::runtime_error ); - BOOST_CHECK_THROW( camera = std::move( vector ), std::runtime_error ); -} - -BOOST_AUTO_TEST_CASE(assignSelf) -{ - zerobuf::render::Camera camera; - camera.setOrigin( zerobuf::render::Vector3f( 1.f, 0.f, 0.f )); - - camera = camera; - BOOST_CHECK_EQUAL( camera.getOrigin(), - zerobuf::render::Vector3f( 1.f, 0.f, 0.f )); - -} - -const std::string expectedJSON = "{\n" - " \"lookAt\" : {\n" - " \"x\" : 0,\n" - " \"y\" : 1,\n" - " \"z\" : 0\n" - " },\n" - " \"origin\" : {\n" - " \"x\" : 1,\n" - " \"y\" : 0,\n" - " \"z\" : 0\n" - " },\n" - " \"up\" : {\n" - " \"x\" : 0,\n" - " \"y\" : 0,\n" - " \"z\" : 1\n" - " }\n" - "}\n"; - -BOOST_AUTO_TEST_CASE(cameraJSON) -{ - zerobuf::render::Camera camera; - camera.setOrigin( zerobuf::render::Vector3f( 1.f, 0.f, 0.f )); - camera.setLookAt( zerobuf::render::Vector3f( 0.f, 1.f, 0.f )); - camera.setUp( zerobuf::render::Vector3f( 0.f, 0.f, 1.f )); - - const std::string& json = camera.toJSON(); - BOOST_CHECK_EQUAL( json, expectedJSON ); - - zerobuf::render::Camera camera2; - camera2.fromJSON( json ); - BOOST_CHECK( camera == camera2 ); - - BOOST_CHECK( !camera.fromJSON( "blubb" )); -} - -BOOST_AUTO_TEST_CASE(cameraBinary) -{ - zerobuf::render::Camera camera; - camera.setOrigin( zerobuf::render::Vector3f( 1.f, 0.f, 0.f )); - camera.setLookAt( zerobuf::render::Vector3f( 0.f, 1.f, 0.f )); - camera.setUp( zerobuf::render::Vector3f( 0.f, 0.f, 1.f )); - - const zerobuf::Zerobuf::Data& data = camera.toBinary(); - BOOST_CHECK_EQUAL( data.size, 52 ); - - zerobuf::render::Camera camera2; - camera2.fromBinary( data ); - BOOST_CHECK( camera == camera2 ); - - BOOST_CHECK( !camera.fromBinary( "blubb", 5 )); -} diff --git a/tests/data/progress.cpp b/tests/data/progress.cpp deleted file mode 100644 index 85fa466..0000000 --- a/tests/data/progress.cpp +++ /dev/null @@ -1,56 +0,0 @@ - -/* Copyright (c) 2016, Human Brain Project - * Stefan.Eilemann@epfl.ch - */ - -#define BOOST_TEST_MODULE data_progress - -#include - -#include - -using zerobuf::data::Progress; - -BOOST_AUTO_TEST_CASE(defaults) -{ - const Progress progress0( 0 ); - BOOST_CHECK_EQUAL( progress0.getAmount(), 1.f ); - - const Progress progress1( 42 ); - BOOST_CHECK_EQUAL( progress1.getAmount(), 0.f ); - BOOST_CHECK( progress1.getOperationString().empty( )); - - const Progress progress2( "foo", 17 ); - BOOST_CHECK_EQUAL( progress2.getAmount(), 0.f ); - BOOST_CHECK_EQUAL( progress2.getOperationString(), "foo" ); -} - -BOOST_AUTO_TEST_CASE(update) -{ - Progress progress( 4 ); - BOOST_CHECK_EQUAL( progress.getAmount(), 0.f ); - - ++progress; - BOOST_CHECK_EQUAL( progress.getAmount(), 0.25f ); - - progress += 2; - BOOST_CHECK_EQUAL( progress.getAmount(), 0.75f ); - - progress += 42; - BOOST_CHECK_EQUAL( progress.getAmount(), 1.f ); -} - -BOOST_AUTO_TEST_CASE(restart) -{ - Progress progress( 4 ); - ++progress; - BOOST_CHECK_EQUAL( progress.getAmount(), 0.25f ); - - progress.restart( 10 ); - BOOST_CHECK_EQUAL( progress.getAmount(), 0.f ); - BOOST_CHECK_EQUAL( progress.count(), 0 ); - - ++progress; - BOOST_CHECK_EQUAL( progress.getAmount(), 0.1f ); - BOOST_CHECK_EQUAL( progress.count(), 1 ); -} diff --git a/tests/imageJPEG.cpp b/tests/imageJPEG.cpp deleted file mode 100644 index c69cbe7..0000000 --- a/tests/imageJPEG.cpp +++ /dev/null @@ -1,88 +0,0 @@ - -/* Copyright (c) 2016, Human Brain Project - * Cyrille Favreau - */ - -#define BOOST_TEST_MODULE imageJPEG - -#include - -#include -#include - -const size_t NB_BYTES = 16; -const std::string expectedJSON = "{\n" - " \"data\" : \"\"\n" - "}\n"; -const std::string expectedJSONWithData = "{\n" - " \"data\" : \"AAECAwQFBgcICQoLDA0ODw==\"\n" - "}\n"; - -BOOST_AUTO_TEST_CASE(emptyImageJPEG) -{ - const zerobuf::render::ImageJPEG imageJPEG; - BOOST_CHECK( imageJPEG.getData().size() == 0 ); -} - -BOOST_AUTO_TEST_CASE(initializeImageJPEG) -{ - zerobuf::render::ImageJPEG imageJPEG; - std::vector< uint8_t > v; - for( uint8_t i = 0; i < NB_BYTES; ++i ) - v.push_back(i); - imageJPEG.setData( v ); - const std::string& json = imageJPEG.toJSON(); - BOOST_CHECK_EQUAL( json, expectedJSONWithData ); -} - -BOOST_AUTO_TEST_CASE(copyConstructImageJPEG) -{ - zerobuf::render::ImageJPEG temporary; - std::vector< uint8_t > v; - for( uint8_t i = 0; i < NB_BYTES; ++i ) - v.push_back(i); - temporary.setData( v ); - zerobuf::render::ImageJPEG imageJPEG( temporary ); - BOOST_CHECK( imageJPEG == temporary ); -} - -BOOST_AUTO_TEST_CASE(moveConstructImageJPEG) -{ - zerobuf::render::ImageJPEG temporary; - std::vector< uint8_t > v; - for( uint8_t i = 0; i < NB_BYTES; ++i ) - v.push_back(i); - temporary.setData( v ); - zerobuf::render::ImageJPEG imageJPEG( std::move( temporary )); - BOOST_CHECK( imageJPEG.getData().size() == NB_BYTES ); - BOOST_CHECK( temporary.getData().size() == 0 ); - BOOST_CHECK_NE( imageJPEG, temporary ); -} - -BOOST_AUTO_TEST_CASE(moveImageJPEG) -{ - zerobuf::render::ImageJPEG temporary; - std::vector< uint8_t > v; - for( uint8_t i = 0; i < NB_BYTES; ++i ) - v.push_back(i); - temporary.setData( v ); - zerobuf::render::ImageJPEG imageJPEG; - imageJPEG = std::move( temporary ); - BOOST_CHECK( imageJPEG.getData().size() == NB_BYTES ); - BOOST_CHECK( temporary.getData().size() == 0 ); - BOOST_CHECK_NE( imageJPEG, temporary ); -} - -BOOST_AUTO_TEST_CASE(ImageJPEGJSON) -{ - zerobuf::render::ImageJPEG imageJPEG; - - const std::string& json = imageJPEG.toJSON(); - BOOST_CHECK_EQUAL( json, expectedJSON ); - - zerobuf::render::ImageJPEG imageJPEG2; - imageJPEG2.fromJSON( json ); - BOOST_CHECK( imageJPEG == imageJPEG2 ); - - BOOST_CHECK( !imageJPEG.fromJSON( "blubb" )); -} diff --git a/tests/vector3f.cpp b/tests/vector3f.cpp deleted file mode 100644 index ec8d400..0000000 --- a/tests/vector3f.cpp +++ /dev/null @@ -1,74 +0,0 @@ - -/* Copyright (c) 2015-2016, Human Brain Project - * Daniel Nachbaur - */ - -#define BOOST_TEST_MODULE vector3f - -#include - -#include -#include - -BOOST_AUTO_TEST_CASE(emptyVector) -{ - const zerobuf::render::Vector3f empty; - BOOST_CHECK_EQUAL( empty.getX(), 0.f ); - BOOST_CHECK_EQUAL( empty.getY(), 0.f ); - BOOST_CHECK_EQUAL( empty.getZ(), 0.f ); - BOOST_CHECK_EQUAL( empty.getZerobufStaticSize(), 16 ); - BOOST_CHECK_EQUAL( empty.getZerobufNumDynamics(), 0 ); -} - -BOOST_AUTO_TEST_CASE(initializeVector) -{ - const zerobuf::render::Vector3f vector( 1, -2, 4.5f ); - BOOST_CHECK_EQUAL( vector.getX(), 1.f ); - BOOST_CHECK_EQUAL( vector.getY(), -2.f ); - BOOST_CHECK_EQUAL( vector.getZ(), 4.5f ); -} - -BOOST_AUTO_TEST_CASE(copyConstructVector) -{ - const zerobuf::render::Vector3f temporary( 1, 0, 0 ); - zerobuf::render::Vector3f vec( temporary ); - BOOST_CHECK( vec == zerobuf::render::Vector3f( 1, 0, 0 )); - BOOST_CHECK( vec == temporary ); -} - -BOOST_AUTO_TEST_CASE(moveConstructVector) -{ - zerobuf::render::Vector3f temporary( 1, 0, 0 ); - zerobuf::render::Vector3f vec( std::move( temporary )); - BOOST_CHECK( vec == zerobuf::render::Vector3f( 1, 0, 0 )); - BOOST_CHECK( vec != temporary ); -} - -BOOST_AUTO_TEST_CASE(changeVector) -{ - zerobuf::render::Vector3f vector; - vector.setX( 2.0f ); - vector.setY( -0.5f ); - vector.setZ( 1.42f ); - BOOST_CHECK_EQUAL( vector.getX(), 2.f ); - BOOST_CHECK_EQUAL( vector.getY(), -.5f ); - BOOST_CHECK_EQUAL( vector.getZ(), 1.42f ); -} - -const std::string expectedJSON = "{\n" - " \"x\" : 1,\n" - " \"y\" : -2,\n" - " \"z\" : 4.5\n" - "}\n"; - -BOOST_AUTO_TEST_CASE(vectorJSON) -{ - const zerobuf::render::Vector3f vector( 1, -2, 4.5f ); - - const std::string& json = vector.toJSON(); - BOOST_CHECK_EQUAL( json, expectedJSON ); - - zerobuf::render::Vector3f vector2; - vector2.fromJSON( json ); - BOOST_CHECK( vector == vector2 ); -} diff --git a/zerobuf/CMakeLists.txt b/zerobuf/CMakeLists.txt index f0dd2a7..47ace52 100644 --- a/zerobuf/CMakeLists.txt +++ b/zerobuf/CMakeLists.txt @@ -49,6 +49,3 @@ set(ZEROBUF_INCLUDE_NAME zerobuf) 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 deleted file mode 100644 index 61f7b8b..0000000 --- a/zerobuf/data/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) HBP 2016 Jafet Villafranca - -set(ZEROBUFDATA_INCLUDE_NAME zerobuf/data) - -include(zerobufGenerateCxx) -zerobuf_generate_cxx(ZEROBUFDATA - ${PROJECT_BINARY_DIR}/include/${ZEROBUFDATA_INCLUDE_NAME} frame.fbs) -zerobuf_generate_cxx(ZEROBUFDATADETAIL - ${PROJECT_BINARY_DIR}/include/${ZEROBUFDATA_INCLUDE_NAME}/detail progress.fbs) - -set(ZEROBUFDATA_PUBLIC_HEADERS ${ZEROBUFDATA_HEADERS} - ${ZEROBUFDATADETAIL_HEADERS} Progress.h) -list(APPEND ZEROBUFDATA_SOURCES ${ZEROBUFDATADETAIL_SOURCES} Progress.cpp) -set(ZEROBUFDATA_LINK_LIBRARIES PUBLIC ZeroBuf) - -set(ZEROBUFDATA_INCLUDE_NAME zerobuf/data) -set(ZEROBUFDATA_NAMESPACE zerobufdata) -common_library(ZeroBufData) diff --git a/zerobuf/data/Progress.cpp b/zerobuf/data/Progress.cpp deleted file mode 100644 index 62c938d..0000000 --- a/zerobuf/data/Progress.cpp +++ /dev/null @@ -1,53 +0,0 @@ - -/* Copyright (c) 2016, Human Brain Project - * Stefan.Eilemann@epfl.ch - */ - -#include "Progress.h" - -namespace zerobuf -{ -namespace data -{ -Progress::Progress( const unsigned long expected ) - : _expected( expected ) - , _count( 0 ) -{ - _update(); -} - -Progress::Progress( const std::string& operation, const unsigned long expected ) - : detail::Progress( operation, 0.f ) - , _expected( expected ) - , _count( 0 ) -{ - _update(); -} - -void Progress::restart( const unsigned long expected ) -{ - _expected = expected; - _count = 0; - _update(); -} - -unsigned long Progress::operator+=( const unsigned long inc ) -{ - _count += inc; - return _update(); -} - -unsigned long Progress::_update() -{ - _count = std::min( _count, _expected ); - const float amount = _expected == 0 ? 1.f : - float( _count ) / float( _expected ); - if( amount == getAmount( )) - return _count; - - setAmount( amount ); - return _count; -} - -} -} diff --git a/zerobuf/data/Progress.h b/zerobuf/data/Progress.h deleted file mode 100644 index 3cae311..0000000 --- a/zerobuf/data/Progress.h +++ /dev/null @@ -1,38 +0,0 @@ - -/* Copyright (c) 2016, Human Brain Project - * Stefan.Eilemann@epfl.ch - */ - -#ifndef ZEROBUF_DATA_PROGRESS_H -#define ZEROBUF_DATA_PROGRESS_H - -#include -#include -#include // base class - -namespace zerobuf -{ -namespace data -{ -/** Drop-in progress meter for boost::progress_display. */ -class Progress : public detail::Progress -{ -public: - ZEROBUFDATA_API explicit Progress( unsigned long expected ); - ZEROBUFDATA_API Progress( const std::string& operation, - unsigned long expected ); - - ZEROBUFDATA_API void restart( unsigned long expected ); - ZEROBUFDATA_API unsigned long operator+=( unsigned long inc ); - unsigned long operator++() { return operator += ( 1 ); } - unsigned long count() const { return _count; } - -private: - unsigned long _update(); - - unsigned long _expected; - unsigned long _count; -}; -} -} -#endif diff --git a/zerobuf/data/frame.fbs b/zerobuf/data/frame.fbs deleted file mode 100644 index 34a0ac2..0000000 --- a/zerobuf/data/frame.fbs +++ /dev/null @@ -1,19 +0,0 @@ -// 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; -} diff --git a/zerobuf/data/progress.fbs b/zerobuf/data/progress.fbs deleted file mode 100644 index 43ce227..0000000 --- a/zerobuf/data/progress.fbs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2016, Human Brain Project -// Jafet.VillafrancaDiaz@epfl.ch -// -namespace zerobuf.data.detail; - -table Progress -{ - // Name of the ongoing operation - operation:string; - // Normalized (0..1) progress state of the operation. Done when >= 1. - amount:float; -} diff --git a/zerobuf/render/CMakeLists.txt b/zerobuf/render/CMakeLists.txt deleted file mode 100644 index c0d63c1..0000000 --- a/zerobuf/render/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) HBP 2015-2016 Daniel Nachbaur - -set(ZEROBUFRENDER_INCLUDE_NAME zerobuf/render) - -include(zerobufGenerateCxx) -zerobuf_generate_cxx(ZEROBUFRENDER - ${PROJECT_BINARY_DIR}/include/${ZEROBUFRENDER_INCLUDE_NAME} - camera.fbs frame.fbs lookOut.fbs lookupTable1D.fbs imageJPEG.fbs exit.fbs) - -set(ZEROBUFRENDER_PUBLIC_HEADERS ${ZEROBUFRENDER_HEADERS}) -set(ZEROBUFRENDER_LINK_LIBRARIES PUBLIC ZeroBuf) - -set(ZEROBUFRENDER_INCLUDE_NAME zerobuf/render) -set(ZEROBUFRENDER_NAMESPACE zerobufrender) -common_library(ZeroBufRender) diff --git a/zerobuf/render/camera.fbs b/zerobuf/render/camera.fbs deleted file mode 100644 index 44182f9..0000000 --- a/zerobuf/render/camera.fbs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2015, Human Brain Project -// Daniel.Nachbaur@epfl.ch -// -namespace zerobuf.render; - -table Vector3f -{ - x: float; - y: float; - z: float; -} - -table Camera -{ - origin: Vector3f = 0, 0, 1; - lookAt: Vector3f; - up: Vector3f = 0, 1, 0; -} - -root_type Camera; diff --git a/zerobuf/render/exit.fbs b/zerobuf/render/exit.fbs deleted file mode 100644 index 29ea68f..0000000 --- a/zerobuf/render/exit.fbs +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2015, Human Brain Project -// Grigori.Chevtchenko@epfl.ch -// -namespace zerobuf.render; - -//This event is used to gracefully close applications. -table Exit -{} diff --git a/zerobuf/render/frame.fbs b/zerobuf/render/frame.fbs deleted file mode 100644 index 7d58757..0000000 --- a/zerobuf/render/frame.fbs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) 2015, Human Brain Project -// Stefan Eilemann -// Grigori.Chevtchenko@epfl.ch -// -namespace zerobuf.render; - -table Frame -{ - // starting frame number for an animation loop - start:uint; - // current frame (wrapped into [start end]) - current:uint; - // end frame number for an animation loop - end:uint; - // animation delta between start<->end - delta:int; -} diff --git a/zerobuf/render/imageJPEG.fbs b/zerobuf/render/imageJPEG.fbs deleted file mode 100644 index 8bec035..0000000 --- a/zerobuf/render/imageJPEG.fbs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2016, Human Brain Project -// Grigori Chevtchenko - -namespace zerobuf.render; - -table ImageJPEG -{ - data:[ubyte]; -} - -root_type ImageJPEG; diff --git a/zerobuf/render/lookOut.fbs b/zerobuf/render/lookOut.fbs deleted file mode 100644 index c277b97..0000000 --- a/zerobuf/render/lookOut.fbs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2016, Human Brain Project -// Grigori.Chevtchenko@epfl.ch -// -namespace zerobuf.render; - -// This event is named "LookOut" instead of "Camera" because -// it may be used in immersive environments. The orientation of -// a display surface or the head position of the observer should -// not be part of this event, i.e., if the user is on a magic -// carpet, you will synchronize the matrices describing the -// carpets but not the user's local movements on the carpet. -// More scientifically can be said that, this transforms from -// world space to carpet space. -// -// The LookOut event contains 16 doubles values representing a -// matrix. The layout of this values is the one expected by OpenGL. -// The positions are in meters. -table LookOut -{ - matrix:[double:16]; -} diff --git a/zerobuf/render/lookupTable1D.fbs b/zerobuf/render/lookupTable1D.fbs deleted file mode 100644 index 72a3253..0000000 --- a/zerobuf/render/lookupTable1D.fbs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2016, Human Brain Project -// Stefan.Eilemann@epfl.ch -// -namespace zerobuf.render; - -table LookupTable1D -{ - lut:[byte:1024]; -} - -root_type LookupTable1D;