Commit 18554908 authored by hrchilds's avatar hrchilds

Merge RC to trunk, picking up rectilinear + volren + panning fix.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16756 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6e7e6c92
......@@ -298,6 +298,9 @@ avtMassVoxelExtractor::Extract(vtkRectilinearGrid *rgrid,
// Hank Childs, Wed Dec 24 11:22:43 PST 2008
// No longer calculate deprecated data member ProportionSpaceToZBufferSpace.
//
// Hank Childs, Fri Nov 18 08:32:45 PST 2011
// Fix ray cast of rectilinear with panning.
//
// ****************************************************************************
void
......@@ -345,6 +348,9 @@ avtMassVoxelExtractor::SetGridsAreInWorldSpace(bool val, const avtViewInfo &v,
// position of the camera for perspective projection).
//
vtkCamera *cam = vtkCamera::New();
// We have *= -1.0 throughout the code. Here is "yet another".
view.imagePan[0] *= -1.0;
view.imagePan[1] *= -1.0;
view.SetCameraFromView(cam);
cam->GetClippingRange(cur_clip_range);
vtkMatrix4x4 *mat = cam->GetCompositeProjectionTransformMatrix(aspect,
......
......@@ -18,6 +18,7 @@ list of changes in release 2.4.</p>
<p><b><font size="4">Bugs fixed in version 2.4.1</font></b></p>
<ul>
<li>Ray-casted volume rendering on rectilinear meshes now correctly works with panning.</li>
<li>VisIt now correctly passes along the -display flag when using hardware acceleration on its parallel server.</li>
</ul>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment