Commit b46ce36c authored by js9's avatar js9

Adding original fullframe correction back for non-vector glyph plots.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21696 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3e18ab1b
......@@ -19,8 +19,8 @@ SET(CMAKE_BUILD_TYPE Debug CACHE STRING "")
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
##
## Parallel Build Setup.
......@@ -45,11 +45,12 @@ VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fvisibility=hidden" TYPE STRING)
##
## Python
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR /usr)
VISIT_OPTION_DEFAULT(PYTHON_INCLUDE_PATH /usr/include/python2.7 )
VISIT_OPTION_DEFAULT(PYTHON_LIBRARY /usr/lib/libpython2.7.so)
VISIT_OPTION_DEFAULT(PYTHON_LIBRARY_DIR /usr/lib/x86_64-linux-gnu)
VISIT_OPTION_DEFAULT(PYTHON_VERSION 2.7)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR /apps/visit/python/2.7.3/linux-x86_64_gcc-4.6)
#VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR /usr)
#VISIT_OPTION_DEFAULT(PYTHON_INCLUDE_PATH /usr/include/python2.7 )
#VISIT_OPTION_DEFAULT(PYTHON_LIBRARY /usr/lib/libpython2.7.so)
#VISIT_OPTION_DEFAULT(PYTHON_LIBRARY_DIR /usr/lib/x86_64-linux-gnu)
#VISIT_OPTION_DEFAULT(PYTHON_VERSION 2.7)
##
## VTK
......@@ -138,7 +139,7 @@ VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP HDF5_LIBRARY_DIR hdf5 VTK_LIBRARY_DIRS v
## PySide
##
#VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.0.7/${VISITARCH}/)
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.1.1/${VISITARCH}/)
#VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.1.1/${VISITARCH}/)
## ITAPS_MOAB (manually configured)
ITAPS_INCLUDE_DIRECTORIES(MOAB /home/js9/moab/460install/include)
......
......@@ -137,6 +137,9 @@ vtkVisItGlyph3D::~vtkVisItGlyph3D()
// full frame correction to the orientation. So the shape has the
// distortion removed, but the orientation properly leaves it in.
//
// Jeremy Meredith, Fri Aug 23 12:01:38 EDT 2013
// Added back the original full frame correction for non-vector glyphs.
//
// ****************************************************************************
int
......@@ -805,6 +808,21 @@ vtkVisItGlyph3D::RequestData(
trans->Scale(scalex,scaley,scalez);
}
if (!haveVectors)
{
// If we are using full frame scaling then add an additional
// transform to undo what fullframe will do.
// Note that we applied a different correction for vectors,
// so only apply this one for non-vectors.
if (this->UseFullFrameScaling)
{
trans->Scale(1. / this->FullFrameScaling[0],
1. / this->FullFrameScaling[1],
1. / this->FullFrameScaling[2]);
}
}
// multiply points and normals by resulting matrix
trans->TransformPoints(sourcePts,newPts);
......
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