Skip to content
This repository has been archived by the owner on Jul 8, 2022. It is now read-only.

Fixed resolution print. Replaced volume bounding box by dataToLivreTr… #313

Merged
merged 2 commits into from
Aug 4, 2016

Conversation

chevtche
Copy link
Contributor

@chevtche chevtche commented Jul 7, 2016

…ansform and added meterToDataUnitRatio in VolumeInformation class.

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.
Copy link
Contributor

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@hernando
Copy link
Contributor

Is this commit really standalone?

@chevtche
Copy link
Contributor Author

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.

@chevtche
Copy link
Contributor Author

Updated

#ifdef LIVRE_USE_ZEROEQ
_impl->communicator->publishCamera();
#endif
//#ifdef LIVRE_USE_ZEROEQ
Copy link
Contributor

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.
Copy link
Contributor

@bilgili bilgili Aug 3, 2016

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.

Copy link
Contributor

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;
Copy link
Contributor

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.

Copy link
Contributor Author

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.

@chevtche chevtche force-pushed the master branch 3 times, most recently from 8086a1b to e23af8e Compare August 3, 2016 13:14
@chevtche
Copy link
Contributor Author

chevtche commented Aug 3, 2016

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Livre space

Copy link
Contributor Author

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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@param position ?

@chevtche
Copy link
Contributor Author

chevtche commented Aug 4, 2016

Mergeable or not mergeable... this is the question!

@bilgili
Copy link
Contributor

bilgili commented Aug 4, 2016

+1 after changelog

{
const Vector3f resolution = info.resolution;

const float ratio = 1.0f / dataSource.getVolumeInfo().meterToDataUnitRatio;
Copy link
Contributor

@hernando hernando Aug 4, 2016

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.

@chevtche chevtche force-pushed the master branch 2 times, most recently from 4682b08 to e445c98 Compare August 4, 2016 09:43
@bilgili bilgili merged commit c54780f into BlueBrain:master Aug 4, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants