-
Notifications
You must be signed in to change notification settings - Fork 21
Fixed resolution print. Replaced volume bounding box by dataToLivreTr… #313
Conversation
Replaced the data bounding box by the data to Livre spaces | ||
transform matrix computed by the datasource for camera | ||
synchronization. Added meterToDataUnitRatio parameter | ||
computed by the datasource. Fixed resolution printing. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a bullet list for better reading?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Is this commit really standalone? |
It can be. There is no camera synch yet, but it will compile and work. It is also needed for Fivox to compile. This commit is fixing the resolution print and adding some fields in the volumeinformation class. |
Updated |
#ifdef LIVRE_USE_ZEROEQ | ||
_impl->communicator->publishCamera(); | ||
#endif | ||
//#ifdef LIVRE_USE_ZEROEQ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Commented code ?
@@ -4,6 +4,7 @@ Changelog {#Changelog} | |||
# master {#master} | |||
|
|||
* [#313](https://github.com/BlueBrain/Livre/pull/313): | |||
Camera synchronization is working. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed the camera synchronization between applications.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still not addressed
…ansform and added meterToDataUnitRatio in VolumeInformation class.
Matrix4f networkModelView( &matrixValues[0], &matrixValues[0] + 16 ); | ||
|
||
Vector4f translation = networkModelView.getColumn( 3 ); | ||
Matrix4f rotation; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can simply inverse the received matrix, get the last column for translate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's do it later.
8086a1b
to
e23af8e
Compare
Updated |
@@ -4,6 +4,7 @@ Changelog {#Changelog} | |||
# master {#master} | |||
|
|||
* [#313](https://github.com/BlueBrain/Livre/pull/313): | |||
Camera synchronization is working. | |||
Replaced the data bounding box by the data to Livre spaces |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Livre space
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you mean by Livre space ? It's not only livre space, RTNeuron camera is also synchronized.
@@ -63,13 +62,33 @@ class CameraSettings : public co::Distributable< ::lexis::render::LookOut > | |||
void setCameraPosition( const Vector3f& position ); | |||
|
|||
/** | |||
* Register a callback for camera changes. | |||
* @param position |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@param position ?
Mergeable or not mergeable... this is the question! |
+1 after changelog |
{ | ||
const Vector3f resolution = info.resolution; | ||
|
||
const float ratio = 1.0f / dataSource.getVolumeInfo().meterToDataUnitRatio; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't call getVolumeInfo again, use the local variable info.
4682b08
to
e445c98
Compare
…ansform and added meterToDataUnitRatio in VolumeInformation class.