From 502fd3b85ca34eb2265ddbd9b04f5590b6948cb1 Mon Sep 17 00:00:00 2001 From: Daniel Nachbaur Date: Mon, 13 Aug 2018 16:48:22 +0200 Subject: [PATCH] Improve clipping planes JSON layout --- brayns/common/types.h | 2 +- plugins/RocketsPlugin/jsonSerialization.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/brayns/common/types.h b/brayns/common/types.h index f5fcff9ec..c6481c6ff 100644 --- a/brayns/common/types.h +++ b/brayns/common/types.h @@ -332,7 +332,7 @@ enum class CameraMode * in absolute value of the coordinate system. Values are stored * in a Vector4, with the following order: nx, ny, nz and d */ -using ClipPlane = Vector4f; +using ClipPlane = std::array; using ClipPlanes = std::vector; struct RenderInput diff --git a/plugins/RocketsPlugin/jsonSerialization.h b/plugins/RocketsPlugin/jsonSerialization.h index a29f813fe..c6aa20899 100644 --- a/plugins/RocketsPlugin/jsonSerialization.h +++ b/plugins/RocketsPlugin/jsonSerialization.h @@ -189,13 +189,6 @@ inline void init(brayns::Renderer::PickResult* p, ObjectHandler* h) h->set_flags(Flags::DisallowUnknownKey); } -inline void init(brayns::ClipPlane* c, ObjectHandler* h) -{ - h->add_property("normal", Vector3fArray(*c)); - h->add_property("d", &c->array[3]); - h->set_flags(Flags::DisallowUnknownKey); -} - inline void init(brayns::Camera* c, ObjectHandler* h) { h->add_property("look_at", Vector3fArray(c->_target), Flags::Optional);