Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Improve clipping planes JSON layout #511

Merged
merged 1 commit into from
Aug 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion brayns/common/types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<float, 4>;
using ClipPlanes = std::vector<ClipPlane>;

struct RenderInput
Expand Down
7 changes: 0 additions & 7 deletions plugins/RocketsPlugin/jsonSerialization.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down