Adapt after HBPVIS/ZeroBuf#77

BlueBrain · Jan 17, 2017 · 0d2d14a · 0d2d14a
1 parent ec8e2fa
commit 0d2d14a
Show file tree

Hide file tree

Showing 5 changed files with 133 additions and 132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ Lunchbox/
 MVDTool/
 httpxx/
 vmmlib/
+Pydoxine/
 CMakeFiles
 .DS_Store
 *~

diff --git a/.gitsubprojects b/.gitsubprojects
@@ -3,7 +3,7 @@ git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 6b7d203)
 git_subproject(Servus https://github.com/HBPVIS/Servus.git 2da95ea)
 
 # ZeroEQ and HTTP messaging
-git_subproject(ZeroBuf https://github.com/HBPVIS/ZeroBuf.git 9e51c26)
+git_subproject(ZeroBuf https://github.com/HBPVIS/ZeroBuf.git f40a6e4)
 git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 2e457a8)
 git_subproject(Lexis https://github.com/HBPVis/Lexis.git 9110580)
 

diff --git a/brayns/common/camera/Camera.cpp b/brayns/common/camera/Camera.cpp
@@ -101,7 +101,7 @@ struct Camera::Impl
     const Vector3f& getTarget() const
     {
     #ifdef BRAYNS_USE_ZEROBUF
-        const floats& lookat = getLook_atVector();
+        const floats& lookat = getLookAtVector();
         _target = Vector3f( lookat[0], lookat[1], lookat[2] );
     #endif
         return _target;
@@ -113,7 +113,7 @@ struct Camera::Impl
             return;
     #ifdef BRAYNS_USE_ZEROBUF
         const floats& lookat = { target.x(), target.y(), target.z() };
-        brayns::v1::Camera::setLook_at( lookat );
+        brayns::v1::Camera::setLookAt( lookat );
     #endif
         _target = target;
         modified = true;
@@ -150,7 +150,7 @@ struct Camera::Impl
         if( _fieldOfView == fieldOfView )
             return;
     #ifdef BRAYNS_USE_ZEROBUF
-        brayns::v1::Camera::setField_of_view( fieldOfView );
+        brayns::v1::Camera::setFieldOfView( fieldOfView );
     #endif
         _fieldOfView = fieldOfView;
         modified = true;
@@ -159,7 +159,7 @@ struct Camera::Impl
     float getFieldOfView( ) const
     {
     #ifdef BRAYNS_USE_ZEROBUF
-        _fieldOfView = brayns::v1::Camera::getField_of_view();
+        _fieldOfView = brayns::v1::Camera::getFieldOfView();
     #endif
         return _fieldOfView;
     }
@@ -201,7 +201,7 @@ struct Camera::Impl
         if( _focalLength == focalLength )
             return;
     #ifdef BRAYNS_USE_ZEROBUF
-        brayns::v1::Camera::setFocal_length( focalLength );
+        brayns::v1::Camera::setFocalLength( focalLength );
     #endif
         _focalLength = focalLength;
         modified = true;
@@ -210,7 +210,7 @@ struct Camera::Impl
     float getFocalLength( ) const
     {
     #ifdef BRAYNS_USE_ZEROBUF
-        _focalLength = brayns::v1::Camera::getFocal_length();
+        _focalLength = brayns::v1::Camera::getFocalLength();
     #endif
         return _focalLength;
     }
@@ -223,13 +223,13 @@ struct Camera::Impl
         switch( stereoMode )
         {
         case CameraStereoMode::left:
-            brayns::v1::Camera::setStereo_mode( brayns::v1::CameraStereoMode::left ); break;
+            brayns::v1::Camera::setStereoMode( brayns::v1::CameraStereoMode::left ); break;
         case CameraStereoMode::right:
-            brayns::v1::Camera::setStereo_mode( brayns::v1::CameraStereoMode::right ); break;
+            brayns::v1::Camera::setStereoMode( brayns::v1::CameraStereoMode::right ); break;
         case CameraStereoMode::side_by_side:
-            brayns::v1::Camera::setStereo_mode( brayns::v1::CameraStereoMode::side_by_side ); break;
+            brayns::v1::Camera::setStereoMode( brayns::v1::CameraStereoMode::side_by_side ); break;
         default:
-            brayns::v1::Camera::setStereo_mode( brayns::v1::CameraStereoMode::none ); break;
+            brayns::v1::Camera::setStereoMode( brayns::v1::CameraStereoMode::none ); break;
         }
     #endif
         _stereoMode = stereoMode;
@@ -239,7 +239,7 @@ struct Camera::Impl
     CameraStereoMode getStereoMode( ) const
     {
     #ifdef BRAYNS_USE_ZEROBUF
-        switch( brayns::v1::Camera::getStereo_mode() )
+        switch( brayns::v1::Camera::getStereoMode() )
         {
         case brayns::v1::CameraStereoMode::left:
             _stereoMode = CameraStereoMode::left; break;
@@ -259,7 +259,7 @@ struct Camera::Impl
         if( _eyeSeparation == eyeSeparation )
             return;
     #ifdef BRAYNS_USE_ZEROBUF
-        brayns::v1::Camera::setEye_separation( eyeSeparation );
+        brayns::v1::Camera::setEyeSeparation( eyeSeparation );
     #endif
         _eyeSeparation = eyeSeparation;
         modified = true;
@@ -268,7 +268,7 @@ struct Camera::Impl
     float getEyeSeparation( ) const
     {
     #ifdef BRAYNS_USE_ZEROBUF
-        _eyeSeparation = brayns::v1::Camera::getEye_separation();
+        _eyeSeparation = brayns::v1::Camera::getEyeSeparation();
     #endif
         return _eyeSeparation;
     }

diff --git a/brayns/parameters/VolumeParameters.h b/brayns/parameters/VolumeParameters.h
@@ -51,7 +51,7 @@ class VolumeParameters final : public AbstractParameters
 
     /** Volume epsilon */
     void setSamplesPerRay( const size_t spr ) { _spr = spr; }
-    const float& getSamplesPerRay() const { return _spr; }
+    size_t getSamplesPerRay() const { return _spr; }
 
 protected:
 
@@ -62,7 +62,7 @@ class VolumeParameters final : public AbstractParameters
     Vector3ui _dimensions;
     Vector3f _elementSpacing;
     Vector3f _offset;
-    float _spr;
+    size_t _spr;
 
 };