From: apl Date: Thu, 6 Mar 2014 11:15:53 +0000 (+0400) Subject: 0024413: Visualization - get rid of projection shift from orthographic camera definition X-Git-Tag: V6_8_0_beta~501 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=197ac94e72caa0d8933f26a8d27c3e1b42790245;p=occt-copy.git 0024413: Visualization - get rid of projection shift from orthographic camera definition From now on, the panning behavior of V3d_View completely corresponds to equal operations with camera. There is no more confusing "Center" property and "ProjectionShift" which were used to introduce composite panning, while respecting view referential points: At, Eye unchanged. The V3d_View::FitAll approach has been rewritten to do "fit all" geometrically, operating with frustum, to make it working for both orthographic and perspective projections. 1) Getting rid of ProjectionShift and Center property: - Removed ProjectionShift property of Graphic3d_Camera. - Removed confusing Center property of V3d_View (related to projection shift). - Removed redundant code related to the Center property of V3d_View. - Removed WindowLimit method of Graphic3d_Camera - no more used. 2) Improvements of fit all and selector: - Improved FitAll operation of V3d_View and reused it in NIS_View - the perspective projection is now handled correctly. - Revised code of Select3D_Projector class - can be defined with any given projection and model-view matrices. - Modified StdSelect_ViewerSelector3d and ensured that panning, zooming and going into the view do not lead to unwanted re-projection of sensitives. The handling of perspective selection is revised. - Take into account graphical boundaries of infinite structure on ZFitAll. 3) Improvements of camera: - Introduced new z range scale parameter for V3d_View::AutoZFit. See, V3d_View::AutoZFitMode. - Allow negative ZNear, ZFar for orthographic camera to avoid clipping of viewed model. - Moved camera ZNear, ZFar validity checks to V3d_View level. - Use more meaningful Standard_ShortReal relative precision for ZNear, ZFar ranges computed by ZFitAll. - Use Standard_Real type for camera projection and orientation matrices. - Extended camera to generate both Standard_Real and Standard_ShortReal transformation matrices using the same matrix evaluation methods and converted input parameters. Correcting picking tests for perspective view Modify v3d face test cases for 1px changes in face picking Modified test cases for new arguments of vviewparams DRAWEXE command --- diff --git a/src/Graphic3d/FILES b/src/Graphic3d/FILES index ffe8d9b45f..f324a12c08 100755 --- a/src/Graphic3d/FILES +++ b/src/Graphic3d/FILES @@ -61,6 +61,7 @@ Graphic3d_Vec2.hxx Graphic3d_Vec3.hxx Graphic3d_Vec4.hxx Graphic3d_Mat4.hxx +Graphic3d_Mat4d.hxx Graphic3d_Vertex.hxx Graphic3d_Vertex.cxx Graphic3d_MarkerImage.hxx diff --git a/src/Graphic3d/Graphic3d.cdl b/src/Graphic3d/Graphic3d.cdl index 44ac5b1017..a9a9a2ac37 100644 --- a/src/Graphic3d/Graphic3d.cdl +++ b/src/Graphic3d/Graphic3d.cdl @@ -417,8 +417,8 @@ is primitive Vec2; primitive Vec3; primitive Vec4; - primitive Mat4; - primitive Mat4d; + imported Mat4; + imported Mat4d; -------------------- -- Category: Classes diff --git a/src/Graphic3d/Graphic3d_Camera.cxx b/src/Graphic3d/Graphic3d_Camera.cxx index 3211619a69..b9634879c3 100644 --- a/src/Graphic3d/Graphic3d_Camera.cxx +++ b/src/Graphic3d/Graphic3d_Camera.cxx @@ -20,6 +20,7 @@ #include #include +#include IMPLEMENT_STANDARD_HANDLE(Graphic3d_Camera, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Camera, Standard_Transient) @@ -27,7 +28,11 @@ IMPLEMENT_STANDARD_RTTIEXT(Graphic3d_Camera, Standard_Transient) namespace { // (degrees -> radians) * 0.5 - static const Standard_ShortReal DTR_HALF = 0.5f * 0.0174532925f; + static const Standard_Real DTR_HALF = 0.5 * 0.0174532925; + + // default property values + static const Standard_Real DEFAULT_ZNEAR = 0.001; + static const Standard_Real DEFAULT_ZFAR = 3000.0; // atomic state counter static volatile Standard_Integer THE_STATE_COUNTER = 0; @@ -41,30 +46,20 @@ Graphic3d_Camera::Graphic3d_Camera() : myUp (0.0, 1.0, 0.0), myEye (0.0, 0.0, -1500.0), myCenter (0.0, 0.0, 0.0), - myProjectionShift (0.0, 0.0, 0.0), myAxialScale (1.0, 1.0, 1.0), myProjType (Projection_Orthographic), myFOVy (45.0), - myZNear (0.001), - myZFar (3000.0), + myZNear (DEFAULT_ZNEAR), + myZFar (DEFAULT_ZFAR), myAspect (1.0), myScale (1000.0), myZFocus (1.0), myZFocusType (FocusType_Relative), myIOD (0.05), - myIODType (IODType_Relative), - myNbUpdateLocks (0) + myIODType (IODType_Relative) { myProjectionState = (Standard_Size)Standard_Atomic_Increment (&THE_STATE_COUNTER); myOrientationState = (Standard_Size)Standard_Atomic_Increment (&THE_STATE_COUNTER); - - myOrientation.InitIdentity(); - myMProjection.InitIdentity(); - myLProjection.InitIdentity(); - myRProjection.InitIdentity(); - - UpdateProjection(); - UpdateOrientation(); } // ======================================================================= @@ -72,7 +67,6 @@ Graphic3d_Camera::Graphic3d_Camera() // purpose : // ======================================================================= Graphic3d_Camera::Graphic3d_Camera (const Handle(Graphic3d_Camera)& theOther) -: myNbUpdateLocks (0) { Copy (theOther); } @@ -83,21 +77,19 @@ Graphic3d_Camera::Graphic3d_Camera (const Handle(Graphic3d_Camera)& theOther) // ======================================================================= void Graphic3d_Camera::CopyMappingData (const Handle(Graphic3d_Camera)& theOtherCamera) { - myProjectionShift = theOtherCamera->myProjectionShift; - myFOVy = theOtherCamera->myFOVy; - myZNear = theOtherCamera->myZNear; - myZFar = theOtherCamera->myZFar; - myAspect = theOtherCamera->myAspect; - myScale = theOtherCamera->myScale; - myZFocus = theOtherCamera->myZFocus; - myZFocusType = theOtherCamera->myZFocusType; - myIOD = theOtherCamera->myIOD; - myIODType = theOtherCamera->myIODType; - myProjType = theOtherCamera->myProjType; + myFOVy = theOtherCamera->myFOVy; + myZNear = theOtherCamera->myZNear; + myZFar = theOtherCamera->myZFar; + myAspect = theOtherCamera->myAspect; + myScale = theOtherCamera->myScale; + myZFocus = theOtherCamera->myZFocus; + myZFocusType = theOtherCamera->myZFocusType; + myIOD = theOtherCamera->myIOD; + myIODType = theOtherCamera->myIODType; + myProjType = theOtherCamera->myProjType; + myProjectionState = theOtherCamera->myProjectionState; - myProjectionState = theOtherCamera->myProjectionState; - - UpdateProjection(); + InvalidateProjection(); } // ======================================================================= @@ -106,14 +98,13 @@ void Graphic3d_Camera::CopyMappingData (const Handle(Graphic3d_Camera)& theOther // ======================================================================= void Graphic3d_Camera::CopyOrientationData (const Handle(Graphic3d_Camera)& theOtherCamera) { - myUp = theOtherCamera->myUp; - myEye = theOtherCamera->myEye; - myCenter = theOtherCamera->myCenter; - myAxialScale = theOtherCamera->myAxialScale; - + myUp = theOtherCamera->myUp; + myEye = theOtherCamera->myEye; + myCenter = theOtherCamera->myCenter; + myAxialScale = theOtherCamera->myAxialScale; myOrientationState = theOtherCamera->myOrientationState; - UpdateOrientation(); + InvalidateOrientation(); } // ======================================================================= @@ -122,10 +113,8 @@ void Graphic3d_Camera::CopyOrientationData (const Handle(Graphic3d_Camera)& theO // ======================================================================= void Graphic3d_Camera::Copy (const Handle(Graphic3d_Camera)& theOther) { - BeginUpdate(); CopyMappingData (theOther); CopyOrientationData (theOther); - EndUpdate(); } // ======================================================================= @@ -135,7 +124,7 @@ void Graphic3d_Camera::Copy (const Handle(Graphic3d_Camera)& theOther) void Graphic3d_Camera::SetEye (const gp_Pnt& theEye) { myEye = theEye; - UpdateOrientation(); + InvalidateOrientation(); } // ======================================================================= @@ -145,7 +134,7 @@ void Graphic3d_Camera::SetEye (const gp_Pnt& theEye) void Graphic3d_Camera::SetCenter (const gp_Pnt& theCenter) { myCenter = theCenter; - UpdateOrientation(); + InvalidateOrientation(); } // ======================================================================= @@ -155,27 +144,17 @@ void Graphic3d_Camera::SetCenter (const gp_Pnt& theCenter) void Graphic3d_Camera::SetUp (const gp_Dir& theUp) { myUp = theUp; - UpdateOrientation(); -} - -// ======================================================================= -// function : SetProjectionShift -// purpose : -// ======================================================================= -void Graphic3d_Camera::SetProjectionShift (const gp_Pnt& theProjShift) -{ - myProjectionShift = theProjShift; - UpdateProjection(); + InvalidateOrientation(); } // ======================================================================= // function : SetAxialScale // purpose : // ======================================================================= -void Graphic3d_Camera::SetAxialScale (const gp_Pnt& theAxialScale) +void Graphic3d_Camera::SetAxialScale (const gp_XYZ& theAxialScale) { myAxialScale = theAxialScale; - UpdateOrientation(); + InvalidateOrientation(); } // ======================================================================= @@ -243,7 +222,7 @@ void Graphic3d_Camera::SetScale (const Standard_Real theScale) break; } - UpdateProjection(); + InvalidateProjection(); } // ======================================================================= @@ -262,7 +241,7 @@ Standard_Real Graphic3d_Camera::Scale() const // case Projection_MonoLeftEye : // case Projection_MonoRightEye : default : - return Distance() * 2.0 * Tan(myFOVy * M_PI / 360.0); + return Distance() * 2.0 * Tan (myFOVy * M_PI / 360.0); } } @@ -279,23 +258,21 @@ void Graphic3d_Camera::SetProjectionType (const Projection theProjectionType) return; } - myProjType = theProjectionType; - - switch (myProjType) + if (anOldType == Projection_Orthographic) { - case Projection_Orthographic : - case Projection_Perspective : - case Projection_MonoLeftEye : - case Projection_MonoRightEye : - myLProjection.InitIdentity(); - myRProjection.InitIdentity(); - break; - - default: - break; + if (myZNear <= RealEpsilon()) + { + myZNear = DEFAULT_ZNEAR; + } + if (myZFar <= RealEpsilon()) + { + myZFar = DEFAULT_ZFAR; + } } - UpdateProjection(); + myProjType = theProjectionType; + + InvalidateProjection(); } // ======================================================================= @@ -305,58 +282,27 @@ void Graphic3d_Camera::SetProjectionType (const Projection theProjectionType) void Graphic3d_Camera::SetFOVy (const Standard_Real theFOVy) { myFOVy = theFOVy; - UpdateProjection(); + InvalidateProjection(); } // ======================================================================= -// function : SetZNear +// function : SetZRange // purpose : // ======================================================================= -void Graphic3d_Camera::SetZNear (const Standard_Real theZNear) +void Graphic3d_Camera::SetZRange (const Standard_Real theZNear, + const Standard_Real theZFar) { - myZNear = theZNear; - - // it is important to prevent too low ZNear values relatively to ZFar - // so we can not just pass Precision::Confusion() to it - const Standard_Real aTolerance = 0.001; - const Standard_Real aMinimumZ = myZFar * aTolerance; - const Standard_Real aMinimumGap = aTolerance; - // while it is possible to manually set up pretty small ZNear value, - // it may affect project / unproject operations dramatically - if (myZNear < aMinimumZ) - { - myZNear = aMinimumZ; - } - - if (myZFar < (myZNear + aMinimumGap)) + Standard_ASSERT_RAISE (theZFar > theZNear, "ZFar should be greater than ZNear"); + if (!IsOrthographic()) { - myZFar = myZNear + aMinimumGap; + Standard_ASSERT_RAISE (theZNear > 0.0, "Only positive Z-Near is allowed for perspective camera"); + Standard_ASSERT_RAISE (theZFar > 0.0, "Only positive Z-Far is allowed for perspective camera"); } - UpdateProjection(); -} - -// ======================================================================= -// function : SetZFar -// purpose : -// ======================================================================= -void Graphic3d_Camera::SetZFar (const Standard_Real theZFar) -{ - myZFar = theZFar; - - // it is important to prevent too low ZNear values relatively to ZFar - // so we can not just pass Precision::Confusion() to it - const Standard_Real aTolerance = 0.001; - const Standard_Real aMinimumGap = aTolerance; - - // while it is possible to manually set up pretty small ZNear value, - // it may affect project / unproject operations dramatically - if (myZFar < (myZNear + aMinimumGap)) - { - myZFar = myZNear + aMinimumGap; - } + myZNear = theZNear; + myZFar = theZFar; - UpdateProjection(); + InvalidateProjection(); } // ======================================================================= @@ -366,7 +312,7 @@ void Graphic3d_Camera::SetZFar (const Standard_Real theZFar) void Graphic3d_Camera::SetAspect (const Standard_Real theAspect) { myAspect = theAspect; - UpdateProjection(); + InvalidateProjection(); } // ======================================================================= @@ -377,7 +323,7 @@ void Graphic3d_Camera::SetZFocus(const FocusType theType, const Standard_Real th { myZFocusType = theType; myZFocus = theZFocus; - UpdateProjection(); + InvalidateProjection(); } // ======================================================================= @@ -388,7 +334,7 @@ void Graphic3d_Camera::SetIOD (const IODType theType, const Standard_Real theIOD { myIODType = theType; myIOD = theIOD; - UpdateProjection(); + InvalidateProjection(); } // ======================================================================= @@ -397,34 +343,20 @@ void Graphic3d_Camera::SetIOD (const IODType theType, const Standard_Real theIOD // ======================================================================= void Graphic3d_Camera::OrthogonalizeUp() { - gp_Dir aDir = Direction(); - gp_Dir aLeft = aDir.Crossed (Up()); - - // recompute up as: up = left x direction - SetUp (aLeft.Crossed (aDir)); -} - -// ======================================================================= -// function : BeginUpdate -// purpose : -// ======================================================================= -void Graphic3d_Camera::BeginUpdate() -{ - myNbUpdateLocks++; + SetUp (OrthogonalizedUp()); } // ======================================================================= -// function : EndUpdate +// function : OrthogonalizedUp // purpose : // ======================================================================= -void Graphic3d_Camera::EndUpdate() +gp_Dir Graphic3d_Camera::OrthogonalizedUp() const { - if (myNbUpdateLocks > 0) - myNbUpdateLocks--; + gp_Dir aDir = Direction(); + gp_Dir aLeft = aDir.Crossed (Up()); - // if number of locks > 0, the updates are bypassed - UpdateProjection(); - UpdateOrientation(); + // recompute up as: up = left x direction + return aLeft.Crossed (aDir); } // ======================================================================= @@ -436,17 +368,17 @@ void Graphic3d_Camera::Transform (const gp_Trsf& theTrsf) myUp.Transform (theTrsf); myEye.Transform (theTrsf); myCenter.Transform (theTrsf); - UpdateOrientation(); + InvalidateOrientation(); } // ======================================================================= // function : safePointCast // purpose : // ======================================================================= -static Graphic3d_Vec4 safePointCast (const gp_Pnt& thePnt) +static Graphic3d_Vec4d safePointCast (const gp_Pnt& thePnt) { Standard_Real aLim = 1e15f; - + // have to deal with values greater then max float gp_Pnt aSafePoint = thePnt; const Standard_Real aBigFloat = aLim * 0.1f; @@ -458,9 +390,7 @@ static Graphic3d_Vec4 safePointCast (const gp_Pnt& thePnt) aSafePoint.SetZ (aSafePoint.Z() >= 0 ? aBigFloat : -aBigFloat); // convert point - Graphic3d_Vec4 aPnt (static_cast (aSafePoint.X()), - static_cast (aSafePoint.Y()), - static_cast (aSafePoint.Z()), 1.0f); + Graphic3d_Vec4d aPnt (aSafePoint.X(), aSafePoint.Y(), aSafePoint.Z(), 1.0); return aPnt; } @@ -471,11 +401,11 @@ static Graphic3d_Vec4 safePointCast (const gp_Pnt& thePnt) // ======================================================================= gp_Pnt Graphic3d_Camera::Project (const gp_Pnt& thePnt) const { - const Graphic3d_Mat4& aViewMx = OrientationMatrix(); - const Graphic3d_Mat4& aProjMx = ProjectionMatrix(); + const Graphic3d_Mat4d& aViewMx = OrientationMatrix(); + const Graphic3d_Mat4d& aProjMx = ProjectionMatrix(); // use compatible type of point - Graphic3d_Vec4 aPnt = safePointCast (thePnt); + Graphic3d_Vec4d aPnt = safePointCast (thePnt); aPnt = aViewMx * aPnt; // convert to view coordinate space aPnt = aProjMx * aPnt; // convert to projection coordinate space @@ -491,11 +421,11 @@ gp_Pnt Graphic3d_Camera::Project (const gp_Pnt& thePnt) const // ======================================================================= gp_Pnt Graphic3d_Camera::UnProject (const gp_Pnt& thePnt) const { - const Graphic3d_Mat4& aViewMx = OrientationMatrix(); - const Graphic3d_Mat4& aProjMx = ProjectionMatrix(); + const Graphic3d_Mat4d& aViewMx = OrientationMatrix(); + const Graphic3d_Mat4d& aProjMx = ProjectionMatrix(); - Graphic3d_Mat4 aInvView; - Graphic3d_Mat4 aInvProj; + Graphic3d_Mat4d aInvView; + Graphic3d_Mat4d aInvProj; // this case should never happen if (!aViewMx.Inverted (aInvView) || !aProjMx.Inverted (aInvProj)) @@ -504,7 +434,7 @@ gp_Pnt Graphic3d_Camera::UnProject (const gp_Pnt& thePnt) const } // use compatible type of point - Graphic3d_Vec4 aPnt = safePointCast (thePnt); + Graphic3d_Vec4d aPnt = safePointCast (thePnt); aPnt = aInvProj * aPnt; // convert to view coordinate space aPnt = aInvView * aPnt; // convert to world coordinate space @@ -520,10 +450,10 @@ gp_Pnt Graphic3d_Camera::UnProject (const gp_Pnt& thePnt) const // ======================================================================= gp_Pnt Graphic3d_Camera::ConvertView2Proj (const gp_Pnt& thePnt) const { - const Graphic3d_Mat4& aProjMx = ProjectionMatrix(); + const Graphic3d_Mat4d& aProjMx = ProjectionMatrix(); // use compatible type of point - Graphic3d_Vec4 aPnt = safePointCast (thePnt); + Graphic3d_Vec4d aPnt = safePointCast (thePnt); aPnt = aProjMx * aPnt; // convert to projection coordinate space @@ -538,18 +468,18 @@ gp_Pnt Graphic3d_Camera::ConvertView2Proj (const gp_Pnt& thePnt) const // ======================================================================= gp_Pnt Graphic3d_Camera::ConvertProj2View (const gp_Pnt& thePnt) const { - const Graphic3d_Mat4& aProjMx = ProjectionMatrix(); + const Graphic3d_Mat4d& aProjMx = ProjectionMatrix(); - Graphic3d_Mat4 aInvProj; + Graphic3d_Mat4d aInvProj; // this case should never happen, but... if (!aProjMx.Inverted (aInvProj)) { - return gp_Pnt(0, 0, 0); + return gp_Pnt (0, 0, 0); } // use compatible type of point - Graphic3d_Vec4 aPnt = safePointCast (thePnt); + Graphic3d_Vec4d aPnt = safePointCast (thePnt); aPnt = aInvProj * aPnt; // convert to view coordinate space @@ -564,10 +494,10 @@ gp_Pnt Graphic3d_Camera::ConvertProj2View (const gp_Pnt& thePnt) const // ======================================================================= gp_Pnt Graphic3d_Camera::ConvertWorld2View (const gp_Pnt& thePnt) const { - const Graphic3d_Mat4& aViewMx = OrientationMatrix(); + const Graphic3d_Mat4d& aViewMx = OrientationMatrix(); // use compatible type of point - Graphic3d_Vec4 aPnt = safePointCast (thePnt); + Graphic3d_Vec4d aPnt = safePointCast (thePnt); aPnt = aViewMx * aPnt; // convert to view coordinate space @@ -582,9 +512,9 @@ gp_Pnt Graphic3d_Camera::ConvertWorld2View (const gp_Pnt& thePnt) const // ======================================================================= gp_Pnt Graphic3d_Camera::ConvertView2World (const gp_Pnt& thePnt) const { - const Graphic3d_Mat4& aViewMx = OrientationMatrix(); + const Graphic3d_Mat4d& aViewMx = OrientationMatrix(); - Graphic3d_Mat4 aInvView; + Graphic3d_Mat4d aInvView; if (!aViewMx.Inverted (aInvView)) { @@ -592,7 +522,7 @@ gp_Pnt Graphic3d_Camera::ConvertView2World (const gp_Pnt& thePnt) const } // use compatible type of point - Graphic3d_Vec4 aPnt = safePointCast (thePnt); + Graphic3d_Vec4d aPnt = safePointCast (thePnt); aPnt = aInvView * aPnt; // convert to world coordinate space @@ -605,275 +535,392 @@ gp_Pnt Graphic3d_Camera::ConvertView2World (const gp_Pnt& thePnt) const // function : ViewDimensions // purpose : // ======================================================================= -gp_Pnt Graphic3d_Camera::ViewDimensions () const +gp_XYZ Graphic3d_Camera::ViewDimensions() const { // view plane dimensions Standard_Real aSizeY = IsOrthographic() ? myScale : (2.0 * Distance() * Tan (DTR_HALF * myFOVy)); Standard_Real aSizeX = myAspect * aSizeY; // and frustum depth - return gp_Pnt (aSizeX, aSizeY, myZFar - myZNear); + return gp_XYZ (aSizeX, aSizeY, myZFar - myZNear); } // ======================================================================= -// function : WindowLimit +// function : Frustum // purpose : // ======================================================================= -void Graphic3d_Camera::WindowLimit (Standard_Real& theUMin, - Standard_Real& theVMin, - Standard_Real& theUMax, - Standard_Real& theVMax) const +void Graphic3d_Camera::Frustum (gp_Pln& theLeft, + gp_Pln& theRight, + gp_Pln& theBottom, + gp_Pln& theTop, + gp_Pln& theNear, + gp_Pln& theFar) const { - gp_Pnt aViewDims = ViewDimensions(); - gp_Pnt aShift = ProjectionShift(); - theUMin = -aViewDims.X() * 0.5 - aShift.X(); - theVMin = -aViewDims.Y() * 0.5 - aShift.Y(); - theUMax = aViewDims.X() * 0.5 - aShift.X(); - theVMax = aViewDims.Y() * 0.5 - aShift.Y(); + gp_Vec aProjection = gp_Vec (Direction()); + gp_Vec anUp = OrthogonalizedUp(); + gp_Vec aSide = aProjection ^ anUp; + + Standard_ASSERT_RAISE ( + !aProjection.IsParallel (anUp, Precision::Angular()), + "Can not derive SIDE = PROJ x UP - directions are parallel"); + + theNear = gp_Pln (Eye().Translated (aProjection * ZNear()), aProjection); + theFar = gp_Pln (Eye().Translated (aProjection * ZFar()), -aProjection); + + Standard_Real aHScaleHor = Scale() * 0.5 * Aspect(); + Standard_Real aHScaleVer = Scale() * 0.5; + + gp_Pnt aPntLeft = Center().Translated (aHScaleHor * -aSide); + gp_Pnt aPntRight = Center().Translated (aHScaleHor * aSide); + gp_Pnt aPntBottom = Center().Translated (aHScaleVer * -anUp); + gp_Pnt aPntTop = Center().Translated (aHScaleVer * anUp); + + gp_Vec aDirLeft = aSide; + gp_Vec aDirRight = -aSide; + gp_Vec aDirBottom = anUp; + gp_Vec aDirTop = -anUp; + if (!IsOrthographic()) + { + Standard_Real aHFOVHor = ATan (Tan (DTR_HALF * FOVy()) * Aspect()); + Standard_Real aHFOVVer = DTR_HALF * FOVy(); + aDirLeft.Rotate (gp_Ax1 (gp::Origin(), anUp), aHFOVHor); + aDirRight.Rotate (gp_Ax1 (gp::Origin(), anUp), -aHFOVHor); + aDirBottom.Rotate (gp_Ax1 (gp::Origin(), aSide), -aHFOVVer); + aDirTop.Rotate (gp_Ax1 (gp::Origin(), aSide), aHFOVVer); + } + + theLeft = gp_Pln (aPntLeft, aDirLeft); + theRight = gp_Pln (aPntRight, aDirRight); + theBottom = gp_Pln (aPntBottom, aDirBottom); + theTop = gp_Pln (aPntTop, aDirTop); +} + +// ======================================================================= +// function : OrientationMatrix +// purpose : +// ======================================================================= +const Graphic3d_Mat4d& Graphic3d_Camera::OrientationMatrix() const +{ + return *UpdateOrientation (myMatricesD).Orientation; +} + +// ======================================================================= +// function : OrientationMatrixF +// purpose : +// ======================================================================= +const Graphic3d_Mat4& Graphic3d_Camera::OrientationMatrixF() const +{ + return *UpdateOrientation (myMatricesF).Orientation; +} + +// ======================================================================= +// function : ProjectionMatrix +// purpose : +// ======================================================================= +const Graphic3d_Mat4d& Graphic3d_Camera::ProjectionMatrix() const +{ + return *UpdateProjection (myMatricesD).MProjection; +} + +// ======================================================================= +// function : ProjectionMatrixF +// purpose : +// ======================================================================= +const Graphic3d_Mat4& Graphic3d_Camera::ProjectionMatrixF() const +{ + return *UpdateProjection (myMatricesF).MProjection; +} + +// ======================================================================= +// function : ProjectionStereoLeft +// purpose : +// ======================================================================= +const Graphic3d_Mat4d& Graphic3d_Camera::ProjectionStereoLeft() const +{ + return *UpdateProjection (myMatricesD).LProjection; +} + +// ======================================================================= +// function : ProjectionStereoLeftF +// purpose : +// ======================================================================= +const Graphic3d_Mat4& Graphic3d_Camera::ProjectionStereoLeftF() const +{ + return *UpdateProjection (myMatricesF).LProjection; +} + +// ======================================================================= +// function : ProjectionStereoRight +// purpose : +// ======================================================================= +const Graphic3d_Mat4d& Graphic3d_Camera::ProjectionStereoRight() const +{ + return *UpdateProjection (myMatricesD).RProjection; +} + +// ======================================================================= +// function : ProjectionStereoRightF +// purpose : +// ======================================================================= +const Graphic3d_Mat4& Graphic3d_Camera::ProjectionStereoRightF() const +{ + return *UpdateProjection (myMatricesF).RProjection; } // ======================================================================= // function : UpdateProjection // purpose : // ======================================================================= -void Graphic3d_Camera::UpdateProjection() +template +Graphic3d_Camera::TransformMatrices& + Graphic3d_Camera::UpdateProjection (TransformMatrices& theMatrices) const { - if (myNbUpdateLocks > 0) + if (theMatrices.IsProjectionValid()) { - return; + return theMatrices; // for inline accessors } - myProjectionState = (Standard_Size)Standard_Atomic_Increment (&THE_STATE_COUNTER); + theMatrices.InitProjection(); // sets top of frustum based on FOVy and near clipping plane - Standard_Real aDYHalf; + Elem_t aScale = static_cast (myScale); + Elem_t aZNear = static_cast (myZNear); + Elem_t aZFar = static_cast (myZFar); + Elem_t anAspect = static_cast (myAspect); + Elem_t aDYHalf = 0.0; if (IsOrthographic()) { - aDYHalf = myScale * 0.5; + aDYHalf = aScale * Elem_t (0.5); } else { - aDYHalf = myZNear * Tan (DTR_HALF * myFOVy); + aDYHalf = aZNear * Elem_t (Tan (DTR_HALF * myFOVy)); } // sets right of frustum based on aspect ratio - Standard_Real aDXHalf = myAspect * aDYHalf; + Elem_t aDXHalf = anAspect * aDYHalf; + Elem_t aLeft = -aDXHalf; + Elem_t aRight = aDXHalf; + Elem_t aBot = -aDYHalf; + Elem_t aTop = aDYHalf; - Standard_ShortReal aLeft = (Standard_ShortReal) -aDXHalf; - Standard_ShortReal aRight = (Standard_ShortReal) aDXHalf; - Standard_ShortReal aBot = (Standard_ShortReal) -aDYHalf; - Standard_ShortReal aTop = (Standard_ShortReal) aDYHalf; - Standard_ShortReal aNear = (Standard_ShortReal) myZNear; - Standard_ShortReal aFar = (Standard_ShortReal) myZFar; - Standard_ShortReal aShiftX = (Standard_ShortReal) myProjectionShift.X(); - Standard_ShortReal aShiftY = (Standard_ShortReal) myProjectionShift.Y(); + Elem_t aIOD = myIODType == IODType_Relative + ? static_cast (myIOD * Distance()) + : static_cast (myIOD); - Standard_ShortReal aIOD = (myIODType == IODType_Relative) - ? (Standard_ShortReal)(myIOD * Distance()) - : (Standard_ShortReal)(myIOD); - - Standard_ShortReal aFocus = (myZFocusType == FocusType_Relative) - ? (Standard_ShortReal)(myZFocus * Distance()) - : (Standard_ShortReal)(myZFocus); + Elem_t aFocus = myZFocusType == FocusType_Relative + ? static_cast (myZFocus * Distance()) + : static_cast (myZFocus); switch (myProjType) { case Projection_Orthographic : - OrthoProj (aLeft, aRight, aBot, aTop, aNear, aFar, aShiftX, aShiftY, myMProjection); + OrthoProj (aLeft, aRight, aBot, aTop, aZNear, aZFar, *theMatrices.MProjection); break; case Projection_Perspective : - PerspectiveProj (aLeft, aRight, aBot, aTop, aNear, aFar, aShiftX, aShiftY, myMProjection); + PerspectiveProj (aLeft, aRight, aBot, aTop, aZNear, aZFar, *theMatrices.MProjection); break; case Projection_MonoLeftEye : { - StereoEyeProj (aLeft, aRight, aBot, aTop, aNear, - aFar, aIOD, aFocus, aShiftX, aShiftY, - Standard_True, myMProjection); + StereoEyeProj (aLeft, aRight, aBot, aTop, + aZNear, aZFar, aIOD, aFocus, + Standard_True, *theMatrices.MProjection); break; } case Projection_MonoRightEye : { - StereoEyeProj (aLeft, aRight, aBot, aTop, aNear, - aFar, aIOD, aFocus, aShiftX, aShiftY, - Standard_False, myMProjection); + StereoEyeProj (aLeft, aRight, aBot, aTop, + aZNear, aZFar, aIOD, aFocus, + Standard_False, *theMatrices.MProjection); break; } case Projection_Stereo : { - PerspectiveProj (aLeft, aRight, aBot, aTop, aNear, aFar, aShiftX, aShiftY, myMProjection); + PerspectiveProj (aLeft, aRight, aBot, aTop, aZNear, aZFar, *theMatrices.MProjection); - StereoEyeProj (aLeft, aRight, aBot, aTop, aNear, - aFar, aIOD, aFocus, aShiftX, aShiftY, - Standard_True, myLProjection); + StereoEyeProj (aLeft, aRight, aBot, aTop, + aZNear, aZFar, aIOD, aFocus, + Standard_True, + *theMatrices.LProjection); - StereoEyeProj (aLeft, aRight, aBot, aTop, aNear, - aFar, aIOD, aFocus, aShiftX, aShiftY, - Standard_False, myRProjection); + StereoEyeProj (aLeft, aRight, aBot, aTop, + aZNear, aZFar, aIOD, aFocus, + Standard_False, + *theMatrices.RProjection); break; } } + + return theMatrices; // for inline accessors } // ======================================================================= // function : UpdateOrientation // purpose : // ======================================================================= -void Graphic3d_Camera::UpdateOrientation() +template +Graphic3d_Camera::TransformMatrices& + Graphic3d_Camera::UpdateOrientation (TransformMatrices& theMatrices) const { - if (myNbUpdateLocks > 0) + if (theMatrices.IsOrientationValid()) { - return; + return theMatrices; // for inline accessors } - myOrientationState = (Standard_Size)Standard_Atomic_Increment (&THE_STATE_COUNTER); + theMatrices.InitOrientation(); + + NCollection_Vec3 anEye (static_cast (myEye.X()), + static_cast (myEye.Y()), + static_cast (myEye.Z())); + + NCollection_Vec3 aCenter (static_cast (myCenter.X()), + static_cast (myCenter.Y()), + static_cast (myCenter.Z())); - Graphic3d_Vec3 anEye ((Standard_ShortReal) myEye.X(), - (Standard_ShortReal) myEye.Y(), - (Standard_ShortReal) myEye.Z()); + NCollection_Vec3 anUp (static_cast (myUp.X()), + static_cast (myUp.Y()), + static_cast (myUp.Z())); - Graphic3d_Vec3 aCenter ((Standard_ShortReal) myCenter.X(), - (Standard_ShortReal) myCenter.Y(), - (Standard_ShortReal) myCenter.Z()); + NCollection_Vec3 anAxialScale (static_cast (myAxialScale.X()), + static_cast (myAxialScale.Y()), + static_cast (myAxialScale.Z())); - Graphic3d_Vec3 anUp ((Standard_ShortReal) myUp.X(), - (Standard_ShortReal) myUp.Y(), - (Standard_ShortReal) myUp.Z()); + LookOrientation (anEye, aCenter, anUp, anAxialScale, *theMatrices.Orientation); - Graphic3d_Vec3 anAxialScale ((Standard_ShortReal) myAxialScale.X(), - (Standard_ShortReal) myAxialScale.Y(), - (Standard_ShortReal) myAxialScale.Z()); + return theMatrices; // for inline accessors +} - LookOrientation (anEye, aCenter, anUp, anAxialScale, myOrientation); +// ======================================================================= +// function : InvalidateProjection +// purpose : +// ======================================================================= +void Graphic3d_Camera::InvalidateProjection() +{ + myMatricesD.ResetProjection(); + myMatricesF.ResetProjection(); + myProjectionState = (Standard_Size)Standard_Atomic_Increment (&THE_STATE_COUNTER); +} - // Update orthogonalized Up vector - myUp = gp_Dir (anUp.x(), anUp.y(), anUp.z()); +// ======================================================================= +// function : InvalidateOrientation +// purpose : +// ======================================================================= +void Graphic3d_Camera::InvalidateOrientation() +{ + myMatricesD.ResetOrientation(); + myMatricesF.ResetOrientation(); + myOrientationState = (Standard_Size)Standard_Atomic_Increment (&THE_STATE_COUNTER); } // ======================================================================= // function : OrthoProj // purpose : // ======================================================================= -void Graphic3d_Camera::OrthoProj (const Standard_ShortReal theLeft, - const Standard_ShortReal theRight, - const Standard_ShortReal theBottom, - const Standard_ShortReal theTop, - const Standard_ShortReal theNear, - const Standard_ShortReal theFar, - const Standard_ShortReal theShiftX, - const Standard_ShortReal theShiftY, - Graphic3d_Mat4& theOutMx) +template +void Graphic3d_Camera::OrthoProj (const Elem_t theLeft, + const Elem_t theRight, + const Elem_t theBottom, + const Elem_t theTop, + const Elem_t theNear, + const Elem_t theFar, + NCollection_Mat4& theOutMx) { // row 0 - theOutMx.ChangeValue (0, 0) = 2.0f / (theRight - theLeft); - theOutMx.ChangeValue (0, 1) = 0.0f; - theOutMx.ChangeValue (0, 2) = 0.0f; + theOutMx.ChangeValue (0, 0) = Elem_t (2.0) / (theRight - theLeft); + theOutMx.ChangeValue (0, 1) = Elem_t (0.0); + theOutMx.ChangeValue (0, 2) = Elem_t (0.0); theOutMx.ChangeValue (0, 3) = - (theRight + theLeft) / (theRight - theLeft); // row 1 - theOutMx.ChangeValue (1, 0) = 0.0f; - theOutMx.ChangeValue (1, 1) = 2.0f / (theTop - theBottom); - theOutMx.ChangeValue (1, 2) = 0.0f; + theOutMx.ChangeValue (1, 0) = Elem_t (0.0); + theOutMx.ChangeValue (1, 1) = Elem_t (2.0) / (theTop - theBottom); + theOutMx.ChangeValue (1, 2) = Elem_t (0.0); theOutMx.ChangeValue (1, 3) = - (theTop + theBottom) / (theTop - theBottom); // row 2 - theOutMx.ChangeValue (2, 0) = 0.0f; - theOutMx.ChangeValue (2, 1) = 0.0f; - theOutMx.ChangeValue (2, 2) = -2.0f / (theFar - theNear); + theOutMx.ChangeValue (2, 0) = Elem_t (0.0); + theOutMx.ChangeValue (2, 1) = Elem_t (0.0); + theOutMx.ChangeValue (2, 2) = Elem_t (-2.0) / (theFar - theNear); theOutMx.ChangeValue (2, 3) = - (theFar + theNear) / (theFar - theNear); // row 3 - theOutMx.ChangeValue (3, 0) = 0.0f; - theOutMx.ChangeValue (3, 1) = 0.0f; - theOutMx.ChangeValue (3, 2) = 0.0f; - theOutMx.ChangeValue (3, 3) = 1.0f; - - Graphic3d_Mat4 aViewportShift; - aViewportShift.ChangeValue (0, 3) = theShiftX; - aViewportShift.ChangeValue (1, 3) = theShiftY; - - theOutMx.Multiply (aViewportShift); + theOutMx.ChangeValue (3, 0) = Elem_t (0.0); + theOutMx.ChangeValue (3, 1) = Elem_t (0.0); + theOutMx.ChangeValue (3, 2) = Elem_t (0.0); + theOutMx.ChangeValue (3, 3) = Elem_t (1.0); } // ======================================================================= // function : PerspectiveProj // purpose : // ======================================================================= -void Graphic3d_Camera::PerspectiveProj (const Standard_ShortReal theLeft, - const Standard_ShortReal theRight, - const Standard_ShortReal theBottom, - const Standard_ShortReal theTop, - const Standard_ShortReal theNear, - const Standard_ShortReal theFar, - const Standard_ShortReal theShiftX, - const Standard_ShortReal theShiftY, - Graphic3d_Mat4& theOutMx) +template +void Graphic3d_Camera::PerspectiveProj (const Elem_t theLeft, + const Elem_t theRight, + const Elem_t theBottom, + const Elem_t theTop, + const Elem_t theNear, + const Elem_t theFar, + NCollection_Mat4& theOutMx) { // column 0 - theOutMx.ChangeValue (0, 0) = (2.0f * theNear) / (theRight - theLeft); - theOutMx.ChangeValue (1, 0) = 0.0f; - theOutMx.ChangeValue (2, 0) = 0.0f; - theOutMx.ChangeValue (3, 0) = 0.0f; + theOutMx.ChangeValue (0, 0) = (Elem_t (2.0) * theNear) / (theRight - theLeft); + theOutMx.ChangeValue (1, 0) = Elem_t (0.0); + theOutMx.ChangeValue (2, 0) = Elem_t (0.0); + theOutMx.ChangeValue (3, 0) = Elem_t (0.0); // column 1 - theOutMx.ChangeValue (0, 1) = 0.0f; - theOutMx.ChangeValue (1, 1) = (2.0f * theNear) / (theTop - theBottom); - theOutMx.ChangeValue (2, 1) = 0.0f; - theOutMx.ChangeValue (3, 1) = 0.0f; + theOutMx.ChangeValue (0, 1) = Elem_t (0.0); + theOutMx.ChangeValue (1, 1) = (Elem_t (2.0) * theNear) / (theTop - theBottom); + theOutMx.ChangeValue (2, 1) = Elem_t (0.0); + theOutMx.ChangeValue (3, 1) = Elem_t (0.0); // column 2 theOutMx.ChangeValue (0, 2) = (theRight + theLeft) / (theRight - theLeft); theOutMx.ChangeValue (1, 2) = (theTop + theBottom) / (theTop - theBottom); theOutMx.ChangeValue (2, 2) = -(theFar + theNear) / (theFar - theNear); - theOutMx.ChangeValue (3, 2) = -1.0f; + theOutMx.ChangeValue (3, 2) = Elem_t (-1.0); // column 3 - theOutMx.ChangeValue (0, 3) = 0.0f; - theOutMx.ChangeValue (1, 3) = 0.0f; - theOutMx.ChangeValue (2, 3) = -(2.0f * theFar * theNear) / (theFar - theNear); - theOutMx.ChangeValue (3, 3) = 0.0f; - - Graphic3d_Mat4 aViewportShift; - aViewportShift.ChangeValue (0, 3) = theShiftX; - aViewportShift.ChangeValue (1, 3) = theShiftY; - - theOutMx.Multiply (aViewportShift); + theOutMx.ChangeValue (0, 3) = Elem_t (0.0); + theOutMx.ChangeValue (1, 3) = Elem_t (0.0); + theOutMx.ChangeValue (2, 3) = -(Elem_t (2.0) * theFar * theNear) / (theFar - theNear); + theOutMx.ChangeValue (3, 3) = Elem_t (0.0); } // ======================================================================= // function : StereoEyeProj // purpose : // ======================================================================= -void Graphic3d_Camera::StereoEyeProj (const Standard_ShortReal theLeft, - const Standard_ShortReal theRight, - const Standard_ShortReal theBottom, - const Standard_ShortReal theTop, - const Standard_ShortReal theNear, - const Standard_ShortReal theFar, - const Standard_ShortReal theIOD, - const Standard_ShortReal theZFocus, - const Standard_ShortReal theShiftX, - const Standard_ShortReal theShiftY, - const Standard_Boolean theIsLeft, - Graphic3d_Mat4& theOutMx) +template +void Graphic3d_Camera::StereoEyeProj (const Elem_t theLeft, + const Elem_t theRight, + const Elem_t theBottom, + const Elem_t theTop, + const Elem_t theNear, + const Elem_t theFar, + const Elem_t theIOD, + const Elem_t theZFocus, + const Standard_Boolean theIsLeft, + NCollection_Mat4& theOutMx) { - Standard_ShortReal aDx = theIsLeft ? ( 0.5f * theIOD) : (-0.5f * theIOD); - Standard_ShortReal aDXStereoShift = aDx * theNear / theZFocus; + Elem_t aDx = theIsLeft ? Elem_t (0.5) * theIOD : Elem_t (-0.5) * theIOD; + Elem_t aDXStereoShift = aDx * theNear / theZFocus; // construct eye projection matrix PerspectiveProj (theLeft + aDXStereoShift, theRight + aDXStereoShift, theBottom, theTop, theNear, theFar, - theShiftX, theShiftY, theOutMx); - if (theIOD != 0.0f) + if (theIOD != Elem_t (0.0)) { // X translation to cancel parallax - theOutMx.Translate (Graphic3d_Vec3 (aDx, 0.0f, 0.0f)); + theOutMx.Translate (NCollection_Vec3 (aDx, Elem_t (0.0), Elem_t (0.0))); } } @@ -881,34 +928,33 @@ void Graphic3d_Camera::StereoEyeProj (const Standard_ShortReal theLeft, // function : LookOrientation // purpose : // ======================================================================= -void Graphic3d_Camera::LookOrientation (const Graphic3d_Vec3& theEye, - const Graphic3d_Vec3& theLookAt, - Graphic3d_Vec3& theUpDir, - const Graphic3d_Vec3& theAxialScale, - Graphic3d_Mat4& theOutMx) +template +void Graphic3d_Camera::LookOrientation (const NCollection_Vec3& theEye, + const NCollection_Vec3& theLookAt, + const NCollection_Vec3& theUpDir, + const NCollection_Vec3& theAxialScale, + NCollection_Mat4& theOutMx) { - Graphic3d_Vec3 aForward = theLookAt - theEye; + NCollection_Vec3 aForward = theLookAt - theEye; aForward.Normalize(); // side = forward x up - Graphic3d_Vec3 aSide = Graphic3d_Vec3::Cross (aForward, theUpDir); + NCollection_Vec3 aSide = NCollection_Vec3::Cross (aForward, theUpDir); aSide.Normalize(); // recompute up as: up = side x forward - Graphic3d_Vec3 anUp = Graphic3d_Vec3::Cross (aSide, aForward); - theUpDir = anUp; + NCollection_Vec3 anUp = NCollection_Vec3::Cross (aSide, aForward); - Graphic3d_Mat4 aLookMx; + NCollection_Mat4 aLookMx; aLookMx.SetRow (0, aSide); aLookMx.SetRow (1, anUp); aLookMx.SetRow (2, -aForward); - theOutMx.InitIdentity(); - theOutMx.Multiply (aLookMx); - + theOutMx.InitIdentity(); + theOutMx.Multiply (aLookMx); theOutMx.Translate (-theEye); - Graphic3d_Mat4 anAxialScaleMx; + NCollection_Mat4 anAxialScaleMx; anAxialScaleMx.ChangeValue (0, 0) = theAxialScale.x(); anAxialScaleMx.ChangeValue (1, 1) = theAxialScale.y(); anAxialScaleMx.ChangeValue (2, 2) = theAxialScale.z(); diff --git a/src/Graphic3d/Graphic3d_Camera.hxx b/src/Graphic3d/Graphic3d_Camera.hxx index 69740cc952..2c14fba975 100644 --- a/src/Graphic3d/Graphic3d_Camera.hxx +++ b/src/Graphic3d/Graphic3d_Camera.hxx @@ -16,9 +16,12 @@ #ifndef _Graphic3d_Camera_HeaderFile #define _Graphic3d_Camera_HeaderFile +#include #include #include +#include + #include #include @@ -31,6 +34,53 @@ DEFINE_STANDARD_HANDLE (Graphic3d_Camera, Standard_Transient) //! and orientation properties of 3D view. class Graphic3d_Camera : public Standard_Transient { +private: + + //! Template container for cached matrices or Real/ShortReal types. + template + struct TransformMatrices + { + void InitOrientation() + { + Orientation = new NCollection_Mat4(); + } + + void InitProjection() + { + MProjection = new NCollection_Mat4(); + LProjection = new NCollection_Mat4(); + RProjection = new NCollection_Mat4(); + } + + void ResetOrientation() + { + Orientation.Nullify(); + } + + void ResetProjection() + { + MProjection.Nullify(); + LProjection.Nullify(); + RProjection.Nullify(); + } + + Standard_Boolean IsOrientationValid() + { + return !Orientation.IsNull(); + } + + Standard_Boolean IsProjectionValid() + { + return !MProjection.IsNull() && + !LProjection.IsNull() && + !RProjection.IsNull(); + } + + NCollection_Handle< NCollection_Mat4 > Orientation; + NCollection_Handle< NCollection_Mat4 > MProjection; + NCollection_Handle< NCollection_Mat4 > LProjection; + NCollection_Handle< NCollection_Mat4 > RProjection; + }; public: @@ -75,7 +125,7 @@ public: //! Initializes camera with the following properties: //! Eye (0, 0, -2); Center (0, 0, 0); Up (0, 1, 0); //! Type (Orthographic); FOVy (45); Scale (1000); IsStereo(false); - //! ZNear (0.1); ZFar (100); Aspect(1); + //! ZNear (0.001); ZFar (3000.0); Aspect(1); //! ZFocus(1.0); ZFocusType(Relative); IOD(0.05); IODType(Relative) Standard_EXPORT Graphic3d_Camera(); @@ -93,17 +143,8 @@ public: //! @param theOther [in] the camera to copy from. Standard_EXPORT void Copy (const Handle(Graphic3d_Camera)& theOther); - //! Returns modification state of camera projection matrix - Standard_Size ProjectionState() const - { - return myProjectionState; - } - - //! Returns modification state of camera model-view matrix - Standard_Size ModelViewState() const - { - return myOrientationState; - } +//! @name Public camera properties +public: //! Sets camera Eye position. //! @param theEye [in] the location of camera's Eye. @@ -127,10 +168,16 @@ public: return myCenter; } - //! Sets camera Up direction vector. + //! Sets camera Up direction vector, orthogonal to camera direction. //! @param theUp [in] the Up direction vector. Standard_EXPORT void SetUp (const gp_Dir& theUp); + //! Orthogonalize up direction vector. + Standard_EXPORT void OrthogonalizeUp(); + + //! Return a copy of orthogonalized up direction vector. + Standard_EXPORT gp_Dir OrthogonalizedUp() const; + //! Get camera Up direction vector. //! @return Camera's Up direction vector. const gp_Dir& Up() const @@ -138,26 +185,13 @@ public: return myUp; } - //! Set camera projection shift vector.
- //! Used for compatibility with older view mechanics. Applied after - //! view transform and before projection step (P * Shift * V). - //! @param theProjShift [in] the projection shift vector. - Standard_EXPORT void SetProjectionShift (const gp_Pnt& theProjShift); - - //! Get camera projection shift vector. - //! @return Camera's projection shift vector. - const gp_Pnt& ProjectionShift() const - { - return myProjectionShift; - } - //! Set camera axial scale.
//! @param theAxialScale [in] the axial scale vector. - Standard_EXPORT void SetAxialScale (const gp_Pnt& theAxialScale); + Standard_EXPORT void SetAxialScale (const gp_XYZ& theAxialScale); //! Get camera axial scale. //! @return Camera's axial scale. - const gp_Pnt& AxialScale() const + const gp_XYZ& AxialScale() const { return myAxialScale; } @@ -190,9 +224,9 @@ public: Standard_EXPORT Standard_Real Scale() const; //! Change camera projection type. - //! While switching between perspective and ortho projection types - //! ZNear and ZFar value conversion is performed due to different - //! coordinate systems (made for compatibility, to be improved..) + //! When switching to perspective projection from orthographic one, + //! the ZNear and ZFar are reset to default values (0.001, 3000.0) + //! if less than 0.0. //! @param theProjectionType [in] the camera projection type. Standard_EXPORT void SetProjectionType (const Projection theProjection); @@ -231,9 +265,14 @@ public: return myFOVy; } - //! Change the Near Z-clipping plane position. + //! Change the Near and Far Z-clipping plane positions. + //! For orthographic projection, theZNear, theZFar can be negative or positive. + //! For perspective projection, only positive values are allowed. + //! Program error exception is raised if non-positive values are + //! specified for perspective projection or theZNear >= theZFar. //! @param theZNear [in] the distance of the plane from the Eye. - Standard_EXPORT void SetZNear (const Standard_Real theZNear); + //! @param theZFar [in] the distance of the plane from the Eye. + Standard_EXPORT void SetZRange (const Standard_Real theZNear, const Standard_Real theZFar); //! Get the Near Z-clipping plane position. //! @return the distance of the plane from the Eye. @@ -242,10 +281,6 @@ public: return myZNear; } - //! Change the Far Z-clipping plane position. - //! @param theZFar [in] the distance of the plane from the Eye. - Standard_EXPORT void SetZFar (const Standard_Real theZFar); - //! Get the Far Z-clipping plane position. //! @return the distance of the plane from the Eye. Standard_Real ZFar() const @@ -307,52 +342,7 @@ public: return myIODType; } - //! Get orientation matrix. - //! @return camera orientation matrix. - const Graphic3d_Mat4& OrientationMatrix() const - { - return myOrientation; - } - - //! Get monographic or middle point projection matrix used for monographic - //! rendering and for point projection / unprojection. - //! @return monographic projection matrix. - const Graphic3d_Mat4& ProjectionMatrix() const - { - return myMProjection; - } - - //! @return stereographic matrix computed for left eye. Please note - //! that this method is used for rendering for Projection_Stereo. - const Graphic3d_Mat4& ProjectionStereoLeft() const - { - return myLProjection; - } - - //! @return stereographic matrix computed for right eye. Please note - //! that this method is used for rendering for Projection_Stereo. - const Graphic3d_Mat4& ProjectionStereoRight() const - { - return myRProjection; - } - -public: - - //! Orthogonalize up direction vector. - Standard_EXPORT void OrthogonalizeUp(); - - //! Suspend internal data recalculation when changing set of camera - //! properties. This method is optional and can be used for pieces - //! of code which are critical to performance. Note that the method - //! supports stacked calls (carried out by internal counter). - Standard_EXPORT void BeginUpdate(); - - //! Unset lock set by BeginUpdate and invoke data recalculation when - //! there are no more locks left. This method is optional and can be used - //! for pieces of code which are critical to performance. - Standard_EXPORT void EndUpdate(); - - // Basic camera operations +//! @name Basic camera operations public: //! Transform orientation components of the camera: @@ -363,20 +353,28 @@ public: //! Calculate view plane size at center (target) point //! and distance between ZFar and ZNear planes. //! @return values in form of gp_Pnt (Width, Height, Depth). - Standard_EXPORT gp_Pnt ViewDimensions () const; - - //! Calculate view plane dimensions with projection shift applied. - //! Analog to old ViewMapping.WindowLimit() function. - //! @param theUMin [out] the u component of min corner of the rect. - //! @param theVMin [out] the v component of min corner of the rect. - //! @param theUMax [out] the u component of max corner of the rect. - //! @param theVMax [out] the v component of max corner of the rect. - Standard_EXPORT void WindowLimit (Standard_Real& theUMin, - Standard_Real& theVMin, - Standard_Real& theUMax, - Standard_Real& theVMax) const; - - // Projection methods + Standard_EXPORT gp_XYZ ViewDimensions() const; + + //! Calculate WCS frustum planes for the camera projection volume. + //! Frustum is a convex volume determined by six planes directing + //! inwards. + //! The frustum planes are usually used as inputs for camera algorithms. + //! Thus, if any changes to projection matrix calculation are necessary, + //! the frustum planes calculation should be also touched. + //! @param theLeft [out] the frustum plane for left side of view. + //! @param theRight [out] the frustum plane for right side of view. + //! @param theBottom [out] the frustum plane for bottom side of view. + //! @param theTop [out] the frustum plane for top side of view. + //! @param theNear [out] the frustum plane for near side of view. + //! @param theFar [out] the frustum plane for far side of view. + Standard_EXPORT void Frustum (gp_Pln& theLeft, + gp_Pln& theRight, + gp_Pln& theBottom, + gp_Pln& theTop, + gp_Pln& theNear, + gp_Pln& theFar) const; + +//! @name Projection methods public: //! Project point from world coordinate space to @@ -415,14 +413,80 @@ public: //! @return point in WCS. Standard_EXPORT gp_Pnt ConvertView2World (const gp_Pnt& thePnt) const; - // managing projection and orientation cache: +//! @name Camera modification state public: - //! Compute and cache projection matrices. - void UpdateProjection(); + //! Returns modification state of camera projection matrix + Standard_Size ProjectionState() const + { + return myProjectionState; + } + + //! Returns modification state of camera model-view matrix + Standard_Size ModelViewState() const + { + return myOrientationState; + } + +//! @name Lazily-computed orientation and projection matrices derived from camera parameters +public: - //! Compute and cache orientation matrix. - void UpdateOrientation(); + //! Get orientation matrix. + //! @return camera orientation matrix. + Standard_EXPORT const Graphic3d_Mat4d& OrientationMatrix() const; + + //! Get orientation matrix of Standard_ShortReal precision. + //! @return camera orientation matrix. + Standard_EXPORT const Graphic3d_Mat4& OrientationMatrixF() const; + + //! Get monographic or middle point projection matrix used for monographic + //! rendering and for point projection / unprojection. + //! @return monographic projection matrix. + Standard_EXPORT const Graphic3d_Mat4d& ProjectionMatrix() const; + + //! Get monographic or middle point projection matrix of Standard_ShortReal precision used for monographic + //! rendering and for point projection / unprojection. + //! @return monographic projection matrix. + Standard_EXPORT const Graphic3d_Mat4& ProjectionMatrixF() const; + + //! @return stereographic matrix computed for left eye. Please note + //! that this method is used for rendering for Projection_Stereo. + Standard_EXPORT const Graphic3d_Mat4d& ProjectionStereoLeft() const; + + //! @return stereographic matrix of Standard_ShortReal precision computed for left eye. + //! Please note that this method is used for rendering for Projection_Stereo. + Standard_EXPORT const Graphic3d_Mat4& ProjectionStereoLeftF() const; + + //! @return stereographic matrix computed for right eye. Please note + //! that this method is used for rendering for Projection_Stereo. + Standard_EXPORT const Graphic3d_Mat4d& ProjectionStereoRight() const; + + //! @return stereographic matrix of Standard_ShortReal precision computed for right eye. + //! Please note that this method is used for rendering for Projection_Stereo. + Standard_EXPORT const Graphic3d_Mat4& ProjectionStereoRightF() const; + +//! @name Managing projection and orientation cache +private: + + //! Compute projection matrices. + //! @param theMatrices [in] the matrices data container. + template + Standard_EXPORT + TransformMatrices& UpdateProjection (TransformMatrices& theMatrices) const; + + //! Compute orientation matrix. + //! @param theMatrices [in] the matrices data container. + template + Standard_EXPORT + TransformMatrices& UpdateOrientation (TransformMatrices& theMatrices) const; + + //! Invalidate state of projection matrix. + //! The matrix will be updated on request. + void InvalidateProjection(); + + //! Invalidate orientation matrix. + //! The matrix will be updated on request. + void InvalidateOrientation(); private: @@ -434,19 +498,16 @@ private: //! @param theTop [in] the top mapping (clipping) coordinate. //! @param theNear [in] the near mapping (clipping) coordinate. //! @param theFar [in] the far mapping (clipping) coordinate. - //! @param theShiftX [in] the shift x coordinate. - //! @param theShiftY [in] the shift y coordinate. //! @param theOutMx [out] the projection matrix. + template static void - OrthoProj (const Standard_ShortReal theLeft, - const Standard_ShortReal theRight, - const Standard_ShortReal theBottom, - const Standard_ShortReal theTop, - const Standard_ShortReal theNear, - const Standard_ShortReal theFar, - const Standard_ShortReal theShiftX, - const Standard_ShortReal theShiftY, - Graphic3d_Mat4& theOutMx); + OrthoProj (const Elem_t theLeft, + const Elem_t theRight, + const Elem_t theBottom, + const Elem_t theTop, + const Elem_t theNear, + const Elem_t theFar, + NCollection_Mat4& theOutMx); //! Compose perspective projection matrix for //! the passed camera volume mapping. @@ -456,19 +517,16 @@ private: //! @param theTop [in] the top mapping (clipping) coordinate. //! @param theNear [in] the near mapping (clipping) coordinate. //! @param theFar [in] the far mapping (clipping) coordinate. - //! @param theShiftX [in] the shift x coordinate. - //! @param theShiftY [in] the shift y coordinate. //! @param theOutMx [out] the projection matrix. + template static void - PerspectiveProj (const Standard_ShortReal theLeft, - const Standard_ShortReal theRight, - const Standard_ShortReal theBottom, - const Standard_ShortReal theTop, - const Standard_ShortReal theNear, - const Standard_ShortReal theFar, - const Standard_ShortReal theShiftX, - const Standard_ShortReal theShiftY, - Graphic3d_Mat4& theOutMx); + PerspectiveProj (const Elem_t theLeft, + const Elem_t theRight, + const Elem_t theBottom, + const Elem_t theTop, + const Elem_t theNear, + const Elem_t theFar, + NCollection_Mat4& theOutMx); //! Compose projection matrix for L/R stereo eyes. //! @param theLeft [in] the left mapping (clipping) coordinate. @@ -480,23 +538,20 @@ private: //! @param theIOD [in] the Intraocular distance. //! @param theZFocus [in] the z coordinate of off-axis //! projection plane with zero parallax. - //! @param theShiftX [in] the shift x coordinate. - //! @param theShiftY [in] the shift y coordinate. //! @param theIsLeft [in] boolean flag to choose between L/R eyes. //! @param theOutMx [out] the projection matrix. + template static void - StereoEyeProj (const Standard_ShortReal theLeft, - const Standard_ShortReal theRight, - const Standard_ShortReal theBottom, - const Standard_ShortReal theTop, - const Standard_ShortReal theNear, - const Standard_ShortReal theFar, - const Standard_ShortReal theIOD, - const Standard_ShortReal theZFocus, - const Standard_ShortReal theShiftX, - const Standard_ShortReal theShiftY, - const Standard_Boolean theIsLeft, - Graphic3d_Mat4& theOutMx); + StereoEyeProj (const Elem_t theLeft, + const Elem_t theRight, + const Elem_t theBottom, + const Elem_t theTop, + const Elem_t theNear, + const Elem_t theFar, + const Elem_t theIOD, + const Elem_t theZFocus, + const Standard_Boolean theIsLeft, + NCollection_Mat4& theOutMx); //! Construct "look at" orientation transformation. //! Reference point differs for perspective and ortho modes @@ -506,12 +561,13 @@ private: //! @param theUpDir [in] the up direction vector. //! @param theAxialScale [in] the axial scale vector. //! @param theOutMx [in/out] the orientation matrix. + template static void - LookOrientation (const Graphic3d_Vec3& theEye, - const Graphic3d_Vec3& theLookAt, - Graphic3d_Vec3& theUpDir, - const Graphic3d_Vec3& theAxialScale, - Graphic3d_Mat4& theOutMx); + LookOrientation (const NCollection_Vec3& theEye, + const NCollection_Vec3& theLookAt, + const NCollection_Vec3& theUpDir, + const NCollection_Vec3& theAxialScale, + NCollection_Mat4& theOutMx); private: @@ -519,14 +575,13 @@ private: gp_Pnt myEye; //!< Camera eye position. gp_Pnt myCenter; //!< Camera center. - gp_Pnt myProjectionShift; //!< Camera projection shift for compatibility. - gp_Pnt myAxialScale; //!< Camera axial scale. + gp_XYZ myAxialScale; //!< World axial scale. - Projection myProjType; //!< Projection type used for rendering. - Standard_Real myFOVy; //!< Field Of View in y axis. - Standard_Real myZNear; //!< Distance to near clipping plane. - Standard_Real myZFar; //!< Distance to far clipping plane. - Standard_Real myAspect; //!< Width to height display ratio. + Projection myProjType; //!< Projection type used for rendering. + Standard_Real myFOVy; //!< Field Of View in y axis. + Standard_Real myZNear; //!< Distance to near clipping plane. + Standard_Real myZFar; //!< Distance to far clipping plane. + Standard_Real myAspect; //!< Width to height display ratio. Standard_Real myScale; //!< Specifies parallel scale for orthographic projection. Standard_Real myZFocus; //!< Stereographic focus value. @@ -535,19 +590,11 @@ private: Standard_Real myIOD; //!< Intraocular distance value. IODType myIODType; //!< Intraocular distance definition type. - //! Number of locks set up on internal data recalculation by - //! (BeginUpdate, EndUpdate) pairs. The counter provides effective - //! use of the mentioned methods when camera properties are modified - //! in stacked functions. - Standard_Integer myNbUpdateLocks; - - Graphic3d_Mat4 myOrientation; //!< Camera orientation matrix. - Graphic3d_Mat4 myMProjection; //!< Monographic projection matrix. - Graphic3d_Mat4 myLProjection; //!< Projection matrix for left eye. - Graphic3d_Mat4 myRProjection; //!< Projection matrix for right eye. + mutable TransformMatrices myMatricesD; + mutable TransformMatrices myMatricesF; - Standard_Size myProjectionState; - Standard_Size myOrientationState; + mutable Standard_Size myProjectionState; + mutable Standard_Size myOrientationState; public: diff --git a/src/Graphic3d/Graphic3d_Mat4.hxx b/src/Graphic3d/Graphic3d_Mat4.hxx index 68c7556d6b..704125304b 100755 --- a/src/Graphic3d/Graphic3d_Mat4.hxx +++ b/src/Graphic3d/Graphic3d_Mat4.hxx @@ -18,6 +18,5 @@ #include typedef NCollection_Mat4 Graphic3d_Mat4; -typedef NCollection_Mat4 Graphic3d_Mat4d; #endif // _Graphic3d_Mat4_HeaderFile diff --git a/src/Graphic3d/Graphic3d_Mat4d.hxx b/src/Graphic3d/Graphic3d_Mat4d.hxx new file mode 100644 index 0000000000..117d796b14 --- /dev/null +++ b/src/Graphic3d/Graphic3d_Mat4d.hxx @@ -0,0 +1,22 @@ +// Copyright (c) 2013 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and / or modify it +// under the terms of the GNU Lesser General Public version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _Graphic3d_Mat4d_HeaderFile +#define _Graphic3d_Mat4d_HeaderFile + +#include +#include + +typedef NCollection_Mat4 Graphic3d_Mat4d; + +#endif // _Graphic3d_Mat4d_HeaderFile diff --git a/src/Graphic3d/Graphic3d_Structure.cdl b/src/Graphic3d/Graphic3d_Structure.cdl index 8025e4d611..4e8dd0322c 100644 --- a/src/Graphic3d/Graphic3d_Structure.cdl +++ b/src/Graphic3d/Graphic3d_Structure.cdl @@ -214,18 +214,14 @@ is -- with the highlight method TOHM_COLOR or TOHM_BOUNDBOX. ---Category: Methods to modify the class definition - SetInfiniteState ( me : mutable; - AFlag : Boolean from Standard ) - is static; - ---Level: Internal - ---Purpose: Modifies the coordinates of the boundary box - -- of the structure . - -- if is Standard_True then is infinite and - -- the MinMaxValues method or the MinMaxCoord method return : - -- XMin = YMin = ZMin = RealFirst (). - -- XMax = YMax = ZMax = RealLast (). - -- By default, is not infinite but empty. - ---Category: Methods to modify the class definition + SetInfiniteState (me : mutable; theToSet : Boolean from Standard) is static; + ---Level: Internal + ---Purpose: If is Standard_True then is infinite and + -- the MinMaxValues method method return : + -- theXMin = theYMin = theZMin = RealFirst(). + -- theXMax = theYMax = theZMax = RealLast(). + -- By default, is not infinite but empty. + ---Category: Methods to modify the class definition SetDisplayPriority ( me : mutable; Priority : Integer from Standard ) @@ -555,17 +551,23 @@ is ---Purpose: Returns the current group of graphic attributes used -- for 3d marker primitives. - MinMaxValues ( me; - XMin, YMin, ZMin : out Real from Standard; - XMax, YMax, ZMax : out Real from Standard ) - is static; - ---Level: Public - ---Purpose: Returns the coordinates of the boundary box - -- of the structure . - -- Warning: If the structure is empty or infinite then : - -- XMin = YMin = ZMin = RealFirst (). - -- XMax = YMax = ZMax = RealLast (). - ---Category: Inquire methods + MinMaxValues (me; + theXMin, theYMin, theZMin : out Real from Standard; + theXMax, theYMax, theZMax : out Real from Standard; + theToIgnoreInfiniteFlag : Boolean from Standard = Standard_False) + is static; + ---Level: Public + ---Purpose: Returns the coordinates of the boundary box of the structure . + -- If is TRUE, the method returns actual graphical + -- boundaries of the Graphic3d_Group components. Otherwise, the + -- method returns boundaries taking into account infinite state + -- of the structure. This approach generally used for application + -- specific fit operation (e.g. fitting the model into screen, + -- not taking into accout infinite helper elements). + -- Warning: If the structure is empty or infinite then : + -- theXMin = theYMin = theZMin = RealFirst (). + -- theXMax = theYMax = theZMax = RealLast (). + ---Category: Inquire methods PrimitivesAspect ( me; CTXL : out AspectLine3d from Graphic3d; @@ -877,17 +879,28 @@ is ---Purpose: Returns the identification number of the structure . ---Category: Private methods - MinMaxCoord ( me; - XMin, YMin, ZMin : out Real from Standard; - XMax, YMax, ZMax : out Real from Standard ) - is static private; - ---Level: Internal - ---Purpose: Returns the extreme coordinates found in the - -- structure . - -- Warning: If the structure is empty or infinite then : - -- XMin = YMin = ZMin = RealFirst (). - -- XMax = YMax = ZMax = RealLast (). - ---Category: Private methods + MinMaxCoord (me; + theXMin, theYMin, theZMin : out Real from Standard; + theXMax, theYMax, theZMax : out Real from Standard) + is static private; + ---Level: Internal + ---Purpose: Returns the extreme coordinates found in the structure . + -- Warning: If the structure is empty or infinite then : + -- theXMin = theYMin = theZMin = RealFirst(). + -- theXMax = theYMax = theZMax = RealLast(). + ---Category: Private methods + + MinMaxCoordWithDescendants (me; + theXMin, theYMin, theZMin : out Real from Standard; + theXMax, theYMax, theZMax : out Real from Standard) + is static private; + ---Level: Internal + ---Purpose: Returns the extreme coordinates found in the structure + -- and its descendants with transformation applied. + -- Warning: If the structure is empty or infinite then : + -- theXMin = theYMin = theZMin = RealFirst(). + -- theXMax = theYMax = theZMax = RealLast(). + ---Category: Private methods Plot ( me : mutable; aPlotter : Plotter from Graphic3d ) @@ -957,6 +970,15 @@ is ---Purpose: Transforms with the transformation . ---Category: Private methods + TransformBoundaries (myclass; + theTrsf : Array2OfReal from TColStd; + theXMin, theYMin, theZMin : in out Real from Standard; + theXMax, theYMax, theZMax : in out Real from Standard) + is protected; + ---Level: Internal + ---Purpose: Transforms boundaries with transformation. + ---Category: Private methods + Update ( me ) is static private; ---Level: Internal diff --git a/src/Graphic3d/Graphic3d_Structure.cxx b/src/Graphic3d/Graphic3d_Structure.cxx index c435617ce2..d8de3bd2cf 100644 --- a/src/Graphic3d/Graphic3d_Structure.cxx +++ b/src/Graphic3d/Graphic3d_Structure.cxx @@ -683,10 +683,13 @@ void Graphic3d_Structure::ReCompute (const Handle(Graphic3d_DataStructureManager } -void Graphic3d_Structure::SetInfiniteState (const Standard_Boolean AValue) { - - MyCStructure.IsInfinite = AValue ? 1:0; - +//============================================================================= +//function : SetInfiniteState +//purpose : +//============================================================================= +void Graphic3d_Structure::SetInfiniteState (const Standard_Boolean theToSet) +{ + MyCStructure.IsInfinite = theToSet ? 1 : 0; } Standard_Boolean Graphic3d_Structure::IsInfinite () const { @@ -1645,70 +1648,120 @@ void Graphic3d_Structure::Transform (TColStd_Array2OfReal& AMatrix) const { } -void Graphic3d_Structure::MinMaxValues (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const { - - Standard_Real RL = RealLast (); - Standard_Real RF = RealFirst (); +//============================================================================= +//function : MinMaxValues +//purpose : +//============================================================================= +void Graphic3d_Structure::MinMaxValues (Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theZMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + Standard_Real& theZMax, + const Standard_Boolean theToIgnoreInfiniteFlag) const +{ + if (IsEmpty()) + { + return; + } - Standard_Real XTMin, YTMin, ZTMin, XTMax, YTMax, ZTMax, U, V, W; + Standard_Real aXMin, aYMin, aZMin, aXMax, aYMax, aZMax; + MinMaxCoord (aXMin, aYMin, aZMin, aXMax, aYMax, aZMax); - MinMaxCoord (XTMin, YTMin, ZTMin, XTMax, YTMax, ZTMax); - if ((XTMin == RF) && (YTMin == RF) && - (ZTMin == RF) && (XTMax == RL) && - (YTMax == RL) && (ZTMax == RL)) { - // Case impossible as it would mean that - // the structure is empty - XMin = RF; - YMin = RF; - ZMin = RF; + // Infinite boundaries corresponding to empty structure or + // non-empty structure, without any primitives specified + if (aXMin == RealFirst() && aYMin == RealFirst() && aZMin == RealFirst() && + aXMax == RealLast() && aYMax == RealLast() && aZMax == RealLast()) + { + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); + return; + } - XMax = RL; - YMax = RL; - ZMax = RL; + // Handle flag, which specifies that structure should be considered as infinite + if (IsInfinite() && !theToIgnoreInfiniteFlag) + { + Graphic3d_Vertex aVertexMin (aXMin, aYMin, aZMin); + Graphic3d_Vertex aVertexMax (aXMax, aYMax, aZMax); + const Standard_Real aDistance = aVertexMin.Distance (aVertexMax); + + // Special case for infinite line: + // Bounding borders of infinite line has been + // calculated as own point in center of this line + if (aDistance >= 500000.0) + { + theXMin = theXMax = 0.5 * (aXMin + aXMax); + theYMin = theYMax = 0.5 * (aYMin + aYMax); + theZMin = theZMax = 0.5 * (aZMin + aZMax); + return; } - else { - Standard_Integer i, j; - TColStd_Array2OfReal TheTrsf (0, 3, 0, 3); - for (i=0; i<=3; i++) - for (j=0; j<=3; j++) - TheTrsf (i, j) = MyCStructure.Transformation[i][j]; - - Graphic3d_Structure::Transforms - (TheTrsf, XTMin, YTMin, ZTMin, XMin, YMin, ZMin); - Graphic3d_Structure::Transforms - (TheTrsf, XTMax, YTMax, ZTMax, XMax, YMax, ZMax); - Graphic3d_Structure::Transforms - (TheTrsf, XTMin, YTMin, ZTMax, U, V, W); - XMin = Min(U,XMin) ; XMax = Max(U,XMax) ; - YMin = Min(V,YMin) ; YMax = Max(V,YMax) ; - ZMin = Min(W,ZMin) ; ZMax = Max(W,ZMax) ; - Graphic3d_Structure::Transforms - (TheTrsf, XTMax, YTMin, ZTMax, U, V, W); - XMin = Min(U,XMin) ; XMax = Max(U,XMax) ; - YMin = Min(V,YMin) ; YMax = Max(V,YMax) ; - ZMin = Min(W,ZMin) ; ZMax = Max(W,ZMax) ; - Graphic3d_Structure::Transforms - (TheTrsf, XTMax, YTMin, ZTMin, U, V, W); - XMin = Min(U,XMin) ; XMax = Max(U,XMax) ; - YMin = Min(V,YMin) ; YMax = Max(V,YMax) ; - ZMin = Min(W,ZMin) ; ZMax = Max(W,ZMax) ; - Graphic3d_Structure::Transforms - (TheTrsf, XTMax, YTMax, ZTMin, U, V, W); - XMin = Min(U,XMin) ; XMax = Max(U,XMax) ; - YMin = Min(V,YMin) ; YMax = Max(V,YMax) ; - ZMin = Min(W,ZMin) ; ZMax = Max(W,ZMax) ; - Graphic3d_Structure::Transforms - (TheTrsf, XTMin, YTMax, ZTMax, U, V, W); - XMin = Min(U,XMin) ; XMax = Max(U,XMax) ; - YMin = Min(V,YMin) ; YMax = Max(V,YMax) ; - ZMin = Min(W,ZMin) ; ZMax = Max(W,ZMax) ; - Graphic3d_Structure::Transforms - (TheTrsf, XTMin, YTMax, ZTMin, U, V, W); - XMin = Min(U,XMin) ; XMax = Max(U,XMax) ; - YMin = Min(V,YMin) ; YMax = Max(V,YMax) ; - ZMin = Min(W,ZMin) ; ZMax = Max(W,ZMax) ; + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); + return; + } + + // Min-Max values of the descendant structures + Standard_Real aDescXMin = RealLast(); + Standard_Real aDescYMin = RealLast(); + Standard_Real aDescZMin = RealLast(); + Standard_Real aDescXMax = RealFirst(); + Standard_Real aDescYMax = RealFirst(); + Standard_Real aDescZMax = RealFirst(); + for (Standard_Integer aStructIt = 1; aStructIt <= MyDescendants.Length(); aStructIt++) + { + Graphic3d_Structure* aStructure = (Graphic3d_Structure*) MyDescendants.Value (aStructIt); + aStructure->MinMaxValues (aXMin, aYMin, aZMin, aXMax, aYMax, aZMax); + aDescXMin = Min (aXMin, aDescXMin); + aDescYMin = Min (aYMin, aDescYMin); + aDescZMin = Min (aZMin, aDescZMin); + aDescXMax = Max (aXMax, aDescXMax); + aDescYMax = Max (aYMax, aDescYMax); + aDescZMax = Max (aZMax, aDescZMax); + } + + if (aDescXMin != RealLast() || aDescYMin != RealLast() || + aDescZMin != RealLast() || aDescXMax != RealFirst() || + aDescYMax != RealFirst() || aDescZMax != RealFirst()) + { + aXMin = Min (aDescXMin, aXMin); + aYMin = Min (aDescYMin, aYMin); + aZMin = Min (aDescZMin, aZMin); + aXMax = Max (aDescXMax, aXMax); + aYMax = Max (aDescYMax, aYMax); + aZMax = Max (aDescZMax, aZMax); + } + + // Case impossible as it would mean that the structure is empty or infinite + if (aXMin == RealFirst() && aYMin == RealFirst() && aZMin == RealFirst() && + aXMax == RealLast() && aYMax == RealLast() && aZMax == RealLast()) + { + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); + return; } + + TColStd_Array2OfReal aTrsf(0, 3, 0, 3); + Transform (aTrsf); + TransformBoundaries (aTrsf, aXMin, aYMin, aZMin, aXMax, aYMax, aZMax); + theXMin = aXMin; + theYMin = aYMin; + theZMin = aZMin; + theXMax = aXMax; + theYMax = aYMax; + theZMax = aZMax; } Standard_Integer Graphic3d_Structure::Identification () const { @@ -1825,93 +1878,156 @@ Handle(Graphic3d_StructureManager) Graphic3d_Structure::StructureManager () cons } +//============================================================================= +//function : MinMaxCoord +//purpose : +//============================================================================= +void Graphic3d_Structure::MinMaxCoord (Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theZMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + Standard_Real& theZMax) const +{ + if (IsEmpty()) + { + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); + return; + } -void Graphic3d_Structure::MinMaxCoord (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const { + Standard_Real aXMin = RealLast(); + Standard_Real aYMin = RealLast(); + Standard_Real aZMin = RealLast(); + Standard_Real aXMax = RealFirst(); + Standard_Real aYMax = RealFirst(); + Standard_Real aZMax = RealFirst(); + Standard_Real aGroupXMin, aGroupYMin, aGroupZMin, aGroupXMax, aGroupYMax, aGroupZMax; + for (Standard_Integer aGroupIt = 1; aGroupIt <= MyGroups.Length(); aGroupIt++) + { + const Handle(Graphic3d_Group)& aGroup = MyGroups.Value (aGroupIt); - Standard_Real RL = RealLast (); - Standard_Real RF = RealFirst (); + if (aGroup->IsEmpty()) + { + continue; + } - Standard_Real Xm, Ym, Zm, XM, YM, ZM; + aGroup->MinMaxValues (aGroupXMin, aGroupYMin, aGroupZMin, aGroupXMax, aGroupYMax, aGroupZMax); + aXMin = Min (aXMin, aGroupXMin); + aYMin = Min (aYMin, aGroupYMin); + aZMin = Min (aZMin, aGroupZMin); + aXMax = Max (aXMax, aGroupXMax); + aYMax = Max (aYMax, aGroupYMax); + aZMax = Max (aZMax, aGroupZMax); + } - //Bounding borders of infinite line has been calculated as own point - //in center of this line - if (IsEmpty () || IsInfinite ()) { - if( IsInfinite ()){ - for (int i=1; i<=MyGroups.Length (); i++) - if (! (MyGroups.Value (i))->IsEmpty () ) { - (MyGroups.Value (i))->MinMaxValues(Xm, Ym, Zm, XM, YM, ZM); - Graphic3d_Vertex vertex1(Xm, Ym, Zm); - Graphic3d_Vertex vertex2(XM, YM, ZM); - const Standard_Real distance = vertex1.Distance( vertex2 ); - if( distance >= 500000.0){ - XMin = XMax = 0.5*(Xm+ XM); - YMin = YMax = 0.5*(Ym+ YM); - ZMin = ZMax = 0.5*(Zm+ ZM); - return; - } - } - } - XMin = RF; - YMin = RF; - ZMin = RF; + // Case impossible as it would mean that the structure is empty + if (aXMin == RealLast() && aYMin == RealLast() && aZMin == RealLast() && + aXMax == RealFirst() && aYMax == RealFirst() && aZMax == RealFirst()) + { + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); + } + + theXMin = aXMin; + theYMin = aYMin; + theZMin = aZMin; + theXMax = aXMax; + theYMax = aYMax; + theZMax = aZMax; +} - XMax = RL; - YMax = RL; - ZMax = RL; +//============================================================================= +//function : MinMaxCoordWithDescendants +//purpose : +//============================================================================= +void Graphic3d_Structure::MinMaxCoordWithDescendants (Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theZMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + Standard_Real& theZMax) const +{ + if (IsEmpty()) + { + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); + return; } - else { - XMin = RL; - YMin = RL; - ZMin = RL; - XMax = RF; - YMax = RF; - ZMax = RF; - Standard_Integer i, Length; + Standard_Real aXMin, aYMin, aZMin, aXMax, aYMax, aZMax; + MinMaxCoord (aXMin, aYMin, aZMin, aXMax, aYMax, aZMax); + + // Min-Max of the descendant structures + Standard_Real aDescXMin = RealLast(); + Standard_Real aDescYMin = RealLast(); + Standard_Real aDescZMin = RealLast(); + Standard_Real aDescXMax = RealFirst(); + Standard_Real aDescYMax = RealFirst(); + Standard_Real aDescZMax = RealFirst(); + for (Standard_Integer aStructIt = 1; aStructIt <= MyDescendants.Length(); aStructIt++) + { + Graphic3d_Structure* aStructure = (Graphic3d_Structure*) MyDescendants.Value (aStructIt); + if (aStructure->IsEmpty()) + { + continue; + } - Length = MyGroups.Length (); - for (i=1; i<=Length; i++) - if (! (MyGroups.Value (i))->IsEmpty () ) { - (MyGroups.Value (i))->MinMaxValues(Xm, Ym, Zm, XM, YM, ZM); - if (Xm < XMin) XMin = Xm; - if (Ym < YMin) YMin = Ym; - if (Zm < ZMin) ZMin = Zm; - if (XM > XMax) XMax = XM; - if (YM > YMax) YMax = YM; - if (ZM > ZMax) ZMax = ZM; - } + aStructure->MinMaxCoordWithDescendants (aXMin, aYMin, aZMin, aXMax, aYMax, aZMax); + aDescXMin = Min (aXMin, aDescXMin); + aDescYMin = Min (aYMin, aDescYMin); + aDescZMin = Min (aZMin, aDescZMin); + aDescXMax = Max (aXMax, aDescXMax); + aDescYMax = Max (aYMax, aDescYMax); + aDescZMax = Max (aZMax, aDescZMax); + } - Length = MyDescendants.Length (); - for (i=1; i<=Length; i++) - if (! ((Graphic3d_Structure *) - (MyDescendants.Value (i)))->IsEmpty () ) { - ((Graphic3d_Structure *) - (MyDescendants.Value (i)))->MinMaxValues (Xm, Ym, Zm, XM, YM, ZM); - - if (Xm < XMin) XMin = Xm; - if (Ym < YMin) YMin = Ym; - if (Zm < ZMin) ZMin = Zm; - if (XM > XMax) XMax = XM; - if (YM > YMax) YMax = YM; - if (ZM > ZMax) ZMax = ZM; - } - - if ((XMin == RL) && (YMin == RL) && - (ZMin == RL) && (XMax == RF) && - (YMax == RF) && (ZMax == RF)) { - // Case impossible as it would mean - // that the structure is empty - XMin = RF; - YMin = RF; - ZMin = RF; - - XMax = RL; - YMax = RL; - ZMax = RL; - } + if (aDescXMin != RealLast() || aDescYMin != RealLast() || + aDescZMin != RealLast() || aDescXMax != RealFirst() || + aDescYMax != RealFirst() || aDescZMax != RealFirst()) + { + TColStd_Array2OfReal aTrsf(0, 3, 0, 3); + Transform (aTrsf); + TransformBoundaries (aTrsf, aDescXMin, aDescYMin, aDescZMin, aDescXMax, aDescYMax, aDescZMax); + + aXMin = Min (aDescXMin, aXMin); + aYMin = Min (aDescYMin, aYMin); + aZMin = Min (aDescZMin, aZMin); + aXMax = Max (aDescXMax, aXMax); + aYMax = Max (aDescYMax, aYMax); + aZMax = Max (aDescZMax, aZMax); + } + // Case impossible as it would mean that the structure is empty + if (aXMin == RealLast() && aYMin == RealLast() && aZMin == RealLast() && + aXMax == RealFirst() && aYMax == RealFirst() && aZMax == RealFirst()) + { + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); } + theXMin = aXMin; + theYMin = aYMin; + theZMin = aZMin; + theXMax = aXMax; + theYMax = aYMax; + theZMax = aZMax; } void Graphic3d_Structure::Transforms (const TColStd_Array2OfReal& ATrsf, const Standard_Real X, const Standard_Real Y, const Standard_Real Z, Standard_Real& NewX, Standard_Real& NewY, Standard_Real& NewZ) { @@ -1973,6 +2089,61 @@ Graphic3d_Vertex Graphic3d_Structure::Transforms (const TColStd_Array2OfReal& AT } +//============================================================================= +//function : Transforms +//purpose : +//============================================================================= +void Graphic3d_Structure::TransformBoundaries (const TColStd_Array2OfReal& theTrsf, + Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theZMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + Standard_Real& theZMax) +{ + Standard_Real aXMin, aYMin, aZMin, aXMax, aYMax, aZMax, anU, aV, aW; + + Graphic3d_Structure::Transforms (theTrsf, theXMin, theYMin, theZMin, aXMin, aYMin, aZMin); + Graphic3d_Structure::Transforms (theTrsf, theXMax, theYMax, theZMax, aXMax, aYMax, aZMax); + + Graphic3d_Structure::Transforms (theTrsf, theXMin, theYMin, theZMax, anU, aV, aW); + aXMin = Min (anU, aXMin); aXMax = Max (anU, aXMax); + aYMin = Min (aV, aYMin); aYMax = Max (aV, aYMax); + aZMin = Min (aW, aZMin); aZMax = Max (aW, aZMax); + + Graphic3d_Structure::Transforms (theTrsf, theXMax, theYMin, theZMax, anU, aV, aW); + aXMin = Min (anU, aXMin); aXMax = Max (anU, aXMax); + aYMin = Min (aV, aYMin); aYMax = Max (aV, aYMax); + aZMin = Min (aW, aZMin); aZMax = Max (aW, aZMax); + + Graphic3d_Structure::Transforms (theTrsf, theXMax, theYMin, theZMin, anU, aV, aW); + aXMin = Min (anU, aXMin); aXMax = Max (anU, aXMax); + aYMin = Min (aV, aYMin); aYMax = Max (aV, aYMax); + aZMin = Min (aW, aZMin); aZMax = Max (aW, aZMax); + + Graphic3d_Structure::Transforms (theTrsf, theXMax, theYMax, theZMin, anU, aV, aW); + aXMin = Min (anU, aXMin); aXMax = Max (anU, aXMax); + aYMin = Min (aV, aYMin); aYMax = Max (aV, aYMax); + aZMin = Min (aW, aZMin); aZMax = Max (aW, aZMax); + + Graphic3d_Structure::Transforms (theTrsf, theXMin, theYMax, theZMax, anU, aV, aW); + aXMin = Min (anU, aXMin); aXMax = Max (anU, aXMax); + aYMin = Min (aV, aYMin); aYMax = Max (aV, aYMax); + aZMin = Min (aW, aZMin); aZMax = Max (aW, aZMax); + + Graphic3d_Structure::Transforms (theTrsf, theXMin, theYMax, theZMin, anU, aV, aW); + aXMin = Min (anU, aXMin); aXMax = Max (anU, aXMax); + aYMin = Min (aV, aYMin); aYMax = Max (aV, aYMax); + aZMin = Min (aW, aZMin); aZMax = Max (aW, aZMax); + + theXMin = aXMin; + theYMin = aYMin; + theZMin = aZMin; + theXMax = aXMax; + theYMax = aYMax; + theZMax = aZMax; +} + void Graphic3d_Structure::Network (const Handle(Graphic3d_Structure)& AStructure, const Graphic3d_TypeOfConnection AType, Graphic3d_MapOfStructure& ASet) { @@ -2308,7 +2479,7 @@ void Graphic3d_Structure::GraphicHighlight (const Aspect_TypeOfHighlightMethod A XMax = YMax = ZMax = 0.; } else { - MinMaxCoord + MinMaxCoordWithDescendants (XMin, YMin, ZMin, XMax, YMax, ZMax); } MyCStructure.BoundBox.Pmin.x = float (XMin); diff --git a/src/Graphic3d/Graphic3d_Vec.hxx b/src/Graphic3d/Graphic3d_Vec.hxx index ee3a89fd5e..a2608d9610 100755 --- a/src/Graphic3d/Graphic3d_Vec.hxx +++ b/src/Graphic3d/Graphic3d_Vec.hxx @@ -20,5 +20,6 @@ #include #include #include +#include #endif // _Graphic3d_Vec_H__ diff --git a/src/NCollection/NCollection_Mat4.hxx b/src/NCollection/NCollection_Mat4.hxx index 61d05adbb3..d7596c102b 100755 --- a/src/NCollection/NCollection_Mat4.hxx +++ b/src/NCollection/NCollection_Mat4.hxx @@ -191,13 +191,13 @@ public: //! Initialize the identity matrix. void InitIdentity() { - static const Element_t anIdentity[] = - {1, 0, 0, 0, - 0, 1, 0, 0, - 0, 0, 1, 0, - 0, 0, 0, 1}; + std::memcpy (this, myIdentityArray, sizeof (NCollection_Mat4)); + } - std::memcpy (this, anIdentity, sizeof (NCollection_Mat4)); + //! Checks the matrix for identity. + bool IsIdentity() const + { + return std::memcmp (this, myIdentityArray, sizeof (NCollection_Mat4)) == 0; } //! Raw access to the data (for OpenGL exchange). @@ -429,6 +429,16 @@ private: Element_t myMat[16]; +private: + + static Element_t myIdentityArray[16]; }; +template +Element_t NCollection_Mat4::myIdentityArray[] = + {1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1}; + #endif // _NCollection_Mat4_HeaderFile diff --git a/src/NIS/NIS_View.cxx b/src/NIS/NIS_View.cxx index f8167527f2..b5c6c18bce 100644 --- a/src/NIS/NIS_View.cxx +++ b/src/NIS/NIS_View.cxx @@ -106,114 +106,26 @@ void NIS_View::RemoveContext (NIS_InteractiveContext * theCtx) Standard_Boolean NIS_View::FitAll3d (const Quantity_Coefficient theCoef) { - Standard_Boolean aResult(Standard_False); - Bnd_B3f aBox = GetBndBox(); - // Check that the box is not empty - if (aBox.IsVoid() == Standard_False && MyView->IsDefined() == Standard_True) + if (aBox.IsVoid() || MyView->IsDefined() == Standard_False) { - // Convert the 3D box to 2D representation in view coordinates - gp_XYZ aCoord; - - const gp_XYZ aCorner[2] = { aBox.CornerMin(), aBox.CornerMax() }; - - // Fit depth - const gp_XYZ& aBMin = aCorner[0]; - const gp_XYZ& aBMax = aCorner[1]; - - gp_Pnt anAABBCenter ((aBMin.X() + aBMax.X()) * 0.5, - (aBMin.Y() + aBMax.Y()) * 0.5, - (aBMin.Z() + aBMax.Z()) * 0.5); - - gp_Vec aCenter2AABB (myCamera->Center(), anAABBCenter); - gp_Dir aDir = myCamera->Direction(); - - // distance projection onto camera direction - Standard_Real aDistToBox = -aCenter2AABB.Dot (aDir); - gp_Vec aZShift = gp_Vec (aDir).Reversed().Scaled (aDistToBox); + return Standard_False; + } - gp_Pnt anEyeBefore = myCamera->Eye(); - gp_Pnt aCenterBefore = myCamera->Center(); + gp_XYZ aMin = aBox.CornerMin(); + gp_XYZ aMax = aBox.CornerMax(); - myCamera->BeginUpdate(); - myCamera->SetEye (myCamera->Eye().Translated (aZShift)); - myCamera->SetCenter (myCamera->Center().Translated (aZShift)); - myCamera->EndUpdate(); + if (!FitMinMax (myCamera, aMin, aMax, theCoef, 0.0, Standard_False)) + { + return Standard_False; + } - Standard_Real Umin = RealLast(); - Standard_Real Umax = RealFirst(); - Standard_Real Vmin = RealLast(); - Standard_Real Vmax = RealFirst(); - Standard_Real U, V, W; + AutoZFit(); - Standard_Boolean doFit = Standard_True; - while (doFit) - { - for (Standard_Integer i = 0; i < 8; i++) { - if (i & 0x1) aCoord.SetX (aCorner[0].X()); - else aCoord.SetX (aCorner[1].X()); - if (i & 0x2) aCoord.SetY (aCorner[0].Y()); - else aCoord.SetY (aCorner[1].Y()); - if (i & 0x4) aCoord.SetZ (aCorner[0].Z()); - else aCoord.SetZ (aCorner[1].Z()); - - MyView->Projects(aCoord.X(), aCoord.Y(), aCoord.Z(), U, V, W); - if (i) { - Umin = Min(Umin, U); Umax = Max(Umax, U); - Vmin = Min(Vmin, V); Vmax = Max(Vmax, V); - } - else { - Umin = Umax = U; - Vmin = Vmax = V; - } - } - - if ( (Umax > Umin) && (Vmax > Vmin) ) - { - gp_Pnt ViewDims = myCamera->ViewDimensions(); - Standard_Real DxvOld = ViewDims.X(); - - Standard_Real Xrp, Yrp, DxvNew, DyvNew; - - DxvNew = Abs(Umax - Umin); DyvNew = Abs(Vmax - Vmin); - DxvNew *= (1. + theCoef); - DyvNew *= (1. + theCoef); - - Standard_Real aRatio = DxvNew / DxvOld; - - Xrp = (Umin + Umax)/2. ; Yrp = (Vmin + Vmax)/2. ; - Umin = Xrp - DxvNew/2. ; Umax = Xrp + DxvNew/2. ; - Vmin = Yrp - DyvNew/2. ; Vmax = Yrp + DyvNew/2. ; - - // fit view - FitAll (Umin, Vmin, Umax, Vmax); - - // ratio 1e+6 often gives calculation error(s), reduce it - // if (aRatio < 1e+6) doFit = Standard_False; - if (aRatio < 100) - { - doFit = Standard_False; - } - - aResult = Standard_True; - } - else - { - doFit = Standard_False; - } - } - - if (!aResult) - { - myCamera->BeginUpdate(); - myCamera->SetCenter (aCenterBefore); - myCamera->SetEye (anEyeBefore); - myCamera->EndUpdate(); - } - } + ImmediateUpdate(); - return aResult; + return Standard_True; } //======================================================================= diff --git a/src/OpenGl/OpenGl_View.cxx b/src/OpenGl/OpenGl_View.cxx index 29b710b90e..6d4db6cb21 100644 --- a/src/OpenGl/OpenGl_View.cxx +++ b/src/OpenGl/OpenGl_View.cxx @@ -32,6 +32,7 @@ #include #include +#include IMPLEMENT_STANDARD_HANDLE(OpenGl_View,MMgt_TShared) IMPLEMENT_STANDARD_RTTIEXT(OpenGl_View,MMgt_TShared) @@ -470,16 +471,15 @@ const TEL_TRANSFORM_PERSISTENCE* OpenGl_View::BeginTransformPersistence (const H void OpenGl_View::GetMatrices (TColStd_Array2OfReal& theMatOrient, TColStd_Array2OfReal& theMatMapping) const { - const OpenGl_Matrix* aProj = (const OpenGl_Matrix*) &myCamera->ProjectionMatrix(); - const OpenGl_Matrix* aOrient = (const OpenGl_Matrix*) &myCamera->OrientationMatrix(); + const Graphic3d_Mat4d& aProj = myCamera->ProjectionMatrix(); + const Graphic3d_Mat4d& aOrient = myCamera->OrientationMatrix(); - int i, j; - for (i = 0; i < 4; ++i) + for (Standard_Integer aRow = 0; aRow < 4; ++aRow) { - for (j = 0; j < 4; ++j) + for (Standard_Integer aCol = 0; aCol < 4; ++aCol) { - theMatOrient (i, j) = aOrient->mat[j][i]; - theMatMapping (i, j) = aProj-> mat[j][i]; + theMatOrient (aRow, aCol) = aOrient.GetValue (aRow, aCol); + theMatMapping (aRow, aCol) = aProj .GetValue (aRow, aCol); } } } diff --git a/src/OpenGl/OpenGl_View_2.cxx b/src/OpenGl/OpenGl_View_2.cxx index e039bb67b9..9513ad817f 100644 --- a/src/OpenGl/OpenGl_View_2.cxx +++ b/src/OpenGl/OpenGl_View_2.cxx @@ -401,13 +401,13 @@ void OpenGl_View::Render (const Handle(OpenGl_PrinterContext)& thePrintContext, if (myProjectionState != myCamera->ProjectionState()) { myProjectionState = myCamera->ProjectionState(); - aManager->UpdateProjectionStateTo ((const Tmatrix3*)myCamera->ProjectionMatrix().GetData()); + aManager->UpdateProjectionStateTo ((const Tmatrix3*)myCamera->ProjectionMatrixF().GetData()); } if (myModelViewState != myCamera->ModelViewState()) { myModelViewState = myCamera->ModelViewState(); - aManager->UpdateWorldViewStateTo ((const Tmatrix3*)myCamera->OrientationMatrix().GetData()); + aManager->UpdateWorldViewStateTo ((const Tmatrix3*)myCamera->OrientationMatrixF().GetData()); } if (aManager->ModelWorldState().Index() == 0) @@ -515,9 +515,9 @@ void OpenGl_View::Render (const Handle(OpenGl_PrinterContext)& thePrintContext, if (!myCamera->IsStereo() || !aContext->HasStereoBuffers()) { // single-pass monographic rendering - const OpenGl_Matrix* aProj = (const OpenGl_Matrix*) &myCamera->ProjectionMatrix(); + const OpenGl_Matrix* aProj = (const OpenGl_Matrix*) &myCamera->ProjectionMatrixF(); - const OpenGl_Matrix* aOrient = (const OpenGl_Matrix*) &myCamera->OrientationMatrix(); + const OpenGl_Matrix* aOrient = (const OpenGl_Matrix*) &myCamera->OrientationMatrixF(); // redraw scene with normal orientation and projection RedrawScene (thePrintContext, theWorkspace, aProj, aOrient); @@ -525,9 +525,9 @@ void OpenGl_View::Render (const Handle(OpenGl_PrinterContext)& thePrintContext, else { // two stereographic passes - const OpenGl_Matrix* aLProj = (const OpenGl_Matrix*) &myCamera->ProjectionStereoLeft(); - const OpenGl_Matrix* aRProj = (const OpenGl_Matrix*) &myCamera->ProjectionStereoRight(); - const OpenGl_Matrix* aOrient = (const OpenGl_Matrix*) &myCamera->OrientationMatrix(); + const OpenGl_Matrix* aLProj = (const OpenGl_Matrix*) &myCamera->ProjectionStereoLeftF(); + const OpenGl_Matrix* aRProj = (const OpenGl_Matrix*) &myCamera->ProjectionStereoRightF(); + const OpenGl_Matrix* aOrient = (const OpenGl_Matrix*) &myCamera->OrientationMatrixF(); // safely switch to left Eye buffer aContext->SetDrawBufferLeft(); diff --git a/src/QABugs/QABugs_16.cxx b/src/QABugs/QABugs_16.cxx index da93d7c814..cda8f97480 100644 --- a/src/QABugs/QABugs_16.cxx +++ b/src/QABugs/QABugs_16.cxx @@ -33,12 +33,14 @@ #include #include #include -#include #include #include #include #include +#include +#include + #include #include #include @@ -163,66 +165,64 @@ static Standard_Integer BUC60814(Draw_Interpretor& di, Standard_Integer argc, c return 0; } -static Standard_Integer BUC60774(Draw_Interpretor& di, Standard_Integer argc, const char ** argv) +//======================================================================= +//function : BUC60774 +//purpose : +//======================================================================= +static Standard_Integer BUC60774 (Draw_Interpretor& theDi, + Standard_Integer theArgNb, + const char** theArgv) { - if(argc!=1) + if (theArgNb != 1) { - di << "Usage : " << argv[0] << "\n"; + std::cout << "Usage : " << theArgv[0] << "\n"; return -1; } - Handle(AIS_InteractiveContext) myAISContext = ViewerTest::GetAISContext(); - if(myAISContext.IsNull()) + const Handle(AIS_InteractiveContext)& anAISContext = ViewerTest::GetAISContext(); + if (anAISContext.IsNull()) { - di << "use 'vinit' command before " << argv[0] << "\n"; + std::cout << "use 'vinit' command before " << theArgv[0] << "\n"; return -1; } - Handle(V3d_View) myV3dView = ViewerTest::CurrentView(); - - double Xc,Yc,Width, Height; - myV3dView->Center(Xc,Yc); - myV3dView-> Size (Width, Height); - - double Xmin,Ymin; - Xmin=Xc-Width/2; - Ymin=Yc-Height/2; - double Xmax,Ymax; - Xmax=Xc+Width/2; - Ymax=Yc+Height/2; - - Standard_Integer XPmin,YPmin; - myV3dView->Convert(Xmin,Ymin,XPmin,YPmin); -// cout<Convert(Xmax,Ymax,XPmax,YPmax); -// cout<Select(XPmin,YPmin,XPmax,YPmax,myV3dView))==AIS_SOP_NothingSelected) - di << "status = AIS_SOP_NothingSelected : OK" << "\n"; - else di << "status = AIS_SOP_NothingSelected : bugged - Faulty " << "\n"; - - di.Eval("box b 10 10 10"); - di.Eval(" vdisplay b"); + const Handle(V3d_View)& aV3dView = ViewerTest::CurrentView(); - if ((status=myAISContext->Select(XPmin,YPmin,XPmax,YPmax,myV3dView))==AIS_SOP_OneSelected) - di << "status = AIS_SOP_OneSelected : OK" << "\n"; - else di << "status = AIS_SOP_OneSelected : bugged - Faulty " << "\n"; + Standard_Integer aWinWidth = 0; + Standard_Integer aWinHeight = 0; + aV3dView->Window()->Size (aWinWidth, aWinHeight); - di.Eval("box w 20 20 20 20 20 20"); - di.Eval(" vdisplay w"); + Standard_Integer aXPixMin = 0; + Standard_Integer aYPixMin = 0; + Standard_Integer aXPixMax = aWinWidth; + Standard_Integer aYPixMax = aWinHeight; - if ((status=myAISContext->Select(XPmin,YPmin,XPmax,YPmax,myV3dView))==AIS_SOP_SeveralSelected) - di << "status = AIS_SOP_SeveralSelected : OK" << "\n"; - else di << "status = AIS_SOP_SeveralSelected : bugged - Faulty " << "\n"; - - return 0; + AIS_StatusOfPick aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView); + theDi << (aPickStatus == AIS_SOP_NothingSelected + ? "status = AIS_SOP_NothingSelected : OK" + : "status = AIS_SOP_NothingSelected : bugged - Faulty "); + theDi << "\n"; + + theDi.Eval ("box b 10 10 10"); + theDi.Eval (" vdisplay b"); -} + aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView); + theDi << (aPickStatus == AIS_SOP_OneSelected + ? "status = AIS_SOP_OneSelected : OK" + : "status = AIS_SOP_OneSelected : bugged - Faulty "); + theDi << "\n"; + + theDi.Eval ("box w 20 20 20 20 20 20"); + theDi.Eval (" vdisplay w"); + + aPickStatus = anAISContext->Select (aXPixMin, aYPixMin, aXPixMax, aYPixMax, aV3dView); + theDi << (aPickStatus == AIS_SOP_SeveralSelected + ? "status = AIS_SOP_SeveralSelected : OK" + : "status = AIS_SOP_SeveralSelected : bugged - Faulty "); + theDi << "\n"; + + return 0; +} static Standard_Integer BUC60972 (Draw_Interpretor& di, Standard_Integer argc, const char ** argv) { diff --git a/src/Select3D/Select3D.cdl b/src/Select3D/Select3D.cdl index 3c06dea624..840afa51f7 100644 --- a/src/Select3D/Select3D.cdl +++ b/src/Select3D/Select3D.cdl @@ -37,7 +37,8 @@ uses TopLoc, Geom, SelectBasics, - V3d + V3d, + Graphic3d is diff --git a/src/Select3D/Select3D_Projector.cdl b/src/Select3D/Select3D_Projector.cdl index 38c84ea748..b821f146c6 100644 --- a/src/Select3D/Select3D_Projector.cdl +++ b/src/Select3D/Select3D_Projector.cdl @@ -45,169 +45,205 @@ uses Vec2d from gp, Pnt2d from gp, Box from Bnd, - View from V3d + View from V3d, + Mat4 from Graphic3d, + Mat4d from Graphic3d raises NoSuchObject from Standard is - Create(aView:View from V3d) returns Projector from Select3D; - --- Purpose: Constructs the 3D projector object defined by the 3D view aView. - Create returns Projector from Select3D; + Create (theView : View from V3d) returns Projector from Select3D; + --- Purpose: Constructs the 3D projector object from the passed view. + -- The projector captures current model-view and projection transformation + -- of the passed view. - Create(CS : Ax2 from gp) - ---Purpose: Creates an axonometric projector. represents viewing coordinate - -- system and could be constructed from x direction, view plane normal direction, - -- and view point location in world-coordinate space. + Create returns Projector from Select3D; + --- Purpose: Constructs identity projector. + + Create (theCS : Ax2 from gp) + ---Purpose: Builds the Projector from the model-view transformation specified + -- by the passed viewing coordinate system . The Projector has + -- identity projection transformation, is orthogonal. + -- The viewing coordinate system could be constructed from x direction, + -- view plane normal direction, and view point location in + -- world-coordinate space. returns Projector from Select3D; - Create(CS : Ax2 from gp; - Focus : Real from Standard) - ---Purpose: Creates a perspective projector. represents viewing - -- coordinate system and could be constructed from x direction, + Create (theCS : Ax2 from gp; + theFocus : Real from Standard) + ---Purpose: Builds the Projector from the model-view transformation specified + -- by the passed view coordinate system and simplified perspective + -- projection transformation defined by parameter. + -- The viewing coordinate system could be constructed from x direction, -- view plane normal direction, and focal point location in world-coordinate - -- space. should represent distance of an eye from view plane + -- space. should represent distance of an eye from view plane -- in world-coordinate space (focal distance). returns Projector from Select3D; - Create(T : Trsf from gp; - Persp : Boolean from Standard; - Focus : Real from Standard) - ---Purpose: build a Projector from the given transformation. - -- In case, when transformation should represent custom view projection, - -- it could be constructed from two separate components: transposed view - -- orientation matrix and translation of focal point in view-coordiante - -- system. could be built up from x direction, up direction, + Create (theViewTrsf : Trsf from gp; + theIsPersp : Boolean from Standard; + theFocus : Real from Standard) + ---Purpose: Build the Projector from the model-view transformation passed + -- as and simplified perspective projection transformation + -- parameters passed as and . + -- In case, when transformation should represent custom view + -- projection, it could be constructed from two separate components: + -- transposed view orientation matrix and translation of focal point + -- in view-coordinate system. + -- could be built up from x direction, up direction, -- view plane normal direction vectors and translation with SetValues(...) -- method, where first row arguments (a11, a12, a13, a14) are x, y, z -- component of x direction vector, and x value of reversed translation -- vector. Second row arguments, are x y z for up direction and y value of -- reversed translation, and the third row defined in the same manner. - -- This also suits for simple perspective view, where is the focale - -- distance of an eye from view plane in world-space coordiantes. + -- This also suits for simple perspective view, where is the focale + -- distance of an eye from view plane in world-space coordinates. -- Note, that in that case amount of perspective distortion (perspective -- angle) should be defined through focal distance. returns Projector from Select3D; - Create(GT : GTrsf from gp; - Persp : Boolean from Standard; - Focus : Real from Standard) - ---Purpose: build a Projector from the given transformation. - -- In case, when transformation should represent custom view + Create (theViewTrsf : GTrsf from gp; + theIsPersp : Boolean from Standard; + theFocus : Real from Standard) + ---Purpose: Builds the Projector from the model-view transformation passed + -- as and projection transformation for and + -- parameters. + -- In case, when transformation should represent custom view -- projection, it could be constructed from two separate components: -- transposed view orientation matrix and translation of a focal point -- in view-coordinate system. - -- This also suits for perspective view, with that could be + -- This also suits for perspective view, with that could be -- equal to distance from an eye to a view plane in -- world-coordinates (focal distance). -- The 3x3 transformation matrix is built up from three vectors: -- x direction, up direction and view plane normal vectors, where each - -- vector is a matrix row. Then is constructed from matrix and + -- vector is a matrix row. Then is constructed from matrix and -- reversed translation with methods SetTranslationPart(..) and -- SetVectorialPart(..). -- Note, that in that case amount of perspective distortion (perspective -- angle) should be defined through focal distance. returns Projector from Select3D; + Create (theViewTrsf : Mat4d from Graphic3d; + theProjTrsf : Mat4d from Graphic3d) + ---Purpose: Builds the Projector from the passed model-view + -- and projection transformation matrices. + returns Projector from Select3D; + Set (me : mutable; - T : Trsf from gp; - Persp : Boolean from Standard; - Focus : Real from Standard) - is static; + theViewTrsf : Trsf from gp; + theIsPersp : Boolean from Standard; + theFocus : Real from Standard); + ---Purpose: Sets new parameters for the Projector. - SetView(me : mutable; V : View from V3d); - ---Purpose: Sets the 3D view V used at the time of construction. + Set (me : mutable; + theViewTrsf : Mat4d from Graphic3d; + theProjTrsf : Mat4d from Graphic3d); + ---Purpose: Sets new parameters for the Projector. + + SetView (me : mutable; + theView : View from V3d); + ---Purpose: Sets new parameters for the Projector + -- captured from the passed view. + + Scaled (me : mutable; theToCheckOptimized : Boolean from Standard = Standard_False) + ---Purpose: Pre-compute inverse transformation and ensure whether it is possible + -- to use optimized transformation for the common view-orientation type or not + -- if is TRUE. + is virtual; - View(me) returns any View from V3d; - ---Purpose: Returns the 3D view used at the time of construction. - ---C++: return const& + Perspective (me) returns Boolean + ---Purpose: Returns True if there is simplified perspective + -- projection approach is used. Distortion defined by Focus. ---C++: inline - - Scaled(me : mutable; On : Boolean from Standard = Standard_False) - ---Purpose: to compute with the given scale and translation. is virtual; - Perspective(me) returns Boolean - ---Purpose: Returns True if there is a perspective transformation. + Focus (me) returns Real from Standard + ---Purpose: Returns the focal length of simplified perspective + -- projection approach. Raises program error exception if the + -- the projection transformation is not specified as simplified + -- Perspective (for example, custom projection transformation is defined + -- or the orthogonal Projector is defined). ---C++: inline is virtual; - Transformation(me) returns GTrsf from gp - ---Purpose: Returns the active transformation. + Projection (me) returns Mat4d from Graphic3d; + ---Purpose: Returns projection transformation. Please note that for + -- simplified perspective projection approach, defined by Focus, the + -- returned transformation is identity. ---C++: inline ---C++: return const & - is virtual; - InvertedTransformation(me) returns GTrsf from gp - ---Purpose: Returns the active inverted transformation. + Transformation (me) returns GTrsf from gp + ---Purpose: Returns the view transformation. ---C++: inline ---C++: return const & is virtual; - FullTransformation(me) returns Trsf from gp - ---Purpose: Returns the original transformation. + InvertedTransformation (me) returns GTrsf from gp + ---Purpose: Returns the inverted view transformation. ---C++: inline ---C++: return const & is virtual; - Focus(me) returns Real from Standard - ---Purpose: Returns the focal length. + FullTransformation (me) returns Trsf from gp + ---Purpose: Returns the uniform-scaled view transformation. ---C++: inline - raises - NoSuchObject from Standard -- if there is no perspective + ---C++: return const & is virtual; - Transform(me; D : in out Vec from gp) + Transform (me; theD : in out Vec from gp) + ---Purpose: Transforms the vector into view-coordinate space. ---C++: inline is virtual; - Transform(me; Pnt : in out Pnt from gp) - ---C++: inline + Transform (me; thePnt : in out Pnt from gp) + ---Purpose: Transforms the point into view-coordinate space. + ---C++: inline is virtual; - Project(me; P : Pnt from gp; - Pout : out Pnt2d from gp) - ---Purpose: Transform and apply perspective if needed. + Project (me; theP : Pnt from gp; thePout : out Pnt2d from gp) + ---Purpose: Transforms the point into view-coordinate space + -- and applies projection transformation. is virtual; - Project(me; P : Pnt from gp; - X,Y,Z : out Real from Standard) - ---Purpose: Transform and apply perspective if needed. + Project (me; theP : Pnt from gp; theX, theY, theZ : out Real from Standard) + ---Purpose: Transforms the point into view-coordinate space + -- and applies projection transformation. is static; - Project(me; P : Pnt from gp; - D1 : Vec from gp; - Pout : out Pnt2d from gp; - D1out : out Vec2d from gp) - ---Purpose: Transform and apply perspective if needed. + Project (me; theP : Pnt from gp; + theD1 : Vec from gp; + thePout : out Pnt2d from gp; + theD1out : out Vec2d from gp) + ---Purpose: Transforms the point and vector passed from its location + -- into view-coordinate space and applies projection transformation. is virtual; - Shoot(me; X , Y : Real from Standard) - returns Lin from gp - ---Purpose: return a line going through the eye towards the - -- 2d point . + Shoot (me; theX, theY : Real from Standard) returns Lin from gp + ---Purpose: Return projection line going through the 2d point is virtual; - Transform(me; P : in out Pnt from gp; - T : GTrsf from gp) + Transform(me; thePnt : in out Pnt from gp; + theTrsf : GTrsf from gp) ---C++: inline is virtual; - Transform(me; D : in out Lin from gp; - T : GTrsf from gp) + Transform(me; theLin : in out Lin from gp; + theTrsf : GTrsf from gp) ---C++: inline is virtual; fields - myType : Integer from Standard; + myType : Integer from Standard; myPersp : Boolean from Standard is protected; myFocus : Real from Standard is protected; - myScaledTrsf : Trsf from gp is protected; myGTrsf : GTrsf from gp is protected; myInvTrsf : GTrsf from gp is protected; - - myView : View from V3d; + myScaledTrsf : Trsf from gp is protected; + myProjTrsf : Mat4d from Graphic3d is protected; end Projector; diff --git a/src/Select3D/Select3D_Projector.cxx b/src/Select3D/Select3D_Projector.cxx index 32e25c841b..6b7eb651fa 100644 --- a/src/Select3D/Select3D_Projector.cxx +++ b/src/Select3D/Select3D_Projector.cxx @@ -14,14 +14,83 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#define IMP240100 //GG -// Change RefToPix()/Convert() to Project() method. - #include #include #include #include #include +#include +#include + +namespace +{ + //======================================================================= + //function : TrsfType + //purpose : + //======================================================================= + static Standard_Integer TrsfType(const gp_GTrsf& theTrsf) + { + const gp_Mat& aMat = theTrsf.VectorialPart(); + if ((Abs (aMat.Value (1, 1) - 1.0) < 1e-15) + && (Abs (aMat.Value (2, 2) - 1.0) < 1e-15) + && (Abs (aMat.Value (3, 3) - 1.0) < 1e-15)) + { + return 1; // top + } + else if ((Abs (aMat.Value (1, 1) - 0.7071067811865476) < 1e-15) + && (Abs (aMat.Value (1, 2) + 0.5) < 1e-15) + && (Abs (aMat.Value (1, 3) - 0.5) < 1e-15) + && (Abs (aMat.Value (2, 1) - 0.7071067811865476) < 1e-15) + && (Abs (aMat.Value (2, 2) - 0.5) < 1e-15) + && (Abs (aMat.Value (2, 3) + 0.5) < 1e-15) + && (Abs (aMat.Value (3, 1)) < 1e-15) + && (Abs (aMat.Value (3, 2) - 0.7071067811865476) < 1e-15) + && (Abs (aMat.Value (3, 3) - 0.7071067811865476) < 1e-15)) + { + return 0; // inverse axo + } + else if ((Abs (aMat.Value (1, 1) - 1.0) < 1e-15) + && (Abs (aMat.Value (2, 3) - 1.0) < 1e-15) + && (Abs (aMat.Value (3, 2) + 1.0) < 1e-15)) + { + return 2; // front + } + else if ((Abs (aMat.Value (1, 1) - 0.7071067811865476) < 1e-15) + && (Abs (aMat.Value (1, 2) - 0.7071067811865476) < 1e-15) + && (Abs (aMat.Value (1, 3)) < 1e-15) + && (Abs (aMat.Value (2, 1) + 0.5) < 1e-15) + && (Abs (aMat.Value (2, 2) - 0.5) < 1e-15) + && (Abs (aMat.Value (2, 3) - 0.7071067811865476) < 1e-15) + && (Abs (aMat.Value (3, 1) - 0.5) < 1e-15) + && (Abs (aMat.Value (3, 2) + 0.5) < 1e-15) + && (Abs (aMat.Value (3, 3) - 0.7071067811865476) < 1e-15)) + { + return 3; // axo + } + + return -1; + } + + //====== TYPE 0 (inverse axonometric) + // (0.7071067811865476, -0.5 , 0.4999999999999999) + // (0.7071067811865475, 0.5000000000000001, -0.5 ) + // (0.0, 0.7071067811865475, 0.7071067811865476) + + // ====== TYPE 1 (top) + // (1.0, 0.0, 0.0) + // (0.0, 1.0, 0.0) + // (0.0, 0.0, 1.0) + + // ======= TYPE 2 (front) + // (1.0, 0.0 , 0.0) + // (0.0, 1.110223024625157e-16 , 1.0) + // (0.0, -1.0 , 1.110223024625157e-16) + + // ======= TYPE 3 (axonometric) + // ( 0.7071067811865476, 0.7071067811865475, 0.0) + // (-0.5 , 0.5000000000000001, 0.7071067811865475) + // ( 0.4999999999999999, -0.5 , 0.7071067811865476) +} // formula for derivating a perspective, from Mathematica @@ -35,20 +104,22 @@ //function : Select3D_Projector //purpose : //======================================================================= - -Select3D_Projector::Select3D_Projector(const Handle(V3d_View)& aViou) - : myView (aViou) +Select3D_Projector::Select3D_Projector (const Handle(V3d_View)& theView) +: myPersp (Standard_False), + myFocus (0.0), + myType (-1) { + SetView (theView); } //======================================================================= //function : Select3D_Projector //purpose : //======================================================================= - Select3D_Projector::Select3D_Projector() -: myPersp(Standard_False), - myFocus(0) +: myPersp (Standard_False), + myFocus (0.0), + myType (-1) { Scaled(); } @@ -57,13 +128,13 @@ Select3D_Projector::Select3D_Projector() //function : Select3D_Projector //purpose : //======================================================================= - -Select3D_Projector::Select3D_Projector (const gp_Ax2& CS) -: myPersp(Standard_False), - myFocus(0) +Select3D_Projector::Select3D_Projector (const gp_Ax2& theCS) +: myPersp (Standard_False), + myFocus (0.0), + myType (-1) { - myScaledTrsf.SetTransformation(CS); - myGTrsf.SetTrsf(myScaledTrsf); + myScaledTrsf.SetTransformation (theCS); + myGTrsf.SetTrsf (myScaledTrsf); Scaled(); } @@ -71,14 +142,13 @@ Select3D_Projector::Select3D_Projector (const gp_Ax2& CS) //function : Select3D_Projector //purpose : //======================================================================= - -Select3D_Projector::Select3D_Projector (const gp_Ax2& CS, - const Standard_Real Focus) -: myPersp(Standard_True), - myFocus(Focus) +Select3D_Projector::Select3D_Projector (const gp_Ax2& theCS, const Standard_Real theFocus) +: myPersp (Standard_True), + myFocus (theFocus), + myType (-1) { - myScaledTrsf.SetTransformation(CS); - myGTrsf.SetTrsf(myScaledTrsf); + myScaledTrsf.SetTransformation (theCS); + myGTrsf.SetTrsf (myScaledTrsf); Scaled(); } @@ -86,15 +156,15 @@ Select3D_Projector::Select3D_Projector (const gp_Ax2& CS, //function : Select3D_Projector //purpose : //======================================================================= - -Select3D_Projector::Select3D_Projector (const gp_Trsf& T, - const Standard_Boolean Persp, - const Standard_Real Focus) -: myPersp(Persp), - myFocus(Focus), - myScaledTrsf(T) +Select3D_Projector::Select3D_Projector (const gp_Trsf& theViewTrsf, + const Standard_Boolean theIsPersp, + const Standard_Real theFocus) +: myPersp (theIsPersp), + myFocus (theFocus), + myGTrsf (theViewTrsf), + myScaledTrsf (theViewTrsf), + myType (-1) { - myGTrsf.SetTrsf(myScaledTrsf); Scaled(); } @@ -102,361 +172,300 @@ Select3D_Projector::Select3D_Projector (const gp_Trsf& T, //function : Select3D_Projector //purpose : //======================================================================= - -Select3D_Projector::Select3D_Projector (const gp_GTrsf& GT, - const Standard_Boolean Persp, - const Standard_Real Focus) -: myPersp(Persp), - myFocus(Focus), - myGTrsf(GT) +Select3D_Projector::Select3D_Projector (const gp_GTrsf& theViewTrsf, + const Standard_Boolean theIsPersp, + const Standard_Real theFocus) +: myPersp (theIsPersp), + myFocus (theFocus), + myGTrsf (theViewTrsf), + myScaledTrsf (theViewTrsf.Trsf()), + myType (-1) { Scaled(); } //======================================================================= -//function : Set +//function : Select3D_Projector //purpose : //======================================================================= - -void Select3D_Projector::Set - (const gp_Trsf& T, - const Standard_Boolean Persp, - const Standard_Real Focus) +Select3D_Projector::Select3D_Projector (const Graphic3d_Mat4d& theViewTrsf, + const Graphic3d_Mat4d& theProjTrsf) +: myPersp (Standard_False), + myFocus (0.0), + myType (-1) { - myPersp = Persp; - myFocus = Focus; - myScaledTrsf = T; - Scaled(); + Set (theViewTrsf, theProjTrsf); } //======================================================================= -//function : Scaled +//function : Set //purpose : //======================================================================= - -#include - -static Standard_Integer TrsfType(const gp_GTrsf& Trsf) { - const gp_Mat& Mat = Trsf.VectorialPart(); - if( (Abs(Mat.Value(1,1)-1.0) < 1e-15) - && (Abs(Mat.Value(2,2)-1.0) < 1e-15) - && (Abs(Mat.Value(3,3)-1.0) < 1e-15)) { - return(1); //-- top - } - else if( (Abs(Mat.Value(1,1)-0.7071067811865476) < 1e-15) - && (Abs(Mat.Value(1,2)+0.5) < 1e-15) - && (Abs(Mat.Value(1,3)-0.5) < 1e-15) - - && (Abs(Mat.Value(2,1)-0.7071067811865476) < 1e-15) - && (Abs(Mat.Value(2,2)-0.5) < 1e-15) - && (Abs(Mat.Value(2,3)+0.5) < 1e-15) - - && (Abs(Mat.Value(3,1)) < 1e-15) - && (Abs(Mat.Value(3,2)-0.7071067811865476) < 1e-15) - && (Abs(Mat.Value(3,3)-0.7071067811865476) < 1e-15)) { - return(0); //-- - } - else if( (Abs(Mat.Value(1,1)-1.0) < 1e-15) - && (Abs(Mat.Value(2,3)-1.0) < 1e-15) - && (Abs(Mat.Value(3,2)+1.0) < 1e-15)) { - return(2); //-- front - } - else if( (Abs(Mat.Value(1,1)-0.7071067811865476) < 1e-15) - && (Abs(Mat.Value(1,2)-0.7071067811865476) < 1e-15) - && (Abs(Mat.Value(1,3)) < 1e-15) - - && (Abs(Mat.Value(2,1)+0.5) < 1e-15) - && (Abs(Mat.Value(2,2)-0.5) < 1e-15) - && (Abs(Mat.Value(2,3)-0.7071067811865476) < 1e-15) - - && (Abs(Mat.Value(3,1)-0.5) < 1e-15) - && (Abs(Mat.Value(3,2)+0.5) < 1e-15) - && (Abs(Mat.Value(3,3)-0.7071067811865476) < 1e-15)) { - return(3); //-- axo - } - return(-1); +void Select3D_Projector::Set (const gp_Trsf& theViewTrsf, + const Standard_Boolean theIsPersp, + const Standard_Real theFocus) +{ + myPersp = theIsPersp; + myFocus = theFocus; + myScaledTrsf = theViewTrsf; + myProjTrsf.InitIdentity(); + Scaled(); } -void Select3D_Projector::Scaled (const Standard_Boolean On) +//======================================================================= +//function : Set +//purpose : +//======================================================================= +void Select3D_Projector::Set (const Graphic3d_Mat4d& theViewTrsf, + const Graphic3d_Mat4d& theProjTrsf) { - myType=-1; - if (!On) { - if (!myPersp) { - //myGTrsf.SetTranslationPart(gp_XYZ(0.,0.,0.)); - myType=TrsfType(myGTrsf); + // Copy elements corresponding to common view-transformation + for (Standard_Integer aRowIt = 0; aRowIt < 3; ++aRowIt) + { + for (Standard_Integer aColIt = 0; aColIt < 4; ++aColIt) + { + myGTrsf.SetValue (aRowIt + 1, aColIt + 1, theViewTrsf.GetValue (aRowIt, aColIt)); } } - myInvTrsf = myGTrsf; - myInvTrsf.Invert(); + + // Adapt scaled transformation for compatibilty + gp_Dir aViewY (theViewTrsf.GetValue (0, 1), theViewTrsf.GetValue (1, 1), theViewTrsf.GetValue (2, 1)); + gp_Dir aViewZ (theViewTrsf.GetValue (0, 2), theViewTrsf.GetValue (1, 2), theViewTrsf.GetValue (2, 2)); + gp_XYZ aViewT (theViewTrsf.GetValue (0, 3), theViewTrsf.GetValue (1, 3), theViewTrsf.GetValue (2, 3)); + gp_Dir aViewX = aViewY ^ aViewZ; + gp_Ax3 aViewAx3 (gp_Pnt (aViewT), aViewZ, aViewX); + myScaledTrsf.SetTransformation (aViewAx3); + + myPersp = Standard_False; + myFocus = 0.0; + myProjTrsf = theProjTrsf; + Scaled(); } //======================================================================= -//function : Project +//function : SetView //purpose : //======================================================================= - -void Select3D_Projector::Project (const gp_Pnt& P, gp_Pnt2d& Pout) const +void Select3D_Projector::SetView (const Handle(V3d_View)& theView) { + const Graphic3d_Mat4d& aViewTrsf = theView->Camera()->OrientationMatrix(); + const Graphic3d_Mat4d& aProjTrsf = theView->Camera()->ProjectionMatrix(); - if(!myView.IsNull()){ - Standard_Real Xout,Yout; -// V3d_View -#ifdef IMP240100 - myView->Project(P.X(),P.Y(),P.Z(),Xout,Yout); -#else - Standard_Integer Xp,Yp; - myView->RefToPix(P.X(),P.Y(),P.Z(),Xp,Yp); - myView->Convert(Xp,Yp,Xout,Yout); -#endif - Pout.SetCoord(Xout,Yout); - } - else{ - if(myType!=-1) { - Standard_Real X,Y; - switch (myType) { - case 0: { //-- axono standard - Standard_Real x07 = P.X()*0.7071067811865475; - Standard_Real y05 = P.Y()*0.5; - Standard_Real z05 = P.Z()*0.5; - X=x07-y05+z05; - Y=x07+y05-z05; - //-- Z=0.7071067811865475*(P.Y()+P.Z()); - break; - } - case 1: { //-- top - X=P.X(); Y=P.Y(); //-- Z=P.Z(); - Pout.SetCoord(X,Y); - break; - } - case 2: { - X=P.X(); Y=P.Z(); //-- Z=-P.Y(); - Pout.SetCoord(X,Y); - break; - } - case 3: { - Standard_Real xmy05 = (P.X()-P.Y())*0.5; - Standard_Real z07 = P.Z()*0.7071067811865476; - X=0.7071067811865476*(P.X()+P.Y()); - Y=-xmy05+z07; - Pout.SetCoord(X,Y); - //-- Z= xmy05+z07; - break; - } - default: { - gp_Pnt P2 = P; - Transform(P2); - if (myPersp) { - Standard_Real R = 1.-P2.Z()/myFocus; - Pout.SetCoord(P2.X()/R,P2.Y()/R); - } - else - Pout.SetCoord(P2.X(),P2.Y()); - break; - } - } - } - else { - gp_Pnt P2 = P; - Transform(P2); - if (myPersp) { - Standard_Real R = 1.-P2.Z()/myFocus; - Pout.SetCoord(P2.X()/R,P2.Y()/R); - } - else - Pout.SetCoord(P2.X(),P2.Y()); - } - } - + gp_XYZ aFrameScale = theView->Camera()->ViewDimensions(); + Graphic3d_Mat4d aScale; + aScale.ChangeValue (0, 0) = aFrameScale.X(); + aScale.ChangeValue (1, 1) = aFrameScale.Y(); + aScale.ChangeValue (2, 2) = aFrameScale.Z(); + Graphic3d_Mat4d aScaledProjTrsf = aScale * aProjTrsf; + Set (aViewTrsf, aScaledProjTrsf); } //======================================================================= -//function : Project +//function : Scaled //purpose : //======================================================================= -/* ====== TYPE 0 (??) - (0.7071067811865476, -0.5 , 0.4999999999999999) - (0.7071067811865475, 0.5000000000000001, -0.5 ) - (0.0, 0.7071067811865475, 0.7071067811865476) - - ====== TYPE 1 (top) -(1.0, 0.0, 0.0) -(0.0, 1.0, 0.0) -(0.0, 0.0, 1.0) - - ======= TYPE 2 (front) -(1.0, 0.0 , 0.0) -(0.0, 1.110223024625157e-16 , 1.0) -(0.0, -1.0 , 1.110223024625157e-16) - - ======= TYPE 3 -( 0.7071067811865476, 0.7071067811865475, 0.0) -(-0.5 , 0.5000000000000001, 0.7071067811865475) -( 0.4999999999999999, -0.5 , 0.7071067811865476) -*/ -void Select3D_Projector::Project (const gp_Pnt& P, - Standard_Real& X, - Standard_Real& Y, - Standard_Real& Z) const +void Select3D_Projector::Scaled (const Standard_Boolean theToCheckOptimized) { - if(!myView.IsNull()){ -// Standard_Real Xout,Yout; -// V3d_View -#ifdef IMP240100 - myView->Project(P.X(),P.Y(),P.Z(),X,Y); -#else - Standard_Integer Xp,Yp; - myView->RefToPix(P.X(),P.Y(),P.Z(),Xp,Yp); - myView->Convert(Xp,Yp,X,Y); -#endif - } - else{ - if(myType!=-1) { - switch (myType) { - case 0: { //-- axono standard - Standard_Real x07 = P.X()*0.7071067811865475; - Standard_Real y05 = P.Y()*0.5; - Standard_Real z05 = P.Z()*0.5; - X=x07-y05+z05; - Y=x07+y05-z05; - Z=0.7071067811865475*(P.Y()+P.Z()); - break; - } - case 1: { //-- top - X=P.X(); Y=P.Y(); Z=P.Z(); - break; - } - case 2: { - X=P.X(); Y=P.Z(); Z=-P.Y(); - break; - } - case 3: { - Standard_Real xmy05 = (P.X()-P.Y())*0.5; - Standard_Real z07 = P.Z()*0.7071067811865476; - X=0.7071067811865476*(P.X()+P.Y()); - Y=-xmy05+z07; - Z= xmy05+z07; - break; - } - default: { - gp_Pnt P2 = P; - Transform(P2); - P2.Coord(X,Y,Z); - break; - } - } - } - else { - gp_Pnt P2 = P; - Transform(P2); - P2.Coord(X,Y,Z); - if (myPersp) { - Standard_Real R = 1 - Z / myFocus; - X = X / R; - Y = Y / R; - } - } + myType = -1; + + if (!theToCheckOptimized && !myPersp && myProjTrsf.IsIdentity()) + { + myType = TrsfType (myGTrsf); } + + myInvTrsf = myGTrsf.Inverted(); } + //======================================================================= //function : Project //purpose : //======================================================================= - -void Select3D_Projector::Project (const gp_Pnt& P, - const gp_Vec& D1, - gp_Pnt2d& Pout, - gp_Vec2d& D1out) const +void Select3D_Projector::Project (const gp_Pnt& theP, gp_Pnt2d& thePout) const { - gp_Pnt PP = P; - Transform(PP); - gp_Vec DD1 = D1; - Transform(DD1); - if (myPersp) { - Standard_Real R = 1. - PP.Z() / myFocus; - Pout .SetCoord(PP .X()/R , PP.Y()/R); - D1out.SetCoord(DD1.X()/R + PP.X()*DD1.Z()/(myFocus * R*R), - DD1.Y()/R + PP.Y()*DD1.Z()/(myFocus * R*R)); - } - else { - Pout .SetCoord(PP .X(),PP .Y()); - D1out.SetCoord(DD1.X(),DD1.Y()); - } + Standard_Real aXout = 0.0; + Standard_Real aYout = 0.0; + Standard_Real aZout = 0.0; + Project (theP, aXout, aYout, aZout); + thePout.SetCoord (aXout, aYout); } - //======================================================================= -//function : Shoot +//function : Project //purpose : //======================================================================= - -gp_Lin Select3D_Projector::Shoot - (const Standard_Real X, - const Standard_Real Y) const +void Select3D_Projector::Project (const gp_Pnt& theP, + Standard_Real& theX, + Standard_Real& theY, + Standard_Real& theZ) const { - gp_Lin L; + Graphic3d_Vec4d aTransformed (0.0, 0.0, 0.0, 1.0); - if (!myView.IsNull()) + // view transformation + switch (myType) { - Handle(Graphic3d_Camera) aCamera = myView->Camera(); - - Standard_Real aUMin, aVMin, aUMax, aVMax; - aCamera->WindowLimit (aUMin, aVMin, aUMax, aVMax); + case 0 : // inverse axo + { + Standard_Real aX07 = theP.X() * 0.7071067811865475; + Standard_Real aY05 = theP.Y() * 0.5; + Standard_Real aZ05 = theP.Z() * 0.5; + aTransformed.x() = aX07 - aY05 + aZ05; + aTransformed.y() = aX07 + aY05 - aZ05; + aTransformed.z() = 0.7071067811865475 * (theP.Y() + theP.Z()); + break; + } - gp_Pnt aPos = aCamera->ConvertView2World (gp_Pnt (X, Y, 1.0)); - gp_Pnt aEyePos = aCamera->Eye(); + case 1 : // top + { + aTransformed.x() = theP.X(); + aTransformed.y() = theP.Y(); + aTransformed.z() = theP.Z(); + break; + } - gp_Dir aDir; + case 2 : // front + { + aTransformed.x() = theP.X(); + aTransformed.y() = theP.Z(); + aTransformed.z() = -theP.Y(); + break; + } - if (aCamera->IsOrthographic()) + case 3 : // axo { - aDir = aCamera->Direction(); + Standard_Real aXmy05 = (theP.X() - theP.Y()) * 0.5; + Standard_Real aZ07 = theP.Z() * 0.7071067811865476; + aTransformed.x() = 0.7071067811865476 * (theP.X() + theP.Y()); + aTransformed.y() = -aXmy05 + aZ07; + aTransformed.z() = aXmy05 + aZ07; + break; } - else + + default : { - aDir = gp_Dir (aPos.X() - aEyePos.X(), - aPos.Y() - aEyePos.Y(), - aPos.Z() - aEyePos.Z()); + gp_Pnt aTransformPnt = theP; + Transform (aTransformPnt); + aTransformed.x() = aTransformPnt.X(); + aTransformed.y() = aTransformPnt.Y(); + aTransformed.z() = aTransformPnt.Z(); } + } - L = gp_Lin (aPos, aDir); + // projection transformation + if (myPersp) + { + // simplified perspective + Standard_Real aDistortion = 1.0 - aTransformed.z() / myFocus; + theX = aTransformed.x() / aDistortion; + theY = aTransformed.y() / aDistortion; + theZ = aTransformed.z(); + return; } - else + + if (myProjTrsf.IsIdentity()) { - if (myPersp) { - L = gp_Lin(gp_Pnt(0,0, myFocus), - gp_Dir(X,Y,-myFocus)); - } - else { - L = gp_Lin(gp_Pnt(X,Y,0), - gp_Dir(0,0,-1)); - } - - Transform(L, myInvTrsf); + // no projection transformation + theX = aTransformed.x(); + theY = aTransformed.y(); + theZ = aTransformed.z(); + return; } + Graphic3d_Vec4d aProjected = myProjTrsf * aTransformed; - return L; + theX = aProjected.x() / aProjected.w(); + theY = aProjected.y() / aProjected.w(); + theZ = aProjected.z() / aProjected.w(); } +//======================================================================= +//function : Project +//purpose : +//======================================================================= +void Select3D_Projector::Project (const gp_Pnt& theP, + const gp_Vec& theD1, + gp_Pnt2d& thePout, + gp_Vec2d& theD1out) const +{ + // view transformation + gp_Pnt aTP = theP; + Transform (aTP); -void Select3D_Projector::SetView(const Handle(V3d_View)& aViou) + gp_Vec aTD1 = theD1; + Transform (aTD1); + + // projection transformation + if (myPersp) + { + // simplified perspective + Standard_Real aDist = 1.0 - aTP.Z() / myFocus; + thePout.SetCoord (aTP.X() / aDist, aTP.Y() / aDist); + theD1out.SetCoord (aTD1.X() / aDist + aTP.X() * aTD1.Z() / (myFocus * aDist * aDist), + aTD1.Y() / aDist + aTP.Y() * aTD1.Z() / (myFocus * aDist * aDist)); + return; + } + + if (myProjTrsf.IsIdentity()) + { + // no projection transformation + thePout.SetCoord (aTP.X(), aTP.Y()); + theD1out.SetCoord (aTD1.X(), aTD1.Y()); + } + + Graphic3d_Vec4d aTransformedPnt1 (aTP.X(), aTP.Y(), aTP.Z(), 1.0); + Graphic3d_Vec4d aTransformedPnt2 (aTP.X() + aTD1.X(), aTP.Y() + aTD1.Y(), aTP.Z() + aTD1.Z(), 1.0); + + Graphic3d_Vec4d aProjectedPnt1 = myProjTrsf * aTransformedPnt1; + Graphic3d_Vec4d aProjectedPnt2 = myProjTrsf * aTransformedPnt2; + + aProjectedPnt1 /= aProjectedPnt1.w(); + aProjectedPnt2 /= aProjectedPnt2.w(); + + Graphic3d_Vec4d aProjectedD1 = aProjectedPnt2 - aProjectedPnt1; + + thePout.SetCoord (aProjectedPnt1.x(), aProjectedPnt1.y()); + theD1out.SetCoord (aProjectedD1.x(), aProjectedD1.y()); +} + +//======================================================================= +//function : Shoot +//purpose : +//======================================================================= +gp_Lin Select3D_Projector::Shoot (const Standard_Real theX, const Standard_Real theY) const { - myView = aViou; - myPersp = aViou->Type()==V3d_PERSPECTIVE; - myFocus= aViou->Focale(); - Standard_Real Xat,Yat,Zat,XUp,YUp,ZUp,DX,DY,DZ; - //Standard_Boolean Pers=Standard_False; - - aViou->At(Xat,Yat,Zat); - aViou->Up(XUp,YUp,ZUp); - aViou->Proj(DX,DY,DZ); - gp_Pnt At (Xat,Yat,Zat); - gp_Dir Zpers (DX,DY,DZ); - gp_Dir Ypers (XUp,YUp,ZUp); - gp_Dir Xpers = Ypers.Crossed(Zpers); - gp_Ax3 Axe (At, Zpers, Xpers); - myScaledTrsf.SetTransformation(Axe); - Scaled(); + gp_Lin aViewLin; + + if (myPersp) + { + // simplified perspective + aViewLin = gp_Lin (gp_Pnt (0.0, 0.0, myFocus), gp_Dir (theX, theY, -myFocus)); + } + else if (myProjTrsf.IsIdentity()) + { + // no projection transformation + aViewLin = gp_Lin (gp_Pnt (theX, theY, 0.0), gp_Dir (0.0, 0.0, -1.0)); + } + else + { + // get direction of projection over the point in view space + Graphic3d_Mat4d aProjInv; + if (!myProjTrsf.Inverted (aProjInv)) + { + return gp_Lin(); + } + + Graphic3d_Vec4d aVPnt1 = aProjInv * Graphic3d_Vec4d (theX, theY, 0.0, 1.0); + Graphic3d_Vec4d aVPnt2 = aProjInv * Graphic3d_Vec4d (theX, theY, 10.0, 1.0); + aVPnt1 /= aVPnt1.w(); + aVPnt2 /= aVPnt1.w(); + + gp_Vec aViewDir (aVPnt2.x() - aVPnt1.x(), aVPnt2.y() - aVPnt1.y(), aVPnt2.z() - aVPnt1.z()); + + aViewLin = gp_Lin (gp_Pnt (aVPnt1.x(), aVPnt1.y(), aVPnt1.z()), gp_Dir (aViewDir)); + } + + // view transformation + Transform (aViewLin, myInvTrsf); + return aViewLin; } diff --git a/src/Select3D/Select3D_Projector.lxx b/src/Select3D/Select3D_Projector.lxx index 2dfca5eae2..f62cf41373 100644 --- a/src/Select3D/Select3D_Projector.lxx +++ b/src/Select3D/Select3D_Projector.lxx @@ -14,54 +14,64 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -#include +#include +#include #include #include #include -#include -#include //======================================================================= //function : Perspective //purpose : //======================================================================= - inline Standard_Boolean Select3D_Projector::Perspective() const -{ return myPersp; } +{ + return myPersp; +} //======================================================================= -//function : Transformation +//function : ProjectionTransformation //purpose : //======================================================================= +inline const Graphic3d_Mat4d& Select3D_Projector::Projection() const +{ + return myProjTrsf; +} +//======================================================================= +//function : Transformation +//purpose : +//======================================================================= inline const gp_GTrsf& Select3D_Projector::Transformation() const -{ return myGTrsf; } +{ + return myGTrsf; +} //======================================================================= //function : InvertedTransformation //purpose : //======================================================================= - inline const gp_GTrsf& Select3D_Projector::InvertedTransformation() const -{ return myInvTrsf; } +{ + return myInvTrsf; +} //======================================================================= //function : FullTransformation //purpose : //======================================================================= - inline const gp_Trsf& Select3D_Projector::FullTransformation() const -{ return myScaledTrsf; } +{ + return myScaledTrsf; +} //======================================================================= //function : Focus //purpose : //======================================================================= - inline Standard_Real Select3D_Projector::Focus() const { - Standard_NoSuchObject_Raise_if(!myPersp, - "Select3D_Projector::Not a Perpective"); + Standard_ASSERT_RAISE (myPersp, "Not a simplified Perspective."); return myFocus; } @@ -69,55 +79,67 @@ inline Standard_Real Select3D_Projector::Focus() const //function : Transform //purpose : //======================================================================= - -inline void Select3D_Projector::Transform (gp_Vec& D) const +inline void Select3D_Projector::Transform (gp_Vec& theD) const { - gp_XYZ coord = D.XYZ(); - if (myGTrsf.Form() == gp_Identity || myGTrsf.Form() == gp_Translation) { } - else if (myGTrsf.Form() == gp_PntMirror) { coord.Reverse(); } - else { coord.Multiply (myGTrsf.VectorialPart()); } - D.SetXYZ(coord); + gp_XYZ aXYZ = theD.XYZ(); + + if (myGTrsf.Form() == gp_PntMirror) + { + aXYZ.Reverse(); + } + else if (myGTrsf.Form() != gp_Identity && myGTrsf.Form() != gp_Translation) + { + aXYZ.Multiply (myGTrsf.VectorialPart()); + } + + theD.SetXYZ (aXYZ); } //======================================================================= //function : Transform //purpose : //======================================================================= - -inline void Select3D_Projector::Transform (gp_Pnt& Pnt) const +inline void Select3D_Projector::Transform (gp_Pnt& thePnt) const { - gp_XYZ xyz = Pnt.XYZ(); - myGTrsf.Transforms(xyz); - Pnt = gp_Pnt(xyz); + Transform (thePnt, myGTrsf); } - -inline const Handle(V3d_View)& Select3D_Projector::View() const -{return myView;} - -inline void Select3D_Projector::Transform (gp_Lin& Lin, const gp_GTrsf& T) const +//======================================================================= +//function : Transform +//purpose : +//======================================================================= +inline void Select3D_Projector::Transform (gp_Lin& theLin, const gp_GTrsf& theTrsf) const { - gp_Ax1 ax1 = Lin.Position(); - gp_XYZ xyz = ax1.Location().XYZ(); - T.Transforms(xyz); - ax1.SetLocation(gp_Pnt(xyz)); - gp_Dir dir = ax1.Direction(); - gp_XYZ coord = dir.XYZ(); - if (T.Form() == gp_Identity || T.Form() == gp_Translation) { } - else if (T.Form() == gp_PntMirror) { coord.Reverse(); } - else { - coord.Multiply (T.VectorialPart()); - Standard_Real D = coord.Modulus(); - coord.Divide(D); + gp_Ax1 anAx1 = theLin.Position(); + gp_XYZ aXYZ = anAx1.Location().XYZ(); + theTrsf.Transforms (aXYZ); + anAx1.SetLocation (gp_Pnt (aXYZ)); + gp_Dir aDir = anAx1.Direction(); + gp_XYZ aDirXYZ = aDir.XYZ(); + + if (theTrsf.Form() == gp_PntMirror) + { + aDirXYZ.Reverse(); } - dir.SetXYZ(coord); - ax1.SetDirection(dir); - Lin.SetPosition(ax1); + else if (theTrsf.Form() != gp_Identity && theTrsf.Form() != gp_Translation) + { + aDirXYZ.Multiply (theTrsf.VectorialPart()); + Standard_Real aModulus = aDirXYZ.Modulus(); + aDirXYZ.Divide (aModulus); + } + + aDir.SetXYZ (aDirXYZ); + anAx1.SetDirection (aDir); + theLin.SetPosition (anAx1); } -inline void Select3D_Projector::Transform (gp_Pnt& Pnt, const gp_GTrsf& T) const +//======================================================================= +//function : Transform +//purpose : +//======================================================================= +inline void Select3D_Projector::Transform (gp_Pnt& thePnt, const gp_GTrsf& theTrsf) const { - gp_XYZ xyz = Pnt.XYZ(); - T.Transforms(xyz); - Pnt = gp_Pnt(xyz); + gp_XYZ aXYZ = thePnt.XYZ(); + theTrsf.Transforms (aXYZ); + thePnt = gp_Pnt (aXYZ); } diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.cdl b/src/StdSelect/StdSelect_ViewerSelector3d.cdl index 68b447db05..dbee19e7c5 100644 --- a/src/StdSelect/StdSelect_ViewerSelector3d.cdl +++ b/src/StdSelect/StdSelect_ViewerSelector3d.cdl @@ -14,14 +14,11 @@ -- Alternatively, this file may be used under the terms of Open CASCADE -- commercial license or contractual agreement. --- Modified by rob jun 25 98 : Add Method : Reactivate projector... - - +-- Modified by rob jun 25 98 : Add Method : Reactivate projector... class ViewerSelector3d from StdSelect inherits ViewerSelector from SelectMgr - ---Purpose: Selector Usable by Viewers from V3d - -- + ---Purpose: Selector Usable by Viewers from V3d uses View from V3d, @@ -34,119 +31,108 @@ uses Array1OfReal from TColStd, Array1OfPnt2d from TColgp, SensitivityMode from StdSelect, - Lin from gp + Lin from gp, + Pnt from gp, + Dir from gp, + XYZ from gp is Create returns mutable ViewerSelector3d from StdSelect; - ---Purpose: Constructs an empty 3D selector object. - Create(aProj : Projector from Select3D) returns mutable ViewerSelector3d from StdSelect; - ---Purpose: Constructs a 3D selector object defined by the projector aProj. + ---Purpose: Constructs an empty 3D selector object. - Convert(me:mutable;aSelection:mutable Selection from SelectMgr) + Create (theProj : Projector from Select3D) returns mutable ViewerSelector3d from StdSelect; + ---Purpose: Constructs a 3D selector object defined by the projector . + + Convert (me : mutable; theSel : mutable Selection from SelectMgr) is redefined static; - ---Level: Public - ---Purpose: Processes the projection of the sensitive primitives - -- in the active view ; to be done before the selection action... + ---Level: Public + ---Purpose: Processes the projection of the sensitive primitives + -- in the active view ; to be done before the selection action... + Set (me : mutable; theProj : Projector from Select3D) is static; + ---Purpose: Sets the new projector to replace the one used at construction time. - Set(me:mutable; aProj: Projector from Select3D) is static; - ---Purpose: Sets the new projector aProj to replace the one used at construction time. - - - SetSensitivityMode(me : mutable; - aMode : SensitivityMode from StdSelect) is static; + SetSensitivityMode (me : mutable; + theMode : SensitivityMode from StdSelect) is static; ---Purpose: Sets the selection sensitivity mode. SM_WINDOW mode -- uses the specified pixel tolerance to compute the sensitivity -- value, SM_VIEW mode allows to define the sensitivity manually. - SensitivityMode(me) returns SensitivityMode from StdSelect; + SensitivityMode (me) returns SensitivityMode from StdSelect; ---C++: inline ---Purpose: Returns the selection sensitivity mode. - SetPixelTolerance(me : mutable; - aTolerance : Integer) is static; - ---Purpose: Sets the pixel tolerance aTolerance. + SetPixelTolerance (me : mutable; + theTolerance : Integer) is static; + ---Purpose: Sets the pixel tolerance . - PixelTolerance(me) returns Integer from Standard; + PixelTolerance (me) returns Integer from Standard; ---C++: inline ---Purpose: Returns the pixel tolerance. + Pick (me : mutable; theXPix, theYPix : Integer; + theView : View from V3d) is static; + ---Level: Public + ---Purpose: Picks the sensitive entity at the pixel coordinates of + -- the mouse and . The selector looks for touched areas and owners. - Pick (me : mutable;XPix,YPix:Integer; - aView : View from V3d) is static; - ---Level: Public - ---Purpose: Picks the sensitive entity at the pixel coordinates of - -- the mouse Xpix and Ypix. The selector looks for touched areas and owners. - - - Pick (me:mutable;XPMin,YPMin,XPMax,YPMax:Integer;aView:View from V3d) is static; - ---Purpose: Picks the sensitive entity according to the minimum - -- and maximum pixel values XPMin, YPMin, XPMax - -- and YPMax defining a 2D area for selection in the 3D view aView. - - Pick (me:mutable;Polyline:Array1OfPnt2d from TColgp;aView:View from V3d) is static; - ---Level: Public - ---Purpose: pick action - input pixel values for polyline selection for selection. - - + Pick (me : mutable; theXPMin, theYPMin, theXPMax, theYPMax : Integer; theView : View from V3d) is static; + ---Purpose: Picks the sensitive entity according to the minimum + -- and maximum pixel values , , + -- and defining a 2D area for selection in the 3D view aView. + Pick (me : mutable; thePolyline : Array1OfPnt2d from TColgp; theView : View from V3d) is static; + ---Level: Public + ---Purpose: pick action - input pixel values for polyline selection for selection. ---Category: Inquire Methods Projector (me) returns Projector from Select3D; - ---Level: Public - ---Purpose: Returns the current Projector. - ---C++: inline - ---C++: return const& - - + ---Level: Public + ---Purpose: Returns the current Projector. + ---C++: inline + ---C++: return const& ---Category: Internal Methods -- ----------------- - UpdateProj(me :mutable; - aView: View from V3d) returns Boolean is static private; - ---Level: Internal - - - DisplayAreas(me :mutable; - aView: View from V3d) is static; - ---Purpose: Displays sensitive areas found in the view aView. + UpdateProj (me : mutable; + theView : View from V3d) returns Boolean is static private; + ---Level: Internal - ClearAreas (me :mutable; - aView: View from V3d) is static; - ---Purpose: Clears the view aView of sensitive areas found in it. - - DisplaySensitive(me:mutable;aView : View from V3d) is static; - - --- Purpose: Displays the selection aSel found in the view aView. - - ClearSensitive(me:mutable;aView:View from V3d) is static; + DisplayAreas (me : mutable; + theView : View from V3d) is static; + ---Purpose: Displays sensitive areas found in the view . + ClearAreas (me : mutable; + theView : View from V3d) is static; + ---Purpose: Clears the view aView of sensitive areas found in it. + DisplaySensitive (me : mutable; theView : View from V3d) is static; + --- Purpose: Displays sensitives in view . + ClearSensitive (me : mutable; theView : View from V3d) is static; - DisplaySensitive(me:mutable; - aSel : Selection from SelectMgr; - aView : View from V3d; - ClearOthers : Boolean from Standard = Standard_True) + DisplaySensitive (me : mutable; + theSel : Selection from SelectMgr; + theView : View from V3d; + theToClearOthers : Boolean from Standard = Standard_True) is static; - - DisplayAreas(me:mutable; - aSel :Selection from SelectMgr; - aView : View from V3d; - ClearOthers : Boolean from Standard = Standard_True) + + DisplayAreas (me : mutable; + theSel : Selection from SelectMgr; + theView : View from V3d; + theToClearOthers : Boolean from Standard = Standard_True) is static; - - - ComputeSensitivePrs(me:mutable;aSel: Selection from SelectMgr) + + ComputeSensitivePrs (me : mutable; theSel: Selection from SelectMgr) is static private; - ---Level: Internal + ---Level: Internal - ComputeAreasPrs(me:mutable;aSel:Selection from SelectMgr) - is static private; - ---Level: Internal + ComputeAreasPrs (me : mutable; theSel : Selection from SelectMgr) + is static private; + ---Level: Internal SetClipping (me : mutable; thePlanes : SequenceOfHClipPlane from Graphic3d) is protected; ---Level: Internal @@ -190,18 +176,19 @@ is fields - myprj : Projector from Select3D; - mycoeff : Real from Standard[14]; - myprevcoeff : Real from Standard[14]; - mycenter : Real from Standard[2]; - myprevcenter : Real from Standard[2]; - mylastzoom : Real from Standard; - mysensmode : SensitivityMode from StdSelect; - mypixtol : Integer ; - myupdatetol : Boolean; - - - --areas verification... + myProjector : Projector from Select3D; + myPrevAt : Real from Standard[3]; + myPrevUp : Real from Standard[3]; + myPrevProj : Real from Standard[3]; + myPrevAxialScale : Real from Standard[3]; + myPrevFOV : Real from Standard; + myPrevScale : Real from Standard; + myPrevOrthographic : Boolean from Standard; + mySensMode : SensitivityMode from StdSelect; + myPixelTolerance : Integer from Standard; + myToUpdateTolerance : Boolean from Standard; + + --areas verification... myareagroup : Group from Graphic3d; mysensgroup : Group from Graphic3d; diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.cxx b/src/StdSelect/StdSelect_ViewerSelector3d.cxx index 3e82c45324..218783109b 100644 --- a/src/StdSelect/StdSelect_ViewerSelector3d.cxx +++ b/src/StdSelect/StdSelect_ViewerSelector3d.cxx @@ -79,491 +79,596 @@ static Standard_Integer StdSel_NumberOfFreeEdges (const Handle(Poly_Triangulatio return nFree; } -static Standard_Boolean ReadIsDebugMode() -{ - OSD_Environment StdSelectdb ("SELDEBUGMODE"); - return !StdSelectdb.Value().IsEmpty(); -} - -static Standard_Boolean StdSelectDebugModeOn() -{ - static const Standard_Boolean isDebugMode = ReadIsDebugMode(); - return isDebugMode; -} - -//================================================== -// Function: -// Purpose : -//================================================== - -StdSelect_ViewerSelector3d -::StdSelect_ViewerSelector3d(): -myprj(new Select3D_Projector()), -mylastzoom(0.0), -mysensmode(StdSelect_SM_WINDOW), -mypixtol(2), -myupdatetol(Standard_True) +//======================================================================= +// Function : Constructor +// Purpose : +//======================================================================= +StdSelect_ViewerSelector3d::StdSelect_ViewerSelector3d() +: myProjector (new Select3D_Projector()), + myPrevFOV (0.0), + myPrevScale (0.0), + myPrevOrthographic (Standard_True), + mySensMode (StdSelect_SM_WINDOW), + myPixelTolerance (2), + myToUpdateTolerance (Standard_True) { - for (Standard_Integer i=0;i<=13;i++) {mycoeff [i] = 0.;myprevcoeff[i]=0.0;} - for (Standard_Integer j=0;j<2;j++) {mycenter [j] = 0.;myprevcenter[j]=0.0;} + myPrevAt[0] = 0.0; + myPrevAt[1] = 0.0; + myPrevAt[2] = 0.0; + myPrevUp[0] = 0.0; + myPrevUp[1] = 0.0; + myPrevUp[2] = 0.0; + myPrevProj[0] = 0.0; + myPrevProj[1] = 0.0; + myPrevProj[2] = 0.0; + myPrevAxialScale[0] = 0.0; + myPrevAxialScale[1] = 0.0; + myPrevAxialScale[2] = 0.0; } - -//================================================== -// Function: -// Purpose : -//================================================== - -StdSelect_ViewerSelector3d -::StdSelect_ViewerSelector3d(const Handle(Select3D_Projector)& aProj): -myprj(aProj), -mylastzoom(0.0), -mysensmode(StdSelect_SM_WINDOW), -mypixtol(2), -myupdatetol(Standard_True) +//======================================================================= +// Function : Constructor +// Purpose : +//======================================================================= +StdSelect_ViewerSelector3d::StdSelect_ViewerSelector3d (const Handle(Select3D_Projector)& theProj) +: myProjector (theProj), + myPrevFOV (0.0), + myPrevScale (0.0), + myPrevOrthographic (Standard_True), + mySensMode (StdSelect_SM_WINDOW), + myPixelTolerance (2), + myToUpdateTolerance (Standard_True) { - for (Standard_Integer i=0;i<=13;i++) {mycoeff [i] = 0.;myprevcoeff[i]=0.0;} - for (Standard_Integer j=0;j<2;j++) {mycenter [j] = 0.;myprevcenter[j]=0.0;} + myPrevAt[0] = 0.0; + myPrevAt[1] = 0.0; + myPrevAt[2] = 0.0; + myPrevUp[0] = 0.0; + myPrevUp[1] = 0.0; + myPrevUp[2] = 0.0; + myPrevProj[0] = 0.0; + myPrevProj[1] = 0.0; + myPrevProj[2] = 0.0; + myPrevAxialScale[0] = 0.0; + myPrevAxialScale[1] = 0.0; + myPrevAxialScale[2] = 0.0; } -//================================================== +//======================================================================= // Function: Convert // Purpose : -//================================================== - -void StdSelect_ViewerSelector3d::Convert(const Handle(SelectMgr_Selection)& aSel) +//======================================================================= +void StdSelect_ViewerSelector3d::Convert (const Handle(SelectMgr_Selection)& theSel) { - for(aSel->Init();aSel->More();aSel->Next()) + for (theSel->Init(); theSel->More(); theSel->Next()) { - if(aSel->Sensitive()->NeedsConversion()) + if (theSel->Sensitive()->NeedsConversion()) { - Handle(Select3D_SensitiveEntity) SE = *((Handle(Select3D_SensitiveEntity)*) &(aSel->Sensitive())); - SE->Project(myprj); - if(!tosort) tosort=Standard_True; + Handle(Select3D_SensitiveEntity) aSE = *((Handle(Select3D_SensitiveEntity)*) &(theSel->Sensitive())); + aSE->Project (myProjector); + if (!tosort) + { + tosort = Standard_True; + } } } } -//================================================== +//======================================================================= // Function: Set // Purpose : -//================================================== - -void StdSelect_ViewerSelector3d -::Set(const Handle(Select3D_Projector)& aProj) +//======================================================================= +void StdSelect_ViewerSelector3d::Set (const Handle(Select3D_Projector)& theProj) { - myprj = aProj; - toupdate=Standard_True; + myProjector = theProj; + toupdate = Standard_True; } -//================================================== +//======================================================================= // Function: SetSensitivityMode // Purpose : -//================================================== - -void StdSelect_ViewerSelector3d -::SetSensitivityMode(const StdSelect_SensitivityMode aMode) +//======================================================================= +void StdSelect_ViewerSelector3d::SetSensitivityMode (const StdSelect_SensitivityMode theMode) { - mysensmode = aMode; + mySensMode = theMode; toupdate = Standard_True; } -//================================================== +//======================================================================= // Function: SetPixelTolerance // Purpose : -//================================================== - -void StdSelect_ViewerSelector3d -::SetPixelTolerance(const Standard_Integer aTolerance) +//======================================================================= +void StdSelect_ViewerSelector3d::SetPixelTolerance (const Standard_Integer theTolerance) { - if(mypixtol!=aTolerance) + if (myPixelTolerance != theTolerance) { - mypixtol = aTolerance; - myupdatetol = Standard_True; + myPixelTolerance = theTolerance; + myToUpdateTolerance = Standard_True; } } -//================================================== -// Function: SelectPix +//======================================================================= +// Function: Pick // Purpose : -//================================================== - -void StdSelect_ViewerSelector3d -::Pick(const Standard_Integer XPix, - const Standard_Integer YPix, - const Handle(V3d_View)& aView) +//======================================================================= +void StdSelect_ViewerSelector3d::Pick (const Standard_Integer theXPix, + const Standard_Integer theYPix, + const Handle(V3d_View)& theView) { - SetClipping (aView->GetClipPlanes()); - UpdateProj(aView); - Standard_Real Xr3d,Yr3d,Zr3d; - gp_Pnt2d P2d; - aView->Convert(XPix,YPix,Xr3d,Yr3d,Zr3d); - myprj->Project(gp_Pnt(Xr3d,Yr3d,Zr3d),P2d); - - InitSelect(P2d.X(),P2d.Y()); -} + SetClipping (theView->GetClipPlanes()); + UpdateProj (theView); + + Standard_Real aXr3d = 0.0; + Standard_Real aYr3d = 0.0; + Standard_Real aZr3d = 0.0; + gp_Pnt2d aP2d; + theView->Convert (theXPix, theYPix, aXr3d, aYr3d, aZr3d); + myProjector->Project (gp_Pnt (aXr3d, aYr3d, aZr3d), aP2d); + InitSelect (aP2d.X(), aP2d.Y()); +} -//================================================== -// Function: InitSelect +//======================================================================= +// Function: Pick // Purpose : -//================================================== - -void StdSelect_ViewerSelector3d -::Pick(const Standard_Integer XPMin, - const Standard_Integer YPMin, - const Standard_Integer XPMax, - const Standard_Integer YPMax, - const Handle(V3d_View)& aView) +//======================================================================= +void StdSelect_ViewerSelector3d::Pick (const Standard_Integer theXPMin, + const Standard_Integer theYPMin, + const Standard_Integer theXPMax, + const Standard_Integer theYPMax, + const Handle(V3d_View)& theView) { - if (myupdatetol && SensitivityMode() == StdSelect_SM_WINDOW) + if (myToUpdateTolerance && SensitivityMode() == StdSelect_SM_WINDOW) { - SetSensitivity (aView->Convert (mypixtol)); - myupdatetol = Standard_False; + SetSensitivity (theView->Convert (myPixelTolerance)); + myToUpdateTolerance = Standard_False; } - UpdateProj (aView); - - Standard_Real x1,y1,z1,x2,y2,z2; - gp_Pnt2d P2d_1,P2d_2; - aView->Convert(XPMin,YPMin,x1,y1,z1); - aView->Convert(XPMax,YPMax,x2,y2,z2); - myprj->Project(gp_Pnt(x1,y1,z1),P2d_1); - myprj->Project(gp_Pnt(x2,y2,z2),P2d_2); - - InitSelect (Min(P2d_1.X(),P2d_2.X()), - Min(P2d_1.Y(),P2d_2.Y()), - Max(P2d_1.X(),P2d_2.X()), - Max(P2d_1.Y(),P2d_2.Y())); + + UpdateProj (theView); + + Standard_Real aX1 = 0.0; + Standard_Real aY1 = 0.0; + Standard_Real aZ1 = 0.0; + Standard_Real aX2 = 0.0; + Standard_Real aY2 = 0.0; + Standard_Real aZ2 = 0.0; + gp_Pnt2d aP2d1; + gp_Pnt2d aP2d2; + + theView->Convert (theXPMin, theYPMin, aX1, aY1, aZ1); + theView->Convert (theXPMax, theYPMax, aX2, aY2, aZ2); + myProjector->Project (gp_Pnt (aX1, aY1, aZ1), aP2d1); + myProjector->Project (gp_Pnt (aX2, aY2, aZ2), aP2d2); + + InitSelect (Min (aP2d1.X(), aP2d2.X()), + Min (aP2d1.Y(), aP2d2.Y()), + Max (aP2d1.X(), aP2d2.X()), + Max (aP2d1.Y(), aP2d2.Y())); } -//================================================== +//======================================================================= // Function: Pick // Purpose : Selection using a polyline -//================================================== - -void StdSelect_ViewerSelector3d::Pick(const TColgp_Array1OfPnt2d& aPolyline, const Handle(V3d_View)& aView) +//======================================================================= +void StdSelect_ViewerSelector3d::Pick (const TColgp_Array1OfPnt2d& thePolyline, + const Handle(V3d_View)& theView) { - if (myupdatetol && SensitivityMode() == StdSelect_SM_WINDOW) + if (myToUpdateTolerance && SensitivityMode() == StdSelect_SM_WINDOW) { - SetSensitivity (aView->Convert (mypixtol)); - myupdatetol = Standard_False; + SetSensitivity (theView->Convert (myPixelTolerance)); + myToUpdateTolerance = Standard_False; } - UpdateProj (aView); + UpdateProj (theView); - Standard_Integer NbPix = aPolyline.Length(); - Standard_Integer i; + Standard_Integer aNbPix = thePolyline.Length(); // Convert pixel - Handle(TColgp_HArray1OfPnt2d) P2d = new TColgp_HArray1OfPnt2d(1,NbPix); + Handle(TColgp_HArray1OfPnt2d) aP2d = new TColgp_HArray1OfPnt2d (1, aNbPix); - for (i = 1; i <= NbPix; ++i) + for (Standard_Integer aPntIt = 1; aPntIt <= aNbPix; ++aPntIt) { - Standard_Real x,y,z; - Standard_Integer XP = (Standard_Integer)(aPolyline(i).X()); - Standard_Integer YP = (Standard_Integer)(aPolyline(i).Y()); - gp_Pnt2d Pnt2d; + Standard_Integer aXP = (Standard_Integer)(thePolyline (aPntIt).X()); + Standard_Integer aYP = (Standard_Integer)(thePolyline (aPntIt).Y()); - aView->Convert (XP, YP, x, y, z); - myprj->Project (gp_Pnt (x, y, z), Pnt2d); + Standard_Real aX = 0.0; + Standard_Real aY = 0.0; + Standard_Real aZ = 0.0; + gp_Pnt2d aPnt2d; - P2d->SetValue (i, Pnt2d); + theView->Convert (aXP, aYP, aX, aY, aZ); + myProjector->Project (gp_Pnt (aX, aY, aZ), aPnt2d); + + aP2d->SetValue (aPntIt, aPnt2d); } - const TColgp_Array1OfPnt2d& aPolyConvert = P2d->Array1(); + const TColgp_Array1OfPnt2d& aPolyConvert = aP2d->Array1(); - InitSelect(aPolyConvert); + InitSelect (aPolyConvert); } -//================================================== +//======================================================================= // Function: DisplayAreas // Purpose : display the activated areas... -//================================================== - -void StdSelect_ViewerSelector3d::DisplayAreas(const Handle(V3d_View)& aView) +//======================================================================= +void StdSelect_ViewerSelector3d::DisplayAreas (const Handle(V3d_View)& theView) { - if (myupdatetol && SensitivityMode() == StdSelect_SM_WINDOW) + if (myToUpdateTolerance && SensitivityMode() == StdSelect_SM_WINDOW) { - SetSensitivity (aView->Convert (mypixtol)); - myupdatetol = Standard_False; + SetSensitivity (theView->Convert (myPixelTolerance)); + myToUpdateTolerance = Standard_False; } - UpdateProj(aView); + + UpdateProj (theView); UpdateSort(); // Updates the activated areas - if(mystruct.IsNull()) - mystruct = new Graphic3d_Structure(aView->Viewer()->Viewer()); + if (mystruct.IsNull()) + { + mystruct = new Graphic3d_Structure (theView->Viewer()->Viewer()); + } - if(myareagroup.IsNull()) - myareagroup = new Graphic3d_Group(mystruct); + if (myareagroup.IsNull()) + { + myareagroup = new Graphic3d_Group (mystruct); + } - SelectMgr_DataMapIteratorOfDataMapOfIntegerSensitive It(myentities); - Handle(Select3D_Projector) prj = StdSelect::GetProjector(aView); - prj->SetView(aView); + SelectMgr_DataMapIteratorOfDataMapOfIntegerSensitive anIt (myentities); + Handle(Select3D_Projector) aProjector = StdSelect::GetProjector (theView); + aProjector->SetView (theView); - Standard_Real xmin,ymin,xmax,ymax; - gp_Pnt Pbid; - SelectBasics_ListOfBox2d BoxList; + Standard_Real aXmin = 0.0; + Standard_Real aYmin = 0.0; + Standard_Real aXmax = 0.0; + Standard_Real aYmax = 0.0; + gp_Pnt aPbid; + SelectBasics_ListOfBox2d aBoxList; TColgp_SequenceOfPnt aSeqLines; - for (; It.More(); It.Next()) + for (; anIt.More(); anIt.Next()) { - It.Value()->Areas(BoxList); - for (SelectBasics_ListIteratorOfListOfBox2d itb (BoxList); itb.More(); itb.Next()) + anIt.Value()->Areas (aBoxList); + + for (SelectBasics_ListIteratorOfListOfBox2d aBoxIt (aBoxList); aBoxIt.More(); aBoxIt.Next()) { - itb.Value().Get (xmin, ymin, xmax, ymax); + aBoxIt.Value().Get (aXmin, aYmin, aXmax, aYmax); - Pbid.SetCoord (xmin - mytolerance, ymin - mytolerance, 0.0); - prj->Transform (Pbid, prj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmin - mytolerance, aYmin - mytolerance, 0.0); + aProjector->Transform (aPbid, aProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); - Pbid.SetCoord (xmax + mytolerance, ymin - mytolerance, 0.0); - prj->Transform (Pbid, prj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmax + mytolerance, aYmin - mytolerance, 0.0); + aProjector->Transform (aPbid, aProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); - Pbid.SetCoord (xmax + mytolerance, ymax + mytolerance, 0.0); - prj->Transform (Pbid, prj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmax + mytolerance, aYmax + mytolerance, 0.0); + aProjector->Transform (aPbid, aProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); - Pbid.SetCoord (xmin - mytolerance, ymax + mytolerance, 0.0); - prj->Transform (Pbid, prj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmin - mytolerance, aYmax + mytolerance, 0.0); + aProjector->Transform (aPbid, aProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); } } if (aSeqLines.Length()) { - Standard_Integer n, np; - const Standard_Integer nbl = aSeqLines.Length() / 4; - Handle(Graphic3d_ArrayOfPolylines) aPrims = new Graphic3d_ArrayOfPolylines(5*nbl,nbl); - for (np = 1, n=0; nAddBound(5); - const gp_Pnt &p1 = aSeqLines(np++); - aPrims->AddVertex(p1); - aPrims->AddVertex(aSeqLines(np++)); - aPrims->AddVertex(aSeqLines(np++)); - aPrims->AddVertex(aSeqLines(np++)); - aPrims->AddVertex(p1); + Standard_Integer aN = 0; + Standard_Integer aNp = 0; + const Standard_Integer aNbl = aSeqLines.Length() / 4; + + Handle(Graphic3d_ArrayOfPolylines) aPrims = new Graphic3d_ArrayOfPolylines (5 * aNbl, aNbl); + for (aNp = 1, aN = 0; aN < aNbl; aN++) + { + aPrims->AddBound (5); + const gp_Pnt &aPnt1 = aSeqLines (aNp++); + aPrims->AddVertex (aPnt1); + aPrims->AddVertex (aSeqLines (aNp++)); + aPrims->AddVertex (aSeqLines (aNp++)); + aPrims->AddVertex (aSeqLines (aNp++)); + aPrims->AddVertex (aPnt1); } - myareagroup->AddPrimitiveArray(aPrims); + myareagroup->AddPrimitiveArray (aPrims); } myareagroup->SetGroupPrimitivesAspect (new Graphic3d_AspectLine3d (Quantity_NOC_AQUAMARINE1, Aspect_TOL_DASH, 1.0)); - myareagroup->Structure()->SetDisplayPriority(10); + myareagroup->Structure()->SetDisplayPriority (10); myareagroup->Structure()->Display(); - if(aView->TransientManagerBeginDraw()) + if (theView->TransientManagerBeginDraw()) { - Visual3d_TransientManager::DrawStructure(mystruct); + Visual3d_TransientManager::DrawStructure (mystruct); Visual3d_TransientManager::EndDraw(); } else { - aView->Update(); + theView->Update(); } } -//================================================== +//======================================================================= // Function: ClearAreas // Purpose : -//================================================== - -void StdSelect_ViewerSelector3d::ClearAreas(const Handle(V3d_View)& aView) +//======================================================================= +void StdSelect_ViewerSelector3d::ClearAreas (const Handle(V3d_View)& theView) { - if(myareagroup.IsNull()) return; + if (myareagroup.IsNull()) + { + return; + } + myareagroup->Clear(); - if(aView.IsNull()) return; - if(aView->TransientManagerBeginDraw()) + + if (theView.IsNull()) + { + return; + } + + if (theView->TransientManagerBeginDraw()) + { Visual3d_TransientManager::EndDraw(); + } else - aView->Update(); + { + theView->Update(); + } } -//================================================== -// Function: updateproj -// Purpose : at any time verifies that -// the view coefficients did not change : -// store current view coeffts -// in static array cf [ 0->2 At coordinates XAT YAT ZAT -// 3->5 Up coordinates XUP YUP ZUP -// 6->8 ProjVect coordinates DX DY DZ -// 9 focale -// 10 1. if pers 0. else -//================================================== - -Standard_Boolean StdSelect_ViewerSelector3d::UpdateProj(const Handle(V3d_View)& aView) +//======================================================================= +// Function: UpdateProj +// Purpose : +//======================================================================= +Standard_Boolean StdSelect_ViewerSelector3d::UpdateProj (const Handle(V3d_View)& theView) { - myprevcoeff[ 9] = 0.0; - myprevcoeff[10] = 0.0; - Standard_Boolean Pers = Standard_False; - if (aView->Type() == V3d_PERSPECTIVE) + // Check common properties of camera + Standard_Real anUp[3]; + Standard_Real aProj[3]; + Standard_Real anAxialScale[3]; + theView->Up (anUp[0], anUp[1], anUp[2]); + theView->Proj (aProj[0], aProj[1], aProj[2]); + theView->AxialScale (anAxialScale[0], anAxialScale[1], anAxialScale[2]); + + Standard_Boolean isOrthographic = theView->Type() == V3d_ORTHOGRAPHIC; + Standard_Boolean toUpdateProjector = myPrevOrthographic != isOrthographic + || myPrevUp[0] != anUp[0] + || myPrevUp[1] != anUp[1] + || myPrevUp[2] != anUp[2] + || myPrevProj[0] != aProj[0] + || myPrevProj[1] != aProj[1] + || myPrevProj[2] != aProj[2] + || myPrevAxialScale[0] != anAxialScale[0] + || myPrevAxialScale[1] != anAxialScale[1] + || myPrevAxialScale[2] != anAxialScale[2]; + + // Check properties of perspective camera + Standard_Real anAt[3]; + Standard_Real aScale = theView->Scale(); + Standard_Real aFOV = theView->Camera()->FOVy(); + theView->At (anAt[0], anAt[1], anAt[2]); + if (!isOrthographic && !toUpdateProjector) { - Pers = Standard_True; - myprevcoeff[10] = 1.0; - myprevcoeff[ 9] = aView->Focale(); + toUpdateProjector = myPrevAt[0] != anAt[0] + || myPrevAt[1] != anAt[1] + || myPrevAt[2] != anAt[2] + || myPrevScale != aScale + || myPrevFOV != aFOV; } - aView->At (myprevcoeff[0], myprevcoeff[1], myprevcoeff[2]); - aView->Up (myprevcoeff[3], myprevcoeff[4], myprevcoeff[5]); - aView->Proj (myprevcoeff[6], myprevcoeff[7], myprevcoeff[8]); - aView->AxialScale (myprevcoeff[11], myprevcoeff[12], myprevcoeff[13]); - aView->Center (myprevcenter[0], myprevcenter[1]); - Standard_Integer ii; - - for (ii = 0; ii <= 13 && (myprevcoeff[ii] == mycoeff[ii]); ++ii) {} - if (ii <= 13 || (myprevcenter[0] != mycenter[0]) || (myprevcenter[1] != mycenter[1])) + + myToUpdateTolerance = aScale != myPrevScale; + + // Update projector if anything changed + if (toUpdateProjector) { - if (StdSelectDebugModeOn()) - { - cout<<"\t\t\t\t\t VS3d::UpdateProj====> coefficients changes on reprojette"<SetProjectionType (Graphic3d_Camera::Projection_Orthographic); + aCamera->SetCenter (gp::Origin()); + aCamera->SetDirection (gp_Dir (-aProj[0], -aProj[1], -aProj[2])); + aCamera->SetUp (gp_Dir (anUp[0], anUp[1], anUp[2])); + aCamera->SetDistance (1.0); + aCamera->SetAxialScale (gp_XYZ (anAxialScale[0], anAxialScale[1], anAxialScale[2])); + + myProjector = new Select3D_Projector (aCamera->OrientationMatrix(), Graphic3d_Mat4d()); } - for (Standard_Integer jmod = 0; jmod < 2; ++jmod) + else { - mycenter[jmod] = myprevcenter[jmod]; + // For perspective projection panning, zooming and location of view + // has effect. Thus, use current view and projection matrices from + // view camera. Exception is that the projection transformation + // is scaled from NDC to size of displaying frame of view space in order + // to maintain consistence with pixel tolerance conversion. + const Graphic3d_Mat4d& aMVMatrix = theView->Camera()->OrientationMatrix(); + const Graphic3d_Mat4d& aProjMatrix = theView->Camera()->ProjectionMatrix(); + gp_XYZ aViewDimensions = theView->Camera()->ViewDimensions(); + + Graphic3d_Mat4d aScaledProj; + aScaledProj.ChangeValue (0, 0) = aViewDimensions.X(); + aScaledProj.ChangeValue (1, 1) = aViewDimensions.Y(); + aScaledProj.ChangeValue (2, 2) = aViewDimensions.Z(); + Graphic3d_Mat4d aScaledProjMatrix = aScaledProj * aProjMatrix; + + myProjector = new Select3D_Projector (aMVMatrix, aScaledProjMatrix); } - - myprj = new Select3D_Projector (aView); - } - if (Abs (aView->Scale() - mylastzoom) > 1.e-3) + myPrevAt[0] = anAt[0]; + myPrevAt[1] = anAt[1]; + myPrevAt[2] = anAt[2]; + myPrevUp[0] = anUp[0]; + myPrevUp[1] = anUp[1]; + myPrevUp[2] = anUp[2]; + myPrevProj[0] = aProj[0]; + myPrevProj[1] = aProj[1]; + myPrevProj[2] = aProj[2]; + myPrevAxialScale[0] = anAxialScale[0]; + myPrevAxialScale[1] = anAxialScale[1]; + myPrevAxialScale[2] = anAxialScale[2]; + myPrevFOV = aFOV; + myPrevScale = aScale; + myPrevOrthographic = isOrthographic; + + if (myToUpdateTolerance && SensitivityMode() == StdSelect_SM_WINDOW) { - myupdatetol = Standard_True; - mylastzoom = aView->Scale(); + SetSensitivity (theView->Convert (myPixelTolerance)); + myToUpdateTolerance = Standard_False; } - if (myupdatetol && SensitivityMode() == StdSelect_SM_WINDOW) + if (toupdate) { - SetSensitivity (aView->Convert (mypixtol)); - myupdatetol = Standard_False; + UpdateConversion(); } - if (toupdate) UpdateConversion(); - if (tosort) UpdateSort(); + if (tosort) + { + UpdateSort(); + } return Standard_True; } -//============================= +//======================================================================= // Function: DisplaySensitive. // Purpose : Display active primitives. -//============================= -void StdSelect_ViewerSelector3d::DisplaySensitive(const Handle(V3d_View)& aViou) +//======================================================================= +void StdSelect_ViewerSelector3d::DisplaySensitive (const Handle(V3d_View)& theView) { - if (myupdatetol && SensitivityMode() == StdSelect_SM_WINDOW) + if (myToUpdateTolerance && SensitivityMode() == StdSelect_SM_WINDOW) + { + SetSensitivity (theView->Convert (myPixelTolerance)); + myToUpdateTolerance = Standard_False; + } + + if (toupdate) + { + UpdateProj (theView); + } + + if (tosort) { - SetSensitivity (aViou->Convert (mypixtol)); - myupdatetol = Standard_False; + UpdateSort(); // Updates the activated areas } - if(toupdate) UpdateProj(aViou); - if(tosort) UpdateSort(); // Updates the activated areas // Preparation des structures - if(mystruct.IsNull()) - mystruct = new Graphic3d_Structure(aViou->Viewer()->Viewer()); + if (mystruct.IsNull()) + { + mystruct = new Graphic3d_Structure (theView->Viewer()->Viewer()); + } + + if (mysensgroup.IsNull()) + { + mysensgroup = new Graphic3d_Group (mystruct); + } - if(mysensgroup.IsNull()) - mysensgroup = new Graphic3d_Group(mystruct); + Quantity_Color aColor (Quantity_NOC_INDIANRED3); + Handle(Graphic3d_AspectMarker3d) aMarkerAspect = + new Graphic3d_AspectMarker3d (Aspect_TOM_O_PLUS, aColor, 2.0); - Quantity_Color Col(Quantity_NOC_INDIANRED3); - Handle(Graphic3d_AspectMarker3d) AM = - new Graphic3d_AspectMarker3d(Aspect_TOM_O_PLUS,Col,2.); - mysensgroup-> SetPrimitivesAspect (AM); + mysensgroup->SetPrimitivesAspect (aMarkerAspect); mysensgroup->SetPrimitivesAspect ( new Graphic3d_AspectLine3d (Quantity_NOC_GRAY40, Aspect_TOL_SOLID, 2.0)); - // Remplissage de la structure... + SelectMgr_DataMapIteratorOfDataMapOfSelectionActivation anIt (myselections); - SelectMgr_DataMapIteratorOfDataMapOfSelectionActivation It(myselections); - - for (; It.More(); It.Next()) + for (; anIt.More(); anIt.Next()) { - if (It.Value()==0) + if (anIt.Value()==0) { - const Handle(SelectMgr_Selection)& Sel = It.Key(); - ComputeSensitivePrs(Sel); + const Handle(SelectMgr_Selection)& aSel = anIt.Key(); + ComputeSensitivePrs (aSel); } } - mysensgroup->Structure()->SetDisplayPriority(10); + mysensgroup->Structure()->SetDisplayPriority (10); mystruct->Display(); - if (aViou->TransientManagerBeginDraw()) + + if (theView->TransientManagerBeginDraw()) { - Visual3d_TransientManager::DrawStructure(mystruct); + Visual3d_TransientManager::DrawStructure (mystruct); Visual3d_TransientManager::EndDraw(); } - else if (!aViou.IsNull()) + else if (!theView.IsNull()) { - aViou->Update(); + theView->Update(); } } -//============================= +//======================================================================= // Function: ClearSensitive // Purpose : -//============================= -void StdSelect_ViewerSelector3d::ClearSensitive(const Handle(V3d_View)& aViou) +//======================================================================= +void StdSelect_ViewerSelector3d::ClearSensitive (const Handle(V3d_View)& theView) { - if(mysensgroup.IsNull()) return; + if (mysensgroup.IsNull()) + { + return; + } + mysensgroup->Clear(); - if(aViou.IsNull()) return; - if(aViou->TransientManagerBeginDraw()) + if (theView.IsNull()) + { + return; + } + + if (theView->TransientManagerBeginDraw()) + { Visual3d_TransientManager::EndDraw(); + } else - aViou->Update(); + { + theView->Update(); + } } //======================================================================= //function : DisplaySenstive //purpose : //======================================================================= -void StdSelect_ViewerSelector3d:: -DisplaySensitive (const Handle(SelectMgr_Selection)& Sel, - const Handle(V3d_View)& aViou, - const Standard_Boolean ClearOthers) +void StdSelect_ViewerSelector3d::DisplaySensitive (const Handle(SelectMgr_Selection)& theSel, + const Handle(V3d_View)& theView, + const Standard_Boolean theToClearOthers) { if (mystruct.IsNull()) - mystruct = new Graphic3d_Structure (aViou->Viewer()->Viewer()); + { + mystruct = new Graphic3d_Structure (theView->Viewer()->Viewer()); + } + if (mysensgroup.IsNull()) { mysensgroup = new Graphic3d_Group (mystruct); - Quantity_Color Col (Quantity_NOC_INDIANRED3); - Handle(Graphic3d_AspectMarker3d) AM = - new Graphic3d_AspectMarker3d (Aspect_TOM_O_PLUS, Col, 2.0); - mysensgroup-> SetPrimitivesAspect (AM); + Quantity_Color aColor (Quantity_NOC_INDIANRED3); + Handle(Graphic3d_AspectMarker3d) aMarkerAspect = + new Graphic3d_AspectMarker3d (Aspect_TOM_O_PLUS, aColor, 2.0); + + mysensgroup-> SetPrimitivesAspect (aMarkerAspect); mysensgroup->SetPrimitivesAspect ( new Graphic3d_AspectLine3d (Quantity_NOC_GRAY40, Aspect_TOL_SOLID, 2.0)); } - if(ClearOthers) mysensgroup->Clear(); + if (theToClearOthers) + { + mysensgroup->Clear(); + } - ComputeSensitivePrs(Sel); + ComputeSensitivePrs (theSel); - mystruct->SetDisplayPriority(10); + mystruct->SetDisplayPriority (10); mystruct->Display(); - if(aViou->TransientManagerBeginDraw()) + if (theView->TransientManagerBeginDraw()) { - Visual3d_TransientManager::DrawStructure(mystruct); + Visual3d_TransientManager::DrawStructure (mystruct); Visual3d_TransientManager::EndDraw(); } - else if(!aViou.IsNull()) + else if(!theView.IsNull()) { - aViou->Update(); + theView->Update(); } } @@ -571,36 +676,40 @@ DisplaySensitive (const Handle(SelectMgr_Selection)& Sel, //function : DisplayAreas //purpose : //======================================================================= - -void StdSelect_ViewerSelector3d:: -DisplayAreas (const Handle(SelectMgr_Selection)& Sel, - const Handle(V3d_View)& aViou, - const Standard_Boolean ClearOthers) +void StdSelect_ViewerSelector3d::DisplayAreas (const Handle(SelectMgr_Selection)& theSel, + const Handle(V3d_View)& theView, + const Standard_Boolean theToClearOthers) { if (mystruct.IsNull()) - mystruct = new Graphic3d_Structure (aViou->Viewer()->Viewer()); + { + mystruct = new Graphic3d_Structure (theView->Viewer()->Viewer()); + } if (mysensgroup.IsNull()) { myareagroup = new Graphic3d_Group (mystruct); - myareagroup->SetGroupPrimitivesAspect(new Graphic3d_AspectLine3d (Quantity_NOC_AQUAMARINE1, Aspect_TOL_DASH, 1.0)); + myareagroup->SetGroupPrimitivesAspect ( + new Graphic3d_AspectLine3d (Quantity_NOC_AQUAMARINE1, Aspect_TOL_DASH, 1.0)); } - if(ClearOthers) myareagroup->Clear(); + if (theToClearOthers) + { + myareagroup->Clear(); + } - ComputeAreasPrs(Sel); + ComputeAreasPrs (theSel); - mystruct->SetDisplayPriority(10); + mystruct->SetDisplayPriority (10); mystruct->Display(); - if(aViou->TransientManagerBeginDraw()) + if(theView->TransientManagerBeginDraw()) { - Visual3d_TransientManager::DrawStructure(mystruct); + Visual3d_TransientManager::DrawStructure (mystruct); Visual3d_TransientManager::EndDraw(); } else { - aViou->Update(); + theView->Update(); } } @@ -608,15 +717,14 @@ DisplayAreas (const Handle(SelectMgr_Selection)& Sel, //function : ComputeSensitivePrs //purpose : //======================================================================= - -void StdSelect_ViewerSelector3d::ComputeSensitivePrs(const Handle(SelectMgr_Selection)& Sel) +void StdSelect_ViewerSelector3d::ComputeSensitivePrs (const Handle(SelectMgr_Selection)& theSel) { TColgp_SequenceOfPnt aSeqLines, aSeqFree; TColStd_SequenceOfInteger aSeqBnds; - for(Sel->Init();Sel->More();Sel->Next()) + for (theSel->Init(); theSel->More(); theSel->Next()) { - Handle(Select3D_SensitiveEntity) Ent = Handle(Select3D_SensitiveEntity)::DownCast(Sel->Sensitive()); + Handle(Select3D_SensitiveEntity) Ent = Handle(Select3D_SensitiveEntity)::DownCast(theSel->Sensitive()); const Standard_Boolean hasloc = (Ent.IsNull()? Standard_False : Ent->HasLocation()); TopLoc_Location theloc; @@ -952,11 +1060,11 @@ void StdSelect_ViewerSelector3d::ComputeSensitivePrs(const Handle(SelectMgr_Sele mysensgroup->SetPrimitivesAspect (new Graphic3d_AspectLine3d (Quantity_NOC_GREEN, Aspect_TOL_SOLID, 2.0)); Handle(Graphic3d_ArrayOfPolylines) aPrims = new Graphic3d_ArrayOfPolylines(aSeqFree.Length(),aSeqFree.Length()/2); for (i = 1; i <= aSeqFree.Length(); i++) - { + { aPrims->AddBound(2); aPrims->AddVertex(aSeqLines(i++)); aPrims->AddVertex(aSeqLines(i)); - } + } mysensgroup->AddPrimitiveArray(aPrims); mysensgroup->SetPrimitivesAspect (new Graphic3d_AspectLine3d (Quantity_NOC_GRAY40, Aspect_TOL_SOLID, 2.0)); } @@ -966,54 +1074,59 @@ void StdSelect_ViewerSelector3d::ComputeSensitivePrs(const Handle(SelectMgr_Sele //function : ComputeAreaPrs //purpose : //======================================================================= - -void StdSelect_ViewerSelector3d::ComputeAreasPrs (const Handle(SelectMgr_Selection)& Sel) +void StdSelect_ViewerSelector3d::ComputeAreasPrs (const Handle(SelectMgr_Selection)& theSel) { - Standard_Real xmin, ymin, xmax, ymax; - gp_Pnt Pbid; - SelectBasics_ListOfBox2d BoxList; + Standard_Real aXmin = 0.0; + Standard_Real aYmin = 0.0; + Standard_Real aXmax = 0.0; + Standard_Real aYmax = 0.0; + + gp_Pnt aPbid; + SelectBasics_ListOfBox2d aBoxList; TColgp_SequenceOfPnt aSeqLines; - for (Sel->Init(); Sel->More(); Sel->Next()) + for (theSel->Init(); theSel->More(); theSel->Next()) { - Sel->Sensitive()->Areas (BoxList); - for (SelectBasics_ListIteratorOfListOfBox2d itb (BoxList); itb.More(); itb.Next()) + theSel->Sensitive()->Areas (aBoxList); + for (SelectBasics_ListIteratorOfListOfBox2d aBoxIt (aBoxList); aBoxIt.More(); aBoxIt.Next()) { - itb.Value().Get (xmin, ymin, xmax, ymax); + aBoxIt.Value().Get (aXmin, aYmin, aXmax, aYmax); - Pbid.SetCoord (xmin - mytolerance, ymin - mytolerance, 0.0); - myprj->Transform (Pbid, myprj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmin - mytolerance, aYmin - mytolerance, 0.0); + myProjector->Transform (aPbid, myProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); - Pbid.SetCoord (xmax + mytolerance, ymin - mytolerance, 0.0); - myprj->Transform (Pbid, myprj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmax + mytolerance, aYmin - mytolerance, 0.0); + myProjector->Transform (aPbid, myProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); - Pbid.SetCoord (xmax + mytolerance, ymax + mytolerance, 0.0); - myprj->Transform (Pbid, myprj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmax + mytolerance, aYmax + mytolerance, 0.0); + myProjector->Transform (aPbid, myProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); - Pbid.SetCoord (xmin - mytolerance, ymax + mytolerance, 0.0); - myprj->Transform (Pbid, myprj->InvertedTransformation()); - aSeqLines.Append(Pbid); + aPbid.SetCoord (aXmin - mytolerance, aYmax + mytolerance, 0.0); + myProjector->Transform (aPbid, myProjector->InvertedTransformation()); + aSeqLines.Append (aPbid); } } if (aSeqLines.Length()) { - Standard_Integer n, np; - const Standard_Integer nbl = aSeqLines.Length() / 4; - Handle(Graphic3d_ArrayOfPolylines) aPrims = new Graphic3d_ArrayOfPolylines(5*nbl,nbl); - for (np = 1, n=0; nAddBound(5); - const gp_Pnt &p1 = aSeqLines(np++); - aPrims->AddVertex(p1); - aPrims->AddVertex(aSeqLines(np++)); - aPrims->AddVertex(aSeqLines(np++)); - aPrims->AddVertex(aSeqLines(np++)); - aPrims->AddVertex(p1); + Standard_Integer aN = 0; + Standard_Integer aNP = 0; + const Standard_Integer aNBL = aSeqLines.Length() / 4; + Handle(Graphic3d_ArrayOfPolylines) aPrims = new Graphic3d_ArrayOfPolylines (5 * aNBL, aNBL); + for (aNP = 1, aN = 0; aN < aNBL; aN++) + { + aPrims->AddBound (5); + const gp_Pnt &aP1 = aSeqLines (aNP++); + aPrims->AddVertex (aP1); + aPrims->AddVertex (aSeqLines (aNP++)); + aPrims->AddVertex (aSeqLines (aNP++)); + aPrims->AddVertex (aSeqLines (aNP++)); + aPrims->AddVertex (aP1); } - myareagroup->AddPrimitiveArray(aPrims); + myareagroup->AddPrimitiveArray (aPrims); } } @@ -1094,7 +1207,7 @@ void StdSelect_ViewerSelector3d::ComputeClipRange (const Graphic3d_SequenceOfHCl //======================================================================= gp_Lin StdSelect_ViewerSelector3d::PickingLine(const Standard_Real theX, const Standard_Real theY) const { - return myprj->Shoot (theX, theY); + return myProjector->Shoot (theX, theY); } //======================================================================= diff --git a/src/StdSelect/StdSelect_ViewerSelector3d.lxx b/src/StdSelect/StdSelect_ViewerSelector3d.lxx index e9f0f4dd2a..8c910c1e31 100644 --- a/src/StdSelect/StdSelect_ViewerSelector3d.lxx +++ b/src/StdSelect/StdSelect_ViewerSelector3d.lxx @@ -14,15 +14,15 @@ inline StdSelect_SensitivityMode StdSelect_ViewerSelector3d::SensitivityMode() const { - return mysensmode; + return mySensMode; } inline Standard_Integer StdSelect_ViewerSelector3d::PixelTolerance() const { - return mypixtol; + return myPixelTolerance; } inline const Handle(Select3D_Projector)& StdSelect_ViewerSelector3d::Projector() const { - return myprj; + return myProjector; } diff --git a/src/V3d/V3d_View.cdl b/src/V3d/V3d_View.cdl index 3dc9fef68e..b8a6ac8015 100644 --- a/src/V3d/V3d_View.cdl +++ b/src/V3d/V3d_View.cdl @@ -135,7 +135,8 @@ uses ExtendedString from TCollection, PrintAlgo from Aspect, ClipPlane_Handle from Graphic3d, - SequenceOfHClipPlane from Graphic3d + SequenceOfHClipPlane from Graphic3d, + XYZ from gp raises BadValue from V3d, TypeMismatch from Standard, @@ -403,14 +404,27 @@ is returns Boolean from Standard; ---Purpose: sets the immediate update mode and returns the previous one. - SetAutoZFitMode( me : mutable; theMode : Boolean ); + SetAutoZFitMode (me : mutable; + theIsOn : Boolean; + theScaleFactor : Real from Standard = 1.0); ---Level: public - ---Purpose: sets the auto z-fit mode - - AutoZFitMode( me ) returns Boolean; + ---Purpose: Sets the automatic z-fit mode and its parameters. + -- The auto z-fit has extra parameters which can controlled from application level + -- to ensure that the size of viewing volume will be sufficiently large to cover + -- the depth of unmanaged objects, for example, transformation persistent ones. + -- @param theScaleFactor [in] the scale factor for Z-range. + -- The range between Z-min, Z-max projection volume planes + -- evaluated by z fitting method will be scaled using this coefficient. + -- Program error exception is thrown if negative or zero value + -- is passed. + + AutoZFitMode (me) returns Boolean; ---Level: public - ---Purpose: returns current auto z-fit mode + ---Purpose: returns TRUE if automatic z-fit mode is turned on. + AutoZFitScaleFactor (me) returns Real from Standard; + ---Level: public + ---Purpose: returns scale factor parameter of automatic z-fit mode. --------------------------------------------------- -- Triedron methods @@ -704,13 +718,15 @@ is -- the current axis a distance relative to the initial -- position expressed by Start = Standard_True - Place (me: mutable; x,y: Integer from Standard; - aZoomFactor: Factor from Quantity = 1) + Place (me : mutable; + theXp : Integer from Standard; + theYp : Integer from Standard; + theZoomFactor : Factor from Quantity = 1) ---Level: Public - ---Purpose: places the point of the view corresponding - -- at the pixel position x,y at the center of the window - -- and updates the view. - is static; + ---Purpose: places the point of the view corresponding + -- at the pixel position x,y at the center of the window + -- and updates the view. + is static; Turn ( me : mutable ; Ax,Ay,Az : PlaneAngle ; Start : Boolean = Standard_True ) @@ -807,27 +823,34 @@ is ---Category: Methods to modify the Mapping of the view -------------------------------------------------------- - Panning ( me : mutable ; Dx , Dy : Length ; - aZoomFactor : Factor from Quantity = 1; - Start : Boolean = Standard_True ) - ---Level: Public - ---Purpose: translates the center of the view and zooms the view. - -- Updates the view. - raises BadValue from V3d ; - - SetCenter ( me : mutable ; Xc , Yc : Coordinate ) - ---Level: Public - ---Purpose: Defines the centre of the view. - -- Updates the view. - raises BadValue from V3d ; - -- If one of the dimensions of the projection is NULL. - - SetCenter ( me : mutable ; X,Y: Integer from Standard) - ---Level: Public - ---Purpose: Defines the centre of the view from a pixel position. - -- Updates the view. - raises BadValue from V3d ; - -- If one of the dimensions of the projection is NULL. + Panning (me : mutable; + theDXv : Real from Standard; + theDYv : Real from Standard; + theZoomFactor : Factor from Quantity = 1; + theToStart : Boolean = Standard_True); + ---Level: Public + ---Purpose: Translates the center of the view along "x" and "y" axes of + -- view projection. Can be used to perform interactive panning operation. + -- In that case the DXv, DXy parameters specify panning relative to the + -- point where the operation is started. + -- @param theDXv [in] the relative panning on "x" axis of view projection, in view space coordinates. + -- @param theDYv [in] the relative panning on "y" axis of view projection, in view space coordinates. + -- @param theZoomFactor [in] the zooming factor. + -- @param theToStart [in] pass TRUE when starting panning to remember view + -- state prior to panning for relative arguments. If panning is started, + -- passing {0, 0} for {theDXv, theDYv} will return view to initial state. + -- Performs update of view. + + SetCenter (me : mutable; theXp, theYp : Integer from Standard) + ---Level: Public + ---Purpose: Relocates center of screen to the point, determined by + -- {Xp, Yp} pixel coordinates relative to the bottom-left corner of + -- screen. To calculate pixel coordinates for any point from world + -- coordinate space, it can be projected using "Project". + -- @param theXp [in] the x coordinate. + -- @param theYp [in] the y coordinate. + raises BadValue from V3d; + -- If one of the dimensions of the projection is NULL. SetSize ( me : mutable ; Size : Length ) ---Level: Public @@ -878,29 +901,34 @@ is raises BadValue from V3d ; -- If the one of factors <= 0 - FitAll ( me : mutable ; Coef : Coefficient = 0.01; update : Boolean from Standard = Standard_True ) + FitAll (me : mutable; + theMargin : Coefficient = 0.01; + theToUpdate : Boolean from Standard = Standard_True); ---Level: Public - ---Purpose: Automatic zoom/panning. Objects in the view are visualised - -- so as to occupy the maximum space while respecting the - -- margin coefficient and the initial height /width ratio. - -- Fits Z depending on AutoZFit option. - raises BadValue from V3d ; - -- If the margin coefficient is <0 ou >= 1 or - -- Updates the view + ---Purpose: Adjust view parameters to fit the displayed scene, respecting height / width ratio. + -- The Z clipping range (depth range) is fitted if AutoZFit flag is TRUE. + -- Throws program error exception if margin coefficient is < 0 or >= 1. + -- Updates the view. + -- @param theMargin [in] the margin coefficient for view borders. + -- @param theToUpdate [in] flag to perform view update. - ZFitAll ( me : mutable ; Coef : Coefficient = 1.0 ) + ZFitAll (me : mutable; theScaleFactor : Real from Standard = 1.0); ---Level: Public - ---Purpose: Automatic Depth Panning. Objects visible in the view are - -- visualised so as to occupy the maximum Z amount of space - -- while respecting the margin coefficient . - -- NOTE than the original XY size of the view is NOT modified . - raises BadValue from V3d ; - -- If the margin coefficient is <0 ou or - -- If No Objects are displayed in the view + ---Purpose: Change Z-min and Z-max planes of projection volume to match the + -- displayed objects. The methods ensures that view volume will + -- be close by depth range to the displayed objects. Fitting assumes that + -- for orthogonal projection the view volume contains the displayed objects + -- completely. For zoomed perspective view, the view volume is adjusted such + -- that it contains the objects or their parts, located in front of the camera. + -- @param theScaleFactor [in] the scale factor for Z-range. + -- The range between Z-min, Z-max projection volume planes + -- evaluated by z fitting method will be scaled using this coefficient. + -- Program error exception is thrown if negative or zero value is passed. - AutoZFit ( me : mutable ); + AutoZFit (me : mutable); ---Level: Public - ---Purpose: Automatic z-range fitting with ZFitAll. Works only if myAutoZFit enabled. + ---Purpose: If automatic z-range fitting is turned on, adjusts Z-min and Z-max + -- projection volume planes with call to ZFitAll. DepthFitAll( me : mutable ; Aspect : Coefficient = 0.01; Margin : Coefficient = 0.01 ); @@ -910,36 +938,29 @@ is -- calculated Z size and Aspect parameter. -- NOTE than the original XY size of the view is NOT modified . - FitAll ( me : mutable ; Umin, Vmin, Umax, Vmax : Coordinate ) + FitAll (me : mutable; + theMinXv : Real from Standard; + theMinYv : Real from Standard; + theMaxXv : Real from Standard; + theMaxYv : Real from Standard) ---Level: Public - ---Purpose: Centres the defined projection window so that it occupies + ---Purpose: Centers the defined projection window so that it occupies -- the maximum space while respecting the initial -- height/width ratio. -- NOTE than the original Z size of the view is NOT modified . raises BadValue from V3d; -- If the defined projection window has zero size. - - WindowFit ( me : mutable ; Xmin, Ymin, Xmax, Ymax : Integer) + WindowFit (me : mutable; theMinXp, theMinYp, theMaxXp, theMaxYp : Integer) ---Level: Public - ---Purpose: Centres the defined PIXEL window so that it occupies - -- the maximum space while respecting the initial - -- height/width ratio. - -- NOTE than the original Z size of the view is NOT modified . - raises BadValue from V3d - -- If the defined projection window has zero size. + ---Purpose: Centers the defined PIXEL window so that it occupies + -- the maximum space while respecting the initial height/width ratio. + -- NOTE than the original Z size of the view is NOT modified. + -- @param theMinXp [in] pixel coordinates of minimal corner on x screen axis. + -- @param theMinYp [in] pixel coordinates of minimal corner on y screen axis. + -- @param theMaxXp [in] pixel coordinates of maximal corner on x screen axis. + -- @param theMaxYp [in] pixel coordinates of maximal corner on y screen axis. is static; - - SetViewingVolume ( me : mutable ; Left, Right, Bottom, Top, ZNear, ZFar : Real from Standard) - ---Level: Public - ---Purpose: Sets Z and XY size of the view according to given values - -- with respecting the initial view depth (eye position). - -- Width/heigth aspect ratio should be preserved by the caller - -- of this method similarly to SetSize() to avoid unexpected - -- visual results like non-uniform scaling of objects in the view. - raises BadValue from V3d; - -- If the ZNear<0, ZFar<0 or ZNear>=Zfar. - SetViewMappingDefault( me : mutable ); ---Level: Public ---Purpose: Saves the current view mapping. This will be the @@ -947,12 +968,12 @@ is ResetViewMapping ( me : mutable ); ---Level: Public - ---Purpose: Resets the centring of the view. + ---Purpose: Resets the centering of the view. -- Updates the view Reset ( me : mutable; update : Boolean from Standard = Standard_True ); ---Level: Public - ---Purpose: Resets the centring and the orientation of the view + ---Purpose: Resets the centering and the orientation of the view -- Updates the view --------------------------------------------------- ---Category: Inquire methods @@ -1085,10 +1106,6 @@ is ---Level: Public ---Purpose: Returns the current values of the anisotropic (axial) scale factors. - Center ( me; Xc,Yc : out Coordinate ); - ---Level: Public - ---Purpose: Returns the centre of the view. - Size ( me; Width, Height : out Length ); ---Level: Public ---Purpose: Returns the height and width of the view. @@ -1214,31 +1231,51 @@ is ---Level: Public ---Purpose: Returns the Type of the View - Pan ( me : mutable; Dx, Dy: Integer from Standard; - aZoomFactor: Factor from Quantity = 1); - ---Level: Public - ---Purpose: translates the center of the view and zooms the view. - -- and updates the view. - - Zoom ( me : mutable; X1 , Y1 , X2 , Y2 : Integer from Standard) - is static; - ---Level: Public - ---Purpose: Zoom the view according to a zoom factor computed - -- from the distance between the 2 mouse position , - - Zoom ( me: mutable; X,Y: Integer from Standard) + Pan (me : mutable; + theDXp : Integer from Standard; + theDYp : Integer from Standard; + theZoomFactor : Factor from Quantity = 1; + theToStart : Boolean = Standard_True); + ---Level: Public + ---Purpose: Translates the center of the view along "x" and "y" axes of + -- view projection. Can be used to perform interactive panning operation. + -- In that case the DXp, DXp parameters specify panning relative to the + -- point where the operation is started. + -- @param theDXp [in] the relative panning on "x" axis of view projection, in pixels. + -- @param theDYp [in] the relative panning on "y" axis of view projection, in pixels. + -- @param theZoomFactor [in] the zooming factor. + -- @param theToStart [in] pass TRUE when starting panning to remember view + -- state prior to panning for relative arguments. Passing 0 for relative + -- panning parameter should return view panning to initial state. + -- Performs update of view. + + Zoom (me : mutable; + theXp1 : Integer from Standard; + theYp1 : Integer from Standard; + theXp2 : Integer from Standard; + theYp2 : Integer from Standard) is static; ---Level: Public ---Purpose: Zoom the view according to a zoom factor computed - -- from the distance between the last and new mouse position + -- from the distance between the 2 mouse position. + -- @param theXp1 [in] the x coordinate of first mouse position, in pixels. + -- @param theYp1 [in] the y coordinate of first mouse position, in pixels. + -- @param theXp2 [in] the x coordinate of second mouse position, in pixels. + -- @param theYp2 [in] the y coordinate of second mouse position, in pixels. - StartZoomAtPoint(me : mutable; - xpix, ypix : Integer from Standard); + StartZoomAtPoint (me : mutable; + theXp : Integer from Standard; + theYp : Integer from Standard); ---Level: Public - ---Purpose: Defines the point (pixel) of zooming (for the method ZoomAtPoint()). + ---Purpose: Defines starting point for ZoomAtPoint view operation. + -- @param theXp [in] the x mouse coordinate, in pixels. + -- @param theYp [in] the y mouse coordinate, in pixels. ZoomAtPoint(me : mutable; - mouseStartX, mouseStartY, mouseEndX, mouseEndY : Integer from Standard); + theMouseStartX : Integer from Standard; + theMouseStartY : Integer from Standard; + theMouseEndX : Integer from Standard; + theMouseEndY : Integer from Standard); ---Level: Public ---Purpose: Zooms the model at a pixel defined by the method StartZoomAtPoint(). @@ -1252,13 +1289,13 @@ is StartRotation(me : mutable ; X,Y :Integer from Standard; zRotationThreshold: Ratio from Quantity = 0.0); ---Level: Public - ---Purpose: Begin the rotation of the view arround the screen axis + ---Purpose: Begin the rotation of the view around the screen axis -- according to the mouse position . -- Warning: Enable rotation around the Z screen axis when -- factor is > 0 soon the distance from the start point and the center -- of the view is > (medium viewSize * ). -- Generally a value of 0.4 is usable to rotate around XY screen axis - -- inside the circular treshold area and to rotate around Z screen axis + -- inside the circular threshold area and to rotate around Z screen axis -- outside this area. Rotation(me:mutable; X,Y :Integer from Standard); @@ -1464,23 +1501,25 @@ is -- you use it for your purposes; -- Warning: Works only under Windows. - ToPixMap ( me : mutable; - theImage : in out PixMap from Image; - theWidth : Integer from Standard; - theHeight : Integer from Standard; - theBufferType : BufferType from Graphic3d = Graphic3d_BT_RGB; - theForceCentered : Boolean from Standard = Standard_True; - theStereoOptions : StereoDumpOptions from V3d = V3d_SDO_MONO ) + ToPixMap (me : mutable; + theImage : in out PixMap from Image; + theWidth : Integer from Standard; + theHeight : Integer from Standard; + theBufferType : BufferType from Graphic3d = Graphic3d_BT_RGB; + theToKeepAspect : Boolean from Standard = Standard_True; + theStereoOptions : StereoDumpOptions from V3d = V3d_SDO_MONO) returns Boolean from Standard; ---Level : Public - ---Purpose : dump the full contents of the view - -- to a pixmap of pixel size * and - -- buffer type . If is true - -- view scene will be centered. - -- Pixmap will be automatically (re)allocated when needed. - -- For stereographic camera by default the monographic projection - -- is used during dumping. flag can be used to - -- dump projection for left right eye. + ---Purpose : Dumps the full contents of the view + -- to a pixmap of pixel size * and + -- buffer type . If is true + -- the aspect ratio of view will be kept if and + -- define another ratio. + -- Pixmap will be automatically (re)allocated when needed. + -- When dumping stereographic camera - the corresponding + -- middle-point monographic projection will be used for dumping by default. + -- flags are to be used for dumping then left or + -- right eye projections. SetProjModel( me : mutable; amOdel: TypeOfProjectionModel from V3d = V3d_TPM_SCREEN ) @@ -1539,7 +1578,7 @@ is ---Purpose: Adds clip plane to the view. The composition of clip planes truncates the -- rendering space to convex volume. Number of supported clip planes can be consulted -- by PlaneLimit method of associated Visual3d_View. Please be aware that the planes - -- which exceed the limit are igonred during rendering. + -- which exceed the limit are ignored during rendering. -- @param thePlane [in] the clip plane to be added to view. RemoveClipPlane (me : mutable; thePlane : ClipPlane_Handle from Graphic3d) is virtual; @@ -1552,7 +1591,7 @@ is -- truncates the rendering space to convex volume. Number of supported -- clip planes can be consulted by PlaneLimit method of associated -- Visual3d_View. Please be aware that the planes which exceed the limit - -- are igonred during rendering. + -- are ignored during rendering. -- @param thePlanes [in] the clip planes to set. GetClipPlanes (me) returns SequenceOfHClipPlane from Graphic3d; @@ -1566,48 +1605,57 @@ is Camera (me) returns Camera_Handle from Graphic3d is static; ---Level: Public + ---C++: return const& ---Purpose: Returns camera object of the view. -- @return: handle to camera object, or NULL if 3D view does not use -- the camera approach. - FitCamera (me : mutable; - theXmin : Real from Standard; - theYmin : Real from Standard; - theZmin : Real from Standard; - theXmax : Real from Standard; - theYmax : Real from Standard; - theZmax : Real from Standard) is protected; + FitMinMax (me; + theCamera : Camera_Handle from Graphic3d; + theMinCorner : XYZ from gp; + theMaxCorner : XYZ from gp; + theMargin : Real from Standard; + theResolution : Real from Standard = 0.0; + theToEnlargeIfLine : Boolean from Standard = Standard_True) + returns Boolean from Standard is protected; ---Level: Protected - ---Purpose: Transform camera to fit in the passed bounding box - -- specified in world coordinate space. - -- @param theXmin [in] x min bounding. - -- @param theYmin [in] y min bounding. - -- @param theZmin [in] z min bounding. - -- @param theXmax [in] x max bounding. - -- @param theYmax [in] y max bounding. - -- @param theZmax [in] z max bounding. - - ZoomCamera (me : mutable; - theUSize : Real from Standard; - theVSize : Real from Standard; - theZDepth : Real from Standard = 0.0) is protected; + ---Purpose: Transform camera eye, center and scale to fit in the + -- passed bounding box specified in WCS. + -- @param theCamera [in] the camera. + -- @param theMinCorner [in] the minimal corner of bounding box. + -- @param theMaxCorner [in] the maximal corner of bounding box. + -- @param theMargin [in] the margin coefficient for view borders. + -- @param theResolution [in] the minimum size of projection of + -- bounding box in Xv or Yv direction when it considered to + -- be a thin plane or point (without a volume). + -- In this case only the center of camera is adjusted. + -- @param theToEnlargeIfLine [in] if passed TRUE - in cases when the + -- whole bounding box projected into thin line going along + -- Z-axis of screen, the view plane is enlarged such that + -- we see the whole line on rotation, otherwise only the + -- center of camera is adjusted. + -- @return TRUE if the fit all operation can be done. + + Scale (me; + theCamera : Camera_Handle from Graphic3d; + theSizeXv : Real from Standard; + theSizeYv : Real from Standard) is protected; ---Level: Protected - ---Purpose: Zoom camera to fit the section defined in view coordinate space - -- lying on the view direction ray. For orthogonal camera the method - -- changes scale, for perspective adjusts Eye location about the Center point. - -- Depth by Z defines distance of the zoomed section from camera Center. - -- It is optional and for orthographic camera has no effect. - -- @param theUSize [in] size of view section on U axis (horizontal to the screen). - -- @param theVSize [in] size of view section on V axis (vertical to the screen). - -- @param theZDepth [in] distance from camera center to the specified section. - - PanCamera (me : mutable; - theU : Real from Standard; - theV : Real from Standard) is protected; + ---Purpose: Scales camera to fit the view frame of defined width and height + -- keeping the aspect. For orthogonal camera the method changes scale, + -- for perspective adjusts Eye location about the Center point. + -- @param theSizeXv [in] size of viewport frame on "x" axis. + -- @param theSizeYv [in] size of viewport frame on "y" axis. + + Translate (me; + theCamera : Camera_Handle from Graphic3d; + theDXv : Real from Standard; + theDYv : Real from Standard) is protected; ---Level: Protected - ---Purpose: Pan camera along the view plane on the passed U, V distances. - -- @param theU [in] the horizontal panning. - -- @param theV [in] the vertical panning. + -- Purpose: Translates camera eye and center along the view plane. + -- @param theCamera [in] the camera to translate. + -- @param theDXv [in] the translation in "x" direction. + -- @param theDYv [in] the translation in "y" direction. SetRaytracingMode (me : mutable) is static; ---Level: Public @@ -1693,13 +1741,14 @@ fields MyTransparencyFlag : Boolean from Standard; myImmediateUpdate: Boolean from Standard is protected; - myXscreenAxis: Vector from Graphic3d; - myYscreenAxis: Vector from Graphic3d; - myZscreenAxis: Vector from Graphic3d; - myViewAxis: Vector from Graphic3d; - myGravityReferencePoint: Vertex from Graphic3d; - myCamProjectionShift: Pnt from gp; - myAutoZFitMode: Boolean from Standard; + myXscreenAxis : Vector from Graphic3d; + myYscreenAxis : Vector from Graphic3d; + myZscreenAxis : Vector from Graphic3d; + myViewAxis : Vector from Graphic3d; + myGravityReferencePoint : Vertex from Graphic3d; + myCamProjectionShift : Pnt from gp; + myAutoZFitIsOn : Boolean from Standard; + myAutoZFitScaleFactor : Real from Standard; friends diff --git a/src/V3d/V3d_View.cxx b/src/V3d/V3d_View.cxx index 19e59e1cad..bd9ac1841c 100644 --- a/src/V3d/V3d_View.cxx +++ b/src/V3d/V3d_View.cxx @@ -111,18 +111,30 @@ To solve the problem (for lack of a better solution) I make 2 passes. */ #include +#include +#include +#include +#include + +#include #include #include -#include +#include + #include #include #include #include -#include + +#include + #include #include #include -#include +#include + +#include + #include #include @@ -138,7 +150,7 @@ To solve the problem (for lack of a better solution) I make 2 passes. #include #include #include -#include +#include #define V3d_FLAG_COMPUTATION 0x00000004 @@ -152,18 +164,20 @@ To solve the problem (for lack of a better solution) I make 2 passes. #define DEUXPI (2. * M_PI) -/*----------------------------------------------------------------------*/ -//-Constructors - +//============================================================================= +//function : Constructor +//purpose : +//============================================================================= V3d_View::V3d_View(const Handle(V3d_Viewer)& VM, const V3d_TypeOfView Type ) : MyProjModel(V3d_TPM_SCREEN), MyViewer(VM.operator->()), MyActiveLights(), MyViewContext (), myActiveLightsIterator(), - SwitchSetFront(Standard_False), + SwitchSetFront(Standard_False), MyTrsf (1, 4, 1, 4), - myAutoZFitMode (Standard_True) + myAutoZFitIsOn (Standard_True), + myAutoZFitScaleFactor (1.0) { myImmediateUpdate = Standard_False; MyView = new Visual3d_View(MyViewer->Viewer()); @@ -244,7 +258,6 @@ V3d_View::V3d_View(const Handle(V3d_Viewer)& VM, const V3d_TypeOfView Type ) : SetZCueingDepth (0.); SetZCueingWidth (zsize); SetDepth (VM->DefaultViewSize()/2.0); - SetCenter (0.,0.); SetViewMappingDefault(); VM->AddView (this); Init(); @@ -257,17 +270,18 @@ V3d_View::V3d_View(const Handle(V3d_Viewer)& VM, const V3d_TypeOfView Type ) : MyTransparencyFlag = Standard_False; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Constructor +//purpose : +//============================================================================= V3d_View::V3d_View(const Handle(V3d_Viewer)& theVM,const Handle(V3d_View)& theView) : -MyProjModel(V3d_TPM_SCREEN), -MyViewer(theVM.operator->()), -MyActiveLights(), -MyViewContext (), -myActiveLightsIterator(), -SwitchSetFront(Standard_False), -MyTrsf (1, 4, 1, 4), -myAutoZFitMode (Standard_True) + MyProjModel(V3d_TPM_SCREEN), + MyViewer(theVM.operator->()), + MyActiveLights(), + MyViewContext (), + myActiveLightsIterator(), + SwitchSetFront(Standard_False), + MyTrsf (1, 4, 1, 4) { Handle(Visual3d_View) aFromView = theView->View(); @@ -282,6 +296,8 @@ myAutoZFitMode (Standard_True) MyViewContext = aFromView->Context() ; SetCamera (new Graphic3d_Camera (theView->Camera())); + myAutoZFitIsOn = theView->AutoZFitMode(); + myAutoZFitScaleFactor = theView->AutoZFitScaleFactor(); MyBackground = aFromView->Background() ; MyGradientBackground = aFromView->GradientBackground(); @@ -297,10 +313,10 @@ myAutoZFitMode (Standard_True) myImmediateUpdate = Standard_True; } -/*----------------------------------------------------------------------*/ - -//-Methods, in order - +//============================================================================= +//function : SetMagnify +//purpose : +//============================================================================= void V3d_View::SetMagnify(const Handle(Aspect_Window)& TheWindow, const Handle(V3d_View)& aPreviousView, const Standard_Integer x1, @@ -323,8 +339,10 @@ void V3d_View::SetMagnify(const Handle(Aspect_Window)& TheWindow, } } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetWindow +//purpose : +//============================================================================= void V3d_View::SetWindow(const Handle(Aspect_Window)& TheWindow) { Standard_MultiplyDefined_Raise_if( MyView->IsDefined(), @@ -343,9 +361,10 @@ void V3d_View::SetWindow(const Handle(Aspect_Window)& TheWindow) MyView->Redraw() ; } -// RIC120302 -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetWindow +//purpose : +//============================================================================= void V3d_View::SetWindow(const Handle(Aspect_Window)& aWindow, const Aspect_RenderingContext aContext, const Aspect_GraphicCallbackProc& aDisplayCB, @@ -365,10 +384,11 @@ void V3d_View::SetWindow(const Handle(Aspect_Window)& aWindow, MyViewer->SetViewOn(this) ; MyView->Redraw() ; } -// RIC120302 - -/*----------------------------------------------------------------------*/ +//============================================================================= +//function : Remove +//purpose : +//============================================================================= void V3d_View::Remove() const { MyViewer->DelView (this); @@ -377,30 +397,38 @@ void V3d_View::Remove() const aWin.Nullify(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Update +//purpose : +//============================================================================= void V3d_View::Update() const { if( MyView->IsDefined() ) MyView->Update() ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Redraw +//purpose : +//============================================================================= void V3d_View::Redraw() const { if( MyView->IsDefined() ) MyView->Redraw() ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Redraw +//purpose : +//============================================================================= void V3d_View::Redraw(const Standard_Integer xc,const Standard_Integer yc, const Standard_Integer width,const Standard_Integer height) const { if( MyView->IsDefined() ) MyView->Redraw(xc,yc,width,height) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : IsEmpty +//purpose : +//============================================================================= Standard_Boolean V3d_View::IsEmpty() const { Standard_Boolean TheStatus = Standard_True ; @@ -411,16 +439,20 @@ Standard_Boolean V3d_View::IsEmpty() const return (TheStatus) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : UpdateLights +//purpose : +//============================================================================= void V3d_View::UpdateLights() const { MyView->SetContext(MyViewContext); Update(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : DoMapping +//purpose : +//============================================================================= void V3d_View::DoMapping() { if( MyView->IsDefined() ) { @@ -428,8 +460,10 @@ void V3d_View::DoMapping() } } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : MustBeResized +//purpose : +//============================================================================= void V3d_View::MustBeResized() { if ( !MyLayerMgr.IsNull() ) @@ -441,8 +475,10 @@ void V3d_View::MustBeResized() } } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBackgroundColor +//purpose : +//============================================================================= void V3d_View::SetBackgroundColor(const Quantity_TypeOfColor Type, const Standard_Real v1, const Standard_Real v2, const Standard_Real v3) { Standard_Real V1 = Max( Min( v1, 1.0 ), 0.0 ); @@ -453,8 +489,10 @@ void V3d_View::SetBackgroundColor(const Quantity_TypeOfColor Type, const Standar SetBackgroundColor( C ); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBackgroundColor +//purpose : +//============================================================================= void V3d_View::SetBackgroundColor(const Quantity_Color &Color) { MyBackground.SetColor( Color ); @@ -465,16 +503,20 @@ void V3d_View::SetBackgroundColor(const Quantity_Color &Color) MyLayerMgr->Resized(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBackgroundColor +//purpose : +//============================================================================= void V3d_View::SetBackgroundColor(const Quantity_NameOfColor Name) { Quantity_Color C( Name ); SetBackgroundColor( C ); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBgGradientColors +//purpose : +//============================================================================= void V3d_View::SetBgGradientColors( const Quantity_Color& Color1, const Quantity_Color& Color2, const Aspect_GradientFillMethod FillStyle, @@ -485,8 +527,10 @@ void V3d_View::SetBgGradientColors( const Quantity_Color& Color1, MyView->SetGradientBackground( MyGradientBackground, status ); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBgGradientColors +//purpose : +//============================================================================= void V3d_View::SetBgGradientColors( const Quantity_NameOfColor Color1, const Quantity_NameOfColor Color2, const Aspect_GradientFillMethod FillStyle, @@ -499,8 +543,10 @@ void V3d_View::SetBgGradientColors( const Quantity_NameOfColor Color1, MyView->SetGradientBackground( MyGradientBackground, status ); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBgGradientStyle +//purpose : +//============================================================================= void V3d_View::SetBgGradientStyle( const Aspect_GradientFillMethod FillStyle, const Standard_Boolean update) { @@ -511,8 +557,10 @@ void V3d_View::SetBgGradientStyle( const Aspect_GradientFillMethod FillStyle, MyView->SetBgGradientStyle( FillStyle, update ) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBackgroundImage +//purpose : +//============================================================================= void V3d_View::SetBackgroundImage( const Standard_CString FileName, const Aspect_FillMethod FillStyle, const Standard_Boolean update ) @@ -523,8 +571,10 @@ void V3d_View::SetBackgroundImage( const Standard_CString FileName, #endif } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetBgImageStyle +//purpose : +//============================================================================= void V3d_View::SetBgImageStyle( const Aspect_FillMethod FillStyle, const Standard_Boolean update ) { @@ -534,8 +584,10 @@ void V3d_View::SetBgImageStyle( const Aspect_FillMethod FillStyle, #endif } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetAxis +//purpose : +//============================================================================= void V3d_View::SetAxis(const Standard_Real X, const Standard_Real Y, const Standard_Real Z, const Standard_Real Vx, const Standard_Real Vy, const Standard_Real Vz) { Standard_Real D,Nx = Vx,Ny = Vy,Nz = Vz ; @@ -547,40 +599,50 @@ void V3d_View::SetAxis(const Standard_Real X, const Standard_Real Y, const Stand MyDefaultViewAxis.SetCoord(Nx,Ny,Nz) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetShadingModel +//purpose : +//============================================================================= void V3d_View::SetShadingModel(const V3d_TypeOfShadingModel Model) { MyViewContext.SetModel((Visual3d_TypeOfModel) Model) ; MyView->SetContext(MyViewContext) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetSurfaceDetail +//purpose : +//============================================================================= void V3d_View::SetSurfaceDetail(const V3d_TypeOfSurfaceDetail Model) { MyViewContext.SetSurfaceDetail((Visual3d_TypeOfSurfaceDetail) Model) ; MyView->SetContext(MyViewContext) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetTextureEnv +//purpose : +//============================================================================= void V3d_View::SetTextureEnv(const Handle(Graphic3d_TextureEnv)& ATexture) { MyViewContext.SetTextureEnv(ATexture) ; MyView->SetContext(MyViewContext) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetVisualization +//purpose : +//============================================================================= void V3d_View::SetVisualization(const V3d_TypeOfVisualization Mode) { MyViewContext.SetVisualization((Visual3d_TypeOfVisualization) Mode); MyView->SetContext(MyViewContext) ; } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : SetFront +//purpose : +//============================================================================= void V3d_View::SetFront() { gp_Ax3 a = MyViewer->PrivilegedPlane(); @@ -590,7 +652,6 @@ void V3d_View::SetFront() a.YDirection().Coord(xu,yu,zu); a.Location().Coord(xo,yo,zo); - myCamera->BeginUpdate(); myCamera->SetCenter (gp_Pnt (xo, yo, zo)); if(SwitchSetFront) myCamera->SetDirection (gp_Dir (vx, vy, vz)); @@ -599,15 +660,16 @@ void V3d_View::SetFront() myCamera->SetUp (gp_Dir (xu, yu, zu)); AutoZFit(); - myCamera->EndUpdate(); SwitchSetFront = !SwitchSetFront; ImmediateUpdate(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Rotate +//purpose : +//============================================================================= void V3d_View::Rotate (const Standard_Real ax, const Standard_Real ay, const Standard_Real az, @@ -631,7 +693,6 @@ void V3d_View::Rotate (const Standard_Real ax, myCamStartOpCenter = myCamera->Center(); } - myCamera->BeginUpdate(); myCamera->SetUp (myCamStartOpUp); myCamera->SetEye (myCamStartOpEye); myCamera->SetCenter (myCamStartOpCenter); @@ -652,15 +713,15 @@ void V3d_View::Rotate (const Standard_Real ax, myCamera->Transform (aTrsf); - myCamera->EndUpdate(); - AutoZFit(); ImmediateUpdate(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Rotate +//purpose : +//============================================================================= void V3d_View::Rotate(const Standard_Real ax, const Standard_Real ay, const Standard_Real az, const Standard_Real X, const Standard_Real Y, const Standard_Real Z, const Standard_Boolean Start) { @@ -686,7 +747,6 @@ void V3d_View::Rotate(const Standard_Real ax, const Standard_Real ay, const Stan const Graphic3d_Vertex& aVref = myGravityReferencePoint; - myCamera->BeginUpdate(); myCamera->SetUp (myCamStartOpUp); myCamera->SetEye (myCamStartOpEye); myCamera->SetCenter (myCamStartOpCenter); @@ -707,15 +767,16 @@ void V3d_View::Rotate(const Standard_Real ax, const Standard_Real ay, const Stan aTrsf.Multiply (aRot[2]); myCamera->Transform (aTrsf); - myCamera->EndUpdate(); AutoZFit(); ImmediateUpdate(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Rotate +//purpose : +//============================================================================= void V3d_View::Rotate(const V3d_TypeOfAxe Axe, const Standard_Real angle, const Standard_Boolean Start) { switch (Axe) { @@ -731,8 +792,10 @@ void V3d_View::Rotate(const V3d_TypeOfAxe Axe, const Standard_Real angle, const } } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Rotate +//purpose : +//============================================================================= void V3d_View::Rotate(const V3d_TypeOfAxe Axe, const Standard_Real angle, const Standard_Real X, const Standard_Real Y, const Standard_Real Z, const Standard_Boolean Start) { @@ -767,7 +830,6 @@ void V3d_View::Rotate(const V3d_TypeOfAxe Axe, const Standard_Real angle, const Graphic3d_Vertex& aVref = myGravityReferencePoint; - myCamera->BeginUpdate(); myCamera->SetUp (myCamStartOpUp); myCamera->SetEye (myCamStartOpEye); myCamera->SetCenter (myCamStartOpCenter); @@ -782,15 +844,15 @@ void V3d_View::Rotate(const V3d_TypeOfAxe Axe, const Standard_Real angle, aRotation.SetRotation (gp_Ax1 (aRCenter, aRAxis), Angle); myCamera->Transform (aRotation); - myCamera->EndUpdate(); - AutoZFit(); ImmediateUpdate(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Rotate +//purpose : +//============================================================================= void V3d_View::Rotate(const Standard_Real angle, const Standard_Boolean Start) { Standard_Real Angle = angle; @@ -807,7 +869,6 @@ void V3d_View::Rotate(const Standard_Real angle, const Standard_Boolean Start) const Graphic3d_Vertex& aPnt = MyDefaultViewPoint; const Graphic3d_Vector& anAxis = MyDefaultViewAxis; - myCamera->BeginUpdate(); myCamera->SetUp (myCamStartOpUp); myCamera->SetEye (myCamStartOpEye); myCamera->SetCenter (myCamStartOpCenter); @@ -818,15 +879,15 @@ void V3d_View::Rotate(const Standard_Real angle, const Standard_Boolean Start) aRotation.SetRotation (gp_Ax1 (aRCenter, aRAxis), Angle); myCamera->Transform (aRotation); - myCamera->EndUpdate(); - AutoZFit(); ImmediateUpdate(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Turn +//purpose : +//============================================================================= void V3d_View::Turn(const Standard_Real ax, const Standard_Real ay, const Standard_Real az, const Standard_Boolean Start) { Standard_Real Ax = ax; @@ -846,7 +907,6 @@ void V3d_View::Turn(const Standard_Real ax, const Standard_Real ay, const Standa myCamStartOpCenter = myCamera->Center(); } - myCamera->BeginUpdate(); myCamera->SetUp (myCamStartOpUp); myCamera->SetEye (myCamStartOpEye); myCamera->SetCenter (myCamStartOpCenter); @@ -866,15 +926,16 @@ void V3d_View::Turn(const Standard_Real ax, const Standard_Real ay, const Standa aTrsf.Multiply (aRot[2]); myCamera->Transform (aTrsf); - myCamera->EndUpdate(); AutoZFit(); ImmediateUpdate(); } -/*----------------------------------------------------------------------*/ - +//============================================================================= +//function : Turn +//purpose : +//============================================================================= void V3d_View::Turn(const V3d_TypeOfAxe Axe, const Standard_Real angle, const Standard_Boolean Start) { switch (Axe) { @@ -890,6 +951,10 @@ void V3d_View::Turn(const V3d_TypeOfAxe Axe, const Standard_Real angle, const St } } +//============================================================================= +//function : Turn +//purpose : +//============================================================================= void V3d_View::Turn(const Standard_Real angle, const Standard_Boolean Start) { Standard_Real Angle = angle ; @@ -903,7 +968,6 @@ void V3d_View::Turn(const Standard_Real angle, const Standard_Boolean Start) myCamStartOpCenter = myCamera->Center(); } - myCamera->BeginUpdate(); myCamera->SetUp (myCamStartOpUp); myCamera->SetEye (myCamStartOpEye); myCamera->SetCenter (myCamStartOpCenter); @@ -916,13 +980,15 @@ void V3d_View::Turn(const Standard_Real angle, const Standard_Boolean Start) aRotation.SetRotation (gp_Ax1 (aRCenter, aRAxis), Angle); myCamera->Transform (aRotation); - myCamera->EndUpdate(); - AutoZFit(); ImmediateUpdate(); } +//============================================================================= +//function : SetTwist +//purpose : +//============================================================================= void V3d_View::SetTwist(const Standard_Real angle) { Standard_Real Angle = angle ; @@ -959,45 +1025,68 @@ void V3d_View::SetTwist(const Standard_Real angle) Standard_Real myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ; myYscreenAxis.Coord (myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ); - - myCamera->BeginUpdate(); + myCamera->SetUp (gp_Dir (myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ)); myCamera->Transform (aTrsf); - myCamera->EndUpdate(); AutoZFit(); ImmediateUpdate(); } -void V3d_View::SetAutoZFitMode (Standard_Boolean theMode) +//============================================================================= +//function : SetAutoZFitMode +//purpose : +//============================================================================= +void V3d_View::SetAutoZFitMode (const Standard_Boolean theIsOn, const Standard_Real theScaleFactor) { - myAutoZFitMode = theMode; + Standard_ASSERT_RAISE (theScaleFactor > 0.0, "Zero or negative scale factor is not allowed."); + myAutoZFitScaleFactor = theScaleFactor; + myAutoZFitIsOn = theIsOn; } -Standard_Boolean V3d_View::AutoZFitMode () const +//============================================================================= +//function : AutoZFitMode +//purpose : +//============================================================================= +Standard_Boolean V3d_View::AutoZFitMode() const { - return myAutoZFitMode; + return myAutoZFitIsOn; } -void V3d_View::SetEye(const Standard_Real X,const Standard_Real Y,const Standard_Real Z) +//============================================================================= +//function : AutoZFitScaleFactor +//purpose : +//============================================================================= +Standard_Real V3d_View::AutoZFitScaleFactor () const { - Standard_Real Angle; - Angle = Twist(); + return myAutoZFitScaleFactor; +} - myCamera->SetEye (gp_Pnt (X, Y, Z)); +//============================================================================= +//function : SetEye +//purpose : +//============================================================================= +void V3d_View::SetEye(const Standard_Real X,const Standard_Real Y,const Standard_Real Z) +{ + Standard_Real aTwistBefore = Twist(); - Standard_Boolean update = myImmediateUpdate; - myImmediateUpdate = Standard_False; + Standard_Boolean wasUpdateEnabled = SetImmediateUpdate (Standard_False); - SetTwist(Angle); + myCamera->SetEye (gp_Pnt (X, Y, Z)); + SetTwist (aTwistBefore); AutoZFit(); - myImmediateUpdate = update; + SetImmediateUpdate (wasUpdateEnabled); + ImmediateUpdate(); } +//============================================================================= +//function : SetDepth +//purpose : +//============================================================================= void V3d_View::SetDepth(const Standard_Real Depth) { V3d_BadValue_Raise_if (Depth == 0. ,"V3d_View::SetDepth, bad depth"); @@ -1008,12 +1097,12 @@ void V3d_View::SetDepth(const Standard_Real Depth) myCamera->SetDistance (Depth); } else - { + { // Move the view ref point instead of the eye. gp_Vec aDir (myCamera->Direction()); gp_Pnt aCameraEye = myCamera->Eye(); - gp_Pnt aCameraCenter = aCameraEye.Translated (aDir.Multiplied (Abs (Depth))); - + gp_Pnt aCameraCenter = aCameraEye.Translated (aDir.Multiplied (Abs (Depth))); + myCamera->SetCenter (aCameraCenter); } @@ -1022,29 +1111,37 @@ void V3d_View::SetDepth(const Standard_Real Depth) ImmediateUpdate(); } - +//============================================================================= +//function : SetProj +//purpose : +//============================================================================= void V3d_View::SetProj( const Standard_Real Vx,const Standard_Real Vy, const Standard_Real Vz ) { - Standard_Real Angle ; - V3d_BadValue_Raise_if( Sqrt(Vx*Vx + Vy*Vy + Vz*Vz) <= 0., "V3d_View::SetProj, null projection vector"); - Angle = Twist(); + Standard_Real aTwistBefore = Twist(); - myCamera->SetDirection (gp_Dir (Vx, Vy, Vz).Reversed()); + Standard_Boolean wasUpdateEnabled = SetImmediateUpdate (Standard_False); - Standard_Boolean update = myImmediateUpdate; - myImmediateUpdate = Standard_False; + myCamera->SetDirection (gp_Dir (Vx, Vy, Vz).Reversed()); - if( MyProjModel == V3d_TPM_SCREEN ) SetTwist(Angle) ; + if (MyProjModel == V3d_TPM_SCREEN) + { + SetTwist(aTwistBefore); + } AutoZFit(); - myImmediateUpdate = update; + SetImmediateUpdate (wasUpdateEnabled); + ImmediateUpdate(); } +//============================================================================= +//function : SetProj +//purpose : +//============================================================================= void V3d_View::SetProj( const V3d_TypeOfOrientation Orientation ) { Standard_Real Xpn=0; @@ -1063,35 +1160,49 @@ void V3d_View::SetProj( const V3d_TypeOfOrientation Orientation ) } const Graphic3d_Vector& aBck = V3d::GetProjAxis (Orientation); - myCamera->BeginUpdate(); + + // retain camera panning from origin when switching projection + gp_Pnt anOriginVCS = myCamera->ConvertWorld2View (gp::Origin()); + Standard_Real aPanX = anOriginVCS.X(); + Standard_Real aPanY = anOriginVCS.Y(); + myCamera->SetCenter (gp_Pnt (0, 0, 0)); myCamera->SetDirection (gp_Dir (aBck.X(), aBck.Y(), aBck.Z()).Reversed()); myCamera->SetUp (gp_Dir (Xpn, Ypn, Zpn)); - myCamera->EndUpdate(); + myCamera->OrthogonalizeUp(); + + Panning (aPanX, aPanY); AutoZFit(); ImmediateUpdate(); } +//============================================================================= +//function : SetAt +//purpose : +//============================================================================= void V3d_View::SetAt(const Standard_Real X,const Standard_Real Y,const Standard_Real Z) { - Standard_Real Angle; + Standard_Real aTwistBefore = Twist(); - Angle = Twist(); + Standard_Boolean wasUpdateEnabled = SetImmediateUpdate (Standard_False); myCamera->SetCenter (gp_Pnt (X, Y, Z)); - Standard_Boolean update = myImmediateUpdate; - myImmediateUpdate = Standard_False; - SetTwist(Angle) ; + SetTwist (aTwistBefore); AutoZFit(); - myImmediateUpdate = update; + SetImmediateUpdate (wasUpdateEnabled); + ImmediateUpdate(); } +//============================================================================= +//function : SetUp +//purpose : +//============================================================================= void V3d_View::SetUp(const Standard_Real Vx,const Standard_Real Vy,const Standard_Real Vz) { Standard_Boolean TheStatus ; @@ -1123,14 +1234,17 @@ void V3d_View::SetUp(const Standard_Real Vx,const Standard_Real Vy,const Standar Standard_Real myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ; myYscreenAxis.Coord (myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ); - myCamera->BeginUpdate(); myCamera->SetUp (gp_Dir (myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ)); + AutoZFit(); - myCamera->EndUpdate(); ImmediateUpdate(); } +//============================================================================= +//function : SetUp +//purpose : +//============================================================================= void V3d_View::SetUp( const V3d_TypeOfOrientation Orientation ) { Standard_Boolean TheStatus ; @@ -1163,14 +1277,17 @@ void V3d_View::SetUp( const V3d_TypeOfOrientation Orientation ) Standard_Real myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ; myYscreenAxis.Coord (myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ); - myCamera->BeginUpdate(); myCamera->SetUp (gp_Dir (myYscreenAxisX, myYscreenAxisY, myYscreenAxisZ)); + AutoZFit(); - myCamera->EndUpdate(); ImmediateUpdate(); } +//============================================================================= +//function : SetViewOrientationDefault +//purpose : +//============================================================================= void V3d_View::SetViewOrientationDefault() { MyView->SetViewOrientationDefault() ; @@ -1178,6 +1295,10 @@ void V3d_View::SetViewOrientationDefault() ImmediateUpdate(); } +//============================================================================= +//function : ResetViewOrientation +//purpose : +//============================================================================= void V3d_View::ResetViewOrientation() { MyView->ViewOrientationReset() ; @@ -1185,73 +1306,61 @@ void V3d_View::ResetViewOrientation() ImmediateUpdate(); } +//============================================================================= +//function : Reset +//purpose : +//============================================================================= void V3d_View::Reset( const Standard_Boolean update ) { Handle(Graphic3d_Camera) aDefaultCamera = MyView->DefaultCamera(); if (!aDefaultCamera.IsNull()) { - myCamera->BeginUpdate(); myCamera->CopyMappingData (aDefaultCamera); myCamera->CopyOrientationData (aDefaultCamera); - myCamera->EndUpdate(); + + AutoZFit(); } - AutoZFit(); SwitchSetFront = Standard_False; if( !myImmediateUpdate && update ) Update(); } -void V3d_View::Panning(const Standard_Real Dx, const Standard_Real Dy, const Quantity_Factor aZoomFactor, const Standard_Boolean Start) -{ - V3d_BadValue_Raise_if( aZoomFactor <= 0.,"V3d_View::Panning, bad zoom factor"); - - if( Start ) { - myCamStartOpEye = myCamera->Eye(); - myCamStartOpCenter = myCamera->Center(); - myCamProjectionShift = myCamera->ProjectionShift(); - } - - myCamera->BeginUpdate(); - myCamera->SetEye (myCamStartOpEye); - myCamera->SetCenter (myCamStartOpCenter); - myCamera->SetProjectionShift (myCamProjectionShift); - PanCamera (-Dx, -Dy); - gp_Pnt aViewDims = myCamera->ViewDimensions(); - ZoomCamera (aViewDims.X() / aZoomFactor, aViewDims.Y() / aZoomFactor); - myCamera->EndUpdate(); - - ImmediateUpdate(); -} - -void V3d_View::SetCenter(const Standard_Integer X, const Standard_Integer Y) -{ - Standard_Real x,y; - Convert(X,Y,x,y); - SetCenter(x,y); -} - -void V3d_View::SetCenter(const Standard_Real Xc, const Standard_Real Yc) +//======================================================================= +//function : SetCenter +//purpose : +//======================================================================= +void V3d_View::SetCenter (const Standard_Integer theXp, + const Standard_Integer theYp) { - myCamera->SetProjectionShift (gp_Pnt (-Xc, -Yc, 0.0)); + Standard_Real aXv, aYv; + Convert (theXp, theYp, aXv, aYv); + Translate (myCamera, aXv, aYv); ImmediateUpdate(); } +//============================================================================= +//function : SetSize +//purpose : +//============================================================================= void V3d_View::SetSize(const Standard_Real Size) { V3d_BadValue_Raise_if( Size <= 0., "V3d_View::SetSize, Window Size is NULL"); - myCamera->BeginUpdate(); myCamera->SetScale (Size); + AutoZFit(); - myCamera->EndUpdate(); ImmediateUpdate(); } +//============================================================================= +//function : SetZSize +//purpose : +//============================================================================= void V3d_View::SetZSize(const Standard_Real Size) { Standard_Real Zmax = Size/2.; @@ -1265,8 +1374,38 @@ void V3d_View::SetZSize(const Standard_Real Size) Standard_Real Front = MyViewContext.ZClippingFrontPlane(); Standard_Real Back = MyViewContext.ZClippingBackPlane(); - myCamera->SetZFar (Zmax + aDistance * 2.0); - myCamera->SetZNear (-Zmax + aDistance); + // ShortReal precision factor used to add meaningful tolerance to + // ZNear, ZFar values in order to avoid equality after type conversion + // to ShortReal matrices type. + const Standard_Real aPrecision = 1.0 / Pow (10.0, ShortRealDigits() - 1); + + Standard_Real aZFar = Zmax + aDistance * 2.0; + Standard_Real aZNear = -Zmax + aDistance; + aZNear -= Abs (aZNear) * aPrecision; + aZFar += Abs (aZFar) * aPrecision; + + if (!myCamera->IsOrthographic()) + { + if (aZFar < aPrecision) + { + // Invalid case when both values are negative + aZNear = aPrecision; + aZFar = aPrecision * 2.0; + } + else if (aZNear < Abs (aZFar) * aPrecision) + { + // Z is less than 0.0, try to fix it using any appropriate z-scale + aZNear = Abs (aZFar) * aPrecision; + } + } + + // If range is too small + if (aZFar < (aZNear + Abs (aZFar) * aPrecision)) + { + aZFar = aZNear + Abs (aZFar) * aPrecision; + } + + myCamera->SetZRange (aZNear, aZFar); if (MyViewContext.FrontZClippingIsOn() || MyViewContext.BackZClippingIsOn()) @@ -1277,6 +1416,10 @@ void V3d_View::SetZSize(const Standard_Real Size) } } +//============================================================================= +//function : SetZoom +//purpose : +//============================================================================= void V3d_View::SetZoom(const Standard_Real Coef,const Standard_Boolean Start) { V3d_BadValue_Raise_if( Coef <= 0.,"V3d_View::SetZoom, bad coefficient"); @@ -1309,24 +1452,24 @@ void V3d_View::SetZoom(const Standard_Real Coef,const Standard_Boolean Start) coef = aViewHeight / 1e12; } - myCamera->BeginUpdate(); myCamera->SetEye (myCamStartOpEye); myCamera->SetCenter (myCamStartOpCenter); myCamera->SetScale (myCamera->Scale() / Coef); AutoZFit(); - myCamera->EndUpdate(); ImmediateUpdate(); } +//============================================================================= +//function : SetScale +//purpose : +//============================================================================= void V3d_View::SetScale( const Standard_Real Coef ) { V3d_BadValue_Raise_if( Coef <= 0. ,"V3d_View::SetScale, bad coefficient"); Handle(Graphic3d_Camera) aDefaultCamera = MyView->DefaultCamera(); - myCamera->BeginUpdate(); - // Strange behavior for the sake of compatibility. if (!aDefaultCamera.IsNull()) { @@ -1340,157 +1483,224 @@ void V3d_View::SetScale( const Standard_Real Coef ) } AutoZFit(); - myCamera->EndUpdate(); ImmediateUpdate(); } +//============================================================================= +//function : SetAxialScale +//purpose : +//============================================================================= void V3d_View::SetAxialScale( const Standard_Real Sx, const Standard_Real Sy, const Standard_Real Sz ) { V3d_BadValue_Raise_if( Sx <= 0. || Sy <= 0. || Sz <= 0.,"V3d_View::SetAxialScale, bad coefficient"); - myCamera->BeginUpdate(); - myCamera->SetAxialScale (gp_Pnt (Sx, Sy, Sz)); + myCamera->SetAxialScale (gp_XYZ (Sx, Sy, Sz)); AutoZFit(); - myCamera->EndUpdate(); } -void V3d_View::FitAll(const Standard_Real Coef, const Standard_Boolean update) +//============================================================================= +//function : FitAll +//purpose : +//============================================================================= +void V3d_View::FitAll (const Standard_Real theMargin, const Standard_Boolean theToUpdate) { - Standard_Real Xmin, Ymin, Zmin, Xmax, Ymax, Zmax; + Standard_ASSERT_RAISE (theMargin >= 0.0 && theMargin < 1.0, "Invalid margin coefficient"); + + if (MyView->NumberOfDisplayedStructures() == 0) + { + return; + } - // retrieve min / max values for current displayed objects - MyView->MinMaxValues (Xmin, Ymin, Zmin, - Xmax, Ymax, Zmax); + Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; + MyView->MinMaxValues (aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); + gp_XYZ aMin (aXmin, aYmin, aZmin); + gp_XYZ aMax (aXmax, aYmax, aZmax); - Standard_Real LIM = ShortRealLast() - 1.0; - if (Abs(Xmin) > LIM || Abs(Ymin) > LIM || Abs(Zmin) > LIM - || Abs(Xmax) > LIM || Abs(Ymax) > LIM || Abs(Zmax) > LIM) + if (!FitMinMax (myCamera, aMin, aMax, theMargin, 10.0 * Precision::Confusion())) { - ImmediateUpdate(); return; } - myCamera->BeginUpdate(); - FitCamera (Xmin, Ymin, Zmin, Xmax, Ymax, Zmax); - myCamera->SetScale (myCamera->Scale() * (1.0 + Coef)); AutoZFit(); - myCamera->EndUpdate(); - if (myImmediateUpdate || update) + if (myImmediateUpdate || theToUpdate) { Update(); } } -//=============================================================================================== +//============================================================================= //function : AutoZFit //purpose : -//=============================================================================================== +//============================================================================= void V3d_View::AutoZFit() { - if (myAutoZFitMode) + if (!AutoZFitMode()) { - ZFitAll(); + return; } -} - -void V3d_View::ZFitAll (const Standard_Real theCoeff) -{ - V3d_BadValue_Raise_if (theCoeff <= 0.0, "V3d_View::ZFitAll, bad margin coefficient"); - - Standard_Real aMinMax[6]; - MyView->MinMaxValues (aMinMax[0], aMinMax[1], aMinMax[2], aMinMax[3], aMinMax[4], aMinMax[5]); - - gp_Pnt aBMin = gp_Pnt (aMinMax[0], aMinMax[1], aMinMax[2]); - gp_Pnt aBMax = gp_Pnt (aMinMax[3], aMinMax[4], aMinMax[5]); + ZFitAll (myAutoZFitScaleFactor); +} - // check bounding box for validness +//============================================================================= +//function : ZFitAll +//purpose : +//============================================================================= +void V3d_View::ZFitAll (const Standard_Real theScaleFactor) +{ + Standard_ASSERT_RAISE (theScaleFactor > 0.0, "Zero or negative scale factor is not allowed."); + + // Method changes ZNear and ZFar planes of camera so as to fit the graphical structures + // by their real boundaries (computed ignoring infinite flag) into the viewing volume. + // In addition to the graphical boundaries, the usual min max used for fitting perspective + // camera. To avoid numeric errors for perspective camera the negative ZNear values are + // fixed using tolerance distance, relative to boundaries size. The tolerance distance + // should be computed using information on boundaries of primary application actors, + // (e.g. representing the displayed model) - to ensure that they are not unreasonably clipped. + + Standard_Real aMinMax[6]; // applicative min max boundaries + View()->MinMaxValues (aMinMax[0], aMinMax[1], aMinMax[2], + aMinMax[3], aMinMax[4], aMinMax[5], + Standard_False); + + Standard_Real aGraphicBB[6]; // real graphical boundaries (not accounting infinite flag). + View()->MinMaxValues (aGraphicBB[0], aGraphicBB[1], aGraphicBB[2], + aGraphicBB[3], aGraphicBB[4], aGraphicBB[5], + Standard_True); + + // Check if anything can be adjusted Standard_Real aLim = (ShortRealLast() - 1.0); - if (Abs (aBMin.X()) > aLim || Abs (aBMin.Y()) > aLim || Abs (aBMin.Z()) > aLim || - Abs (aBMax.X()) > aLim || Abs (aBMax.Y()) > aLim || Abs (aBMax.Z()) > aLim) + if (Abs (aGraphicBB[0]) > aLim || Abs (aGraphicBB[1]) > aLim || Abs (aGraphicBB[2]) > aLim || + Abs (aGraphicBB[3]) > aLim || Abs (aGraphicBB[4]) > aLim || Abs (aGraphicBB[5]) > aLim) { SetZSize (0.0); ImmediateUpdate(); return; } - // adapt bound points - gp_Pnt aPnts[8] = - { gp_Pnt (aBMin.X(), aBMin.Y(), aBMin.Z()), - gp_Pnt (aBMin.X(), aBMin.Y(), aBMax.Z()), - gp_Pnt (aBMin.X(), aBMax.Y(), aBMin.Z()), - gp_Pnt (aBMin.X(), aBMax.Y(), aBMax.Z()), - gp_Pnt (aBMax.X(), aBMin.Y(), aBMin.Z()), - gp_Pnt (aBMax.X(), aBMin.Y(), aBMax.Z()), - gp_Pnt (aBMax.X(), aBMax.Y(), aBMin.Z()), - gp_Pnt (aBMax.X(), aBMax.Y(), aBMax.Z()) }; - - // camera Eye plane - gp_Dir aDir = myCamera->Direction(); - gp_Pnt anEye = myCamera->Eye(); - gp_Pln aCamPln (anEye, aDir); - - Standard_Real aMinDist = RealLast() - 1; - Standard_Real aMaxDist = RealFirst() + 1; - - gp_Pnt anAxialScale = myCamera->AxialScale(); - - // get minimum and maximum distances to the eye plane - for (Standard_Integer aPntIt = 0; aPntIt < 8; ++aPntIt) + // Measure depth of boundary points from camera eye + gp_Pnt aPntsToMeasure[16] = + { + gp_Pnt (aMinMax[0], aMinMax[1], aMinMax[2]), + gp_Pnt (aMinMax[0], aMinMax[1], aMinMax[5]), + gp_Pnt (aMinMax[0], aMinMax[4], aMinMax[2]), + gp_Pnt (aMinMax[0], aMinMax[4], aMinMax[5]), + gp_Pnt (aMinMax[3], aMinMax[1], aMinMax[2]), + gp_Pnt (aMinMax[3], aMinMax[1], aMinMax[5]), + gp_Pnt (aMinMax[3], aMinMax[4], aMinMax[2]), + gp_Pnt (aMinMax[3], aMinMax[4], aMinMax[5]), + + gp_Pnt (aGraphicBB[0], aGraphicBB[1], aGraphicBB[2]), + gp_Pnt (aGraphicBB[0], aGraphicBB[1], aGraphicBB[5]), + gp_Pnt (aGraphicBB[0], aGraphicBB[4], aGraphicBB[2]), + gp_Pnt (aGraphicBB[0], aGraphicBB[4], aGraphicBB[5]), + gp_Pnt (aGraphicBB[3], aGraphicBB[1], aGraphicBB[2]), + gp_Pnt (aGraphicBB[3], aGraphicBB[1], aGraphicBB[5]), + gp_Pnt (aGraphicBB[3], aGraphicBB[4], aGraphicBB[2]), + gp_Pnt (aGraphicBB[3], aGraphicBB[4], aGraphicBB[5]) + }; + + // Camera eye plane + gp_Dir aCamDir = myCamera->Direction(); + gp_Pnt aCamEye = myCamera->Eye(); + gp_Pln aCamPln (aCamEye, aCamDir); + + Standard_Real aModelMinDist = RealLast(); + Standard_Real aModelMaxDist = RealFirst(); + Standard_Real aGraphicMinDist = RealLast(); + Standard_Real aGraphicMaxDist = RealFirst(); + + const gp_XYZ& anAxialScale = myCamera->AxialScale(); + + // Get minimum and maximum distances to the eye plane + for (Standard_Integer aPntIt = 0; aPntIt < 16; ++aPntIt) { - gp_Pnt aPnt = aPnts[aPntIt]; + gp_Pnt aMeasurePnt = aPntsToMeasure[aPntIt]; + + if (Abs (aMeasurePnt.X()) > aLim || Abs (aMeasurePnt.Y()) > aLim || Abs (aMeasurePnt.Z()) > aLim) + { + continue; + } - aPnt = gp_Pnt (aPnt.X() * anAxialScale.X(), - aPnt.Y() * anAxialScale.Y(), - aPnt.Z() * anAxialScale.Z()); + aMeasurePnt = gp_Pnt (aMeasurePnt.X() * anAxialScale.X(), + aMeasurePnt.Y() * anAxialScale.Y(), + aMeasurePnt.Z() * anAxialScale.Z()); - Standard_Real aDistance = aCamPln.Distance (aPnt); + Standard_Real aDistance = aCamPln.Distance (aMeasurePnt); - // check if the camera is intruded into the scene - if (aDir.IsOpposite (gp_Vec (anEye, aPnt), M_PI * 0.5)) + // Check if the camera is intruded into the scene + if (aCamDir.IsOpposite (gp_Vec (aCamEye, aMeasurePnt), M_PI * 0.5)) { aDistance *= -1; } - aMinDist = Min (aDistance, aMinDist); - aMaxDist = Max (aDistance, aMaxDist); + Standard_Real& aChangeMinDist = aPntIt >= 8 ? aGraphicMinDist : aModelMinDist; + Standard_Real& aChangeMaxDist = aPntIt >= 8 ? aGraphicMaxDist : aModelMaxDist; + aChangeMinDist = Min (aDistance, aChangeMinDist); + aChangeMaxDist = Max (aDistance, aChangeMaxDist); } - // compute depth of bounding box center - Standard_Real aMidDepth = (aMinDist + aMaxDist) * 0.5; - Standard_Real aHalfDepth = (aMaxDist - aMinDist) * 0.5; + // Compute depth of bounding box center + Standard_Real aMidDepth = (aGraphicMinDist + aGraphicMaxDist) * 0.5; + Standard_Real aHalfDepth = (aGraphicMaxDist - aGraphicMinDist) * 0.5; - // compute enlarged or shrank near and far z ranges. - Standard_Real aZNear = aMidDepth - aHalfDepth * theCoeff; - Standard_Real aZFar = aMidDepth + aHalfDepth * theCoeff; + // ShortReal precision factor used to add meaningful tolerance to + // ZNear, ZFar values in order to avoid equality after type conversion + // to ShortReal matrices type. + const Standard_Real aPrecision = 1.0 / Pow (10.0, ShortRealDigits() - 1); - myCamera->BeginUpdate(); + // Compute enlarged or shrank near and far z ranges + Standard_Real aZNear = aMidDepth - aHalfDepth * theScaleFactor; + Standard_Real aZFar = aMidDepth + aHalfDepth * theScaleFactor; + aZNear -= Abs (aZNear) * aPrecision; + aZFar += Abs (aZFar) * aPrecision; - if (myCamera->IsOrthographic()) + if (!myCamera->IsOrthographic()) { - myCamera->SetZFar (myCamera->Distance() * 3.0); - myCamera->SetZNear (0.0); + if (aZFar >= aPrecision) + { + // To avoid numeric errors... (See comments in the beginning of the method). + // Choose between model distance and graphical distance, as the model boundaries + // might be infinite if all structures have infinite flag. + const Standard_Real aGraphicDepth = aGraphicMaxDist >= aGraphicMinDist + ? aGraphicMaxDist - aGraphicMinDist : RealLast(); - if (aZNear < 0.0) + const Standard_Real aModelDepth = aModelMaxDist >= aModelMinDist + ? aModelMaxDist - aModelMinDist : RealLast(); + + const Standard_Real aMinDepth = Min (aModelDepth, aGraphicDepth); + const Standard_Real aZTolerance = + Max (Abs (aMinDepth) * aPrecision, aPrecision); + + if (aZNear < aZTolerance) + { + aZNear = aZTolerance; + } + } + else // aZFar < aPrecision - Invalid case when both ZNear and ZFar are negative { - myCamera->SetDistance (myCamera->Distance() - (aZNear + myCamera->ZNear()) + 10.0); + aZNear = aPrecision; + aZFar = aPrecision * 2.0; } } - else + + // If range is too small + if (aZFar < (aZNear + Abs (aZFar) * aPrecision)) { - myCamera->SetZFar (aZFar); - myCamera->SetZNear (aZNear); + aZFar = aZNear + Abs (aZFar) * aPrecision; } - myCamera->EndUpdate(); + myCamera->SetZRange (aZNear, aZFar); ImmediateUpdate(); } - -// Better to use ZFitAll instead. +//============================================================================= +//function : DepthFitAll +//purpose : +//============================================================================= void V3d_View::DepthFitAll(const Quantity_Coefficient Aspect, const Quantity_Coefficient Margin) { @@ -1564,20 +1774,41 @@ void V3d_View::DepthFitAll(const Quantity_Coefficient Aspect, ImmediateUpdate(); } -void V3d_View::FitAll(const Standard_Real Xmin, const Standard_Real Ymin, const Standard_Real Xmax, const Standard_Real Ymax) +//============================================================================= +//function : FitAll +//purpose : +//============================================================================= +void V3d_View::FitAll(const Standard_Real theMinXv, + const Standard_Real theMinYv, + const Standard_Real theMaxXv, + const Standard_Real theMaxYv) { - FitAll(MyWindow,Xmin,Ymin,Xmax,Ymax); - - ImmediateUpdate(); + FitAll (MyWindow, theMinXv, theMinYv, theMaxXv, theMaxYv); } -void V3d_View::WindowFitAll(const Standard_Integer Xmin, const Standard_Integer Ymin, const Standard_Integer Xmax, const Standard_Integer Ymax) +//============================================================================= +//function : WindowFitAll +//purpose : +//============================================================================= +void V3d_View::WindowFitAll(const Standard_Integer Xmin, + const Standard_Integer Ymin, + const Standard_Integer Xmax, + const Standard_Integer Ymax) { WindowFit(Xmin,Ymin,Xmax,Ymax); } -void V3d_View::WindowFit(const Standard_Integer Xmin, const Standard_Integer Ymin, const Standard_Integer Xmax, const Standard_Integer Ymax) +//======================================================================= +//function : WindowFit +//purpose : +//======================================================================= +void V3d_View::WindowFit (const Standard_Integer theMinXp, + const Standard_Integer theMinYp, + const Standard_Integer theMaxXp, + const Standard_Integer theMaxYp) { + Standard_Boolean wasUpdateEnabled = SetImmediateUpdate (Standard_False); + if (!myCamera->IsOrthographic()) { // normalize view coordiantes @@ -1588,10 +1819,10 @@ void V3d_View::WindowFit(const Standard_Integer Xmin, const Standard_Integer Ymi Standard_Real aDepth = myCamera->Project (myCamera->Center()).Z(); // camera projection coordinate are in NDC which are normalized [-1, 1] - Standard_Real aUMin = (2.0 / aWinWidth) * Xmin - 1.0; - Standard_Real aUMax = (2.0 / aWinWidth) * Xmax - 1.0; - Standard_Real aVMin = (2.0 / aWinHeight) * Ymin - 1.0; - Standard_Real aVMax = (2.0 / aWinHeight) * Ymax - 1.0; + Standard_Real aUMin = (2.0 / aWinWidth) * theMinXp - 1.0; + Standard_Real aUMax = (2.0 / aWinWidth) * theMaxXp - 1.0; + Standard_Real aVMin = (2.0 / aWinHeight) * theMinYp - 1.0; + Standard_Real aVMax = (2.0 / aWinHeight) * theMaxYp - 1.0; // compute camera panning gp_Pnt aScreenCenter (0.0, 0.0, aDepth); @@ -1609,22 +1840,27 @@ void V3d_View::WindowFit(const Standard_Integer Xmin, const Standard_Integer Ymi Standard_Real aUSize = aViewTopRight.X() - aViewBotLeft.X(); Standard_Real aVSize = aViewTopRight.Y() - aViewBotLeft.Y(); - myCamera->BeginUpdate(); - PanCamera (aPanVec.X(), -aPanVec.Y()); - ZoomCamera (aUSize, aVSize); + Translate (myCamera, aPanVec.X(), -aPanVec.Y()); + Scale (myCamera, aUSize, aVSize); AutoZFit(); - myCamera->EndUpdate(); } else { - Standard_Real x1,y1,x2,y2; - Convert(Xmin,Ymin,x1,y1); - Convert(Xmax,Ymax,x2,y2); - - FitAll(x1,y1,x2,y2); + Standard_Real aX1, aY1, aX2, aY2; + Convert (theMinXp, theMinYp, aX1, aY1); + Convert (theMaxXp, theMaxYp, aX2, aY2); + FitAll (aX1, aY1, aX2, aY2); } + + SetImmediateUpdate (wasUpdateEnabled); + + ImmediateUpdate(); } +//======================================================================= +//function : SetViewMappingDefault +//purpose : +//======================================================================= void V3d_View::SetViewMappingDefault() { MyView->SetViewMappingDefault(); @@ -1632,6 +1868,10 @@ void V3d_View::SetViewMappingDefault() ImmediateUpdate(); } +//======================================================================= +//function : ResetViewMapping +//purpose : +//======================================================================= void V3d_View::ResetViewMapping() { MyView->ViewMappingReset(); @@ -1639,7 +1879,15 @@ void V3d_View::ResetViewMapping() Update(); } -void V3d_View::ConvertToGrid(const Standard_Integer Xp, const Standard_Integer Yp, Standard_Real& Xg, Standard_Real& Yg, Standard_Real& Zg) const +//======================================================================= +//function : ConvertToGrid +//purpose : +//======================================================================= +void V3d_View::ConvertToGrid(const Standard_Integer Xp, + const Standard_Integer Yp, + Standard_Real& Xg, + Standard_Real& Yg, + Standard_Real& Zg) const { Graphic3d_Vertex aVrp; Standard_Real anX, anY, aZ; @@ -1653,7 +1901,16 @@ void V3d_View::ConvertToGrid(const Standard_Integer Xp, const Standard_Integer Y aVrp.Coord (Xg,Yg,Zg) ; } -void V3d_View::ConvertToGrid(const Standard_Real X, const Standard_Real Y, const Standard_Real Z, Standard_Real& Xg, Standard_Real& Yg, Standard_Real& Zg) const +//======================================================================= +//function : ConvertToGrid +//purpose : +//======================================================================= +void V3d_View::ConvertToGrid(const Standard_Real X, + const Standard_Real Y, + const Standard_Real Z, + Standard_Real& Xg, + Standard_Real& Yg, + Standard_Real& Zg) const { if( MyViewer->Grid()->IsActive() ) { Graphic3d_Vertex aVrp (X,Y,Z) ; @@ -1664,7 +1921,10 @@ void V3d_View::ConvertToGrid(const Standard_Real X, const Standard_Real Y, const } } - +//======================================================================= +//function : Convert +//purpose : +//======================================================================= Standard_Real V3d_View::Convert(const Standard_Integer Vp) const { Standard_Integer aDxw, aDyw ; @@ -1673,14 +1933,21 @@ Standard_Real V3d_View::Convert(const Standard_Integer Vp) const MyWindow->Size (aDxw, aDyw); Standard_Real aValue; - + gp_Pnt aViewDims = myCamera->ViewDimensions(); aValue = aViewDims.X() * (Standard_Real)Vp / (Standard_Real)aDxw; return aValue; } -void V3d_View::Convert(const Standard_Integer Xp, const Standard_Integer Yp, Standard_Real& Xv, Standard_Real& Yv) const +//======================================================================= +//function : Convert +//purpose : +//======================================================================= +void V3d_View::Convert(const Standard_Integer Xp, + const Standard_Integer Yp, + Standard_Real& Xv, + Standard_Real& Yv) const { Standard_Integer aDxw, aDyw; @@ -1695,6 +1962,10 @@ void V3d_View::Convert(const Standard_Integer Xp, const Standard_Integer Yp, Sta Yv = aPoint.Y(); } +//======================================================================= +//function : Convert +//purpose : +//======================================================================= Standard_Integer V3d_View::Convert(const Standard_Real Vv) const { V3d_UnMapped_Raise_if (!MyView->IsDefined(), "view has no window"); @@ -1708,7 +1979,14 @@ Standard_Integer V3d_View::Convert(const Standard_Real Vv) const return aValue; } -void V3d_View::Convert(const Standard_Real Xv, const Standard_Real Yv, Standard_Integer& Xp, Standard_Integer& Yp) const +//======================================================================= +//function : Convert +//purpose : +//======================================================================= +void V3d_View::Convert(const Standard_Real Xv, + const Standard_Real Yv, + Standard_Integer& Xp, + Standard_Integer& Yp) const { V3d_UnMapped_Raise_if (!MyView->IsDefined(), "view has no window"); @@ -1723,7 +2001,15 @@ void V3d_View::Convert(const Standard_Real Xv, const Standard_Real Yv, Standard_ Yp = RealToInt (aPoint.Y()); } -void V3d_View::Convert(const Standard_Integer Xp, const Standard_Integer Yp, Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const +//======================================================================= +//function : Convert +//purpose : +//======================================================================= +void V3d_View::Convert(const Standard_Integer Xp, + const Standard_Integer Yp, + Standard_Real& X, + Standard_Real& Y, + Standard_Real& Z) const { V3d_UnMapped_Raise_if (!MyView->IsDefined(), "view has no window"); Standard_Integer aHeight, aWidth; @@ -1748,7 +2034,18 @@ void V3d_View::Convert(const Standard_Integer Xp, const Standard_Integer Yp, Sta } } -void V3d_View::ConvertWithProj(const Standard_Integer Xp, const Standard_Integer Yp, Standard_Real& X, Standard_Real& Y, Standard_Real& Z, Standard_Real& Dx, Standard_Real& Dy, Standard_Real& Dz) const +//======================================================================= +//function : ConvertWithProj +//purpose : +//======================================================================= +void V3d_View::ConvertWithProj(const Standard_Integer Xp, + const Standard_Integer Yp, + Standard_Real& X, + Standard_Real& Y, + Standard_Real& Z, + Standard_Real& Dx, + Standard_Real& Dy, + Standard_Real& Dz) const { V3d_UnMapped_Raise_if( !MyView->IsDefined(), "view has no window"); Standard_Integer aHeight, aWidth; @@ -1779,7 +2076,15 @@ void V3d_View::ConvertWithProj(const Standard_Integer Xp, const Standard_Integer } } -void V3d_View::Convert(const Standard_Real X, const Standard_Real Y, const Standard_Real Z, Standard_Integer& Xp, Standard_Integer& Yp) const +//======================================================================= +//function : Convert +//purpose : +//======================================================================= +void V3d_View::Convert(const Standard_Real X, + const Standard_Real Y, + const Standard_Real Z, + Standard_Integer& Xp, + Standard_Integer& Yp) const { V3d_UnMapped_Raise_if( !MyView->IsDefined(), "view has no window"); Standard_Integer aHeight, aWidth; @@ -1791,33 +2096,64 @@ void V3d_View::Convert(const Standard_Real X, const Standard_Real Y, const Stand Yp = RealToInt ((aPoint.Y() + 1) * 0.5 * aHeight); } -void V3d_View::Project(const Standard_Real X, const Standard_Real Y, const Standard_Real Z, Standard_Real &Xp, Standard_Real &Yp) const +//======================================================================= +//function : Project +//purpose : +//======================================================================= +void V3d_View::Project(const Standard_Real X, + const Standard_Real Y, + const Standard_Real Z, + Standard_Real &Xp, + Standard_Real &Yp) const { Standard_Real Zp; MyView->Projects (X, Y, Z, Xp, Yp, Zp); } -void V3d_View::BackgroundColor(const Quantity_TypeOfColor Type,Standard_Real& V1, Standard_Real& V2, Standard_Real& V3) const +//======================================================================= +//function : BackgroundColor +//purpose : +//======================================================================= +void V3d_View::BackgroundColor(const Quantity_TypeOfColor Type, + Standard_Real& V1, + Standard_Real& V2, + Standard_Real& V3) const { Quantity_Color C = BackgroundColor() ; C.Values(V1,V2,V3,Type) ; } +//======================================================================= +//function : BackgroundColor +//purpose : +//======================================================================= Quantity_Color V3d_View::BackgroundColor() const { return MyBackground.Color() ; } +//======================================================================= +//function : GradientBackgroundColors +//purpose : +//======================================================================= void V3d_View::GradientBackgroundColors(Quantity_Color& Color1,Quantity_Color& Color2) const { MyGradientBackground.Colors(Color1, Color2); } +//======================================================================= +//function : GradientBackground +//purpose : +//======================================================================= Aspect_GradientBackground V3d_View::GradientBackground() const { return MyGradientBackground; } +//======================================================================= +//function : Scale +//purpose : +//======================================================================= Standard_Real V3d_View::Scale() const { Handle(Graphic3d_Camera) aDefaultCamera = MyView->DefaultCamera(); @@ -1838,6 +2174,10 @@ Standard_Real V3d_View::Scale() const return aCameraScale; } +//======================================================================= +//function : AxialScale +//purpose : +//======================================================================= void V3d_View::AxialScale(Standard_Real& Sx, Standard_Real& Sy, Standard_Real& Sz) const { gp_Pnt anAxialScale = myCamera->AxialScale(); @@ -1846,14 +2186,10 @@ void V3d_View::AxialScale(Standard_Real& Sx, Standard_Real& Sy, Standard_Real& S Sz = anAxialScale.Z(); } -void V3d_View::Center(Standard_Real& Xc, Standard_Real& Yc) const -{ - gp_Pnt aCamProjShift = myCamera->ProjectionShift(); - - Xc = -aCamProjShift.X(); - Yc = -aCamProjShift.Y(); -} - +//======================================================================= +//function : Size +//purpose : +//======================================================================= void V3d_View::Size(Standard_Real& Width, Standard_Real& Height) const { gp_Pnt aViewDims = myCamera->ViewDimensions(); @@ -1862,6 +2198,10 @@ void V3d_View::Size(Standard_Real& Width, Standard_Real& Height) const Height = aViewDims.Y(); } +//======================================================================= +//function : ZSize +//purpose : +//======================================================================= Standard_Real V3d_View::ZSize() const { gp_Pnt aViewDims = myCamera->ViewDimensions(); @@ -1869,7 +2209,14 @@ Standard_Real V3d_View::ZSize() const return aViewDims.Z(); } -Standard_Integer V3d_View::MinMax(Standard_Real& Umin, Standard_Real& Vmin, Standard_Real& Umax, Standard_Real& Vmax) const +//======================================================================= +//function : MinMax +//purpose : +//======================================================================= +Standard_Integer V3d_View::MinMax(Standard_Real& Umin, + Standard_Real& Vmin, + Standard_Real& Umax, + Standard_Real& Vmax) const { Standard_Real Wmin,Wmax,U,V,W ; Standard_Real Xmin,Ymin,Zmin,Xmax,Ymax,Zmax ; @@ -1908,7 +2255,16 @@ Standard_Integer V3d_View::MinMax(Standard_Real& Umin, Standard_Real& Vmin, Stan return Nstruct ; } -Standard_Integer V3d_View::MinMax(Standard_Real& Xmin, Standard_Real& Ymin, Standard_Real& Zmin, Standard_Real& Xmax, Standard_Real& Ymax, Standard_Real& Zmax) const +//======================================================================= +//function : MinMax +//purpose : +//======================================================================= +Standard_Integer V3d_View::MinMax(Standard_Real& Xmin, + Standard_Real& Ymin, + Standard_Real& Zmin, + Standard_Real& Xmax, + Standard_Real& Ymax, + Standard_Real& Zmax) const { // CAL 6/11/98 // Standard_Integer Nstruct = (MyView->DisplayedStructures())->Extent() ; @@ -1920,6 +2276,10 @@ Standard_Integer V3d_View::MinMax(Standard_Real& Xmin, Standard_Real& Ymin, Stan return Nstruct ; } +//======================================================================= +//function : Gravity +//purpose : +//======================================================================= Standard_Integer V3d_View::Gravity(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const { Standard_Real Xmin,Ymin,Zmin,Xmax,Ymax,Zmax; @@ -1939,6 +2299,14 @@ Standard_Integer V3d_View::Gravity(Standard_Real& X, Standard_Real& Y, Standard_ { aStruct->MinMaxValues (Xmin, Ymin, Zmin, Xmax, Ymax, Zmax); + // Check bounding box for validness + Standard_Real aLim = (ShortRealLast() - 1.0); + if (Abs (Xmin) > aLim || Abs (Ymin) > aLim || Abs (Zmin) > aLim || + Abs (Xmax) > aLim || Abs (Ymax) > aLim || Abs (Zmax) > aLim) + { + continue; + } + // use camera projection to find gravity point gp_Pnt aPnts[8] = { gp_Pnt (Xmin, Ymin, Zmin), gp_Pnt (Xmin, Ymin, Zmax), @@ -1970,6 +2338,10 @@ Standard_Integer V3d_View::Gravity(Standard_Real& X, Standard_Real& Y, Standard_ return Nstruct ; } +//======================================================================= +//function : Eye +//purpose : +//======================================================================= void V3d_View::Eye(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const { gp_Pnt aCameraEye = myCamera->Eye(); @@ -1978,12 +2350,27 @@ void V3d_View::Eye(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const Z = aCameraEye.Z(); } +//============================================================================= +//function : FocalReferencePoint +//purpose : +//============================================================================= void V3d_View::FocalReferencePoint(Standard_Real& X, Standard_Real& Y,Standard_Real& Z) const { Eye (X,Y,Z); } -void V3d_View::ProjReferenceAxe(const Standard_Integer Xpix, const Standard_Integer Ypix, Standard_Real& XP, Standard_Real& YP, Standard_Real& ZP, Standard_Real& VX, Standard_Real& VY, Standard_Real& VZ) const +//============================================================================= +//function : ProjReferenceAxe +//purpose : +//============================================================================= +void V3d_View::ProjReferenceAxe(const Standard_Integer Xpix, + const Standard_Integer Ypix, + Standard_Real& XP, + Standard_Real& YP, + Standard_Real& ZP, + Standard_Real& VX, + Standard_Real& VY, + Standard_Real& VZ) const { Standard_Real Xo,Yo,Zo; @@ -2001,11 +2388,19 @@ void V3d_View::ProjReferenceAxe(const Standard_Integer Xpix, const Standard_Inte } } +//============================================================================= +//function : Depth +//purpose : +//============================================================================= Standard_Real V3d_View::Depth() const { return myCamera->Distance(); } +//============================================================================= +//function : Proj +//purpose : +//============================================================================= void V3d_View::Proj(Standard_Real& Dx, Standard_Real& Dy, Standard_Real& Dz) const { gp_Dir aCameraDir = myCamera->Direction().Reversed(); @@ -2014,6 +2409,10 @@ void V3d_View::Proj(Standard_Real& Dx, Standard_Real& Dy, Standard_Real& Dz) con Dz = aCameraDir.Z(); } +//============================================================================= +//function : At +//purpose : +//============================================================================= void V3d_View::At(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const { gp_Pnt aCameraCenter = myCamera->Center(); @@ -2022,6 +2421,10 @@ void V3d_View::At(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const Z = aCameraCenter.Z(); } +//============================================================================= +//function : Up +//purpose : +//============================================================================= void V3d_View::Up(Standard_Real& Vx, Standard_Real& Vy, Standard_Real& Vz) const { gp_Dir aCameraUp = myCamera->Up(); @@ -2030,6 +2433,10 @@ void V3d_View::Up(Standard_Real& Vx, Standard_Real& Vy, Standard_Real& Vz) const Vz = aCameraUp.Z(); } +//============================================================================= +//function : Twist +//purpose : +//============================================================================= Standard_Real V3d_View::Twist() const { Standard_Real Xup,Yup,Zup,Xpn,Ypn,Zpn,X0,Y0,Z0 ; @@ -2073,24 +2480,40 @@ Standard_Real V3d_View::Twist() const return angle ; } +//============================================================================= +//function : ShadingModel +//purpose : +//============================================================================= V3d_TypeOfShadingModel V3d_View::ShadingModel() const { V3d_TypeOfShadingModel SM = (V3d_TypeOfShadingModel)MyViewContext.Model() ; return SM ; } +//============================================================================= +//function : SurfaceDetail +//purpose : +//============================================================================= V3d_TypeOfSurfaceDetail V3d_View::SurfaceDetail() const { V3d_TypeOfSurfaceDetail SM = (V3d_TypeOfSurfaceDetail)MyViewContext.SurfaceDetail() ; return SM ; } +//============================================================================= +//function : TextureEnv +//purpose : +//============================================================================= Handle_Graphic3d_TextureEnv V3d_View::TextureEnv() const { Handle(Graphic3d_TextureEnv) SM = MyViewContext.TextureEnv() ; return SM ; } +//============================================================================= +//function : Visualization +//purpose : +//============================================================================= V3d_TypeOfVisualization V3d_View::Visualization() const { V3d_TypeOfVisualization V = @@ -2098,33 +2521,57 @@ V3d_TypeOfVisualization V3d_View::Visualization() const return V ; } +//============================================================================= +//function : Antialiasing +//purpose : +//============================================================================= Standard_Boolean V3d_View::Antialiasing() const { Standard_Boolean A = MyViewContext.AliasingIsOn() ; return A ; } +//============================================================================= +//function : Viewer +//purpose : +//============================================================================= Handle(V3d_Viewer) V3d_View::Viewer() const { return MyViewer ; } +//============================================================================= +//function : IfWindow +//purpose : +//============================================================================= Standard_Boolean V3d_View::IfWindow() const { Standard_Boolean TheStatus = MyView->IsDefined() ; return TheStatus ; } +//============================================================================= +//function : Window +//purpose : +//============================================================================= Handle(Aspect_Window) V3d_View::Window() const { return MyWindow; } +//============================================================================= +//function : Type +//purpose : +//============================================================================= V3d_TypeOfView V3d_View::Type() const { return myCamera->IsOrthographic() ? V3d_ORTHOGRAPHIC : V3d_PERSPECTIVE; } +//============================================================================= +//function : SetFocale +//purpose : +//============================================================================= void V3d_View::SetFocale( const Standard_Real focale ) { if (myCamera->IsOrthographic()) @@ -2139,6 +2586,10 @@ void V3d_View::SetFocale( const Standard_Real focale ) ImmediateUpdate(); } +//============================================================================= +//function : Focale +//purpose : +//============================================================================= Standard_Real V3d_View::Focale() const { if (myCamera->IsOrthographic()) @@ -2149,37 +2600,19 @@ Standard_Real V3d_View::Focale() const return myCamera->Distance() * 2.0 * Tan(myCamera->FOVy() * M_PI / 360.0); } -void V3d_View::SetViewingVolume(const Standard_Real Left, const Standard_Real Right, - const Standard_Real Bottom, const Standard_Real Top, - const Standard_Real ZNear, const Standard_Real ZFar) -{ - V3d_BadValue_Raise_if (ZNear >= ZFar, "V3d_View::SetVolume, bad distances"); - - - myCamera->BeginUpdate(); - - myCamera->SetZFar (ZFar); - myCamera->SetZNear (ZNear); - - myCamera->SetScale (Top - Bottom); - myCamera->SetAspect ((Right - Left) / (Top - Bottom)); - gp_Pnt aCameraProjShift (-(Left + Right) / 2.0, -(Bottom + Top) / 2.0, 0.0); - myCamera->SetProjectionShift (aCameraProjShift); - if (myCamera->IsOrthographic()) - { - myCamera->SetDistance (Abs (ZNear)); - } - AutoZFit(); - myCamera->EndUpdate(); - - ImmediateUpdate(); -} - +//============================================================================= +//function : View +//purpose : +//============================================================================= Handle(Visual3d_View) V3d_View::View() const { return MyView ; } +//============================================================================= +//function : ScreenAxis +//purpose : +//============================================================================= Standard_Boolean V3d_View::ScreenAxis( const gp_Dir &Vpn, const gp_Dir &Vup, Graphic3d_Vector &Xaxe, Graphic3d_Vector &Yaxe, Graphic3d_Vector &Zaxe) { Standard_Real Xpn, Ypn, Zpn, Xup, Yup, Zup; @@ -2206,6 +2639,10 @@ Standard_Boolean V3d_View::ScreenAxis( const gp_Dir &Vpn, const gp_Dir &Vup, Gra return Standard_True; } +//============================================================================= +//function : TrsPoint +//purpose : +//============================================================================= Graphic3d_Vertex V3d_View::TrsPoint( const Graphic3d_Vertex &P, const TColStd_Array2OfReal &Matrix ) { Graphic3d_Vertex PP ; @@ -2235,104 +2672,140 @@ Graphic3d_Vertex V3d_View::TrsPoint( const Graphic3d_Vertex &P, const TColStd_Ar return PP ; } -void V3d_View::Pan(const Standard_Integer Dx, const Standard_Integer Dy,const Quantity_Factor aZoomFactor) +//======================================================================= +//function : Pan +//purpose : +//======================================================================= +void V3d_View::Pan (const Standard_Integer theDXp, + const Standard_Integer theDYp, + const Quantity_Factor theZoomFactor, + const Standard_Boolean theToStart) { - Panning (Convert(Dx), Convert(Dy), aZoomFactor, Standard_True); + Panning (Convert (theDXp), Convert (theDYp), theZoomFactor, theToStart); } -void V3d_View::Zoom (const Standard_Integer X1, - const Standard_Integer Y1, - const Standard_Integer X2, - const Standard_Integer Y2) +//======================================================================= +//function : Panning +//purpose : +//======================================================================= +void V3d_View::Panning (const Standard_Real theDXv, + const Standard_Real theDYv, + const Quantity_Factor theZoomFactor, + const Standard_Boolean theToStart) { + Standard_ASSERT_RAISE (theZoomFactor > 0.0, "Bad zoom factor"); - Standard_Real dx = Standard_Real (X2-X1); - Standard_Real dy = Standard_Real (Y2-Y1); - if ( dx != 0. || dy != 0. ) { - Standard_Real dzoom = Sqrt(dx*dx + dy*dy) / 100. + 1; - dzoom = (dx > 0) ? dzoom : 1./dzoom; - SetZoom(dzoom, Standard_True); + if (theToStart) + { + myCamStartOpEye = myCamera->Eye(); + myCamStartOpCenter = myCamera->Center(); } + + Standard_Boolean wasUpdateEnabled = SetImmediateUpdate (Standard_False); + + gp_Pnt aViewDims = myCamera->ViewDimensions(); + + myCamera->SetEye (myCamStartOpEye); + myCamera->SetCenter (myCamStartOpCenter); + Translate (myCamera, -theDXv, -theDYv); + Scale (myCamera, aViewDims.X() / theZoomFactor, aViewDims.Y() / theZoomFactor); + + SetImmediateUpdate (wasUpdateEnabled); + + ImmediateUpdate(); } -void V3d_View::Zoom (const Standard_Integer X1, - const Standard_Integer Y1) -{ - Standard_Real x,y; - Center(x,y); - Standard_Integer ix,iy; - Convert(x,y,ix,iy); - Zoom(ix,iy,X1,Y1); +//======================================================================= +//function : Zoom +//purpose : +//======================================================================= +void V3d_View::Zoom (const Standard_Integer theXp1, + const Standard_Integer theYp1, + const Standard_Integer theXp2, + const Standard_Integer theYp2) +{ + Standard_Integer aDx = theXp2 - theXp1; + Standard_Integer aDy = theYp2 - theYp1; + if (aDx != 0 || aDy != 0) + { + Standard_Real aCoeff = Sqrt( (Standard_Real)(aDx * aDx + aDy * aDy) ) / 100.0 + 1.0; + aCoeff = (aDx > 0) ? aCoeff : 1.0 / aCoeff; + SetZoom (aCoeff, Standard_True); + } } -// Defines the point (pixel) of zooming (for the method ZoomAtPoint()). -void V3d_View::StartZoomAtPoint(const Standard_Integer xpix, const Standard_Integer ypix) +//======================================================================= +//function : StartZoomAtPoint +//purpose : +//======================================================================= +void V3d_View::StartZoomAtPoint (const Standard_Integer theXp, + const Standard_Integer theYp) { - MyZoomAtPointX = xpix; - MyZoomAtPointY = ypix; + MyZoomAtPointX = theXp; + MyZoomAtPointY = theYp; } -// Zooms the model at a pixel defined by the method StartZoomAtPoint(). -void V3d_View::ZoomAtPoint(const Standard_Integer mouseStartX, - const Standard_Integer mouseStartY, - const Standard_Integer mouseEndX, - const Standard_Integer mouseEndY) +//======================================================================= +//function : ZoomAtPoint +//purpose : +//======================================================================= +void V3d_View::ZoomAtPoint (const Standard_Integer theMouseStartX, + const Standard_Integer theMouseStartY, + const Standard_Integer theMouseEndX, + const Standard_Integer theMouseEndY) { - Standard_Boolean update; - V3d_Coordinate X0, Y0, XS, YS; + Standard_Boolean wasUpdateEnabled = SetImmediateUpdate (Standard_False); - // Forbid any update. - update = SetImmediateUpdate(Standard_False); + // zoom + Standard_Real aDxy = Standard_Real ((theMouseEndX + theMouseEndY) - (theMouseStartX + theMouseStartY)); + Standard_Real aDZoom = Abs (aDxy) / 100.0 + 1.0; + aDZoom = (aDxy > 0.0) ? aDZoom : 1.0 / aDZoom; - // Get center point - Center(X0, Y0); + V3d_BadValue_Raise_if (aDZoom <= 0.0, "V3d_View::ZoomAtPoint, bad coefficient"); - // Pan the point to the center of window. - Convert(MyZoomAtPointX, MyZoomAtPointY, XS, YS); - Panning(X0-XS, Y0-YS); + Standard_Real aViewWidth = myCamera->ViewDimensions().X(); + Standard_Real aViewHeight = myCamera->ViewDimensions().Y(); - // Zoom - Standard_Real d = Standard_Real ((mouseEndX + mouseEndY) - (mouseStartX + mouseStartY)); + // ensure that zoom will not be too small or too big. + Standard_Real aCoef = aDZoom; + if (aViewWidth < aCoef * Precision::Confusion()) + { + aCoef = aViewWidth / Precision::Confusion(); + } + else if (aViewWidth > aCoef * 1e12) + { + aCoef = aViewWidth / 1e12; + } + if (aViewHeight < aCoef * Precision::Confusion()) + { + aCoef = aViewHeight / Precision::Confusion(); + } + else if (aViewHeight > aCoef * 1e12) + { + aCoef = aViewHeight / 1e12; + } - Standard_Real dzoom = fabs(d) / 100.0 + 1.0; - dzoom = (d > 0) ? dzoom : 1.0 / dzoom; - V3d_BadValue_Raise_if( dzoom <= 0.,"V3d_View::ZoomAtPoint, bad coefficient"); + Standard_Real aZoomAtPointXv = 0.0; + Standard_Real aZoomAtPointYv = 0.0; + Convert (MyZoomAtPointX, MyZoomAtPointY, aZoomAtPointXv, aZoomAtPointYv); - Standard_Real aViewWidth = myCamera->ViewDimensions().X(); - Standard_Real aViewHeight = myCamera->ViewDimensions().Y(); + V3d_Coordinate aDxv = aZoomAtPointXv / aCoef; + V3d_Coordinate aDyv = aZoomAtPointYv / aCoef; - // Ensure that zoom will not be too small or too big. - Standard_Real coef = dzoom; - if (aViewWidth < coef * Precision::Confusion()) - { - coef = aViewWidth / Precision::Confusion(); - } - else if (aViewWidth > coef * 1e12) - { - coef = aViewWidth / 1e12; - } - if (aViewHeight < coef * Precision::Confusion()) - { - coef = aViewHeight / Precision::Confusion(); - } - else if (aViewHeight > coef * 1e12) - { - coef = aViewHeight / 1e12; - } - - V3d_Coordinate Dxv = (XS - X0) / coef; - V3d_Coordinate Dyv = (YS - Y0) / coef; + myCamera->SetScale (myCamera->Scale() / aCoef); + Translate (myCamera, aZoomAtPointXv - aDxv, aZoomAtPointYv - aDyv); - myCamera->SetScale (myCamera->Scale() / coef); - PanCamera (-Dxv, -Dyv); + AutoZFit(); - AutoZFit(); + SetImmediateUpdate (wasUpdateEnabled); - // Update the view. - SetImmediateUpdate(update); - ImmediateUpdate(); + ImmediateUpdate(); } +//============================================================================= +//function : AxialScale +//purpose : +//============================================================================= void V3d_View::AxialScale (const Standard_Integer Dx, const Standard_Integer Dy, const V3d_TypeOfAxe Axis) @@ -2349,38 +2822,44 @@ void V3d_View::AxialScale (const Standard_Integer Dx, } } - +//============================================================================= +//function : FitAll +//purpose : +//============================================================================= void V3d_View::FitAll(const Handle(Aspect_Window)& aWindow, const Standard_Real Xmin, const Standard_Real Ymin, const Standard_Real Xmax, const Standard_Real Ymax) { - // normalize view coordinates Standard_Integer aWinWidth, aWinHeight; aWindow->Size (aWinWidth, aWinHeight); - // compute camera panning - gp_Vec aPanVec ((Xmin + Xmax) * 0.5, (Ymin + Ymax) * 0.5, 0.0); - - // compute section size - gp_Pnt aViewBotLeft (Xmin, Ymin, 0.0); - gp_Pnt aViewTopRight (Xmax, Ymax, 0.0); - - Standard_Real aUSize = Abs (Xmax - Xmin); - Standard_Real aVSize = Abs (Ymax - Ymin); - - myCamera->BeginUpdate(); - myCamera->SetProjectionShift (gp_Pnt (0.0, 0.0, 0.0)); - PanCamera (aPanVec.X(), aPanVec.Y()); - ZoomCamera (aUSize, aVSize); - myCamera->EndUpdate(); + Standard_Real aWinAspect = (Standard_Real)aWinWidth / aWinHeight; + Standard_Real aFitSizeU = Abs (Xmax - Xmin); + Standard_Real aFitSizeV = Abs (Ymax - Ymin); + Standard_Real aFitAspect = aFitSizeU / aFitSizeV; + if (aFitAspect >= aWinAspect) + { + aFitSizeV = aFitSizeU / aWinAspect; + } + else + { + aFitSizeU = aFitSizeV * aWinAspect; + } + myCamera->SetAspect (aWinAspect); + Translate (myCamera, (Xmin + Xmax) * 0.5, (Ymin + Ymax) * 0.5); + Scale (myCamera, aFitSizeU, aFitSizeV); AutoZFit(); - Update(); + ImmediateUpdate(); } +//============================================================================= +//function : StartRotation +//purpose : +//============================================================================= #ifdef IMP250900 static Standard_Boolean zRotation = Standard_False; #endif @@ -2408,6 +2887,10 @@ void V3d_View::StartRotation(const Standard_Integer X, } +//============================================================================= +//function : Rotation +//purpose : +//============================================================================= void V3d_View::Rotation(const Standard_Integer X, const Standard_Integer Y) { @@ -2443,50 +2926,86 @@ void V3d_View::Rotation(const Standard_Integer X, #endif } -void V3d_View :: SetComputedMode ( const Standard_Boolean aMode ) +//============================================================================= +//function : SetComputedMode +//purpose : +//============================================================================= +void V3d_View::SetComputedMode (const Standard_Boolean aMode) { - if( aMode ) { - if( myComputedMode ) { - MyView -> SetComputedMode ( Standard_True ); - Update (); + if (aMode) + { + if (myComputedMode) + { + MyView->SetComputedMode (Standard_True); + Update(); } - } else { - MyView -> SetComputedMode ( Standard_False ); - Update (); + } + else + { + MyView->SetComputedMode (Standard_False); + Update(); } } -Standard_Boolean V3d_View :: ComputedMode () const +//============================================================================= +//function : ComputedMode +//purpose : +//============================================================================= +Standard_Boolean V3d_View::ComputedMode() const { - return MyView -> ComputedMode (); + return MyView->ComputedMode(); } -void V3d_View :: SetBackFacingModel (const V3d_TypeOfBackfacingModel aModel) +//============================================================================= +//function : SetBackFacingModel +//purpose : +//============================================================================= +void V3d_View::SetBackFacingModel (const V3d_TypeOfBackfacingModel aModel) { - MyView -> SetBackFacingModel ( Visual3d_TypeOfBackfacingModel(aModel) ); + MyView->SetBackFacingModel (Visual3d_TypeOfBackfacingModel(aModel)); Redraw(); } -V3d_TypeOfBackfacingModel V3d_View :: BackFacingModel () const +//============================================================================= +//function : BackFacingModel +//purpose : +//============================================================================= +V3d_TypeOfBackfacingModel V3d_View::BackFacingModel() const { return V3d_TypeOfBackfacingModel(MyView -> BackFacingModel ()); } +//============================================================================= +//function : TransientManagerBeginDraw +//purpose : +//============================================================================= Standard_Boolean V3d_View::TransientManagerBeginDraw(const Standard_Boolean DoubleBuffer,const Standard_Boolean RetainMode) const { return Visual3d_TransientManager::BeginDraw(MyView,DoubleBuffer,RetainMode); } +//============================================================================= +//function : TransientManagerClearDraw +//purpose : +//============================================================================= void V3d_View::TransientManagerClearDraw() const { Visual3d_TransientManager::ClearDraw(MyView); } +//============================================================================= +//function : TransientManagerBeginAddDraw +//purpose : +//============================================================================= Standard_Boolean V3d_View::TransientManagerBeginAddDraw() const { return Visual3d_TransientManager::BeginAddDraw(MyView); } +//============================================================================= +//function : Init +//purpose : +//============================================================================= void V3d_View::Init() { myComputedMode = MyViewer->ComputedMode(); @@ -2495,21 +3014,29 @@ void V3d_View::Init() } } +//============================================================================= +//function : SetPlotter +//purpose : +//============================================================================= void V3d_View::SetPlotter(const Handle(Graphic3d_Plotter)& aPlotter) { MyPlotter = aPlotter; } +//============================================================================= +//function : Plot +//purpose : +//============================================================================= void V3d_View::Plot() { V3d_BadValue_Raise_if( !MyPlotter.IsNull(), "view has no plotter"); MyView->Plot(MyPlotter); } -#include -#include - -//////////////////////////////////////////////////////////////// +//============================================================================= +//function : Dump +//purpose : +//============================================================================= Standard_Boolean V3d_View::Dump (const Standard_CString theFile, const Graphic3d_BufferType& theBufferType) { @@ -2520,12 +3047,15 @@ Standard_Boolean V3d_View::Dump (const Standard_CString theFile, return ToPixMap (anImage, aWinWidth, aWinHeight, theBufferType) && anImage.Save (theFile); } -//////////////////////////////////////////////////////////////// +//============================================================================= +//function : ToPixMap +//purpose : +//============================================================================= Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage, const Standard_Integer theWidth, const Standard_Integer theHeight, const Graphic3d_BufferType& theBufferType, - const Standard_Boolean theIsForceCentred, + const Standard_Boolean theToKeepAspect, const V3d_StereoDumpOptions theStereoOptions) { Graphic3d_CView* cView = (Graphic3d_CView* )MyView->CView(); @@ -2583,7 +3113,6 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage, Handle(Graphic3d_Camera) aStoreMapping = new Graphic3d_Camera(); aStoreMapping->Copy (myCamera); - Standard_Real Umin, Vmin, Umax, Vmax; if (myCamera->IsStereo()) { @@ -2603,32 +3132,11 @@ Standard_Boolean V3d_View::ToPixMap (Image_PixMap& theImage, } } - if (theIsForceCentred) - { - Standard_Real PUmin, PVmin, PUmax, PVmax; - myCamera->WindowLimit (PUmin, PVmin, PUmax, PVmax); - - // calculate expansion - Umin = PUmin; Vmin = PVmin; Umax = PUmax; Vmax = PVmax; - Standard_Real oldWidth = (PUmax - PUmin), oldHeight = (PVmax - PVmin); - Standard_Real newWidth = (oldHeight * aFBOVPSizeX) / aFBOVPSizeY; - if (newWidth < oldWidth) - { - Standard_Real newHeight = (oldWidth * aFBOVPSizeY) / aFBOVPSizeX; - // Expand height - Standard_Real delta = 0.5 * (newHeight - oldHeight); - Vmin = PVmin - delta; - Vmax = PVmax + delta; - } - else - { - // Expand width - Standard_Real delta = 0.5 * (newWidth - oldWidth); - Umin = PUmin - delta; - Umax = PUmax + delta; - } + AutoZFit(); - FitAll (Umin, Vmin, Umax, Vmax); + if (theToKeepAspect) + { + myCamera->SetAspect ((Standard_Real) aFBOVPSizeX / aFBOSizeYMax); } //workaround for rendering list of Over and Under Layers @@ -2700,6 +3208,8 @@ Standard_Boolean V3d_View::SetImmediateUpdate (const Standard_Boolean theImmedia // ======================================================================= void V3d_View::SetCamera (const Handle(Graphic3d_Camera)& theCamera) { + Standard_ASSERT_RAISE (!theCamera.IsNull(), "Void camera is not allowed"); + myCamera = theCamera; MyView->SetCamera (theCamera); @@ -2709,169 +3219,198 @@ void V3d_View::SetCamera (const Handle(Graphic3d_Camera)& theCamera) // function : GetCamera // purpose : // ======================================================================= -Handle(Graphic3d_Camera) V3d_View::Camera() const +const Handle(Graphic3d_Camera)& V3d_View::Camera() const { return myCamera; } // ======================================================================= -// function : FitCamera -// purpose : +// function : FitMinMax +// purpose : Internal // ======================================================================= -void V3d_View::FitCamera (const Standard_Real theXmin, - const Standard_Real theYmin, - const Standard_Real theZmin, - const Standard_Real theXmax, - const Standard_Real theYmax, - const Standard_Real theZmax) -{ - if (myCamera.IsNull()) - return; - - // check bounding box for validness +Standard_Boolean V3d_View::FitMinMax (const Handle(Graphic3d_Camera)& theCamera, + const gp_XYZ& theMinCorner, + const gp_XYZ& theMaxCorner, + const Standard_Real theMargin, + const Standard_Real theResolution, + const Standard_Boolean theToEnlargeIfLine) const +{ + // Check bounding box for validness Standard_Real aLim = (ShortRealLast() - 1.0); - if (Abs (theXmin) > aLim || Abs (theYmin) > aLim || Abs (theZmin) > aLim || - Abs (theXmax) > aLim || Abs (theYmax) > aLim || Abs (theZmax) > aLim) - return; - - // place camera center at the geometrical center - // of the passed bounding box - gp_Pnt aCenter ((theXmin + theXmax) * 0.5, - (theYmin + theYmax) * 0.5, - (theZmin + theZmax) * 0.5); - - // adapt bound points - gp_Pnt aPnts[8] = - { gp_Pnt (theXmin, theYmin, theZmin), - gp_Pnt (theXmin, theYmin, theZmax), - gp_Pnt (theXmin, theYmax, theZmin), - gp_Pnt (theXmin, theYmax, theZmax), - gp_Pnt (theXmax, theYmin, theZmin), - gp_Pnt (theXmax, theYmin, theZmax), - gp_Pnt (theXmax, theYmax, theZmin), - gp_Pnt (theXmax, theYmax, theZmax) }; - - Standard_Real aViewMinX = (RealLast() - 1); - Standard_Real aViewMinY = (RealLast() - 1); - Standard_Real aViewMinZ = (RealLast() - 1); - Standard_Real aViewMaxX = (RealFirst() + 1); - Standard_Real aViewMaxY = (RealFirst() + 1); - Standard_Real aViewMaxZ = (RealFirst() + 1); - - // find out minimum and maximum values of bounding box - // converted to view space. the limits point out a rectangular - // section parallel to the screen that camera should zoom in. - for (Standard_Integer aPntIt = 0; aPntIt < 8; ++aPntIt) + if (Abs (theMinCorner.X()) > aLim || Abs (theMinCorner.Y()) > aLim || Abs (theMinCorner.Z()) > aLim || + Abs (theMaxCorner.X()) > aLim || Abs (theMaxCorner.Y()) > aLim || Abs (theMaxCorner.Z()) > aLim) { - gp_Pnt aView = myCamera->ConvertWorld2View (aPnts[aPntIt]); - aViewMinX = Min (aViewMinX, aView.X()); - aViewMinY = Min (aViewMinY, aView.Y()); - aViewMaxX = Max (aViewMaxX, aView.X()); - aViewMaxY = Max (aViewMaxY, aView.Y()); - aViewMinZ = Min (aViewMinZ, aView.Z()); - aViewMaxZ = Max (aViewMaxZ, aView.Z()); - } - - // evaluate section size for x1 zoom. - Standard_Real aSectU = (aViewMaxX - aViewMinX); - Standard_Real aSectV = (aViewMaxY - aViewMinY); - - // zoom camera to front plane of bounding box. the camera - // is set up at the center of bbox, so the depth is half - // space of it in view coordinate space. - Standard_Real aSectDepth = (aViewMaxZ - aViewMinZ) * 0.5; - - // re-compute Eye position - gp_Vec aBck = gp_Vec (myCamera->Center(), myCamera->Eye()); - gp_Pnt aEye = aCenter.Translated (aBck); - - // start camera updates - myCamera->BeginUpdate(); - - if (myCamera->IsOrthographic()) + return Standard_False; // bounding box is out of bounds... + } + + // Apply "axial scaling" to the bounding points. + // It is not the best approach to make this scaling as a part of fit all operation, + // but the axial scale is integrated into camera orientation matrix and the other + // option is to perform frustum plane adjustment algorithm in view camera space, + // which will lead to a number of additional world-view space conversions and + // loosing precision as well. + Standard_Real aXmin = theMinCorner.X() * theCamera->AxialScale().X(); + Standard_Real aXmax = theMaxCorner.X() * theCamera->AxialScale().X(); + Standard_Real aYmin = theMinCorner.Y() * theCamera->AxialScale().Y(); + Standard_Real aYmax = theMaxCorner.Y() * theCamera->AxialScale().Y(); + Standard_Real aZmin = theMinCorner.Z() * theCamera->AxialScale().Z(); + Standard_Real aZmax = theMaxCorner.Z() * theCamera->AxialScale().Z(); + + Bnd_Box aBBox; + aBBox.Update (aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); + if (aBBox.IsThin (RealEpsilon())) { - Standard_Real anX = (aViewMaxX + aViewMinX) * 0.5; - Standard_Real anY = (aViewMaxY + aViewMinY) * 0.5; - myCamera->SetProjectionShift (gp_Pnt (-anX, -anY, 0.0)); - } - else + return Standard_False; // nothing to fit all + } + + gp_Pnt aBBCenter ((aXmin + aXmax) * 0.5, (aYmin + aYmax) * 0.5, (aZmin + aZmax) * 0.5); + + gp_Pln aFrustumLeft; + gp_Pln aFrustumRight; + gp_Pln aFrustumBottom; + gp_Pln aFrustumTop; + gp_Pln aFrustumNear; + gp_Pln aFrustumFar; + theCamera->Frustum (aFrustumLeft, aFrustumRight, aFrustumBottom, aFrustumTop, aFrustumNear, aFrustumFar); + + gp_Dir aCamUp = theCamera->OrthogonalizedUp(); + gp_Dir aCamDir = theCamera->Direction(); + gp_Dir aCamSide = aCamDir ^ aCamUp; + + // Perspective-correct camera projection vector, matching the bounding box is determined geometrically. + // Knowing the initial shape of a frustum it is possible to match it to a bounding box. + // Then, knowing the relation of camera projection vector to the frustum shape it is possible to + // set up perspective-correct camera projection matching the bounding box. + // These steps support non-asymmetric transformations of view-projection space provided by camera. + // The zooming can be done by calculating view plane size matching the bounding box at center of + // the bounding box. The only limitation here is that the scale of camera should define size of + // its view plane passing through the camera center, and the center of camera should be on the + // same line with the center of bounding box. + + // The following method is applied: + // 1) Determine normalized asymmetry of camera projection vector by frustum planes. + // 2) Determine new location of frustum planes, "matching" the bounding box. + // 3) Determine new camera projection vector using the normalized asymmetry. + // 4) Determine new zooming in view space. + + // Determine normalized projection asymmetry (if any). + + Standard_Real anAssymX = Tan ( aCamSide.Angle (aFrustumLeft.Axis().Direction())) + - Tan (-aCamSide.Angle (aFrustumRight.Axis().Direction())); + Standard_Real anAssymY = Tan ( aCamUp.Angle (aFrustumBottom.Axis().Direction())) + - Tan (-aCamUp.Angle (aFrustumTop.Axis().Direction())); + + // Determine how far should be the frustum planes placed from center + // of bounding box, in order to match the bounding box closely. + gp_Pln aMatchSide[6] = {aFrustumLeft, aFrustumRight, aFrustumBottom, aFrustumTop, aFrustumNear, aFrustumFar}; + Standard_Real aMatchDistance[6] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; + for (Standard_Integer anIt = 0; anIt < 6; ++anIt) + { + const gp_Dir& aPlaneN = aMatchSide[anIt].Axis().Direction(); + + gp_Trsf aPlaneTrsf; + aPlaneTrsf.SetTransformation (gp_Ax3(), gp_Ax3 (aBBCenter, aPlaneN)); + Bnd_Box aRelativeBBox = aBBox.Transformed (aPlaneTrsf); + + Standard_Real aDummy = 0.0; + Standard_Real aZmin = 0.0; + Standard_Real aZmax = 0.0; + aRelativeBBox.Get (aDummy, aDummy, aZmin, aDummy, aDummy, aZmax); + aMatchDistance[anIt] = -aZmin; + } + // The center of camera is placed on the same line with center of bounding box. + // The view plane section crosses the bounding box at its center. + // To compute view plane size, evaluate coefficients converting "point -> plane distance" + // into view section size between the point and the frustum plane. + // proj + // /|\ right half of frame // + // | // + // point o<-- distance * coeff -->//---- (view plane section) + // \ // + // (distance) // + // ~ // + // (distance) // + // \/\// + // \// + // // + // (frustum plane) + + aMatchDistance[0] *= Sqrt(1 + Pow (Tan ( aCamSide.Angle (aFrustumLeft.Axis().Direction())), 2.0)); + aMatchDistance[1] *= Sqrt(1 + Pow (Tan (-aCamSide.Angle (aFrustumRight.Axis().Direction())), 2.0)); + aMatchDistance[2] *= Sqrt(1 + Pow (Tan ( aCamUp.Angle (aFrustumBottom.Axis().Direction())), 2.0)); + aMatchDistance[3] *= Sqrt(1 + Pow (Tan (-aCamUp.Angle (aFrustumTop.Axis().Direction())), 2.0)); + aMatchDistance[4] *= Sqrt(1 + Pow (Tan ( aCamDir.Angle (aFrustumNear.Axis().Direction())), 2.0)); + aMatchDistance[5] *= Sqrt(1 + Pow (Tan (-aCamDir.Angle (aFrustumFar.Axis().Direction())), 2.0)); + + Standard_Real aViewSizeXv = aMatchDistance[0] + aMatchDistance[1]; + Standard_Real aViewSizeYv = aMatchDistance[2] + aMatchDistance[3]; + Standard_Real aViewSizeZv = aMatchDistance[4] + aMatchDistance[5]; + + // Place center of camera on the same line with center of bounding + // box applying corresponding projection asymmetry (if any). + Standard_Real anAssymXv = anAssymX * aViewSizeXv * 0.5; + Standard_Real anAssymYv = anAssymY * aViewSizeYv * 0.5; + Standard_Real anOffsetXv = (aMatchDistance[1] - aMatchDistance[0]) * 0.5 + anAssymXv; + Standard_Real anOffsetYv = (aMatchDistance[3] - aMatchDistance[2]) * 0.5 + anAssymYv; + gp_Vec aTranslateSide = gp_Vec (aCamSide) * anOffsetXv; + gp_Vec aTranslateUp = gp_Vec (aCamUp) * anOffsetYv; + gp_Pnt aNewCenter = aBBCenter.Translated (aTranslateSide).Translated (aTranslateUp); + + gp_Trsf aCenterTrsf; + aCenterTrsf.SetTranslation (theCamera->Center(), aNewCenter); + theCamera->Transform (aCenterTrsf); + theCamera->SetDistance (Max (aMatchDistance[5] + aMatchDistance[4], Precision::Confusion())); + + // Bounding box collapses to a point or thin line going in depth of the screen + if (aViewSizeXv < theResolution && aViewSizeYv < theResolution) { - myCamera->SetProjectionShift (gp_Pnt (0.0, 0.0, 0.0)); - myCamera->SetCenter (aCenter); - myCamera->SetEye (aEye); + if (aViewSizeXv < theResolution || !theToEnlargeIfLine) + { + return Standard_True; // This is just one point or line and zooming has no effect. + } + + // Looking along line and "theToEnlargeIfLine" is requested. + // Fit view to see whole scene on rotation. + aViewSizeXv = aViewSizeZv; + aViewSizeYv = aViewSizeZv; } - // zoom camera to fit in the bounding box. - ZoomCamera (aSectU, aSectV, aSectDepth); + Scale (theCamera, aViewSizeXv * (1.0 + theMargin), aViewSizeYv * (1.0 + theMargin)); - // re-evaluate camera - myCamera->EndUpdate(); + return Standard_True; } // ======================================================================= -// function : ZoomCamera -// purpose : +// function : Scale +// purpose : Internal // ======================================================================= -void V3d_View::ZoomCamera (const Standard_Real theUSize, - const Standard_Real theVSize, - const Standard_Real theZDepth) +void V3d_View::Scale (const Handle(Graphic3d_Camera)& theCamera, + const Standard_Real theSizeXv, + const Standard_Real theSizeYv) const { - if (myCamera.IsNull()) - return; - - // compute maximum section size along both directions. - Standard_Real anAspect = myCamera->Aspect(); - Standard_Real aSize = Max (theUSize / anAspect, theVSize); - - myCamera->BeginUpdate(); - myCamera->SetScale (aSize); - - if (!myCamera->IsOrthographic()) - { - myCamera->SetDistance (myCamera->Distance() + theZDepth); - } - - AutoZFit(); - - myCamera->EndUpdate(); + Standard_Real anAspect = theCamera->Aspect(); + Standard_Real aMaxSize = Max (theSizeXv / anAspect, theSizeYv); + theCamera->SetScale (aMaxSize); } // ======================================================================= -// function : PanCamera -// purpose : panning is fun +// function : Translate +// purpose : Internal // ======================================================================= -void V3d_View::PanCamera (const Standard_Real theU, - const Standard_Real theV) -{ - if (myCamera.IsNull()) - return; - - if (myCamera->IsOrthographic()) - { - // Projection based panning for compatibility. - myCamera->SetProjectionShift (myCamera->ProjectionShift(). - Translated (gp_Vec (-theU, -theV, 0.0))); - } - else - { - gp_Vec anUp = myCamera->Up(); - gp_Vec aSide = myCamera->Direction().Crossed (anUp); - - gp_Vec aPanU = aSide.Scaled (theU); - gp_Vec aPanV = anUp.Scaled (theV); - gp_Pnt aPannedEye (myCamera->Eye()); - gp_Pnt aPannedCenter (myCamera->Center()); - - aPannedEye.Translate (aPanU); - aPannedEye.Translate (aPanV); - aPannedCenter.Translate (aPanU); - aPannedCenter.Translate (aPanV); - - myCamera->BeginUpdate(); - myCamera->SetEye (aPannedEye); - myCamera->SetCenter (aPannedCenter); - myCamera->EndUpdate(); - } - - AutoZFit(); +void V3d_View::Translate (const Handle(Graphic3d_Camera)& theCamera, + const Standard_Real theDXv, + const Standard_Real theDYv) const +{ + const gp_Pnt& aCenter = theCamera->Center(); + const gp_Dir& aDir = theCamera->Direction(); + const gp_Dir& anUp = theCamera->Up(); + gp_Ax3 aCameraCS (aCenter, aDir.Reversed(), aDir ^ anUp); + + gp_Vec aCameraPanXv = gp_Vec (aCameraCS.XDirection()) * theDXv; + gp_Vec aCameraPanYv = gp_Vec (aCameraCS.YDirection()) * theDYv; + gp_Vec aCameraPan = aCameraPanXv + aCameraPanYv; + gp_Trsf aPanTrsf; + aPanTrsf.SetTranslation (aCameraPan); + + theCamera->Transform (aPanTrsf); } diff --git a/src/V3d/V3d_View_3.cxx b/src/V3d/V3d_View_3.cxx index a8e35b364c..2aca0229bb 100644 --- a/src/V3d/V3d_View_3.cxx +++ b/src/V3d/V3d_View_3.cxx @@ -161,13 +161,22 @@ void V3d_View::Translate(const V3d_TypeOfAxe Axe, const Standard_Real Length,con break ; } } -void V3d_View::Place (const Standard_Integer ix, const Standard_Integer iy, - const Quantity_Factor aZoomFactor) { - Standard_Real xpos, ypos; - Standard_Integer xc, yc; - Center (xpos, ypos); - Convert (xpos, ypos, xc, yc); - Pan (xc - ix, iy - yc, aZoomFactor / Scale()); + +//======================================================================= +//function : Place +//purpose : +//======================================================================= +void V3d_View::Place (const Standard_Integer theXp, + const Standard_Integer theYp, + const Quantity_Factor theZoomFactor) +{ + Standard_Integer aWinWidth = 0; + Standard_Integer aWinHeight = 0; + View()->Window()->Size (aWinWidth, aWinHeight); + + Standard_Integer aWinCXp = aWinWidth / 2; + Standard_Integer aWinCYp = aWinHeight / 2; + Pan (aWinCXp - theXp, aWinCYp - theYp, theZoomFactor / Scale()); } void V3d_View::Translate(const Standard_Real theLength, const Standard_Boolean theStart) { diff --git a/src/ViewerTest/ViewerTest.cdl b/src/ViewerTest/ViewerTest.cdl index 6f807af56a..bf1aa85e61 100644 --- a/src/ViewerTest/ViewerTest.cdl +++ b/src/ViewerTest/ViewerTest.cdl @@ -197,5 +197,4 @@ is ---Purpose: Splits "parameter=value" string into separate -- parameter and value strings. -- @return TRUE if the string matches pattern "=" - end; diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx index 256e2eb81e..586dd224d6 100644 --- a/src/ViewerTest/ViewerTest.cxx +++ b/src/ViewerTest/ViewerTest.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -87,7 +88,6 @@ extern int ViewerMainLoop(Standard_Integer argc, const char** argv); #define DEFAULT_COLOR Quantity_NOC_GOLDENROD #define DEFAULT_MATERIAL Graphic3d_NOM_BRASS - //======================================================================= //function : GetColorFromName //purpose : get the Quantity_NameOfColor from a string @@ -3784,7 +3784,7 @@ static Standard_Integer TDraft(Draw_Interpretor& di, Standard_Integer argc, cons //============================================================================== //function : splitParameter -//purpose : Split parameter string to parameter name an parameter value +//purpose : Split parameter string to parameter name and parameter value //============================================================================== Standard_Boolean ViewerTest::SplitParameter (const TCollection_AsciiString& theString, TCollection_AsciiString& theName, diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx index aaaa42cea7..fb2281d80c 100644 --- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx +++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx @@ -58,9 +58,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -1670,12 +1672,12 @@ static void ProcessControlButton1Motion() //============================================================================== void VT_ProcessControlButton2Motion() { - Quantity_Length dx = ViewerTest::CurrentView()->Convert(X_Motion - X_ButtonPress); - Quantity_Length dy = ViewerTest::CurrentView()->Convert(Y_Motion - Y_ButtonPress); + Standard_Integer aDx = X_Motion - X_ButtonPress; + Standard_Integer aDy = Y_Motion - Y_ButtonPress; - dy = -dy; // Xwindow Y axis is from top to Bottom + aDy = -aDy; // Xwindow Y axis is from top to Bottom - ViewerTest::CurrentView()->Panning( dx, dy ); + ViewerTest::CurrentView()->Pan (aDx, aDy); X_ButtonPress = X_Motion; Y_ButtonPress = Y_Motion; @@ -2457,20 +2459,46 @@ static int VFit(Draw_Interpretor& , Standard_Integer , const char** ) //purpose : ZFitall, no DRAW arguments //Draw arg : No args //============================================================================== - -static int VZFit(Draw_Interpretor& , Standard_Integer , const char** ) +static int VZFit (Draw_Interpretor& /*theDi*/, Standard_Integer theArgsNb, const char** theArgVec) { - Handle(V3d_View) V = ViewerTest::CurrentView(); - if ( !V.IsNull() ) V->ZFitAll(); return 0; } + const Handle(V3d_View)& aCurrentView = ViewerTest::CurrentView(); + + if (aCurrentView.IsNull()) + { + std::cout << theArgVec[0] << ": Call vinit before this command, please.\n"; + return 1; + } + + if (theArgsNb == 1) + { + aCurrentView->ZFitAll(); + aCurrentView->Redraw(); + return 0; + } + + Standard_Real aScale = 1.0; + + if (theArgsNb >= 2) + { + aScale = Draw::Atoi (theArgVec[1]); + } + + aCurrentView->ZFitAll (aScale); + aCurrentView->Redraw(); + return 0; +} -static int VRepaint(Draw_Interpretor& , Standard_Integer , const char** ) +//============================================================================== +//function : VRepaint +//purpose : +//============================================================================== +static int VRepaint (Draw_Interpretor& , Standard_Integer , const char** ) { Handle(V3d_View) V = ViewerTest::CurrentView(); if ( !V.IsNull() ) V->Redraw(); return 0; } - //============================================================================== //function : VClear //purpose : Remove all the object from the viewer @@ -4342,70 +4370,181 @@ static Standard_Integer VMoveTo (Draw_Interpretor& di, return 0; } -//======================================================================= +//================================================================================================= //function : VViewParams //purpose : Gets or sets AIS View characteristics -//======================================================================= -static Standard_Integer VViewParams (Draw_Interpretor& di, - Standard_Integer argc, - const char ** argv) +//================================================================================================= +static int VViewParams (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const char** theArgVec) { - if ( argc != 1 && argc != 13) + Handle(V3d_View) anAISView = ViewerTest::CurrentView(); + if (anAISView.IsNull()) { - di << "Usage : " << argv[0] << "\n"; + std::cout << theArgVec[0] << ": please initialize or activate view.\n"; return 1; } - Handle (V3d_View) anAISView = ViewerTest::CurrentView (); - if ( anAISView.IsNull () ) + + if (theArgsNb == 1) { - di << "use 'vinit' command before " << argv[0] << "\n"; - return 1; - } - if(argc==1){ - Quantity_Factor anAISViewScale = anAISView -> V3d_View::Scale (); - Standard_Real anAISViewCenterCoordinateX = 0.0; - Standard_Real anAISViewCenterCoordinateY = 0.0; - anAISView -> V3d_View::Center (anAISViewCenterCoordinateX, anAISViewCenterCoordinateY); + // print all of the available view parameters + Quantity_Factor anAISViewScale = anAISView->Scale(); + Standard_Real anAISViewProjX = 0.0; Standard_Real anAISViewProjY = 0.0; Standard_Real anAISViewProjZ = 0.0; - anAISView -> V3d_View::Proj (anAISViewProjX, anAISViewProjY, anAISViewProjZ); + anAISView->Proj (anAISViewProjX, anAISViewProjY, anAISViewProjZ); + Standard_Real anAISViewUpX = 0.0; Standard_Real anAISViewUpY = 0.0; Standard_Real anAISViewUpZ = 0.0; - anAISView -> V3d_View::Up (anAISViewUpX, anAISViewUpY, anAISViewUpZ); + anAISView->Up (anAISViewUpX, anAISViewUpY, anAISViewUpZ); + Standard_Real anAISViewAtX = 0.0; Standard_Real anAISViewAtY = 0.0; Standard_Real anAISViewAtZ = 0.0; - anAISView -> V3d_View::At (anAISViewAtX, anAISViewAtY, anAISViewAtZ); - di << "Scale of current view: " << anAISViewScale << "\n"; - di << "Center on X : "<< anAISViewCenterCoordinateX << "; on Y: " << anAISViewCenterCoordinateY << "\n"; - di << "Proj on X : " << anAISViewProjX << "; on Y: " << anAISViewProjY << "; on Z: " << anAISViewProjZ << "\n"; - di << "Up on X : " << anAISViewUpX << "; on Y: " << anAISViewUpY << "; on Z: " << anAISViewUpZ << "\n"; - di << "At on X : " << anAISViewAtX << "; on Y: " << anAISViewAtY << "; on Z: " << anAISViewAtZ << "\n"; + anAISView->At (anAISViewAtX, anAISViewAtY, anAISViewAtZ); + + Standard_Real anAISViewEyeX = 0.0; + Standard_Real anAISViewEyeY = 0.0; + Standard_Real anAISViewEyeZ = 0.0; + anAISView->Eye (anAISViewEyeX, anAISViewEyeY, anAISViewEyeZ); + + theDi << "Scale of current view: " << anAISViewScale << "\n"; + theDi << "Proj on X : " << anAISViewProjX << "; on Y: " << anAISViewProjY << "; on Z: " << anAISViewProjZ << "\n"; + theDi << "Up on X : " << anAISViewUpX << "; on Y: " << anAISViewUpY << "; on Z: " << anAISViewUpZ << "\n"; + theDi << "At on X : " << anAISViewAtX << "; on Y: " << anAISViewAtY << "; on Z: " << anAISViewAtZ << "\n"; + theDi << "Eye on X : " << anAISViewEyeX << "; on Y: " << anAISViewEyeY << "; on Z: " << anAISViewEyeZ << "\n"; + return 0; } - else + + // ------------------------- + // Parse options and values + // ------------------------- + + NCollection_DataMap aMapOfKeysByValues; + TCollection_AsciiString aParseKey; + for (Standard_Integer anArgIt = 1; anArgIt < theArgsNb; ++anArgIt) + { + TCollection_AsciiString anArg (theArgVec [anArgIt]); + + if (anArg.Value (1) == '-' && !anArg.IsRealValue()) + { + aParseKey = anArg; + aParseKey.Remove (1); + aParseKey.UpperCase(); + aMapOfKeysByValues.Bind (aParseKey, TColStd_SequenceOfAsciiString()); + continue; + } + + aMapOfKeysByValues.ChangeFind (aParseKey).Append (anArg); + } + + // --------------------------------------------- + // Change or print parameters, order plays role + // --------------------------------------------- + + // Check arguments for validity + NCollection_DataMap::Iterator aMapIt (aMapOfKeysByValues); + for (; aMapIt.More(); aMapIt.Next()) { - Quantity_Factor anAISViewScale = atof (argv [1]); - Standard_Real anAISViewCenterCoordinateX = atof (argv [2]); - Standard_Real anAISViewCenterCoordinateY = atof (argv [3]); - Standard_Real anAISViewProjX = atof (argv [4]); - Standard_Real anAISViewProjY = atof (argv [5]); - Standard_Real anAISViewProjZ = atof (argv [6]); - Standard_Real anAISViewUpX = atof (argv [7]); - Standard_Real anAISViewUpY = atof (argv [8]); - Standard_Real anAISViewUpZ = atof (argv [9]); - Standard_Real anAISViewAtX = atof (argv [10]); - Standard_Real anAISViewAtY = atof (argv [11]); - Standard_Real anAISViewAtZ = atof (argv [12]); - anAISView -> V3d_View::Camera()->BeginUpdate(); - anAISView -> V3d_View::SetCenter (anAISViewCenterCoordinateX, anAISViewCenterCoordinateY); - anAISView -> V3d_View::SetAt (anAISViewAtX, anAISViewAtY, anAISViewAtZ); - anAISView -> V3d_View::SetScale (anAISViewScale); - anAISView -> V3d_View::SetProj (anAISViewProjX, anAISViewProjY, anAISViewProjZ); - anAISView -> V3d_View::SetUp (anAISViewUpX, anAISViewUpY, anAISViewUpZ); - anAISView -> V3d_View::Camera()->EndUpdate(); + const TCollection_AsciiString& aKey = aMapIt.Key(); + const TColStd_SequenceOfAsciiString& aValues = aMapIt.Value(); + + if (!(aKey.IsEqual ("SCALE") && (aValues.Length() == 1 || aValues.IsEmpty())) + && !(aKey.IsEqual ("EYE") && (aValues.Length() == 3 || aValues.IsEmpty())) + && !(aKey.IsEqual ("AT") && (aValues.Length() == 3 || aValues.IsEmpty())) + && !(aKey.IsEqual ("UP") && (aValues.Length() == 3 || aValues.IsEmpty())) + && !(aKey.IsEqual ("PROJ") && (aValues.Length() == 3 || aValues.IsEmpty())) + && !(aKey.IsEqual ("CENTER") && aValues.Length() == 2)) + { + TCollection_AsciiString aLowerKey; + aLowerKey = "-"; + aLowerKey += aKey; + aLowerKey.LowerCase(); + std::cout << theArgVec[0] << ": " << aLowerKey << " is unknown option, or number of arguments is invalid.\n"; + std::cout << "Type help for more information.\n"; + return 1; + } } + + TColStd_SequenceOfAsciiString aValues; + + // Change view parameters in proper order + if (aMapOfKeysByValues.Find ("SCALE", aValues)) + { + if (aValues.IsEmpty()) + { + theDi << "Scale: " << anAISView->Scale() << "\n"; + } + else + { + anAISView->SetScale (aValues (1).RealValue()); + } + } + if (aMapOfKeysByValues.Find ("EYE", aValues)) + { + if (aValues.IsEmpty()) + { + Standard_Real anEyeX = 0.0; + Standard_Real anEyeY = 0.0; + Standard_Real anEyeZ = 0.0; + anAISView->Eye (anEyeX, anEyeY, anEyeZ); + theDi << "Eye X: " << anEyeX << " Y: " << anEyeY << " Z: " << anEyeZ << "\n"; + } + else + { + anAISView->SetEye (aValues (1).RealValue(), aValues (2).RealValue(), aValues (3).RealValue()); + } + } + if (aMapOfKeysByValues.Find ("AT", aValues)) + { + if (aValues.IsEmpty()) + { + Standard_Real anAtX = 0.0; + Standard_Real anAtY = 0.0; + Standard_Real anAtZ = 0.0; + anAISView->At (anAtX, anAtY, anAtZ); + theDi << "At X: " << anAtX << " Y: " << anAtY << " Z: " << anAtZ << "\n"; + } + else + { + anAISView->SetAt (aValues (1).RealValue(), aValues (2).RealValue(), aValues (3).RealValue()); + } + } + if (aMapOfKeysByValues.Find ("PROJ", aValues)) + { + if (aValues.IsEmpty()) + { + Standard_Real aProjX = 0.0; + Standard_Real aProjY = 0.0; + Standard_Real aProjZ = 0.0; + anAISView->Proj (aProjX, aProjY, aProjZ); + theDi << "Proj X: " << aProjX << " Y: " << aProjY << " Z: " << aProjZ << "\n"; + } + else + { + anAISView->SetProj (aValues (1).RealValue(), aValues (2).RealValue(), aValues (3).RealValue()); + } + } + if (aMapOfKeysByValues.Find ("UP", aValues)) + { + if (aValues.IsEmpty()) + { + Standard_Real anUpX = 0.0; + Standard_Real anUpY = 0.0; + Standard_Real anUpZ = 0.0; + anAISView->Up (anUpX, anUpY, anUpZ); + theDi << "Up X: " << anUpX << " Y: " << anUpY << " Z: " << anUpZ << "\n"; + } + else + { + anAISView->SetUp (aValues (1).RealValue(), aValues (2).RealValue(), aValues (3).RealValue()); + } + } + if (aMapOfKeysByValues.Find ("CENTER", aValues)) + { + anAISView->SetCenter (aValues (1).IntegerValue(), aValues (2).IntegerValue()); + } + return 0; } @@ -5348,13 +5487,15 @@ static int VSetTextureMode (Draw_Interpretor& theDi, Standard_Integer theArgsNb, //=============================================================================================== static int VZRange (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const char** theArgVec) { - if (ViewerTest::CurrentView().IsNull()) + const Handle(V3d_View)& aCurrentView = ViewerTest::CurrentView(); + + if (aCurrentView.IsNull()) { - theDi << theArgVec[0] << ": Call vinit before this command, please.\n"; + std::cout << theArgVec[0] << ": Call vinit before this command, please.\n"; return 1; } - Handle(Graphic3d_Camera) aCamera = ViewerTest::CurrentView()->Camera(); + Handle(Graphic3d_Camera) aCamera = aCurrentView->Camera(); if (theArgsNb < 2) { @@ -5367,18 +5508,30 @@ static int VZRange (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const c { Standard_Real aNewZNear = atof (theArgVec[1]); Standard_Real aNewZFar = atof (theArgVec[2]); - - aCamera->BeginUpdate(); - aCamera->SetZFar (aNewZFar); - aCamera->SetZNear (aNewZNear); - aCamera->EndUpdate(); + + if (aNewZNear >= aNewZFar) + { + std::cout << theArgVec[0] << ": invalid arguments: znear should be less than zfar.\n"; + return 1; + } + + if (!aCamera->IsOrthographic() && (aNewZNear <= 0.0 || aNewZFar <= 0.0)) + { + std::cout << theArgVec[0] << ": invalid arguments: "; + std::cout << "znear, zfar should be positive for perspective camera.\n"; + return 1; + } + + aCamera->SetZRange (aNewZNear, aNewZFar); } else { - theDi << theArgVec[0] << ": wrong command arguments. Type help for more information.\n"; + std::cout << theArgVec[0] << ": wrong command arguments. Type help for more information.\n"; return 1; } + aCurrentView->Redraw(); + return 0; } @@ -5388,30 +5541,41 @@ static int VZRange (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const c //=============================================================================================== static int VAutoZFit (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const char** theArgVec) { - if (ViewerTest::CurrentView().IsNull()) + const Handle(V3d_View)& aCurrentView = ViewerTest::CurrentView(); + + if (aCurrentView.IsNull()) { - theDi << theArgVec[0] << ": Call vinit before this command, please.\n"; + std::cout << theArgVec[0] << ": Call vinit before this command, please.\n"; return 1; } - if (theArgsNb < 2) + Standard_Real aScale = aCurrentView->AutoZFitScaleFactor(); + + if (theArgsNb > 3) { - theDi << "Auto z-fit mode: " << (ViewerTest::CurrentView()->AutoZFitMode() ? "enabled" : "disabled"); - return 0; + std::cout << theArgVec[0] << ": wrong command arguments. Type help for more information.\n"; + return 1; } - if (theArgsNb == 2) + if (theArgsNb < 2) { - Standard_Real aNewMode = atoi (theArgVec[1]); - - ViewerTest::CurrentView()->SetAutoZFitMode (aNewMode != 0); + theDi << "Auto z-fit mode: " << "\n" + << "On: " << (aCurrentView->AutoZFitMode() ? "enabled" : "disabled") << "\n" + << "Scale: " << aScale << "\n"; + return 0; } - else + + Standard_Boolean isOn = Draw::Atoi (theArgVec[1]) == 1; + + if (theArgsNb >= 3) { - theDi << theArgVec[0] << ": wrong command arguments. Type help for more information.\n"; - return 1; + aScale = Draw::Atoi (theArgVec[2]); } + aCurrentView->SetAutoZFitMode (isOn, aScale); + aCurrentView->AutoZFit(); + aCurrentView->Redraw(); + return 0; } @@ -5469,13 +5633,10 @@ static int VChangeCamera (Draw_Interpretor& theDi, Standard_Integer theArgsNb, c theDi << theArgVec[0] << anErrorMessage; return 1; } - - ViewerTest::CurrentView()->ZFitAll(); } else if (aCommand == "dist") { aCamera->SetDistance (aValue.RealValue()); - ViewerTest::CurrentView()->ZFitAll(); } else if (aCommand == "iod") { @@ -5527,6 +5688,7 @@ static int VChangeCamera (Draw_Interpretor& theDi, Standard_Integer theArgsNb, c return 1; } + ViewerTest::CurrentView()->AutoZFit(); ViewerTest::CurrentView()->Redraw(); return 0; @@ -6309,9 +6471,10 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands) theCommands.Add("vfit" , "vfit or : vfit", __FILE__,VFit,group); - theCommands.Add("vzfit" , - "vzfit", - __FILE__,VZFit,group); + theCommands.Add ("vzfit", "vzfit [scale]\n" + " Matches Z near, Z far view volume planes to the displayed objects.\n" + " \"scale\" - specifies factor to scale computed z range.\n", + __FILE__, VZFit, group); theCommands.Add("vrepaint", "vrepaint : vrepaint, force redraw", __FILE__,VRepaint,group); @@ -6423,10 +6586,20 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands) "vmoveto x y" "- emulates cursor movement to pixel postion (x,y)", __FILE__, VMoveTo, group); - theCommands.Add("vviewparams", - "vviewparams [scale center_X center_Y proj_X proj_Y proj_Z up_X up_Y up_Z at_X at_Y at_Z]" - "- gets or sets current view characteristics", - __FILE__,VViewParams, group); + theCommands.Add ("vviewparams", "vviewparams usage:\n" + "- vviewparams\n" + "- vviewparams [-scale [s]] [-eye [x y z]] [-at [x y z]] [-up [x y z]]\n" + " [-proj [x y z]] [-center x y]\n" + "- Gets or sets current view parameters.\n" + "- If called without arguments, all view parameters are printed.\n" + "- The options are:\n" + " -scale [s] : prints or sets viewport scale.\n" + " -eye [x y z] : prints or sets eye location.\n" + " -at [x y z] : prints or sets center of look.\n" + " -up [x y z] : prints or sets direction of up vector.\n" + " -proj [x y z] : prints or sets direction of look.\n" + " -center x y : sets location of center of the screen in pixels.\n", + __FILE__, VViewParams, group); theCommands.Add("vchangeselected", "vchangeselected shape" "- adds to shape to selection or remove one from it", @@ -6457,8 +6630,11 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands) " Intraocular distance definition type (absolute value or coefficient).\n", __FILE__, VChangeCamera, group); theCommands.Add ("vautozfit", "command to enable or disable automatic z-range adjusting\n" - " vautozfit [1|0]", - __FILE__,VAutoZFit, group); + "- vautozfit [on={1|0}] [scale]\n" + " Prints or changes parameters of automatic z-fit mode:\n" + " \"on\" - turns automatic z-fit on or off\n" + " \"scale\" - specifies factor to scale computed z range.\n", + __FILE__, VAutoZFit, group); theCommands.Add ("vzrange", "command to manually access znear and zfar values\n" " vzrange - without parameters shows current values\n" " vzrange [znear] [zfar] - applies provided values to view", diff --git a/src/Visual3d/Visual3d_View.cdl b/src/Visual3d/Visual3d_View.cdl index 1d7e8eadcc..60085e8058 100644 --- a/src/Visual3d/Visual3d_View.cdl +++ b/src/Visual3d/Visual3d_View.cdl @@ -637,39 +637,55 @@ is -- is deleted after the call Remove (me). ---Category: Inquire methods - MinMaxValues ( me; - XMin, YMin, ZMin : out Real from Standard; - XMax, YMax, ZMax : out Real from Standard ) - is static; - ---Level: Public - ---Purpose: Returns the coordinates of the boundary box of all - -- structures displayed in the view . - - MinMaxValues ( me; - ASet : MapOfStructure from Graphic3d; - XMin, YMin, ZMin : out Real from Standard; - XMax, YMax, ZMax : out Real from Standard ) - is static; - ---Level: Public - ---Purpose: Returns the coordinates of the boundary box of all - -- structures in the set . - - MinMaxValues ( me : mutable; - XMin, YMin : out Real from Standard; - XMax, YMax : out Real from Standard ) - is static; - ---Level: Public - ---Purpose: Returns the coordinates of the projection of the - -- boundary box of all structures displayed in the view . - - MinMaxValues ( me : mutable; - ASet : MapOfStructure from Graphic3d; - XMin, YMin : out Real from Standard; - XMax, YMax : out Real from Standard ) - is static; - ---Level: Public - ---Purpose: Returns the coordinates of the projection of the - -- boundary box of all structures in the set . + MinMaxValues (me; + theXMin, theYMin, theZMin : out Real from Standard; + theXMax, theYMax, theZMax : out Real from Standard; + theToIgnoreInfiniteFlag : Boolean from Standard = Standard_False) + is static; + ---Level: Public + ---Purpose: Returns the coordinates of the boundary box of all + -- structures displayed in the view . + -- If is TRUE, then the boundary box + -- also includes minimum and maximum limits of graphical elements + -- forming parts of infinite structures. + + MinMaxValues (me; + theSet : MapOfStructure from Graphic3d; + theXMin, theYMin, theZMin : out Real from Standard; + theXMax, theYMax, theZMax : out Real from Standard; + theToIgnoreInfiniteFlag : Boolean from Standard = Standard_False) + is static; + ---Level: Public + ---Purpose: Returns the coordinates of the boundary box of all + -- structures in the set . + -- If is TRUE, then the boundary box + -- also includes minimum and maximum limits of graphical elements + -- forming parts of infinite structures. + + MinMaxValues (me; + theXMin, theYMin : out Real from Standard; + theXMax, theYMax : out Real from Standard; + theToIgnoreInfiniteFlag : Boolean from Standard = Standard_False) + is static; + ---Level: Public + ---Purpose: Returns the coordinates of the projection of the + -- boundary box of all structures displayed in the view . + -- If is TRUE, then the boundary box + -- also includes minimum and maximum limits of graphical elements + -- forming parts of infinite structures. + + MinMaxValues (me; + theSet : MapOfStructure from Graphic3d; + theXMin, theYMin : out Real from Standard; + theXMax, theYMax : out Real from Standard; + theToIgnoreInfiniteFlag : Boolean from Standard = Standard_False) + is static; + ---Level: Public + ---Purpose: Returns the coordinates of the projection of the + -- boundary box of all structures in the set . + -- If is TRUE, then the boundary box + -- also includes minimum and maximum limits of graphical elements + -- forming parts of infinite structures. NumberOfDisplayedStructures ( me ) returns Integer from Standard @@ -678,7 +694,7 @@ is ---Purpose: Returns number of displayed structures in -- the view . - Projects ( me : mutable; + Projects (me; AX, AY, AZ : Real from Standard; APX, APY, APZ : out Real from Standard ) is static; diff --git a/src/Visual3d/Visual3d_View.cxx b/src/Visual3d/Visual3d_View.cxx index 57cf527ed9..7d544f80b6 100644 --- a/src/Visual3d/Visual3d_View.cxx +++ b/src/Visual3d/Visual3d_View.cxx @@ -1754,110 +1754,166 @@ Graphic3d_MapIteratorOfMapOfStructure Iterator (ASet); } -void Visual3d_View::MinMaxValues (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const { - - MinMaxValues - (MyDisplayedStructure, XMin, YMin, ZMin, XMax, YMax, ZMax); - +//============================================================================= +//function : MinMaxValues +//purpose : +//============================================================================= +void Visual3d_View::MinMaxValues (Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theZMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + Standard_Real& theZMax, + const Standard_Boolean theToIgnoreInfiniteFlag) const +{ + MinMaxValues (MyDisplayedStructure, + theXMin, theYMin, theZMin, + theXMax, theYMax, theZMax, + theToIgnoreInfiniteFlag); } -void Visual3d_View::MinMaxValues (const Graphic3d_MapOfStructure& ASet, Standard_Real& XMin, Standard_Real& YMin, Standard_Real& ZMin, Standard_Real& XMax, Standard_Real& YMax, Standard_Real& ZMax) const { - - if (ASet.IsEmpty ()) { - XMin = RealFirst (); - YMin = RealFirst (); - ZMin = RealFirst (); +//============================================================================= +//function : MinMaxValues +//purpose : +//============================================================================= +void Visual3d_View::MinMaxValues (const Graphic3d_MapOfStructure& theSet, + Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theZMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + Standard_Real& theZMax, + const Standard_Boolean theToIgnoreInfiniteFlag) const +{ + if (theSet.IsEmpty ()) + { + theXMin = RealFirst(); + theYMin = RealFirst(); + theZMin = RealFirst(); - XMax = RealLast (); - YMax = RealLast (); - ZMax = RealLast (); + theXMax = RealLast(); + theYMax = RealLast(); + theZMax = RealLast(); } - else { - - Standard_Real Xm, Ym, Zm, XM, YM, ZM; - Graphic3d_MapIteratorOfMapOfStructure Iterator (ASet); + else + { + Standard_Real aXm, aYm, aZm, aXM, aYM, aZM; + Graphic3d_MapIteratorOfMapOfStructure anIterator (theSet); - XMin = RealLast (); - YMin = RealLast (); - ZMin = RealLast (); + theXMin = RealLast(); + theYMin = RealLast(); + theZMin = RealLast(); - XMax = RealFirst (); - YMax = RealFirst (); - ZMax = RealFirst (); + theXMax = RealFirst (); + theYMax = RealFirst (); + theZMax = RealFirst (); - for ( Iterator.Initialize (ASet); - Iterator.More (); - Iterator.Next ()) { + for (anIterator.Initialize (theSet); anIterator.More(); anIterator.Next()) + { + const Handle(Graphic3d_Structure)& aStructure = anIterator.Key(); - if ((Iterator.Key ())->IsInfinite ()){ + if (aStructure->IsInfinite() && !theToIgnoreInfiniteFlag) + { //XMin, YMin .... ZMax are initialized by means of infinite line data - (Iterator.Key ())->MinMaxValues (Xm, Ym, Zm, XM, YM, ZM); - if ( Xm != RealFirst() && Xm < XMin ) - XMin = Xm ; - if ( Ym != RealFirst() && Ym < YMin ) - YMin = Ym ; - if ( Zm != RealFirst() && Zm < ZMin ) - ZMin = Zm ; - if ( XM != RealLast() && XM > XMax ) - XMax = XM ; - if ( YM != RealLast() && YM > YMax ) - YMax = YM ; - if ( ZM != RealLast() && ZM > ZMax ) - ZMax = ZM ; + aStructure->MinMaxValues (aXm, aYm, aZm, aXM, aYM, aZM, Standard_False); + if (aXm != RealFirst() && aXm < theXMin) + { + theXMin = aXm; + } + if (aYm != RealFirst() && aYm < theYMin) + { + theYMin = aYm; + } + if (aZm != RealFirst() && aZm < theZMin) + { + theZMin = aZm; + } + if (aXM != RealLast() && aXM > theXMax) + { + theXMax = aXM; + } + if (aYM != RealLast() && aYM > theYMax) + { + theYMax = aYM; + } + if (aZM != RealLast() && aZM > theZMax) + { + theZMax = aZM; + } } + // Only non-empty and non-infinite structures // are taken into account for calculation of MinMax - if (! (Iterator.Key ())->IsInfinite () && - ! (Iterator.Key ())->IsEmpty ()) { - (Iterator.Key ())->MinMaxValues(Xm, Ym, Zm, XM, YM, ZM); - /* ABD 29/10/04 Transform Persistence of Presentation( pan, zoom, rotate ) */ - //"FitAll" operation ignores object with transform persitence parameter - if( (Iterator.Key ())->TransformPersistenceMode() == Graphic3d_TMF_None ) - { - if (Xm < XMin) XMin = Xm; - if (Ym < YMin) YMin = Ym; - if (Zm < ZMin) ZMin = Zm; - if (XM > XMax) XMax = XM; - if (YM > YMax) YMax = YM; - if (ZM > ZMax) ZMax = ZM; - } + if ((!aStructure->IsInfinite() || theToIgnoreInfiniteFlag) && !aStructure->IsEmpty()) + { + aStructure->MinMaxValues (aXm, aYm, aZm, aXM, aYM, aZM, theToIgnoreInfiniteFlag); + + /* ABD 29/10/04 Transform Persistence of Presentation( pan, zoom, rotate ) */ + //"FitAll" operation ignores object with transform persitence parameter + if(aStructure->TransformPersistenceMode() == Graphic3d_TMF_None ) + { + theXMin = Min (aXm, theXMin); + theYMin = Min (aYm, theYMin); + theZMin = Min (aZm, theZMin); + theXMax = Max (aXM, theXMax); + theYMax = Max (aYM, theYMax); + theZMax = Max (aZM, theZMax); } + } } // The following cases are relevant // For exemple if all structures are empty or infinite - if (XMax < XMin) { Xm = XMin; XMin = XMax; XMax = Xm; } - if (YMax < YMin) { Ym = YMin; YMin = YMax; YMax = Ym; } - if (ZMax < ZMin) { Zm = ZMin; ZMin = ZMax; ZMax = Zm; } + if (theXMax < theXMin) { aXm = theXMin; theXMin = theXMax; theXMax = aXm; } + if (theYMax < theYMin) { aYm = theYMin; theYMin = theYMax; theYMax = aYm; } + if (theZMax < theZMin) { aZm = theZMin; theZMin = theZMax; theZMax = aZm; } } } -void Visual3d_View::MinMaxValues (Standard_Real& XMin, Standard_Real& YMin, Standard_Real& XMax, Standard_Real& YMax) { - - MinMaxValues (MyDisplayedStructure, XMin, YMin, XMax, YMax); - +//============================================================================= +//function : MinMaxValues +//purpose : +//============================================================================= +void Visual3d_View::MinMaxValues (Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + const Standard_Boolean theToIgnoreInfiniteFlag) const +{ + MinMaxValues (MyDisplayedStructure, + theXMin, theYMin, + theXMax, theYMax, + theToIgnoreInfiniteFlag); } -void Visual3d_View::MinMaxValues (const Graphic3d_MapOfStructure& ASet, Standard_Real& XMin, Standard_Real& YMin, Standard_Real& XMax, Standard_Real& YMax) { - -Standard_Real Xm, Ym, Zm, XM, YM, ZM; -Standard_Real Xp, Yp, Zp; +//============================================================================= +//function : MinMaxValues +//purpose : +//============================================================================= +void Visual3d_View::MinMaxValues (const Graphic3d_MapOfStructure& theSet, + Standard_Real& theXMin, + Standard_Real& theYMin, + Standard_Real& theXMax, + Standard_Real& theYMax, + const Standard_Boolean theToIgnoreInfiniteFlag) const +{ + Standard_Real aXm, aYm, aZm, aXM, aYM, aZM; + Standard_Real aXp, aYp, aZp; - MinMaxValues (ASet, Xm, Ym, Zm, XM, YM, ZM); + MinMaxValues (theSet, aXm, aYm, aZm, aXM, aYM, aZM, theToIgnoreInfiniteFlag); - Projects (Xm, Ym, Zm, Xp, Yp, Zp); - XMin = Xp; - YMin = Yp; + Projects (aXm, aYm, aZm, aXp, aYp, aZp); + theXMin = aXp; + theYMin = aYp; - Projects (XM, YM, ZM, Xp, Yp, Zp); - XMax = Xp; - YMax = Yp; + Projects (aXM, aYM, aZM, aXp, aYp, aZp); + theXMax = aXp; + theYMax = aYp; - if (XMax < XMin) { Xp = XMax; XMax = XMin; XMin = Xp; } - if (YMax < YMin) { Yp = YMax; YMax = YMin; YMin = Yp; } + if (theXMax < theXMin) { aXp = theXMax; theXMax = theXMin; theXMin = aXp; } + if (theYMax < theYMin) { aYp = theYMax; theYMax = theYMin; theYMin = aYp; } } - Standard_Integer Visual3d_View::NumberOfDisplayedStructures () const { Standard_Integer Result = MyDisplayedStructure.Extent (); @@ -1866,28 +1922,30 @@ Standard_Integer Result = MyDisplayedStructure.Extent (); } -void Visual3d_View::Projects (const Standard_Real AX, - const Standard_Real AY, - const Standard_Real AZ, - Standard_Real& APX, - Standard_Real& APY, - Standard_Real& APZ) +//======================================================================= +//function : Projects +//purpose : +//======================================================================= +void Visual3d_View::Projects (const Standard_Real theX, + const Standard_Real theY, + const Standard_Real theZ, + Standard_Real& thePX, + Standard_Real& thePY, + Standard_Real& thePZ) const { - Handle(Graphic3d_Camera) aCamera = MyCView.Context.Camera; - - Standard_Real aUmin, aVMin, aUMax, aVMax; - Standard_Real aNear, aFar; - aCamera->WindowLimit (aUmin, aVMin, aUMax, aVMax); + const Handle(Graphic3d_Camera)& aCamera = MyCView.Context.Camera; - aNear = aCamera->ZNear(); - aFar = aCamera->ZFar(); + gp_XYZ aViewSpaceDimensions = aCamera->ViewDimensions(); + Standard_Real aXSize = aViewSpaceDimensions.X(); + Standard_Real aYSize = aViewSpaceDimensions.Y(); + Standard_Real aZSize = aViewSpaceDimensions.Z(); - gp_Pnt aPoint (AX, AY, AZ); - aPoint = aCamera->Project (aPoint); + gp_Pnt aPoint = aCamera->Project (gp_Pnt (theX, theY, theZ)); - APX = (aPoint.X() + 1) * 0.5 * (aUMax - aUmin) + aUmin; - APY = (aPoint.Y() + 1) * 0.5 * (aVMax - aVMin) + aVMin; - APZ = aPoint.Z() * (aFar - aNear) + aNear; + // NDC [-1, 1] --> PROJ [ -size / 2, +size / 2 ] + thePX = aPoint.X() * aXSize * 0.5; + thePY = aPoint.Y() * aYSize * 0.5; + thePZ = aPoint.Z() * aZSize * 0.5; } Standard_Integer Visual3d_View::Identification () const { diff --git a/tests/bugs/modalg_2/bug20785 b/tests/bugs/modalg_2/bug20785 index 6a7ea868d3..aa2189089d 100755 --- a/tests/bugs/modalg_2/bug20785 +++ b/tests/bugs/modalg_2/bug20785 @@ -31,21 +31,17 @@ set only_screen 0 set scale 2.7840527693872859 set center_X 3.7559505017270567e-07 -set center_Y -71.035163389154491 set proj_X -0.89892524480819702 set proj_Y -0.37323716282844543 set proj_Z -0.22940616309642792 set up_X -0.41990724205970764 set up_Y 0.58468854427337646 set up_Z 0.69413024187088013 -set at_X -74.980735778808594 -set at_Y 22.785961151123047 -set at_Z -49.215263366699219 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -44.6832661344329 +set at_Y -21.4529078187916 +set at_Z -95.9601818852522 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21255 b/tests/bugs/modalg_2/bug21255 index 9050872b2b..a72cd2ff8a 100755 --- a/tests/bugs/modalg_2/bug21255 +++ b/tests/bugs/modalg_2/bug21255 @@ -34,22 +34,17 @@ set nb_shape_good 58 vfit set scale 5.8955238204183011 - set center_X -43.928617104386774 - set center_Y 295.47887425975171 - set proj_X 0.62061613798141479 + set proj_X 0.62061613798141479 set proj_Y -0.6891753077507019 set proj_Z -0.37399500608444214 set up_X -0.12894462049007416 set up_Y -0.56017255783081055 set up_Z 0.81827831268310547 - set at_X 15.248310089111328 - set at_Y 165.90042114257812 - set at_Z 225.19309997558594 - - vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} + set at_X -56.828238528324 + set at_Y -19.8089213662065 + set at_Z 447.801500039167 + + vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} } diff --git a/tests/bugs/modalg_2/bug21261_1 b/tests/bugs/modalg_2/bug21261_1 index 5e85ddafbd..7ee67a8830 100755 --- a/tests/bugs/modalg_2/bug21261_1 +++ b/tests/bugs/modalg_2/bug21261_1 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.8136266443689317 -set center_X -34.878384652992025 -set center_Y 41.518039353084561 set proj_X 0.5689244270324707 set proj_Y -0.54117375612258911 set proj_Z -0.61923813819885254 set up_X 0.48309960961341858 set up_Y -0.38943690061569214 set up_Z 0.78418976068496704 -set at_X -38.500396728515625 -set at_Y 34.677536010742188 -set at_Z -7.9150166511535645 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -41.655908269392 +set at_Y -7.48592829187374 +set at_Z 26.0339793965026 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_10 b/tests/bugs/modalg_2/bug21261_10 index b71bbf876b..fc70d13b7e 100755 --- a/tests/bugs/modalg_2/bug21261_10 +++ b/tests/bugs/modalg_2/bug21261_10 @@ -33,21 +33,17 @@ vfit set scale 6.3723487126883533 set center_X -4.2632564145606011e-14 -set center_Y -22.430308400362279 set proj_X 0.57735025882720947 set proj_Y -0.57735025882720947 set proj_Z 0.57735025882720947 set up_X -0.40824827551841736 set up_Y 0.40824827551841736 set up_Z 0.81649655103683472 -set at_X 0 -set at_Y 0 -set at_Z 0 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 6.14255753835228 +set at_Y -12.171712579698 +set at_Z -18.3142701180503 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_11 b/tests/bugs/modalg_2/bug21261_11 index 49057b0ab9..c3f03ac594 100755 --- a/tests/bugs/modalg_2/bug21261_11 +++ b/tests/bugs/modalg_2/bug21261_11 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 17.084273613995954 -set center_X 210.44987026890158 -set center_Y -5.2570485620847549 set proj_X 0.98952245712280273 set proj_Y -0.12535266578197479 set proj_Z 0.071637466549873352 set up_X -0.016377445310354233 set up_Y 0.39552098512649536 set up_Z 0.91831082105636597 -set at_X 121.38485717773438 -set at_Y -46.730243682861328 -set at_Z 83.376449584960938 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 151.659324986196 +set at_Y 142.670935515999 +set at_Z -3.38433863631535 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_2 b/tests/bugs/modalg_2/bug21261_2 index 09315aa48e..d0e2aa33a5 100755 --- a/tests/bugs/modalg_2/bug21261_2 +++ b/tests/bugs/modalg_2/bug21261_2 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.8136266443689317 -set center_X -34.878384652992025 -set center_Y 41.518039353084561 set proj_X 0.5689244270324707 set proj_Y -0.54117375612258911 set proj_Z -0.61923813819885254 set up_X 0.48309960961341858 set up_Y -0.38943690061569214 set up_Z 0.78418976068496704 -set at_X -38.500396728515625 -set at_Y 34.677536010742188 -set at_Z -7.9150166511535645 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -41.655908269392 +set at_Y -7.48592829187374 +set at_Z 26.0339793965026 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_3 b/tests/bugs/modalg_2/bug21261_3 index 987e8badd8..3f2b69999d 100755 --- a/tests/bugs/modalg_2/bug21261_3 +++ b/tests/bugs/modalg_2/bug21261_3 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.4752524438940986 -set center_X 0.12443750381514462 -set center_Y 30.91257192276079 set proj_X 0.75705158710479736 set proj_Y -0.55456298589706421 set proj_Z 0.34544554352760315 set up_X -0.26271694898605347 set up_Y 0.22571359574794769 set up_Z 0.93810069561004639 -set at_X -8.4405813217163086 -set at_Y 5.1293683052062988 -set at_Z 1.3484655618667603 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -16.4873994814895 +set at_Y 12.2064246030849 +set at_Z 30.344440786584 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_4 b/tests/bugs/modalg_2/bug21261_4 index 40b37e4a92..383db1529c 100755 --- a/tests/bugs/modalg_2/bug21261_4 +++ b/tests/bugs/modalg_2/bug21261_4 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.4752524438940986 -set center_X 0.12443750381514462 -set center_Y 30.91257192276079 set proj_X 0.75705158710479736 set proj_Y -0.55456298589706421 set proj_Z 0.34544554352760315 set up_X -0.26271694898605347 set up_Y 0.22571359574794769 set up_Z 0.93810069561004639 -set at_X -8.4405813217163086 -set at_Y 5.1293683052062988 -set at_Z 1.3484655618667603 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -16.4873994814895 +set at_Y 12.2064246030849 +set at_Z 30.344440786584 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_40 b/tests/bugs/modalg_2/bug21261_40 index 6c2c9442ac..27ebea0aaf 100755 --- a/tests/bugs/modalg_2/bug21261_40 +++ b/tests/bugs/modalg_2/bug21261_40 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 4.1681300306816444 -set center_X 0.13164276086378379 -set center_Y 6.6154949824974238 set proj_X 0.48621529340744019 set proj_Y -0.47558537125587463 set proj_Z 0.73308473825454712 set up_X -0.51949578523635864 set up_Y 0.51725912094116211 set up_Z 0.68012285232543945 -set at_X 1.1775522232055664 -set at_Y -1.214188814163208 -set at_Z 0.14915035665035248 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -2.16667064830908 +set at_Y 2.30140290143177 +set at_Z 4.64791596010368 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_41 b/tests/bugs/modalg_2/bug21261_41 index 7966f0f2f9..5e4bec418b 100755 --- a/tests/bugs/modalg_2/bug21261_41 +++ b/tests/bugs/modalg_2/bug21261_41 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 4.1681300306816444 -set center_X 0.13164276086378379 -set center_Y 6.6154949824974238 set proj_X 0.48621529340744019 set proj_Y -0.47558537125587463 set proj_Z 0.73308473825454712 set up_X -0.51949578523635864 set up_Y 0.51725912094116211 set up_Z 0.68012285232543945 -set at_X 1.1775522232055664 -set at_Y -1.214188814163208 -set at_Z 0.14915035665035248 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -2.16667064830908 +set at_Y 2.30140290143177 +set at_Z 4.64791596010368 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_42 b/tests/bugs/modalg_2/bug21261_42 index 53799a16e4..4597a3add0 100755 --- a/tests/bugs/modalg_2/bug21261_42 +++ b/tests/bugs/modalg_2/bug21261_42 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.7979972910353759 -set center_X 134.00320461480183 -set center_Y 57.36536300752401 set proj_X 0.40099617838859558 set proj_Y -0.39083370566368103 set proj_Z 0.82852339744567871 set up_X -0.58777821063995361 set up_Y 0.58394128084182739 set up_Z 0.55993682146072388 -set at_X 14.468252182006836 -set at_Y -14.975484848022461 -set at_Z -8.813446044921875 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 74.9076600209737 +set at_Y 113.868559295313 +set at_Z 22.713272605878 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_43 b/tests/bugs/modalg_2/bug21261_43 index 2a634ce7c4..6a03d51f80 100755 --- a/tests/bugs/modalg_2/bug21261_43 +++ b/tests/bugs/modalg_2/bug21261_43 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.7979972910353759 -set center_X 134.00320461480183 -set center_Y 57.36536300752401 set proj_X 0.40099617838859558 set proj_Y -0.39083370566368103 set proj_Z 0.82852339744567871 set up_X -0.58777821063995361 set up_Y 0.58394128084182739 set up_Z 0.55993682146072388 -set at_X 14.468252182006836 -set at_Y -14.975484848022461 -set at_Z -8.813446044921875 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 74.9076600209737 +set at_Y 113.868559295313 +set at_Z 22.713272605878 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_44 b/tests/bugs/modalg_2/bug21261_44 index cebbaa93a1..46f35d0f26 100755 --- a/tests/bugs/modalg_2/bug21261_44 +++ b/tests/bugs/modalg_2/bug21261_44 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 17.084273613995954 -set center_X 210.44987026890158 -set center_Y -5.2570485620847549 set proj_X 0.98952245712280273 set proj_Y -0.12535266578197479 set proj_Z 0.071637466549873352 set up_X -0.016377445310354233 set up_Y 0.39552098512649536 set up_Z 0.91831082105636597 -set at_X 121.38485717773438 -set at_Y -46.730243682861328 -set at_Z 83.376449584960938 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 151.659324986196 +set at_Y 142.670935515999 +set at_Z -3.38433863631535 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_5 b/tests/bugs/modalg_2/bug21261_5 index 8263c7f404..4f0d5261a3 100755 --- a/tests/bugs/modalg_2/bug21261_5 +++ b/tests/bugs/modalg_2/bug21261_5 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 4.1681300306816444 -set center_X 0.13164276086378379 -set center_Y 6.6154949824974238 set proj_X 0.48621529340744019 set proj_Y -0.47558537125587463 set proj_Z 0.73308473825454712 set up_X -0.51949578523635864 set up_Y 0.51725912094116211 set up_Z 0.68012285232543945 -set at_X 1.1775522232055664 -set at_Y -1.214188814163208 -set at_Z 0.14915035665035248 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -2.16667064830908 +set at_Y 2.30140290143177 +set at_Z 4.64791596010368 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_6 b/tests/bugs/modalg_2/bug21261_6 index b60fff91fb..cb32f22792 100755 --- a/tests/bugs/modalg_2/bug21261_6 +++ b/tests/bugs/modalg_2/bug21261_6 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 4.1681300306816444 -set center_X 0.13164276086378379 -set center_Y 6.6154949824974238 set proj_X 0.48621529340744019 set proj_Y -0.47558537125587463 set proj_Z 0.73308473825454712 set up_X -0.51949578523635864 set up_Y 0.51725912094116211 set up_Z 0.68012285232543945 -set at_X 1.1775522232055664 -set at_Y -1.214188814163208 -set at_Z 0.14915035665035248 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X -2.16667064830908 +set at_Y 2.30140290143177 +set at_Z 4.64791596010368 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_7 b/tests/bugs/modalg_2/bug21261_7 index 29a0a48b85..10b4db5827 100755 --- a/tests/bugs/modalg_2/bug21261_7 +++ b/tests/bugs/modalg_2/bug21261_7 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.7979972910353759 -set center_X 134.00320461480183 -set center_Y 57.36536300752401 set proj_X 0.40099617838859558 set proj_Y -0.39083370566368103 set proj_Z 0.82852339744567871 set up_X -0.58777821063995361 set up_Y 0.58394128084182739 set up_Z 0.55993682146072388 -set at_X 14.468252182006836 -set at_Y -14.975484848022461 -set at_Z -8.813446044921875 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 74.9076600209737 +set at_Y 113.868559295313 +set at_Z 22.713272605878 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_8 b/tests/bugs/modalg_2/bug21261_8 index a89cced51a..f9a3650715 100755 --- a/tests/bugs/modalg_2/bug21261_8 +++ b/tests/bugs/modalg_2/bug21261_8 @@ -32,22 +32,17 @@ vsetdispmode 0 vfit set scale 5.7979972910353759 -set center_X 134.00320461480183 -set center_Y 57.36536300752401 set proj_X 0.40099617838859558 set proj_Y -0.39083370566368103 set proj_Z 0.82852339744567871 set up_X -0.58777821063995361 set up_Y 0.58394128084182739 set up_Z 0.55993682146072388 -set at_X 14.468252182006836 -set at_Y -14.975484848022461 -set at_Z -8.813446044921875 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 74.9076600209737 +set at_Y 113.868559295313 +set at_Z 22.713272605878 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21261_9 b/tests/bugs/modalg_2/bug21261_9 index c96dbe9428..31f0162c0b 100755 --- a/tests/bugs/modalg_2/bug21261_9 +++ b/tests/bugs/modalg_2/bug21261_9 @@ -33,21 +33,17 @@ vfit set scale 6.3723487126883533 set center_X -4.2632564145606011e-14 -set center_Y -22.430308400362279 set proj_X 0.57735025882720947 set proj_Y -0.57735025882720947 set proj_Z 0.57735025882720947 set up_X -0.40824827551841736 set up_Y 0.40824827551841736 set up_Z 0.81649655103683472 -set at_X 0 -set at_Y 0 -set at_Z 0 - -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +set at_X 6.14255753835228 +set at_Y -12.171712579698 +set at_Z -18.3142701180503 + +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 0 diff --git a/tests/bugs/modalg_2/bug21415 b/tests/bugs/modalg_2/bug21415 index 7b57ac973a..076ff40311 100755 --- a/tests/bugs/modalg_2/bug21415 +++ b/tests/bugs/modalg_2/bug21415 @@ -14,17 +14,15 @@ set BugNumber OCC21415 # Data set scale 19.469810863701095 -set center_X 436.67687011410339 -set center_Y 148.0981469658436 set proj_X 0.99999862909317017 set proj_Y 0.0012245246907696128 set proj_Z -0.0011169711360707879 set up_X 0.00037844621692784131 set up_Y 0.48741284012794495 set up_Z 0.87317168712615967 -set at_X 291.61880493164062 -set at_Y -453.53787231445312 -set at_Z 82.229469299316406 +set at_X 290.970210143045 +set at_Y -0.0594423932820831 +set at_Z -1.29683163874688 # Start @@ -37,10 +35,7 @@ vsetdispmode 1 vfit -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} puts "TEMPORARY!!!!!!!!!!!!!!!!!" set square 400000 diff --git a/tests/bugs/modalg_2/bug21909 b/tests/bugs/modalg_2/bug21909 index 58552629b2..f8872879f2 100755 --- a/tests/bugs/modalg_2/bug21909 +++ b/tests/bugs/modalg_2/bug21909 @@ -13,17 +13,15 @@ set BugNumber OCC21909 # Data set scale 57.547428234801195 -set center_X -29.161882474505589 -set center_Y -27.085456554411167 set proj_X -0.25567048788070679 set proj_Y -0.92769843339920044 set proj_Z 0.27204453945159912 set up_X 0.43156850337982178 set up_Y 0.14228194952011108 set up_Z 0.89078855514526367 -set at_X 53.189125061035156 -set at_Y -25.674787521362305 -set at_Z -2.9377093315124512 +set at_X 16.2722331487924 +set at_Y -19.463212261103 +set at_Z -16.4505465814645 set x1 190 @@ -40,10 +38,7 @@ vfit vsetdispmode 1 vfit -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} vmoveto ${x1} ${y1} vmoveto ${x1} ${y1} diff --git a/tests/bugs/modalg_4/bug895 b/tests/bugs/modalg_4/bug895 index 2d2edccf50..0d86ea2ecd 100755 --- a/tests/bugs/modalg_4/bug895 +++ b/tests/bugs/modalg_4/bug895 @@ -10,17 +10,15 @@ puts "" pload QAcommands set scale 73.609 -set center_X 7.93702 -set center_Y 0.264503 set proj_X 0.523995 set proj_Y 0.359655 set proj_Z 0.77206 set up_X -0.739036 set up_Y -0.258607 set up_Z 0.622051 -set at_X 9.06773 -set at_Y -1.93771 -set at_Z 1.45124 +set at_X 5.51184366274157 +set at_Y 5.10968389884332 +set at_Z 0.581665443993578 set x_coord 210 set y_coord 210 @@ -40,10 +38,7 @@ if { ${status} == 0} { vsetdispmode 1 vdisplay result - vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} + vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} checkcolor $x_coord $y_coord 0.98 0.72 0.13 diff --git a/tests/bugs/modalg_5/bug24012 b/tests/bugs/modalg_5/bug24012 index 13ef5f18f3..3d8f6d9387 100644 --- a/tests/bugs/modalg_5/bug24012 +++ b/tests/bugs/modalg_5/bug24012 @@ -21,21 +21,16 @@ vfit set scale 71.101493567712652 -set center_X 8.280398902360842 -set center_Y 7.1615404015522026 set proj_X -0.14605970947882216 set proj_Y -0.18639384905183365 set proj_Z 0.97155745805516014 set up_X -0.587582742029223 set up_Y 0.80643668322534767 set up_Z 0.066380699137021923 -set at_X 3.9226062794202492 -set at_Y -3.6740070074451168 -set at_Z 6.1530005464201167 +set at_X 6.30475074082204 +set at_Y 6.748073489527 +set at_Z 8.5106037329062 -vviewparams ${scale} ${center_X} ${center_Y} \ -${proj_X} ${proj_Y} ${proj_Z} \ -${up_X} ${up_Y} ${up_Z} \ -${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 1 diff --git a/tests/bugs/moddata_1/bug20 b/tests/bugs/moddata_1/bug20 index b9f4dc0911..562a459cab 100755 --- a/tests/bugs/moddata_1/bug20 +++ b/tests/bugs/moddata_1/bug20 @@ -18,7 +18,7 @@ vinit vdisplay result vsetdispmode result 1 -vviewparams 5.1346924 95.358439 -4.910448 0.23495967 -0.302 0.923899 -0.7304302 0.5722587 0.372815 9.550874 -7.55706 -28.83166 +vviewparams -scale 5.1346924 -proj 0.23495967 -0.302 0.923899 -up -0.7304302 0.5722587 0.372815 -at 74.2909604913005 62.3380479127367 -22.4489114507273 isos result 0 triangles result diff --git a/tests/bugs/vis/buc60688 b/tests/bugs/vis/buc60688 index 03afec74c5..94a216dc81 100755 --- a/tests/bugs/vis/buc60688 +++ b/tests/bugs/vis/buc60688 @@ -18,7 +18,7 @@ wire w_1 e_1 e_2 e_3 e_4 mkplane r w_1 vdisplay r vfit -vselect 120 21 +vselect 120 22 puts "WARNING : The rectangular MUST be highlighted !" puts "" diff --git a/tests/bugs/vis/bug113 b/tests/bugs/vis/bug113 index 8985c0cab3..6e33b668fd 100755 --- a/tests/bugs/vis/bug113 +++ b/tests/bugs/vis/bug113 @@ -12,17 +12,15 @@ set X_02 204 set Y_02 300 set scale 60.6309 -set center_X 7.07107 -set center_Y 4.08248 set proj_X 0.479541 set proj_Y 0.586729 set proj_Z 0.652525 set up_X -0.838029 set up_Y 0.0856396 set up_Z 0.538863 -set at_X 8.87741 -set at_Y -2.73728 -set at_Z 4.68363 +set at_X 3.61568258316782 +set at_Y 3.30626448080767 +set at_Z 3.11631746104816 # Display two face vinit @@ -57,6 +55,6 @@ vmoveto ${X_02} ${Y_02} checkcolor ${X_02} ${Y_02} 0 1 1 # Rotation -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set only_screen 1 diff --git a/tests/bugs/vis/bug1174 b/tests/bugs/vis/bug1174 index 4afae8ebaa..bf841193c7 100755 --- a/tests/bugs/vis/bug1174 +++ b/tests/bugs/vis/bug1174 @@ -20,19 +20,17 @@ vdisplay a vfit set scale 2.50501 -set center_X 191.285 -set center_Y 76.6556 set proj_X 0.672033 set proj_Y -0.721033 set proj_Z 0.168771 set up_X -0.131494 set up_Y 0.108095 set up_Z 0.985406 -set at_X -27.258 -set at_Y 30.2321 -set at_Z -9.0201 +set at_X 102.061817325836 +set at_Y 169.436979868935 +set at_Z 70.7572056943368 -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set x_GREEN 300 set y_GREEN 180 diff --git a/tests/bugs/vis/bug128 b/tests/bugs/vis/bug128 index e058174a67..5e9deabdb7 100755 --- a/tests/bugs/vis/bug128 +++ b/tests/bugs/vis/bug128 @@ -10,7 +10,7 @@ set y_coord 171 vinit OCC128 -vviewparams 4.9487928 89.23589 4.1505 0.7329295 0.59461397 0.33052679 -0.536849 0.2071041 0.81786 71.971878 -17.250309 33.509651 +vviewparams -scale 4.9487928 -proj 0.7329295 0.59461397 0.33052679 -up -0.536849 0.2071041 0.81786 -at 32.4556665273951 52.9347942181675 -5.1270029887922 checkcolor $x_coord $y_coord 0.43 0.48 0.54 diff --git a/tests/bugs/vis/bug137_4 b/tests/bugs/vis/bug137_4 index d7c181c4ea..fa72e3258c 100755 --- a/tests/bugs/vis/bug137_4 +++ b/tests/bugs/vis/bug137_4 @@ -46,7 +46,7 @@ checkcolor $x_coord $y_coord 0 1 1 set x_coord 105 set y_coord 340 -vviewparams 60.6309 7.07107 4.08248 0.592163 -0.60038 -0.537482 0.369921 -0.390032 0.843228 -3.28175 3.38875 3.0464 +vviewparams -scale 60.6309 -proj 0.592163 -0.60038 -0.537482 -up 0.369921 -0.390032 0.843228 -at 3.29057034725635 6.73314999296002 6.55157729015654 checkcolor $x_coord $y_coord 0.78 0.54 0.09 diff --git a/tests/bugs/vis/bug137_5 b/tests/bugs/vis/bug137_5 index 97b1b89dd6..feff6df430 100755 --- a/tests/bugs/vis/bug137_5 +++ b/tests/bugs/vis/bug137_5 @@ -44,7 +44,7 @@ set y_coord 340 checkcolor $x_coord $y_coord 0 1 1 -vviewparams 60.6309 7.07107 4.08248 0.592163 -0.60038 -0.537482 0.369921 -0.390032 0.843228 -3.28175 3.38875 3.0464 +vviewparams -scale 60.6309 -proj 0.592163 -0.60038 -0.537482 -up 0.369921 -0.390032 0.843228 -at 3.29057034725635 6.73314999296002 6.55157729015654 set x_coord 105 set y_coord 340 diff --git a/tests/bugs/vis/bug215 b/tests/bugs/vis/bug215 index 6429417877..edca9c3830 100755 --- a/tests/bugs/vis/bug215 +++ b/tests/bugs/vis/bug215 @@ -11,19 +11,17 @@ vdisplay result vfit set scale 6.29714883567995 -set center_X 70.7106779835678 -set center_Y 41.2330922040446 set proj_X 0.344812899827957 set proj_Y -0.830477952957153 set proj_Z 0.43750473856926 set up_X -0.368759274482727 set up_Y 0.308769434690475 set up_Z 0.876742839813232 -set at_X -5.88607025146484 -set at_Y 28.6973209381104 -set at_Z -12.5332689285278 +set at_X 39.9465644699194 +set at_Y 74.2135758209193 +set at_Z 37.7440421525395 -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set x_coord 229 set y_coord 94 diff --git a/tests/bugs/vis/bug218 b/tests/bugs/vis/bug218 index 0f24ecbe3c..2576e008e6 100755 --- a/tests/bugs/vis/bug218 +++ b/tests/bugs/vis/bug218 @@ -10,22 +10,20 @@ vdisplay b_1 vfit set scale 7674.87317785833 -set center_X -2.16918246707847 -set center_Y 9.87290703657064 set proj_X 0.966540098190308 set proj_Y -0.24304473400116 set proj_Z 0.0820330902934074 set up_X -0.0460147373378277 set up_Y 0.150333747267723 set up_Z 0.987563848495483 -set at_X 1.04834496974945 -set at_Y 0.741619229316711 -set at_Z -0.0881031528115273 +set at_X 0.0466426680664981 +set at_Y 0.147133996816294 +set at_Z 9.95295385008357 set x_coord 388 set y_coord 28 -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} OCC218 trihedron1 b_1 X Y diff --git a/tests/bugs/vis/bug22313 b/tests/bugs/vis/bug22313 index e28ef87acc..7929c3dfad 100755 --- a/tests/bugs/vis/bug22313 +++ b/tests/bugs/vis/bug22313 @@ -11,17 +11,15 @@ set BugNumber OCC22313 # Data set scale 2.9701073117025172 -set center_X -1339.0679502864409 -set center_Y -2077.3454643258542 set proj_X 0.4096425473690033 set proj_Y 0.77340573072433472 set proj_Z 0.48377299308776855 set up_X -0.83569550514221191 set up_Y 0.1055084615945816 set up_Z 0.538962721824646 -set at_X -2857.961669921875 -set at_Y -1655.37939453125 -set at_Z -1782.80908203125 +set at_X -632.109173226325 +set at_Y -2711.56694941045 +set at_Z -1979.06316609577 set x1 300 @@ -42,10 +40,7 @@ vsetdispmode 1 vfit -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} checkcolor ${x1} ${y1} ${Artifact_R} ${Artifact_G} ${Artifact_B} diff --git a/tests/bugs/vis/bug22701 b/tests/bugs/vis/bug22701 index e6885499cc..38b9907774 100755 --- a/tests/bugs/vis/bug22701 +++ b/tests/bugs/vis/bug22701 @@ -11,17 +11,15 @@ set BugNumber OCC22701 # Data set scale 276.45658048904141 -set center_X 0.41566799352988693 -set center_Y -1.4232027731292387 set proj_X -0.8895147442817688 set proj_Y -0.37965071201324463 set proj_Z 0.25422060489654541 set up_X -0.055201318114995956 set up_Y 0.64161688089370728 set up_Z 0.76503568887710571 -set at_X -0.018965641036629677 -set at_Y 1.2994236946105957 -set at_Z -0.41784921288490295 +set at_X 0.248127012715387 +set at_Y 0.109238834542233 +set at_Z -1.2607059785715 set x1 105 set y1 275 @@ -47,10 +45,7 @@ vsetdispmode 1 vfit -vviewparams ${scale} ${center_X} ${center_Y} \ - ${proj_X} ${proj_Y} ${proj_Z} \ - ${up_X} ${up_Y} ${up_Z} \ - ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} checkcolor ${x1} ${y1} ${Hole1_R} ${Hole1_G} ${Hole1_B} checkcolor ${x2} ${y2} ${Hole2_R} ${Hole2_G} ${Hole2_B} diff --git a/tests/bugs/vis/bug23652 b/tests/bugs/vis/bug23652 index 7b9b8a4dd9..591e289f79 100755 --- a/tests/bugs/vis/bug23652 +++ b/tests/bugs/vis/bug23652 @@ -12,8 +12,6 @@ vdrawtext Default 0.0 0.0 0.0 255 255 255 0 0 0 1 20 0 vdrawtext Right_Align 0.0 0.0 0.0 255 255 255 2 0 0 1 20 0 set scale 3.1783114563761763 -set center_X 0 -set center_Y 0 set proj_X 0.57735025882720947 set proj_Y -0.57735025882720947 set proj_Z 0.57735025882720947 @@ -24,7 +22,7 @@ set at_X 0 set at_Y 0 set at_Z 0 -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set x_coord 210 set y_coord 204 diff --git a/tests/bugs/vis/bug280_2 b/tests/bugs/vis/bug280_2 index 0f5870a361..5f9193f6e3 100755 --- a/tests/bugs/vis/bug280_2 +++ b/tests/bugs/vis/bug280_2 @@ -11,7 +11,7 @@ OCC280 0 0 # selected point set x_coord 22 -set y_coord 230 +set y_coord 241 vfit diff --git a/tests/bugs/vis/bug280_3 b/tests/bugs/vis/bug280_3 index 7c1dc5c23a..9cf74282e3 100755 --- a/tests/bugs/vis/bug280_3 +++ b/tests/bugs/vis/bug280_3 @@ -11,7 +11,7 @@ vsetdispmode b 1 OCC280 0 1 set x_coord 22 -set y_coord 230 +set y_coord 241 puts "Before View->FitAll()" diff --git a/tests/bugs/vis/bug281_1 b/tests/bugs/vis/bug281_1 index 85fd2f001f..eeb6ca3f5d 100755 --- a/tests/bugs/vis/bug281_1 +++ b/tests/bugs/vis/bug281_1 @@ -9,8 +9,6 @@ set y 208 set TypeOfMarker 0 set scale 50.0521 -set center_X 0 -set center_Y 0 set proj_X 0.57735 set proj_Y -0.57735 set proj_Z 0.57735 @@ -21,7 +19,7 @@ set at_X 0 set at_Y 0 set at_Z 0 -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} OCC281 ${x} ${y} ${TypeOfMarker} OCC281 ${x} ${y} ${TypeOfMarker} diff --git a/tests/bugs/vis/bug319 b/tests/bugs/vis/bug319 index 6ec9b5ef9b..c012bceaba 100755 --- a/tests/bugs/vis/bug319 +++ b/tests/bugs/vis/bug319 @@ -25,19 +25,17 @@ vsetdispmode result 1 vfit set scale 16.5593321780929 -set center_X -0.0688543427812931 -set center_Y 11.6346916159369 set proj_X 0.207536488771439 set proj_Y -0.233648166060448 set proj_Z 0.949914216995239 set up_X -0.857990384101868 set up_Y 0.422952175140381 set up_Z 0.291485607624054 -set at_X 8.22575855255127 -set at_Y -2.95449280738831 -set at_Z 3.08669567108154 +set at_X -1.78904829452738 +set at_Y 1.90614280957802 +set at_Z 6.47028180612483 -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set info [trinfo result] regexp { +([-0-9.+eE]+) +triangles} $info full tri diff --git a/tests/bugs/vis/bug349 b/tests/bugs/vis/bug349 index 9434e754af..28a4a015b7 100755 --- a/tests/bugs/vis/bug349 +++ b/tests/bugs/vis/bug349 @@ -13,40 +13,40 @@ OCC280 1 0 vfit set x1 135 -set y1 170 +set y1 119 -set x2 314 -set y2 97 +set x2 387 +set y2 33 set x3 172 -set y3 184 +set y3 144 -set x4 32 -set y4 241 +set x4 28 +set y4 190 -set x5 156 -set y5 263 +set x5 160 +set y5 257 -set x6 305 -set y6 186 +set x6 365 +set y6 150 -set x7 186 -set y7 280 +set x7 212 +set y7 272 -set x8 54 -set y8 342 +set x8 60 +set y8 343 -set x9 32 -set y9 286 +set x9 26 +set y9 255 -set x10 295 -set y10 142 +set x10 353 +set y10 99 -set x11 322 -set y11 153 +set x11 389 +set y11 113 -set x12 56 -set y12 305 +set x12 60 +set y12 276 # # ___________2________________ diff --git a/tests/bugs/vis/bug349_1 b/tests/bugs/vis/bug349_1 index 0acda1ae90..ce1a8b1375 100755 --- a/tests/bugs/vis/bug349_1 +++ b/tests/bugs/vis/bug349_1 @@ -13,40 +13,40 @@ OCC280 1 1 vfit set x1 135 -set y1 170 +set y1 119 -set x2 314 -set y2 97 +set x2 387 +set y2 33 set x3 172 -set y3 184 +set y3 144 -set x4 32 -set y4 241 +set x4 28 +set y4 190 -set x5 156 -set y5 263 +set x5 160 +set y5 257 -set x6 305 -set y6 186 +set x6 365 +set y6 150 -set x7 186 -set y7 280 +set x7 212 +set y7 272 -set x8 54 -set y8 342 +set x8 60 +set y8 343 -set x9 32 -set y9 286 +set x9 26 +set y9 255 -set x10 295 -set y10 142 +set x10 353 +set y10 99 -set x11 322 -set y11 153 +set x11 389 +set y11 113 -set x12 56 -set y12 305 +set x12 60 +set y12 276 set Black_R 0 set Black_G 0 diff --git a/tests/bugs/vis/bug544 b/tests/bugs/vis/bug544 index f865077ae5..7cea82176a 100755 --- a/tests/bugs/vis/bug544 +++ b/tests/bugs/vis/bug544 @@ -17,19 +17,17 @@ vsetdispmode 1 vfit set scale 2.05374 -set center_X 169.854 -set center_Y -49.5549 set proj_X 0.135192 set proj_Y -0.978297 set proj_Z -0.157031 set up_X -0.399854 set up_Y -0.198875 set up_Z 0.894743 -set at_X 241.985 -set at_Y 329.911 -set at_Z 390.356 +set at_X 415.781529476262 +set at_Y 349.647084890243 +set at_Z 417.026634136105 -vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z} +vviewparams -scale ${scale} -proj ${proj_X} ${proj_Y} ${proj_Z} -up ${up_X} ${up_Y} ${up_Z} -at ${at_X} ${at_Y} ${at_Z} set x1 300 set y1 70 diff --git a/tests/v3d/edge/A3 b/tests/v3d/edge/A3 index 27b603d402..5d3177b455 100644 --- a/tests/v3d/edge/A3 +++ b/tests/v3d/edge/A3 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/edge/A4 b/tests/v3d/edge/A4 index aa33abf2a3..5cb62d35c8 100644 --- a/tests/v3d/edge/A4 +++ b/tests/v3d/edge/A4 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/edge/A5 b/tests/v3d/edge/A5 index a55f311edb..3f9689019d 100644 --- a/tests/v3d/edge/A5 +++ b/tests/v3d/edge/A5 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/edge/A6 b/tests/v3d/edge/A6 index ab30b3cdf2..a47b2a6009 100644 --- a/tests/v3d/edge/A6 +++ b/tests/v3d/edge/A6 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -15,7 +15,7 @@ vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/edge/A7 b/tests/v3d/edge/A7 index b82ad7dae5..f2f902bc91 100644 --- a/tests/v3d/edge/A7 +++ b/tests/v3d/edge/A7 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -15,7 +15,7 @@ vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/edge/A8 b/tests/v3d/edge/A8 index eeda694cc9..acf4bf2287 100644 --- a/tests/v3d/edge/A8 +++ b/tests/v3d/edge/A8 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -15,7 +15,7 @@ vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/edge/A9 b/tests/v3d/edge/A9 index e6054b9436..b19cab5d2b 100644 --- a/tests/v3d/edge/A9 +++ b/tests/v3d/edge/A9 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -15,7 +15,7 @@ vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/edge/B1 b/tests/v3d/edge/B1 index 1699896be8..2cd06bd478 100644 --- a/tests/v3d/edge/B1 +++ b/tests/v3d/edge/B1 @@ -7,7 +7,7 @@ vselmode 2 1 vmoveto 102 204 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -15,7 +15,7 @@ vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/edge/C3 b/tests/v3d/edge/C3 index 1d9d74d7ce..e901c95814 100644 --- a/tests/v3d/edge/C3 +++ b/tests/v3d/edge/C3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/C4 b/tests/v3d/edge/C4 index b01ec2b755..eea31f5bc6 100644 --- a/tests/v3d/edge/C4 +++ b/tests/v3d/edge/C4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/C5 b/tests/v3d/edge/C5 index 18695993fc..a9789d8a03 100644 --- a/tests/v3d/edge/C5 +++ b/tests/v3d/edge/C5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/C6 b/tests/v3d/edge/C6 index 9d064bb724..88f1011746 100644 --- a/tests/v3d/edge/C6 +++ b/tests/v3d/edge/C6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/C7 b/tests/v3d/edge/C7 index fcd7c621de..0edbe385e4 100644 --- a/tests/v3d/edge/C7 +++ b/tests/v3d/edge/C7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/C8 b/tests/v3d/edge/C8 index 2562b0245b..e56acf0867 100644 --- a/tests/v3d/edge/C8 +++ b/tests/v3d/edge/C8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/C9 b/tests/v3d/edge/C9 index a2ac894a1b..b7a675f8ea 100644 --- a/tests/v3d/edge/C9 +++ b/tests/v3d/edge/C9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/D1 b/tests/v3d/edge/D1 index 7e1ec3ad45..19eae7a90e 100644 --- a/tests/v3d/edge/D1 +++ b/tests/v3d/edge/D1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/D2 b/tests/v3d/edge/D2 index bb8e9f8f86..b364b32519 100644 --- a/tests/v3d/edge/D2 +++ b/tests/v3d/edge/D2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/D3 b/tests/v3d/edge/D3 index c4ef1b0d31..53a090884a 100644 --- a/tests/v3d/edge/D3 +++ b/tests/v3d/edge/D3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/D4 b/tests/v3d/edge/D4 index cd0ae30405..599192e986 100644 --- a/tests/v3d/edge/D4 +++ b/tests/v3d/edge/D4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/D5 b/tests/v3d/edge/D5 index 03356f7ef8..a1b37d1d73 100644 --- a/tests/v3d/edge/D5 +++ b/tests/v3d/edge/D5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/D6 b/tests/v3d/edge/D6 index d1723f160b..ee0bb681ec 100644 --- a/tests/v3d/edge/D6 +++ b/tests/v3d/edge/D6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 diff --git a/tests/v3d/edge/D7 b/tests/v3d/edge/D7 index 82b59670cc..a9f6933b30 100644 --- a/tests/v3d/edge/D7 +++ b/tests/v3d/edge/D7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/D8 b/tests/v3d/edge/D8 index 1f63824367..9d7094bc67 100644 --- a/tests/v3d/edge/D8 +++ b/tests/v3d/edge/D8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/D9 b/tests/v3d/edge/D9 index fa4510f712..e1d4f91732 100644 --- a/tests/v3d/edge/D9 +++ b/tests/v3d/edge/D9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/E1 b/tests/v3d/edge/E1 index 48ab48764b..6a5dc164f2 100644 --- a/tests/v3d/edge/E1 +++ b/tests/v3d/edge/E1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/E2 b/tests/v3d/edge/E2 index f474c98d8e..a402fd034c 100644 --- a/tests/v3d/edge/E2 +++ b/tests/v3d/edge/E2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/E3 b/tests/v3d/edge/E3 index 87119a2617..82c7650c1c 100644 --- a/tests/v3d/edge/E3 +++ b/tests/v3d/edge/E3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/E4 b/tests/v3d/edge/E4 index f3fc5a3018..f83197d757 100644 --- a/tests/v3d/edge/E4 +++ b/tests/v3d/edge/E4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/E5 b/tests/v3d/edge/E5 index 7ba34cc38d..fc982bcfc1 100644 --- a/tests/v3d/edge/E5 +++ b/tests/v3d/edge/E5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/E6 b/tests/v3d/edge/E6 index cf49265503..0563601226 100644 --- a/tests/v3d/edge/E6 +++ b/tests/v3d/edge/E6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 diff --git a/tests/v3d/edge/E7 b/tests/v3d/edge/E7 index d28104ec95..e02d1cab9d 100644 --- a/tests/v3d/edge/E7 +++ b/tests/v3d/edge/E7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 100 230 diff --git a/tests/v3d/edge/E8 b/tests/v3d/edge/E8 index d435ff544c..613d0c32f1 100644 --- a/tests/v3d/edge/E8 +++ b/tests/v3d/edge/E8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 100 230 diff --git a/tests/v3d/edge/E9 b/tests/v3d/edge/E9 index 37bc94edde..1933a75eb4 100644 --- a/tests/v3d/edge/E9 +++ b/tests/v3d/edge/E9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 100 230 diff --git a/tests/v3d/edge/F1 b/tests/v3d/edge/F1 index f90ab033df..3d2e65e59b 100644 --- a/tests/v3d/edge/F1 +++ b/tests/v3d/edge/F1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 100 230 diff --git a/tests/v3d/edge/F2 b/tests/v3d/edge/F2 index bcec97f730..f78c42c6c2 100644 --- a/tests/v3d/edge/F2 +++ b/tests/v3d/edge/F2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 185 110 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 140 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 100 230 diff --git a/tests/v3d/edge_face/A3 b/tests/v3d/edge_face/A3 index bc1e9376bb..75c0542563 100644 --- a/tests/v3d/edge_face/A3 +++ b/tests/v3d/edge_face/A3 @@ -7,7 +7,7 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/A4 b/tests/v3d/edge_face/A4 index f73127a492..77070bbfbf 100644 --- a/tests/v3d/edge_face/A4 +++ b/tests/v3d/edge_face/A4 @@ -7,7 +7,7 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/A5 b/tests/v3d/edge_face/A5 index 31eca6c092..1cdfd17676 100644 --- a/tests/v3d/edge_face/A5 +++ b/tests/v3d/edge_face/A5 @@ -7,7 +7,7 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/A6 b/tests/v3d/edge_face/A6 index 08af2b6cff..4508946a88 100644 --- a/tests/v3d/edge_face/A6 +++ b/tests/v3d/edge_face/A6 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/A7 b/tests/v3d/edge_face/A7 index 646b4a6700..9259d517ed 100644 --- a/tests/v3d/edge_face/A7 +++ b/tests/v3d/edge_face/A7 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/A8 b/tests/v3d/edge_face/A8 index 9dca554f26..761b440c82 100644 --- a/tests/v3d/edge_face/A8 +++ b/tests/v3d/edge_face/A8 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/A9 b/tests/v3d/edge_face/A9 index df7c1a76f8..a5738dbfdd 100644 --- a/tests/v3d/edge_face/A9 +++ b/tests/v3d/edge_face/A9 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/B1 b/tests/v3d/edge_face/B1 index a122c42895..df93c79de8 100644 --- a/tests/v3d/edge_face/B1 +++ b/tests/v3d/edge_face/B1 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 4 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/C3 b/tests/v3d/edge_face/C3 index 16ce5be63e..dcc153b6eb 100644 --- a/tests/v3d/edge_face/C3 +++ b/tests/v3d/edge_face/C3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/C4 b/tests/v3d/edge_face/C4 index 495f5b5bd8..f1be0ada00 100644 --- a/tests/v3d/edge_face/C4 +++ b/tests/v3d/edge_face/C4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/C5 b/tests/v3d/edge_face/C5 index 94676d46f0..c1c5c86b65 100644 --- a/tests/v3d/edge_face/C5 +++ b/tests/v3d/edge_face/C5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/C6 b/tests/v3d/edge_face/C6 index 5b35a4ec55..43db2eaf63 100644 --- a/tests/v3d/edge_face/C6 +++ b/tests/v3d/edge_face/C6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/C7 b/tests/v3d/edge_face/C7 index 9cace65c12..b205cc1f93 100644 --- a/tests/v3d/edge_face/C7 +++ b/tests/v3d/edge_face/C7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/C8 b/tests/v3d/edge_face/C8 index 0fd8d180e0..08a7f29e09 100644 --- a/tests/v3d/edge_face/C8 +++ b/tests/v3d/edge_face/C8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/C9 b/tests/v3d/edge_face/C9 index 95587e52cf..364a249114 100644 --- a/tests/v3d/edge_face/C9 +++ b/tests/v3d/edge_face/C9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/D1 b/tests/v3d/edge_face/D1 index dec96899e2..47fd758685 100644 --- a/tests/v3d/edge_face/D1 +++ b/tests/v3d/edge_face/D1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/D2 b/tests/v3d/edge_face/D2 index 9f168ed7ed..592de346c0 100644 --- a/tests/v3d/edge_face/D2 +++ b/tests/v3d/edge_face/D2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/D3 b/tests/v3d/edge_face/D3 index 5cf9fa8d8a..98bc8d5152 100644 --- a/tests/v3d/edge_face/D3 +++ b/tests/v3d/edge_face/D3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/D4 b/tests/v3d/edge_face/D4 index c0d3584d31..512272d8a2 100644 --- a/tests/v3d/edge_face/D4 +++ b/tests/v3d/edge_face/D4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/D5 b/tests/v3d/edge_face/D5 index 9e754a2208..9373f9976b 100644 --- a/tests/v3d/edge_face/D5 +++ b/tests/v3d/edge_face/D5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/D6 b/tests/v3d/edge_face/D6 index 5b5e38b053..2d1acd0fa4 100644 --- a/tests/v3d/edge_face/D6 +++ b/tests/v3d/edge_face/D6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/D7 b/tests/v3d/edge_face/D7 index 3cbcd2aeb8..0252a5ab51 100644 --- a/tests/v3d/edge_face/D7 +++ b/tests/v3d/edge_face/D7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/D8 b/tests/v3d/edge_face/D8 index 976073d3e8..63419c4110 100644 --- a/tests/v3d/edge_face/D8 +++ b/tests/v3d/edge_face/D8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/D9 b/tests/v3d/edge_face/D9 index 34e512b1b9..c040eef2e6 100644 --- a/tests/v3d/edge_face/D9 +++ b/tests/v3d/edge_face/D9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/E1 b/tests/v3d/edge_face/E1 index 477992af10..695c2712ea 100644 --- a/tests/v3d/edge_face/E1 +++ b/tests/v3d/edge_face/E1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/E2 b/tests/v3d/edge_face/E2 index 2df1eabd73..771fabf979 100644 --- a/tests/v3d/edge_face/E2 +++ b/tests/v3d/edge_face/E2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/E3 b/tests/v3d/edge_face/E3 index a0b743e3fe..4c1d024be2 100644 --- a/tests/v3d/edge_face/E3 +++ b/tests/v3d/edge_face/E3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/E4 b/tests/v3d/edge_face/E4 index d1294ffdac..d7b93fabf2 100644 --- a/tests/v3d/edge_face/E4 +++ b/tests/v3d/edge_face/E4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/E5 b/tests/v3d/edge_face/E5 index 0f8ed79414..8395f1a097 100644 --- a/tests/v3d/edge_face/E5 +++ b/tests/v3d/edge_face/E5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/E6 b/tests/v3d/edge_face/E6 index ce6447d647..c0b20c92f6 100644 --- a/tests/v3d/edge_face/E6 +++ b/tests/v3d/edge_face/E6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/E7 b/tests/v3d/edge_face/E7 index f3781b5c1c..58d5227b1e 100644 --- a/tests/v3d/edge_face/E7 +++ b/tests/v3d/edge_face/E7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/E8 b/tests/v3d/edge_face/E8 index 8d0261d258..afc4094e51 100644 --- a/tests/v3d/edge_face/E8 +++ b/tests/v3d/edge_face/E8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/E9 b/tests/v3d/edge_face/E9 index 4613f9edbd..4344ea8f5a 100644 --- a/tests/v3d/edge_face/E9 +++ b/tests/v3d/edge_face/E9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/F1 b/tests/v3d/edge_face/F1 index 96d6a92008..1ad4a9a3b7 100644 --- a/tests/v3d/edge_face/F1 +++ b/tests/v3d/edge_face/F1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/F2 b/tests/v3d/edge_face/F2 index d4e9484e1c..2c22ba8f18 100644 --- a/tests/v3d/edge_face/F2 +++ b/tests/v3d/edge_face/F2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/F5 b/tests/v3d/edge_face/F5 index ab9acc548a..ed09e4333d 100644 --- a/tests/v3d/edge_face/F5 +++ b/tests/v3d/edge_face/F5 @@ -8,7 +8,7 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/F6 b/tests/v3d/edge_face/F6 index 4de3e4d714..f2a0683623 100644 --- a/tests/v3d/edge_face/F6 +++ b/tests/v3d/edge_face/F6 @@ -8,7 +8,7 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/F7 b/tests/v3d/edge_face/F7 index 2f763c8f86..af3a5e2757 100644 --- a/tests/v3d/edge_face/F7 +++ b/tests/v3d/edge_face/F7 @@ -8,7 +8,7 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/F8 b/tests/v3d/edge_face/F8 index 794f5e2a7b..728ff1289d 100644 --- a/tests/v3d/edge_face/F8 +++ b/tests/v3d/edge_face/F8 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/F9 b/tests/v3d/edge_face/F9 index 594666aeb7..814271afa2 100644 --- a/tests/v3d/edge_face/F9 +++ b/tests/v3d/edge_face/F9 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/G1 b/tests/v3d/edge_face/G1 index 233c09b21b..52a48dd7d1 100644 --- a/tests/v3d/edge_face/G1 +++ b/tests/v3d/edge_face/G1 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/G2 b/tests/v3d/edge_face/G2 index 69953ccce1..b9957d7171 100644 --- a/tests/v3d/edge_face/G2 +++ b/tests/v3d/edge_face/G2 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/G3 b/tests/v3d/edge_face/G3 index 501cc36da0..3ad4e19f0d 100644 --- a/tests/v3d/edge_face/G3 +++ b/tests/v3d/edge_face/G3 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/H5 b/tests/v3d/edge_face/H5 index a917e2d34f..a237626bb5 100644 --- a/tests/v3d/edge_face/H5 +++ b/tests/v3d/edge_face/H5 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/H6 b/tests/v3d/edge_face/H6 index 8a49108248..868813c596 100644 --- a/tests/v3d/edge_face/H6 +++ b/tests/v3d/edge_face/H6 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/H7 b/tests/v3d/edge_face/H7 index f4ed73abae..db07ca89c4 100644 --- a/tests/v3d/edge_face/H7 +++ b/tests/v3d/edge_face/H7 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/H8 b/tests/v3d/edge_face/H8 index 4f5ffc7b3e..b191cfa1c7 100644 --- a/tests/v3d/edge_face/H8 +++ b/tests/v3d/edge_face/H8 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/H9 b/tests/v3d/edge_face/H9 index 317eae9c05..9d68ad195a 100644 --- a/tests/v3d/edge_face/H9 +++ b/tests/v3d/edge_face/H9 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I1 b/tests/v3d/edge_face/I1 index 3513af07f8..9ab6d3c8d5 100644 --- a/tests/v3d/edge_face/I1 +++ b/tests/v3d/edge_face/I1 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I2 b/tests/v3d/edge_face/I2 index 175cb5f15d..2068da2fcc 100644 --- a/tests/v3d/edge_face/I2 +++ b/tests/v3d/edge_face/I2 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I3 b/tests/v3d/edge_face/I3 index 235200fbc9..35b94698f1 100644 --- a/tests/v3d/edge_face/I3 +++ b/tests/v3d/edge_face/I3 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I4 b/tests/v3d/edge_face/I4 index 428cea15bc..79059926bd 100644 --- a/tests/v3d/edge_face/I4 +++ b/tests/v3d/edge_face/I4 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I5 b/tests/v3d/edge_face/I5 index a3605c317d..21116a611a 100644 --- a/tests/v3d/edge_face/I5 +++ b/tests/v3d/edge_face/I5 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I6 b/tests/v3d/edge_face/I6 index e6e412438f..a0729699c8 100644 --- a/tests/v3d/edge_face/I6 +++ b/tests/v3d/edge_face/I6 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I7 b/tests/v3d/edge_face/I7 index 42865b32b4..d3b4b7e732 100644 --- a/tests/v3d/edge_face/I7 +++ b/tests/v3d/edge_face/I7 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I8 b/tests/v3d/edge_face/I8 index 41d8fc2b25..5b05dd25fb 100644 --- a/tests/v3d/edge_face/I8 +++ b/tests/v3d/edge_face/I8 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/I9 b/tests/v3d/edge_face/I9 index 03e67b663b..c3dac37698 100644 --- a/tests/v3d/edge_face/I9 +++ b/tests/v3d/edge_face/I9 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J1 b/tests/v3d/edge_face/J1 index 6d22deb631..c3c2a0a670 100644 --- a/tests/v3d/edge_face/J1 +++ b/tests/v3d/edge_face/J1 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J2 b/tests/v3d/edge_face/J2 index 2689846bd7..3b5eac460e 100644 --- a/tests/v3d/edge_face/J2 +++ b/tests/v3d/edge_face/J2 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J3 b/tests/v3d/edge_face/J3 index 8a6ae6c15a..3fa7fa6e2c 100644 --- a/tests/v3d/edge_face/J3 +++ b/tests/v3d/edge_face/J3 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J4 b/tests/v3d/edge_face/J4 index 694c0156df..fa7a6560fb 100644 --- a/tests/v3d/edge_face/J4 +++ b/tests/v3d/edge_face/J4 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J5 b/tests/v3d/edge_face/J5 index 7748ad8302..9c84f72685 100644 --- a/tests/v3d/edge_face/J5 +++ b/tests/v3d/edge_face/J5 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J6 b/tests/v3d/edge_face/J6 index ab984aa1b0..f5298bfb18 100644 --- a/tests/v3d/edge_face/J6 +++ b/tests/v3d/edge_face/J6 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J7 b/tests/v3d/edge_face/J7 index 315373b776..792a610883 100644 --- a/tests/v3d/edge_face/J7 +++ b/tests/v3d/edge_face/J7 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J8 b/tests/v3d/edge_face/J8 index 5f24da4a18..c6d0b731df 100644 --- a/tests/v3d/edge_face/J8 +++ b/tests/v3d/edge_face/J8 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/J9 b/tests/v3d/edge_face/J9 index 7ff63e0b06..df483122ba 100644 --- a/tests/v3d/edge_face/J9 +++ b/tests/v3d/edge_face/J9 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/K1 b/tests/v3d/edge_face/K1 index 46f2a077b2..f0903a24fe 100644 --- a/tests/v3d/edge_face/K1 +++ b/tests/v3d/edge_face/K1 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/K2 b/tests/v3d/edge_face/K2 index 6cdab70577..7d81c1e88d 100644 --- a/tests/v3d/edge_face/K2 +++ b/tests/v3d/edge_face/K2 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/K3 b/tests/v3d/edge_face/K3 index a755557226..55ae63721e 100644 --- a/tests/v3d/edge_face/K3 +++ b/tests/v3d/edge_face/K3 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/K4 b/tests/v3d/edge_face/K4 index d5370031b3..62887dae82 100644 --- a/tests/v3d/edge_face/K4 +++ b/tests/v3d/edge_face/K4 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/K7 b/tests/v3d/edge_face/K7 index 296d25d486..a05dba53ae 100644 --- a/tests/v3d/edge_face/K7 +++ b/tests/v3d/edge_face/K7 @@ -10,7 +10,7 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/K8 b/tests/v3d/edge_face/K8 index 4ff119d6e8..48dbbd2736 100644 --- a/tests/v3d/edge_face/K8 +++ b/tests/v3d/edge_face/K8 @@ -10,7 +10,7 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/K9 b/tests/v3d/edge_face/K9 index d6ada04bef..584f30cdfb 100644 --- a/tests/v3d/edge_face/K9 +++ b/tests/v3d/edge_face/K9 @@ -10,7 +10,7 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/L1 b/tests/v3d/edge_face/L1 index 46da17c510..64ead913cb 100644 --- a/tests/v3d/edge_face/L1 +++ b/tests/v3d/edge_face/L1 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/L2 b/tests/v3d/edge_face/L2 index bd3ef76af5..77a1c5b12e 100644 --- a/tests/v3d/edge_face/L2 +++ b/tests/v3d/edge_face/L2 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/L3 b/tests/v3d/edge_face/L3 index f0141c42dc..c1215df319 100644 --- a/tests/v3d/edge_face/L3 +++ b/tests/v3d/edge_face/L3 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/L4 b/tests/v3d/edge_face/L4 index 49c18a0740..70c782c13e 100644 --- a/tests/v3d/edge_face/L4 +++ b/tests/v3d/edge_face/L4 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/L5 b/tests/v3d/edge_face/L5 index 377b4a79c4..da54ca26e6 100644 --- a/tests/v3d/edge_face/L5 +++ b/tests/v3d/edge_face/L5 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/M7 b/tests/v3d/edge_face/M7 index 2834cdb671..5dc6845479 100644 --- a/tests/v3d/edge_face/M7 +++ b/tests/v3d/edge_face/M7 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/M8 b/tests/v3d/edge_face/M8 index eb023b1f8d..3052199da9 100644 --- a/tests/v3d/edge_face/M8 +++ b/tests/v3d/edge_face/M8 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/M9 b/tests/v3d/edge_face/M9 index 0b88c3555b..85cb3e12f4 100644 --- a/tests/v3d/edge_face/M9 +++ b/tests/v3d/edge_face/M9 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N1 b/tests/v3d/edge_face/N1 index 5badc617b3..15049331bb 100644 --- a/tests/v3d/edge_face/N1 +++ b/tests/v3d/edge_face/N1 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N2 b/tests/v3d/edge_face/N2 index 6cf140a127..de2028d48a 100644 --- a/tests/v3d/edge_face/N2 +++ b/tests/v3d/edge_face/N2 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N3 b/tests/v3d/edge_face/N3 index c9b2f81c76..9d4aaab043 100644 --- a/tests/v3d/edge_face/N3 +++ b/tests/v3d/edge_face/N3 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N4 b/tests/v3d/edge_face/N4 index 919f92ae11..67c5ffb15d 100644 --- a/tests/v3d/edge_face/N4 +++ b/tests/v3d/edge_face/N4 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N5 b/tests/v3d/edge_face/N5 index aac41608ce..f5386bb920 100644 --- a/tests/v3d/edge_face/N5 +++ b/tests/v3d/edge_face/N5 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N6 b/tests/v3d/edge_face/N6 index 16a763a028..b1ad84b330 100644 --- a/tests/v3d/edge_face/N6 +++ b/tests/v3d/edge_face/N6 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N7 b/tests/v3d/edge_face/N7 index 9efe2a89e7..739387f6ee 100644 --- a/tests/v3d/edge_face/N7 +++ b/tests/v3d/edge_face/N7 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N8 b/tests/v3d/edge_face/N8 index 4fd77725f5..f1956c48e7 100644 --- a/tests/v3d/edge_face/N8 +++ b/tests/v3d/edge_face/N8 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/N9 b/tests/v3d/edge_face/N9 index 7bd36ae08d..a7bce83a7b 100644 --- a/tests/v3d/edge_face/N9 +++ b/tests/v3d/edge_face/N9 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/O1 b/tests/v3d/edge_face/O1 index eb6a526747..e7fa1c0749 100644 --- a/tests/v3d/edge_face/O1 +++ b/tests/v3d/edge_face/O1 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_face/O2 b/tests/v3d/edge_face/O2 index a17f28299e..c7a3b102ca 100644 --- a/tests/v3d/edge_face/O2 +++ b/tests/v3d/edge_face/O2 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/O3 b/tests/v3d/edge_face/O3 index c6b3dd66a4..a4e7353f6d 100644 --- a/tests/v3d/edge_face/O3 +++ b/tests/v3d/edge_face/O3 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/O4 b/tests/v3d/edge_face/O4 index 27037a9f95..736349c860 100644 --- a/tests/v3d/edge_face/O4 +++ b/tests/v3d/edge_face/O4 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/O5 b/tests/v3d/edge_face/O5 index bd3972bee7..ecea85211e 100644 --- a/tests/v3d/edge_face/O5 +++ b/tests/v3d/edge_face/O5 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/O6 b/tests/v3d/edge_face/O6 index 82dea06595..cef19cee5a 100644 --- a/tests/v3d/edge_face/O6 +++ b/tests/v3d/edge_face/O6 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/O7 b/tests/v3d/edge_face/O7 index 26e48bc96a..8b588e4be2 100644 --- a/tests/v3d/edge_face/O7 +++ b/tests/v3d/edge_face/O7 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/O8 b/tests/v3d/edge_face/O8 index e10d41e9f8..fb6dacdde0 100644 --- a/tests/v3d/edge_face/O8 +++ b/tests/v3d/edge_face/O8 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/O9 b/tests/v3d/edge_face/O9 index 5abaa64128..1fd89e62dc 100644 --- a/tests/v3d/edge_face/O9 +++ b/tests/v3d/edge_face/O9 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/P1 b/tests/v3d/edge_face/P1 index a620df3b12..554d474b7f 100644 --- a/tests/v3d/edge_face/P1 +++ b/tests/v3d/edge_face/P1 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_face/P2 b/tests/v3d/edge_face/P2 index 72d272c5bf..fabfa19232 100644 --- a/tests/v3d/edge_face/P2 +++ b/tests/v3d/edge_face/P2 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/P3 b/tests/v3d/edge_face/P3 index 90c802e5f1..5bfbd3d783 100644 --- a/tests/v3d/edge_face/P3 +++ b/tests/v3d/edge_face/P3 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/P4 b/tests/v3d/edge_face/P4 index 51edbaf6af..b3fcd32a7d 100644 --- a/tests/v3d/edge_face/P4 +++ b/tests/v3d/edge_face/P4 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/P5 b/tests/v3d/edge_face/P5 index 292ce04823..fd62978cb3 100644 --- a/tests/v3d/edge_face/P5 +++ b/tests/v3d/edge_face/P5 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_face/P6 b/tests/v3d/edge_face/P6 index b497e430c4..b061b80eeb 100644 --- a/tests/v3d/edge_face/P6 +++ b/tests/v3d/edge_face/P6 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/A3 b/tests/v3d/edge_solid/A3 index 6221621ecc..9c75bbf7ab 100644 --- a/tests/v3d/edge_solid/A3 +++ b/tests/v3d/edge_solid/A3 @@ -7,7 +7,7 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/A4 b/tests/v3d/edge_solid/A4 index 0a8f9b7a12..5ede3d9d93 100644 --- a/tests/v3d/edge_solid/A4 +++ b/tests/v3d/edge_solid/A4 @@ -7,7 +7,7 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/A5 b/tests/v3d/edge_solid/A5 index ad1564522b..c56ac95753 100644 --- a/tests/v3d/edge_solid/A5 +++ b/tests/v3d/edge_solid/A5 @@ -7,7 +7,7 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/A6 b/tests/v3d/edge_solid/A6 index 195395f81d..2e9402db4d 100644 --- a/tests/v3d/edge_solid/A6 +++ b/tests/v3d/edge_solid/A6 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/A7 b/tests/v3d/edge_solid/A7 index 1885e3ff33..ba5b3a8b41 100644 --- a/tests/v3d/edge_solid/A7 +++ b/tests/v3d/edge_solid/A7 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/A8 b/tests/v3d/edge_solid/A8 index 07a4292caf..e062093bee 100644 --- a/tests/v3d/edge_solid/A8 +++ b/tests/v3d/edge_solid/A8 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/A9 b/tests/v3d/edge_solid/A9 index 778feb7069..bfd3e799a2 100644 --- a/tests/v3d/edge_solid/A9 +++ b/tests/v3d/edge_solid/A9 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/B1 b/tests/v3d/edge_solid/B1 index 1147ef1663..7b3847f383 100644 --- a/tests/v3d/edge_solid/B1 +++ b/tests/v3d/edge_solid/B1 @@ -7,14 +7,14 @@ vselmode 2 1 vselmode 6 1 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/C3 b/tests/v3d/edge_solid/C3 index e1d4e99f8e..15fa69a1ce 100644 --- a/tests/v3d/edge_solid/C3 +++ b/tests/v3d/edge_solid/C3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/C4 b/tests/v3d/edge_solid/C4 index f4c9c3015b..9d2c6f698c 100644 --- a/tests/v3d/edge_solid/C4 +++ b/tests/v3d/edge_solid/C4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/C5 b/tests/v3d/edge_solid/C5 index b00a7cd224..6d5b318946 100644 --- a/tests/v3d/edge_solid/C5 +++ b/tests/v3d/edge_solid/C5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/C6 b/tests/v3d/edge_solid/C6 index c1c89668c4..711fc93df9 100644 --- a/tests/v3d/edge_solid/C6 +++ b/tests/v3d/edge_solid/C6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/C7 b/tests/v3d/edge_solid/C7 index edcc602cd3..5f5cdc19f0 100644 --- a/tests/v3d/edge_solid/C7 +++ b/tests/v3d/edge_solid/C7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/C8 b/tests/v3d/edge_solid/C8 index 20e2ce1b27..e9f5a87c85 100644 --- a/tests/v3d/edge_solid/C8 +++ b/tests/v3d/edge_solid/C8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/C9 b/tests/v3d/edge_solid/C9 index 41c989dec4..7059abcb76 100644 --- a/tests/v3d/edge_solid/C9 +++ b/tests/v3d/edge_solid/C9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/D1 b/tests/v3d/edge_solid/D1 index e79ac2cf7d..8166de35cf 100644 --- a/tests/v3d/edge_solid/D1 +++ b/tests/v3d/edge_solid/D1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/D2 b/tests/v3d/edge_solid/D2 index 64a963aa4d..c31a1805fa 100644 --- a/tests/v3d/edge_solid/D2 +++ b/tests/v3d/edge_solid/D2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/D3 b/tests/v3d/edge_solid/D3 index 6ad9ea77e4..0a19e83608 100644 --- a/tests/v3d/edge_solid/D3 +++ b/tests/v3d/edge_solid/D3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/D4 b/tests/v3d/edge_solid/D4 index e987654d00..65c220eaf7 100644 --- a/tests/v3d/edge_solid/D4 +++ b/tests/v3d/edge_solid/D4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/D5 b/tests/v3d/edge_solid/D5 index ec50aa271e..556be322bd 100644 --- a/tests/v3d/edge_solid/D5 +++ b/tests/v3d/edge_solid/D5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/D6 b/tests/v3d/edge_solid/D6 index 4a755a6bd0..4b33ea1c08 100644 --- a/tests/v3d/edge_solid/D6 +++ b/tests/v3d/edge_solid/D6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/D7 b/tests/v3d/edge_solid/D7 index 661c062cdb..566ba38859 100644 --- a/tests/v3d/edge_solid/D7 +++ b/tests/v3d/edge_solid/D7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/D8 b/tests/v3d/edge_solid/D8 index 8856e2056d..6d4e12af9e 100644 --- a/tests/v3d/edge_solid/D8 +++ b/tests/v3d/edge_solid/D8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/D9 b/tests/v3d/edge_solid/D9 index 3f20363c05..10d52a814e 100644 --- a/tests/v3d/edge_solid/D9 +++ b/tests/v3d/edge_solid/D9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/E1 b/tests/v3d/edge_solid/E1 index 4c7381cfc7..7e7cfef4d8 100644 --- a/tests/v3d/edge_solid/E1 +++ b/tests/v3d/edge_solid/E1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/E2 b/tests/v3d/edge_solid/E2 index 7b3c5b55aa..53f8cd8e1a 100644 --- a/tests/v3d/edge_solid/E2 +++ b/tests/v3d/edge_solid/E2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/E3 b/tests/v3d/edge_solid/E3 index 7ace1d4739..b275359ff9 100644 --- a/tests/v3d/edge_solid/E3 +++ b/tests/v3d/edge_solid/E3 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/E4 b/tests/v3d/edge_solid/E4 index abee50164e..f5463581ba 100644 --- a/tests/v3d/edge_solid/E4 +++ b/tests/v3d/edge_solid/E4 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/E5 b/tests/v3d/edge_solid/E5 index 8e86212b01..313e2715ed 100644 --- a/tests/v3d/edge_solid/E5 +++ b/tests/v3d/edge_solid/E5 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/E6 b/tests/v3d/edge_solid/E6 index 496b067bb0..0154e5d331 100644 --- a/tests/v3d/edge_solid/E6 +++ b/tests/v3d/edge_solid/E6 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/E7 b/tests/v3d/edge_solid/E7 index 83a0ac7569..59abf1a60e 100644 --- a/tests/v3d/edge_solid/E7 +++ b/tests/v3d/edge_solid/E7 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/E8 b/tests/v3d/edge_solid/E8 index 5e80772583..7f463cf344 100644 --- a/tests/v3d/edge_solid/E8 +++ b/tests/v3d/edge_solid/E8 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/E9 b/tests/v3d/edge_solid/E9 index 3bb543becc..1c9fc7178a 100644 --- a/tests/v3d/edge_solid/E9 +++ b/tests/v3d/edge_solid/E9 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/F1 b/tests/v3d/edge_solid/F1 index 42e7021e16..2cfa8b6f7a 100644 --- a/tests/v3d/edge_solid/F1 +++ b/tests/v3d/edge_solid/F1 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/F2 b/tests/v3d/edge_solid/F2 index 39f20c931b..0ae317f966 100644 --- a/tests/v3d/edge_solid/F2 +++ b/tests/v3d/edge_solid/F2 @@ -18,7 +18,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -35,7 +35,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/F5 b/tests/v3d/edge_solid/F5 index 88c1e0ef24..cfdfdb8187 100644 --- a/tests/v3d/edge_solid/F5 +++ b/tests/v3d/edge_solid/F5 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/F6 b/tests/v3d/edge_solid/F6 index 24432a2486..dd0db1cec3 100644 --- a/tests/v3d/edge_solid/F6 +++ b/tests/v3d/edge_solid/F6 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/F7 b/tests/v3d/edge_solid/F7 index 608b4850f1..b517d10405 100644 --- a/tests/v3d/edge_solid/F7 +++ b/tests/v3d/edge_solid/F7 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/F8 b/tests/v3d/edge_solid/F8 index de0ced2d85..539d6eb552 100644 --- a/tests/v3d/edge_solid/F8 +++ b/tests/v3d/edge_solid/F8 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/F9 b/tests/v3d/edge_solid/F9 index 6fc9e28f3d..29611c0d89 100644 --- a/tests/v3d/edge_solid/F9 +++ b/tests/v3d/edge_solid/F9 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/G1 b/tests/v3d/edge_solid/G1 index d951099bae..d36b9750fe 100644 --- a/tests/v3d/edge_solid/G1 +++ b/tests/v3d/edge_solid/G1 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/G2 b/tests/v3d/edge_solid/G2 index 4be617cbbf..d95cc43127 100644 --- a/tests/v3d/edge_solid/G2 +++ b/tests/v3d/edge_solid/G2 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/G3 b/tests/v3d/edge_solid/G3 index c6f02a6dc9..6eb6fd07e7 100644 --- a/tests/v3d/edge_solid/G3 +++ b/tests/v3d/edge_solid/G3 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 260 110 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/H5 b/tests/v3d/edge_solid/H5 index 9582af8768..3d261dc237 100644 --- a/tests/v3d/edge_solid/H5 +++ b/tests/v3d/edge_solid/H5 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/H6 b/tests/v3d/edge_solid/H6 index 5b38219be8..9c152d570b 100644 --- a/tests/v3d/edge_solid/H6 +++ b/tests/v3d/edge_solid/H6 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/H7 b/tests/v3d/edge_solid/H7 index 79e5cf7dc3..2d11c59259 100644 --- a/tests/v3d/edge_solid/H7 +++ b/tests/v3d/edge_solid/H7 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/H8 b/tests/v3d/edge_solid/H8 index 4f52265da2..e87da545b0 100644 --- a/tests/v3d/edge_solid/H8 +++ b/tests/v3d/edge_solid/H8 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/H9 b/tests/v3d/edge_solid/H9 index cfcf9d8c1d..770733a986 100644 --- a/tests/v3d/edge_solid/H9 +++ b/tests/v3d/edge_solid/H9 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I1 b/tests/v3d/edge_solid/I1 index 1873861a3e..94f1fc3ca8 100644 --- a/tests/v3d/edge_solid/I1 +++ b/tests/v3d/edge_solid/I1 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I2 b/tests/v3d/edge_solid/I2 index f41d81cbca..871559f7f1 100644 --- a/tests/v3d/edge_solid/I2 +++ b/tests/v3d/edge_solid/I2 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I3 b/tests/v3d/edge_solid/I3 index 3fab19e9db..d560b9729f 100644 --- a/tests/v3d/edge_solid/I3 +++ b/tests/v3d/edge_solid/I3 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I4 b/tests/v3d/edge_solid/I4 index b625686116..7a7758c827 100644 --- a/tests/v3d/edge_solid/I4 +++ b/tests/v3d/edge_solid/I4 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I5 b/tests/v3d/edge_solid/I5 index 44a534fe3a..e387433604 100644 --- a/tests/v3d/edge_solid/I5 +++ b/tests/v3d/edge_solid/I5 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I6 b/tests/v3d/edge_solid/I6 index 494d4f99f3..3b7c4ebf54 100644 --- a/tests/v3d/edge_solid/I6 +++ b/tests/v3d/edge_solid/I6 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I7 b/tests/v3d/edge_solid/I7 index db1e4feeb8..db4c7ffcd3 100644 --- a/tests/v3d/edge_solid/I7 +++ b/tests/v3d/edge_solid/I7 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I8 b/tests/v3d/edge_solid/I8 index fbcd3010fe..1e22b8f0b3 100644 --- a/tests/v3d/edge_solid/I8 +++ b/tests/v3d/edge_solid/I8 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/I9 b/tests/v3d/edge_solid/I9 index f69759653f..d8f7eeac84 100644 --- a/tests/v3d/edge_solid/I9 +++ b/tests/v3d/edge_solid/I9 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J1 b/tests/v3d/edge_solid/J1 index 366b6d5905..ee8d4d6d25 100644 --- a/tests/v3d/edge_solid/J1 +++ b/tests/v3d/edge_solid/J1 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J2 b/tests/v3d/edge_solid/J2 index cccabaded3..312c53a7ce 100644 --- a/tests/v3d/edge_solid/J2 +++ b/tests/v3d/edge_solid/J2 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J3 b/tests/v3d/edge_solid/J3 index 7cc8de8995..fd22e7a317 100644 --- a/tests/v3d/edge_solid/J3 +++ b/tests/v3d/edge_solid/J3 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J4 b/tests/v3d/edge_solid/J4 index 5e87359675..fa9eff5695 100644 --- a/tests/v3d/edge_solid/J4 +++ b/tests/v3d/edge_solid/J4 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J5 b/tests/v3d/edge_solid/J5 index 05426b1003..426392dec7 100644 --- a/tests/v3d/edge_solid/J5 +++ b/tests/v3d/edge_solid/J5 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J6 b/tests/v3d/edge_solid/J6 index 205be07143..f636c8b5a9 100644 --- a/tests/v3d/edge_solid/J6 +++ b/tests/v3d/edge_solid/J6 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J7 b/tests/v3d/edge_solid/J7 index ac545fcaab..6d6d7ae58d 100644 --- a/tests/v3d/edge_solid/J7 +++ b/tests/v3d/edge_solid/J7 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J8 b/tests/v3d/edge_solid/J8 index c0293689d5..b6d4d9ac10 100644 --- a/tests/v3d/edge_solid/J8 +++ b/tests/v3d/edge_solid/J8 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/J9 b/tests/v3d/edge_solid/J9 index c21ca21779..471f8593fc 100644 --- a/tests/v3d/edge_solid/J9 +++ b/tests/v3d/edge_solid/J9 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/K1 b/tests/v3d/edge_solid/K1 index 08b503cf1a..052ab4a37b 100644 --- a/tests/v3d/edge_solid/K1 +++ b/tests/v3d/edge_solid/K1 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/K2 b/tests/v3d/edge_solid/K2 index 86a71963c1..1c52ccc36b 100644 --- a/tests/v3d/edge_solid/K2 +++ b/tests/v3d/edge_solid/K2 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/K3 b/tests/v3d/edge_solid/K3 index 2968233c90..78bbf14d67 100644 --- a/tests/v3d/edge_solid/K3 +++ b/tests/v3d/edge_solid/K3 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/K4 b/tests/v3d/edge_solid/K4 index 43e4b7eea4..568563a9e8 100644 --- a/tests/v3d/edge_solid/K4 +++ b/tests/v3d/edge_solid/K4 @@ -19,7 +19,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -36,7 +36,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/K7 b/tests/v3d/edge_solid/K7 index 67cd23dc55..71e6055eff 100644 --- a/tests/v3d/edge_solid/K7 +++ b/tests/v3d/edge_solid/K7 @@ -10,7 +10,7 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/K8 b/tests/v3d/edge_solid/K8 index 1aa142ea18..b208a9d3fd 100644 --- a/tests/v3d/edge_solid/K8 +++ b/tests/v3d/edge_solid/K8 @@ -10,7 +10,7 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/K9 b/tests/v3d/edge_solid/K9 index 5141abcc26..e82c498f8c 100644 --- a/tests/v3d/edge_solid/K9 +++ b/tests/v3d/edge_solid/K9 @@ -10,7 +10,7 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/L1 b/tests/v3d/edge_solid/L1 index c09d398eda..1f2cf633f1 100644 --- a/tests/v3d/edge_solid/L1 +++ b/tests/v3d/edge_solid/L1 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/L2 b/tests/v3d/edge_solid/L2 index ecc181c3da..9e6464c050 100644 --- a/tests/v3d/edge_solid/L2 +++ b/tests/v3d/edge_solid/L2 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/L3 b/tests/v3d/edge_solid/L3 index bd6cf9e697..60512ba6f7 100644 --- a/tests/v3d/edge_solid/L3 +++ b/tests/v3d/edge_solid/L3 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/L4 b/tests/v3d/edge_solid/L4 index f5cf946deb..966b58cf30 100644 --- a/tests/v3d/edge_solid/L4 +++ b/tests/v3d/edge_solid/L4 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/L5 b/tests/v3d/edge_solid/L5 index 9145035361..b119e2c4d4 100644 --- a/tests/v3d/edge_solid/L5 +++ b/tests/v3d/edge_solid/L5 @@ -10,14 +10,14 @@ vselect 260 110 vmoveto 0 0 vmoveto 110 352 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 vmoveto 0 0 vselect 120 350 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/M7 b/tests/v3d/edge_solid/M7 index 0c42cdc6ff..7196fc325e 100644 --- a/tests/v3d/edge_solid/M7 +++ b/tests/v3d/edge_solid/M7 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/M8 b/tests/v3d/edge_solid/M8 index 825f17a540..75d3f0cb53 100644 --- a/tests/v3d/edge_solid/M8 +++ b/tests/v3d/edge_solid/M8 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/M9 b/tests/v3d/edge_solid/M9 index a4932cdab4..faa4da254a 100644 --- a/tests/v3d/edge_solid/M9 +++ b/tests/v3d/edge_solid/M9 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N1 b/tests/v3d/edge_solid/N1 index ab6bab59b9..4d1262b8c5 100644 --- a/tests/v3d/edge_solid/N1 +++ b/tests/v3d/edge_solid/N1 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N2 b/tests/v3d/edge_solid/N2 index 358f412a4b..e1ca62860f 100644 --- a/tests/v3d/edge_solid/N2 +++ b/tests/v3d/edge_solid/N2 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N3 b/tests/v3d/edge_solid/N3 index a7f91e9383..24c64e6013 100644 --- a/tests/v3d/edge_solid/N3 +++ b/tests/v3d/edge_solid/N3 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N4 b/tests/v3d/edge_solid/N4 index 33f65cadd6..cc71a6bb5d 100644 --- a/tests/v3d/edge_solid/N4 +++ b/tests/v3d/edge_solid/N4 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N5 b/tests/v3d/edge_solid/N5 index 4987d0c0f2..fdbd5491cf 100644 --- a/tests/v3d/edge_solid/N5 +++ b/tests/v3d/edge_solid/N5 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N6 b/tests/v3d/edge_solid/N6 index 5c954cfb3d..984201cefd 100644 --- a/tests/v3d/edge_solid/N6 +++ b/tests/v3d/edge_solid/N6 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N7 b/tests/v3d/edge_solid/N7 index 2034818f71..8e32eec7c8 100644 --- a/tests/v3d/edge_solid/N7 +++ b/tests/v3d/edge_solid/N7 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N8 b/tests/v3d/edge_solid/N8 index e050af0980..34e8e3ca92 100644 --- a/tests/v3d/edge_solid/N8 +++ b/tests/v3d/edge_solid/N8 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/N9 b/tests/v3d/edge_solid/N9 index 81d37db02d..7b9c1fed99 100644 --- a/tests/v3d/edge_solid/N9 +++ b/tests/v3d/edge_solid/N9 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/O1 b/tests/v3d/edge_solid/O1 index 7a0f2567d3..df88616672 100644 --- a/tests/v3d/edge_solid/O1 +++ b/tests/v3d/edge_solid/O1 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 diff --git a/tests/v3d/edge_solid/O2 b/tests/v3d/edge_solid/O2 index 3701f8073e..d10bb90b02 100644 --- a/tests/v3d/edge_solid/O2 +++ b/tests/v3d/edge_solid/O2 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/O3 b/tests/v3d/edge_solid/O3 index 057b4009d1..c9aed66f30 100644 --- a/tests/v3d/edge_solid/O3 +++ b/tests/v3d/edge_solid/O3 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/O4 b/tests/v3d/edge_solid/O4 index 1fe9596902..4ca0be092a 100644 --- a/tests/v3d/edge_solid/O4 +++ b/tests/v3d/edge_solid/O4 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/O5 b/tests/v3d/edge_solid/O5 index 0af6dc90e9..fe67eab386 100644 --- a/tests/v3d/edge_solid/O5 +++ b/tests/v3d/edge_solid/O5 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/O6 b/tests/v3d/edge_solid/O6 index 92908f0f2f..8042caa787 100644 --- a/tests/v3d/edge_solid/O6 +++ b/tests/v3d/edge_solid/O6 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/O7 b/tests/v3d/edge_solid/O7 index e006cd8f4d..30cf957155 100644 --- a/tests/v3d/edge_solid/O7 +++ b/tests/v3d/edge_solid/O7 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/O8 b/tests/v3d/edge_solid/O8 index 7f7e666949..be1dedbd0c 100644 --- a/tests/v3d/edge_solid/O8 +++ b/tests/v3d/edge_solid/O8 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/O9 b/tests/v3d/edge_solid/O9 index 00d2bd7778..ad46708c1b 100644 --- a/tests/v3d/edge_solid/O9 +++ b/tests/v3d/edge_solid/O9 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/P1 b/tests/v3d/edge_solid/P1 index 10841dd484..a99c36f882 100644 --- a/tests/v3d/edge_solid/P1 +++ b/tests/v3d/edge_solid/P1 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 diff --git a/tests/v3d/edge_solid/P2 b/tests/v3d/edge_solid/P2 index 914980138c..b5fc662adf 100644 --- a/tests/v3d/edge_solid/P2 +++ b/tests/v3d/edge_solid/P2 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/P3 b/tests/v3d/edge_solid/P3 index f83e47d7a2..2a33bc3dc5 100644 --- a/tests/v3d/edge_solid/P3 +++ b/tests/v3d/edge_solid/P3 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/P4 b/tests/v3d/edge_solid/P4 index 96de1e9bb3..b4396bb43e 100644 --- a/tests/v3d/edge_solid/P4 +++ b/tests/v3d/edge_solid/P4 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/P5 b/tests/v3d/edge_solid/P5 index b7a0118d6f..6dc6997398 100644 --- a/tests/v3d/edge_solid/P5 +++ b/tests/v3d/edge_solid/P5 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/edge_solid/P6 b/tests/v3d/edge_solid/P6 index 3486839350..cd5bca7234 100644 --- a/tests/v3d/edge_solid/P6 +++ b/tests/v3d/edge_solid/P6 @@ -21,7 +21,7 @@ vmoveto 29 204 vmoveto 0 0 vmoveto 204 306 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 120 350 @@ -38,7 +38,7 @@ vmoveto 50 220 vmoveto 0 0 vmoveto 150 330 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 225 98 @@ -51,7 +51,7 @@ vselect 270 326 1 vmoveto 0 0 vmoveto 270 326 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 310 87 diff --git a/tests/v3d/face/A3 b/tests/v3d/face/A3 index 531f28dee3..78c4b9a1c8 100644 --- a/tests/v3d/face/A3 +++ b/tests/v3d/face/A3 @@ -6,7 +6,7 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 diff --git a/tests/v3d/face/A4 b/tests/v3d/face/A4 index 791e36ef3d..8500d16529 100644 --- a/tests/v3d/face/A4 +++ b/tests/v3d/face/A4 @@ -6,7 +6,7 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 diff --git a/tests/v3d/face/A5 b/tests/v3d/face/A5 index b370aad6b6..7f12ef80cf 100644 --- a/tests/v3d/face/A5 +++ b/tests/v3d/face/A5 @@ -6,7 +6,7 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 diff --git a/tests/v3d/face/A6 b/tests/v3d/face/A6 index d69c051798..c897507852 100644 --- a/tests/v3d/face/A6 +++ b/tests/v3d/face/A6 @@ -6,14 +6,14 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 350 128 diff --git a/tests/v3d/face/A7 b/tests/v3d/face/A7 index 44a7b8aba3..d7d9bf7272 100644 --- a/tests/v3d/face/A7 +++ b/tests/v3d/face/A7 @@ -6,14 +6,14 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 350 128 diff --git a/tests/v3d/face/A8 b/tests/v3d/face/A8 index 68b9ac9904..ddced8f250 100644 --- a/tests/v3d/face/A8 +++ b/tests/v3d/face/A8 @@ -6,14 +6,14 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 350 128 diff --git a/tests/v3d/face/A9 b/tests/v3d/face/A9 index d7f3fa38d2..9f1be022c8 100644 --- a/tests/v3d/face/A9 +++ b/tests/v3d/face/A9 @@ -6,14 +6,14 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 350 128 diff --git a/tests/v3d/face/B1 b/tests/v3d/face/B1 index e487dce7a2..ef12ba4cd7 100644 --- a/tests/v3d/face/B1 +++ b/tests/v3d/face/B1 @@ -6,14 +6,14 @@ vmoveto 0 0 vselmode 4 1 vmoveto 150 250 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 250 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 350 128 diff --git a/tests/v3d/face/B2 b/tests/v3d/face/B2 index 3e6699a725..ecac08351f 100644 --- a/tests/v3d/face/B2 +++ b/tests/v3d/face/B2 @@ -5,6 +5,6 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 diff --git a/tests/v3d/face/B3 b/tests/v3d/face/B3 index 457b302afb..729623ee44 100644 --- a/tests/v3d/face/B3 +++ b/tests/v3d/face/B3 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 diff --git a/tests/v3d/face/B4 b/tests/v3d/face/B4 index 94a8f26ff5..07b5f40e91 100644 --- a/tests/v3d/face/B4 +++ b/tests/v3d/face/B4 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/B5 b/tests/v3d/face/B5 index 75aedb4048..93ed06ebf1 100644 --- a/tests/v3d/face/B5 +++ b/tests/v3d/face/B5 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/B6 b/tests/v3d/face/B6 index 1dd896b5fd..7e28f2a282 100644 --- a/tests/v3d/face/B6 +++ b/tests/v3d/face/B6 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/B7 b/tests/v3d/face/B7 index f9dc68e8e8..cdcae08d12 100644 --- a/tests/v3d/face/B7 +++ b/tests/v3d/face/B7 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/B8 b/tests/v3d/face/B8 index 98cf5ef7f2..d9a66f6a97 100644 --- a/tests/v3d/face/B8 +++ b/tests/v3d/face/B8 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/B9 b/tests/v3d/face/B9 index 60018dca58..676a563ab2 100644 --- a/tests/v3d/face/B9 +++ b/tests/v3d/face/B9 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/C1 b/tests/v3d/face/C1 index 540b5bfb62..3d61e596c5 100644 --- a/tests/v3d/face/C1 +++ b/tests/v3d/face/C1 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/C2 b/tests/v3d/face/C2 index ceb483e98e..e41311f446 100644 --- a/tests/v3d/face/C2 +++ b/tests/v3d/face/C2 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 diff --git a/tests/v3d/face/C3 b/tests/v3d/face/C3 index f46a2e2b92..13c8c934da 100644 --- a/tests/v3d/face/C3 +++ b/tests/v3d/face/C3 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/C4 b/tests/v3d/face/C4 index fc02bff40a..3e0d93b4d9 100644 --- a/tests/v3d/face/C4 +++ b/tests/v3d/face/C4 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/C5 b/tests/v3d/face/C5 index e3119798b0..70fc599db2 100644 --- a/tests/v3d/face/C5 +++ b/tests/v3d/face/C5 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/C6 b/tests/v3d/face/C6 index 8b63386525..bb9944df86 100644 --- a/tests/v3d/face/C6 +++ b/tests/v3d/face/C6 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/C7 b/tests/v3d/face/C7 index a1c2514f11..ee17f25abf 100644 --- a/tests/v3d/face/C7 +++ b/tests/v3d/face/C7 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/C8 b/tests/v3d/face/C8 index 9ab50b2e9a..c9dca46422 100644 --- a/tests/v3d/face/C8 +++ b/tests/v3d/face/C8 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/C9 b/tests/v3d/face/C9 index 8e63254eb0..0f32170d10 100644 --- a/tests/v3d/face/C9 +++ b/tests/v3d/face/C9 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/D1 b/tests/v3d/face/D1 index dbff8f01e3..faa173ed6b 100644 --- a/tests/v3d/face/D1 +++ b/tests/v3d/face/D1 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/D2 b/tests/v3d/face/D2 index f79f335309..0f4976e177 100644 --- a/tests/v3d/face/D2 +++ b/tests/v3d/face/D2 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/D3 b/tests/v3d/face/D3 index 04c3733648..07fbb98c43 100644 --- a/tests/v3d/face/D3 +++ b/tests/v3d/face/D3 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/D4 b/tests/v3d/face/D4 index 32f8899c84..4b00a7702e 100644 --- a/tests/v3d/face/D4 +++ b/tests/v3d/face/D4 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/D5 b/tests/v3d/face/D5 index cc69f1b0a1..76797a2c69 100644 --- a/tests/v3d/face/D5 +++ b/tests/v3d/face/D5 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/D6 b/tests/v3d/face/D6 index 51a17c9783..3df1468896 100644 --- a/tests/v3d/face/D6 +++ b/tests/v3d/face/D6 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/face/D7 b/tests/v3d/face/D7 index f8bf1689d5..1ec8528bae 100644 --- a/tests/v3d/face/D7 +++ b/tests/v3d/face/D7 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/D8 b/tests/v3d/face/D8 index ea916a7293..a0d65d6859 100644 --- a/tests/v3d/face/D8 +++ b/tests/v3d/face/D8 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/D9 b/tests/v3d/face/D9 index a8dc193636..3af0b0302d 100644 --- a/tests/v3d/face/D9 +++ b/tests/v3d/face/D9 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/E1 b/tests/v3d/face/E1 index 3193645b0d..91b12b30a0 100644 --- a/tests/v3d/face/E1 +++ b/tests/v3d/face/E1 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/E2 b/tests/v3d/face/E2 index 8719910ba4..9734232250 100644 --- a/tests/v3d/face/E2 +++ b/tests/v3d/face/E2 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/E3 b/tests/v3d/face/E3 index 0ccf060336..4562377384 100644 --- a/tests/v3d/face/E3 +++ b/tests/v3d/face/E3 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/E4 b/tests/v3d/face/E4 index 48cec63f8b..bc2ef02aa6 100644 --- a/tests/v3d/face/E4 +++ b/tests/v3d/face/E4 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/E5 b/tests/v3d/face/E5 index 5f3d2ad120..e397ccb52b 100644 --- a/tests/v3d/face/E5 +++ b/tests/v3d/face/E5 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/E6 b/tests/v3d/face/E6 index c072c4ed7f..6866dcdba9 100644 --- a/tests/v3d/face/E6 +++ b/tests/v3d/face/E6 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 diff --git a/tests/v3d/face/E7 b/tests/v3d/face/E7 index 6f71f1066b..1dbd6754de 100644 --- a/tests/v3d/face/E7 +++ b/tests/v3d/face/E7 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 300 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.924699 -0.333605 0.937786 -0.108455 -0.146382 -0.163422 -0.975587 4.079070 -26.221900 108.54900 +vviewparams -scale 6.063090 -proj -0.333605 0.937786 -0.108455 -up -0.146382 -0.163422 -0.975587 -at 63.9550768175051 -11.0454729423178 55.0758857080164 vfit vmoveto 0 0 vmoveto 100 150 diff --git a/tests/v3d/face/E8 b/tests/v3d/face/E8 index c02eae8cbe..c4c855e5e3 100644 --- a/tests/v3d/face/E8 +++ b/tests/v3d/face/E8 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 300 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.924699 -0.333605 0.937786 -0.108455 -0.146382 -0.163422 -0.975587 4.079070 -26.221900 108.54900 +vviewparams -scale 6.063090 -proj -0.333605 0.937786 -0.108455 -up -0.146382 -0.163422 -0.975587 -at 63.9550768175051 -11.0454729423178 55.0758857080164 vfit vmoveto 0 0 vmoveto 100 150 diff --git a/tests/v3d/face/E9 b/tests/v3d/face/E9 index 619b7464b0..1bcb87fb08 100644 --- a/tests/v3d/face/E9 +++ b/tests/v3d/face/E9 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 300 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.924699 -0.333605 0.937786 -0.108455 -0.146382 -0.163422 -0.975587 4.079070 -26.221900 108.54900 +vviewparams -scale 6.063090 -proj -0.333605 0.937786 -0.108455 -up -0.146382 -0.163422 -0.975587 -at 63.9550768175051 -11.0454729423178 55.0758857080164 vfit vmoveto 0 0 vmoveto 100 150 diff --git a/tests/v3d/face/F1 b/tests/v3d/face/F1 index 4cdbe9b47e..d0d13b2a99 100644 --- a/tests/v3d/face/F1 +++ b/tests/v3d/face/F1 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 300 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.924699 -0.333605 0.937786 -0.108455 -0.146382 -0.163422 -0.975587 4.079070 -26.221900 108.54900 +vviewparams -scale 6.063090 -proj -0.333605 0.937786 -0.108455 -up -0.146382 -0.163422 -0.975587 -at 63.9550768175051 -11.0454729423178 55.0758857080164 vfit vmoveto 0 0 vmoveto 100 150 diff --git a/tests/v3d/face/F2 b/tests/v3d/face/F2 index f93182bfc7..c0e38ebe37 100644 --- a/tests/v3d/face/F2 +++ b/tests/v3d/face/F2 @@ -5,7 +5,7 @@ vfit vmoveto 0 0 vselmode 4 1 vmoveto 150 250 -vselect 100 346 +vselect 100 347 vmoveto 0 0 vmoveto 90 89 vmoveto 0 0 @@ -18,7 +18,7 @@ vmoveto 0 0 vmoveto 250 250 vmoveto 350 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.8249 0.411696 -0.786621 0.462736 -0.373037 0.31875 0.871669 -5.442030 22.021500 -10.360400 +vviewparams -scale 6.063090 -proj 0.411696 -0.786621 0.462736 -up -0.373037 0.31875 0.871669 -at 38.160233803417 72.5566786768416 36.6684620085254 vfit vmoveto 0 0 vmoveto 200 200 @@ -35,7 +35,7 @@ vmoveto 30 290 vmoveto 0 0 vmoveto 300 300 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.82481 0.826197 -0.328587 -0.456835 -0.325366 0.383482 -0.864270 52.8625 108.023000 126.162000 +vviewparams -scale 6.063090 -proj 0.826197 -0.328587 -0.456835 -up -0.325366 0.383482 -0.864270 -at 7.09632267265386 62.6518178738573 76.0263734322149 vfit vmoveto 0 0 vmoveto 250 300 @@ -48,7 +48,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 300 250 vmoveto 0 0 -vviewparams 6.063090 70.710700 40.924699 -0.333605 0.937786 -0.108455 -0.146382 -0.163422 -0.975587 4.079070 -26.221900 108.54900 +vviewparams -scale 6.063090 -proj -0.333605 0.937786 -0.108455 -up -0.146382 -0.163422 -0.975587 -at 63.9550768175051 -11.0454729423178 55.0758857080164 vfit vmoveto 0 0 vmoveto 100 150 diff --git a/tests/v3d/vertex/A3 b/tests/v3d/vertex/A3 index 30b24b3c6f..1159e48978 100644 --- a/tests/v3d/vertex/A3 +++ b/tests/v3d/vertex/A3 @@ -4,7 +4,7 @@ vdisplay t_box vfit vmoveto 0 0 vselmode 1 1 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/A4 b/tests/v3d/vertex/A4 index 0d95aeacf4..772071fc81 100644 --- a/tests/v3d/vertex/A4 +++ b/tests/v3d/vertex/A4 @@ -4,7 +4,7 @@ vdisplay t_box vfit vmoveto 0 0 vselmode 1 1 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 73 302 vmoveto 0 0 diff --git a/tests/v3d/vertex/A5 b/tests/v3d/vertex/A5 index 3b3dc88917..c4ffe0750c 100644 --- a/tests/v3d/vertex/A5 +++ b/tests/v3d/vertex/A5 @@ -4,7 +4,7 @@ vdisplay t_box vfit vmoveto 0 0 vselmode 1 1 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vselect 73 302 diff --git a/tests/v3d/vertex/A6 b/tests/v3d/vertex/A6 index 20d74346a6..62278c8ee4 100644 --- a/tests/v3d/vertex/A6 +++ b/tests/v3d/vertex/A6 @@ -4,7 +4,7 @@ vdisplay t_box vfit vmoveto 0 0 vselmode 1 1 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vselect 161 197 diff --git a/tests/v3d/vertex/A7 b/tests/v3d/vertex/A7 index a23b321557..e058925959 100644 --- a/tests/v3d/vertex/A7 +++ b/tests/v3d/vertex/A7 @@ -4,7 +4,7 @@ vdisplay t_box vfit vmoveto 0 0 vselmode 1 1 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vselect 161 197 diff --git a/tests/v3d/vertex/A8 b/tests/v3d/vertex/A8 index eb74d71291..685c70949e 100644 --- a/tests/v3d/vertex/A8 +++ b/tests/v3d/vertex/A8 @@ -3,7 +3,7 @@ box t_box 100 100 100 vdisplay t_box vfit vselmode 1 1 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vselect 161 197 diff --git a/tests/v3d/vertex/A9 b/tests/v3d/vertex/A9 index 2e3b930880..d044a554cf 100644 --- a/tests/v3d/vertex/A9 +++ b/tests/v3d/vertex/A9 @@ -3,7 +3,7 @@ box t_box 100 100 100 vdisplay t_box vfit vselmode 1 1 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vselect 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex/B1 b/tests/v3d/vertex/B1 index 3a7064e944..59238697a9 100644 --- a/tests/v3d/vertex/B1 +++ b/tests/v3d/vertex/B1 @@ -3,7 +3,7 @@ box t_box 100 100 100 vdisplay t_box vfit vselmode 1 1 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vselect 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex/C3 b/tests/v3d/vertex/C3 index 7c37e4a835..4c1f350a34 100644 --- a/tests/v3d/vertex/C3 +++ b/tests/v3d/vertex/C3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/C4 b/tests/v3d/vertex/C4 index 7c4441853b..af35ef7fde 100644 --- a/tests/v3d/vertex/C4 +++ b/tests/v3d/vertex/C4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/C5 b/tests/v3d/vertex/C5 index 1ccb624f91..235429f1ce 100644 --- a/tests/v3d/vertex/C5 +++ b/tests/v3d/vertex/C5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/C6 b/tests/v3d/vertex/C6 index b7f2c94a8b..f20836a1b0 100644 --- a/tests/v3d/vertex/C6 +++ b/tests/v3d/vertex/C6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/C7 b/tests/v3d/vertex/C7 index aab2734815..8ce64a2f9b 100644 --- a/tests/v3d/vertex/C7 +++ b/tests/v3d/vertex/C7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/C8 b/tests/v3d/vertex/C8 index 0fa6a7b667..2fc0baa7c9 100644 --- a/tests/v3d/vertex/C8 +++ b/tests/v3d/vertex/C8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/C9 b/tests/v3d/vertex/C9 index 4fc82a977a..e468579e72 100644 --- a/tests/v3d/vertex/C9 +++ b/tests/v3d/vertex/C9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/D1 b/tests/v3d/vertex/D1 index 3ec18ee7ee..24b67f1e46 100644 --- a/tests/v3d/vertex/D1 +++ b/tests/v3d/vertex/D1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/D2 b/tests/v3d/vertex/D2 index 75b46aa6db..bff52bd9d4 100644 --- a/tests/v3d/vertex/D2 +++ b/tests/v3d/vertex/D2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/D3 b/tests/v3d/vertex/D3 index 1d1b4661b3..1056c504a3 100644 --- a/tests/v3d/vertex/D3 +++ b/tests/v3d/vertex/D3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/D4 b/tests/v3d/vertex/D4 index 844a00f6f9..f5e435691b 100644 --- a/tests/v3d/vertex/D4 +++ b/tests/v3d/vertex/D4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/D5 b/tests/v3d/vertex/D5 index d0c83d7875..a5c72e9d55 100644 --- a/tests/v3d/vertex/D5 +++ b/tests/v3d/vertex/D5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/D6 b/tests/v3d/vertex/D6 index 8213e27c8a..0834a17db8 100644 --- a/tests/v3d/vertex/D6 +++ b/tests/v3d/vertex/D6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 diff --git a/tests/v3d/vertex/D7 b/tests/v3d/vertex/D7 index 5165998cfc..4056326d6f 100644 --- a/tests/v3d/vertex/D7 +++ b/tests/v3d/vertex/D7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/D8 b/tests/v3d/vertex/D8 index 2bbb34453f..3509c38a88 100644 --- a/tests/v3d/vertex/D8 +++ b/tests/v3d/vertex/D8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/D9 b/tests/v3d/vertex/D9 index 4a31e09c70..834b98867f 100644 --- a/tests/v3d/vertex/D9 +++ b/tests/v3d/vertex/D9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/E1 b/tests/v3d/vertex/E1 index d1a47877d2..5035cc701b 100644 --- a/tests/v3d/vertex/E1 +++ b/tests/v3d/vertex/E1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/E2 b/tests/v3d/vertex/E2 index 734199eb58..2d2d1c54f2 100644 --- a/tests/v3d/vertex/E2 +++ b/tests/v3d/vertex/E2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/E3 b/tests/v3d/vertex/E3 index a1c10dd330..fa4549d34d 100644 --- a/tests/v3d/vertex/E3 +++ b/tests/v3d/vertex/E3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/E4 b/tests/v3d/vertex/E4 index 077cdab5ee..14505c8486 100644 --- a/tests/v3d/vertex/E4 +++ b/tests/v3d/vertex/E4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/E5 b/tests/v3d/vertex/E5 index 24e002aa2b..f95f0e1e32 100644 --- a/tests/v3d/vertex/E5 +++ b/tests/v3d/vertex/E5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/E6 b/tests/v3d/vertex/E6 index 88f8570623..c9e7ff5cdb 100644 --- a/tests/v3d/vertex/E6 +++ b/tests/v3d/vertex/E6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 diff --git a/tests/v3d/vertex/E7 b/tests/v3d/vertex/E7 index efcd4f71c2..869fecbd4b 100644 --- a/tests/v3d/vertex/E7 +++ b/tests/v3d/vertex/E7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 @@ -53,7 +53,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 39 208 diff --git a/tests/v3d/vertex/E8 b/tests/v3d/vertex/E8 index f89714f37f..5d517c1b81 100644 --- a/tests/v3d/vertex/E8 +++ b/tests/v3d/vertex/E8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 @@ -53,7 +53,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 39 208 diff --git a/tests/v3d/vertex/E9 b/tests/v3d/vertex/E9 index 3a55aa3461..19bba398eb 100644 --- a/tests/v3d/vertex/E9 +++ b/tests/v3d/vertex/E9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 @@ -53,7 +53,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 39 208 diff --git a/tests/v3d/vertex/F1 b/tests/v3d/vertex/F1 index 64026be79b..d80a1ec47f 100644 --- a/tests/v3d/vertex/F1 +++ b/tests/v3d/vertex/F1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 @@ -53,7 +53,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 39 208 diff --git a/tests/v3d/vertex/F2 b/tests/v3d/vertex/F2 index 4f7d0454ae..71c02b75c1 100644 --- a/tests/v3d/vertex/F2 +++ b/tests/v3d/vertex/F2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 46 204 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 191 319 @@ -53,7 +53,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 39 208 diff --git a/tests/v3d/vertex_edge/A3 b/tests/v3d/vertex_edge/A3 index c0b9b9058c..5c1045a4f2 100644 --- a/tests/v3d/vertex_edge/A3 +++ b/tests/v3d/vertex_edge/A3 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/A4 b/tests/v3d/vertex_edge/A4 index ae0f5da4a3..fc36664c34 100644 --- a/tests/v3d/vertex_edge/A4 +++ b/tests/v3d/vertex_edge/A4 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/A5 b/tests/v3d/vertex_edge/A5 index ece0fb1ae6..24857f2d1d 100644 --- a/tests/v3d/vertex_edge/A5 +++ b/tests/v3d/vertex_edge/A5 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/A6 b/tests/v3d/vertex_edge/A6 index 182bb4bb1e..655f7e0569 100644 --- a/tests/v3d/vertex_edge/A6 +++ b/tests/v3d/vertex_edge/A6 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/A7 b/tests/v3d/vertex_edge/A7 index 387f63f979..f9f152aeae 100644 --- a/tests/v3d/vertex_edge/A7 +++ b/tests/v3d/vertex_edge/A7 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/A8 b/tests/v3d/vertex_edge/A8 index 14259c9915..6ffb6f373e 100644 --- a/tests/v3d/vertex_edge/A8 +++ b/tests/v3d/vertex_edge/A8 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/A9 b/tests/v3d/vertex_edge/A9 index 11b585479c..ba82bef0d2 100644 --- a/tests/v3d/vertex_edge/A9 +++ b/tests/v3d/vertex_edge/A9 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/B1 b/tests/v3d/vertex_edge/B1 index bdea4130e9..533fb81f2c 100644 --- a/tests/v3d/vertex_edge/B1 +++ b/tests/v3d/vertex_edge/B1 @@ -9,7 +9,7 @@ vselmode 2 1 vmoveto 379 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/C3 b/tests/v3d/vertex_edge/C3 index 143d47a06a..19b7d6429f 100644 --- a/tests/v3d/vertex_edge/C3 +++ b/tests/v3d/vertex_edge/C3 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/C4 b/tests/v3d/vertex_edge/C4 index 48b54f7f29..ab025bf682 100644 --- a/tests/v3d/vertex_edge/C4 +++ b/tests/v3d/vertex_edge/C4 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/C5 b/tests/v3d/vertex_edge/C5 index 3d95d2db93..1acdcc360d 100644 --- a/tests/v3d/vertex_edge/C5 +++ b/tests/v3d/vertex_edge/C5 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/C6 b/tests/v3d/vertex_edge/C6 index c1249127e0..939d993436 100644 --- a/tests/v3d/vertex_edge/C6 +++ b/tests/v3d/vertex_edge/C6 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/C7 b/tests/v3d/vertex_edge/C7 index fc3cc9420d..a42915a338 100644 --- a/tests/v3d/vertex_edge/C7 +++ b/tests/v3d/vertex_edge/C7 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/C8 b/tests/v3d/vertex_edge/C8 index 0d3a435ef4..1be9e903a8 100644 --- a/tests/v3d/vertex_edge/C8 +++ b/tests/v3d/vertex_edge/C8 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/C9 b/tests/v3d/vertex_edge/C9 index 95b35674ed..753269f9e4 100644 --- a/tests/v3d/vertex_edge/C9 +++ b/tests/v3d/vertex_edge/C9 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/D1 b/tests/v3d/vertex_edge/D1 index 7b7194690e..ab12f7921f 100644 --- a/tests/v3d/vertex_edge/D1 +++ b/tests/v3d/vertex_edge/D1 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/D2 b/tests/v3d/vertex_edge/D2 index c8346c0b5e..bc549cbd5c 100644 --- a/tests/v3d/vertex_edge/D2 +++ b/tests/v3d/vertex_edge/D2 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/D3 b/tests/v3d/vertex_edge/D3 index 1953802f68..2f35c71819 100644 --- a/tests/v3d/vertex_edge/D3 +++ b/tests/v3d/vertex_edge/D3 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/D4 b/tests/v3d/vertex_edge/D4 index f56fba6564..f2c8632de3 100644 --- a/tests/v3d/vertex_edge/D4 +++ b/tests/v3d/vertex_edge/D4 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/D5 b/tests/v3d/vertex_edge/D5 index 500bac4434..4d521de038 100644 --- a/tests/v3d/vertex_edge/D5 +++ b/tests/v3d/vertex_edge/D5 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/D6 b/tests/v3d/vertex_edge/D6 index f9926e9852..0f6584c8f1 100644 --- a/tests/v3d/vertex_edge/D6 +++ b/tests/v3d/vertex_edge/D6 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/D7 b/tests/v3d/vertex_edge/D7 index 19d7cd91ad..613a5a0d1d 100644 --- a/tests/v3d/vertex_edge/D7 +++ b/tests/v3d/vertex_edge/D7 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/D8 b/tests/v3d/vertex_edge/D8 index 72189b087a..a629aa1ed9 100644 --- a/tests/v3d/vertex_edge/D8 +++ b/tests/v3d/vertex_edge/D8 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/D9 b/tests/v3d/vertex_edge/D9 index 6d12850e98..7544f611e1 100644 --- a/tests/v3d/vertex_edge/D9 +++ b/tests/v3d/vertex_edge/D9 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/E1 b/tests/v3d/vertex_edge/E1 index 09a0693d41..6d7951b16b 100644 --- a/tests/v3d/vertex_edge/E1 +++ b/tests/v3d/vertex_edge/E1 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/E2 b/tests/v3d/vertex_edge/E2 index 2c17229149..4ab86a3e10 100644 --- a/tests/v3d/vertex_edge/E2 +++ b/tests/v3d/vertex_edge/E2 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/E3 b/tests/v3d/vertex_edge/E3 index 3592bd855c..03834a8f84 100644 --- a/tests/v3d/vertex_edge/E3 +++ b/tests/v3d/vertex_edge/E3 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/E4 b/tests/v3d/vertex_edge/E4 index de383d6ddf..5af405645a 100644 --- a/tests/v3d/vertex_edge/E4 +++ b/tests/v3d/vertex_edge/E4 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/E5 b/tests/v3d/vertex_edge/E5 index ce0b090023..2fed42f498 100644 --- a/tests/v3d/vertex_edge/E5 +++ b/tests/v3d/vertex_edge/E5 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/E6 b/tests/v3d/vertex_edge/E6 index 2c45638e74..94e26eba6b 100644 --- a/tests/v3d/vertex_edge/E6 +++ b/tests/v3d/vertex_edge/E6 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/E7 b/tests/v3d/vertex_edge/E7 index 8152b64341..75d8b4fea0 100644 --- a/tests/v3d/vertex_edge/E7 +++ b/tests/v3d/vertex_edge/E7 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/E8 b/tests/v3d/vertex_edge/E8 index 5dd45a20b0..744f9e2d28 100644 --- a/tests/v3d/vertex_edge/E8 +++ b/tests/v3d/vertex_edge/E8 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/E9 b/tests/v3d/vertex_edge/E9 index 629001d6ec..66d0c89737 100644 --- a/tests/v3d/vertex_edge/E9 +++ b/tests/v3d/vertex_edge/E9 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/F1 b/tests/v3d/vertex_edge/F1 index ed0fb5fa90..0218a6413a 100644 --- a/tests/v3d/vertex_edge/F1 +++ b/tests/v3d/vertex_edge/F1 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/F2 b/tests/v3d/vertex_edge/F2 index 249d792f73..bafb55286e 100644 --- a/tests/v3d/vertex_edge/F2 +++ b/tests/v3d/vertex_edge/F2 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/F5 b/tests/v3d/vertex_edge/F5 index 1d1b679c3b..2ff326ff3b 100644 --- a/tests/v3d/vertex_edge/F5 +++ b/tests/v3d/vertex_edge/F5 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/F6 b/tests/v3d/vertex_edge/F6 index 08bfe4a002..cbb9b2df29 100644 --- a/tests/v3d/vertex_edge/F6 +++ b/tests/v3d/vertex_edge/F6 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/F7 b/tests/v3d/vertex_edge/F7 index a7c0b4cf88..49c058cfea 100644 --- a/tests/v3d/vertex_edge/F7 +++ b/tests/v3d/vertex_edge/F7 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/F8 b/tests/v3d/vertex_edge/F8 index 95959c7205..9cc2592660 100644 --- a/tests/v3d/vertex_edge/F8 +++ b/tests/v3d/vertex_edge/F8 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/F9 b/tests/v3d/vertex_edge/F9 index f48dc74151..358dff47f1 100644 --- a/tests/v3d/vertex_edge/F9 +++ b/tests/v3d/vertex_edge/F9 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/G1 b/tests/v3d/vertex_edge/G1 index 75ae362b12..7aded8eb74 100644 --- a/tests/v3d/vertex_edge/G1 +++ b/tests/v3d/vertex_edge/G1 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/G2 b/tests/v3d/vertex_edge/G2 index 56f946b927..9992b01e95 100644 --- a/tests/v3d/vertex_edge/G2 +++ b/tests/v3d/vertex_edge/G2 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/G3 b/tests/v3d/vertex_edge/G3 index 70b3eb3f7d..133a9ec394 100644 --- a/tests/v3d/vertex_edge/G3 +++ b/tests/v3d/vertex_edge/G3 @@ -11,7 +11,7 @@ vselect 379 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/H5 b/tests/v3d/vertex_edge/H5 index aac12b2d94..5f665bc6fc 100644 --- a/tests/v3d/vertex_edge/H5 +++ b/tests/v3d/vertex_edge/H5 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/H6 b/tests/v3d/vertex_edge/H6 index 277134abd2..49c213085b 100644 --- a/tests/v3d/vertex_edge/H6 +++ b/tests/v3d/vertex_edge/H6 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/H7 b/tests/v3d/vertex_edge/H7 index e0cdb45069..9de1263467 100644 --- a/tests/v3d/vertex_edge/H7 +++ b/tests/v3d/vertex_edge/H7 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/H8 b/tests/v3d/vertex_edge/H8 index 4b8af24453..8ed3bedf97 100644 --- a/tests/v3d/vertex_edge/H8 +++ b/tests/v3d/vertex_edge/H8 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/H9 b/tests/v3d/vertex_edge/H9 index 0283d690b6..e703229907 100644 --- a/tests/v3d/vertex_edge/H9 +++ b/tests/v3d/vertex_edge/H9 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I1 b/tests/v3d/vertex_edge/I1 index 407e893b33..8855e26c6d 100644 --- a/tests/v3d/vertex_edge/I1 +++ b/tests/v3d/vertex_edge/I1 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I2 b/tests/v3d/vertex_edge/I2 index 9f223a7ad5..b80ed570b3 100644 --- a/tests/v3d/vertex_edge/I2 +++ b/tests/v3d/vertex_edge/I2 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I3 b/tests/v3d/vertex_edge/I3 index 12a39f5862..e31d4d40f6 100644 --- a/tests/v3d/vertex_edge/I3 +++ b/tests/v3d/vertex_edge/I3 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I4 b/tests/v3d/vertex_edge/I4 index e58da8496d..bda6057540 100644 --- a/tests/v3d/vertex_edge/I4 +++ b/tests/v3d/vertex_edge/I4 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I5 b/tests/v3d/vertex_edge/I5 index 5fac2a2852..893da4cc0f 100644 --- a/tests/v3d/vertex_edge/I5 +++ b/tests/v3d/vertex_edge/I5 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I6 b/tests/v3d/vertex_edge/I6 index 3255db25e2..4ec7576430 100644 --- a/tests/v3d/vertex_edge/I6 +++ b/tests/v3d/vertex_edge/I6 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I7 b/tests/v3d/vertex_edge/I7 index 7096f138e3..ce44966a9f 100644 --- a/tests/v3d/vertex_edge/I7 +++ b/tests/v3d/vertex_edge/I7 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I8 b/tests/v3d/vertex_edge/I8 index 3bcde83b61..6fa374152a 100644 --- a/tests/v3d/vertex_edge/I8 +++ b/tests/v3d/vertex_edge/I8 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_edge/I9 b/tests/v3d/vertex_edge/I9 index 06ce4335b0..d54c3199d2 100644 --- a/tests/v3d/vertex_edge/I9 +++ b/tests/v3d/vertex_edge/I9 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J1 b/tests/v3d/vertex_edge/J1 index d6aea28af5..b139081960 100644 --- a/tests/v3d/vertex_edge/J1 +++ b/tests/v3d/vertex_edge/J1 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J2 b/tests/v3d/vertex_edge/J2 index 095fdd43d6..200a96c58b 100644 --- a/tests/v3d/vertex_edge/J2 +++ b/tests/v3d/vertex_edge/J2 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J3 b/tests/v3d/vertex_edge/J3 index d8cbebe415..fd4918c3f1 100644 --- a/tests/v3d/vertex_edge/J3 +++ b/tests/v3d/vertex_edge/J3 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J4 b/tests/v3d/vertex_edge/J4 index 6e96a520b4..cd5b34ef85 100644 --- a/tests/v3d/vertex_edge/J4 +++ b/tests/v3d/vertex_edge/J4 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J5 b/tests/v3d/vertex_edge/J5 index 1b3698b56a..adfffe2fca 100644 --- a/tests/v3d/vertex_edge/J5 +++ b/tests/v3d/vertex_edge/J5 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J6 b/tests/v3d/vertex_edge/J6 index d58d13c106..2ef02a4714 100644 --- a/tests/v3d/vertex_edge/J6 +++ b/tests/v3d/vertex_edge/J6 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J7 b/tests/v3d/vertex_edge/J7 index 7b3422b70b..aa57bad44b 100644 --- a/tests/v3d/vertex_edge/J7 +++ b/tests/v3d/vertex_edge/J7 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J8 b/tests/v3d/vertex_edge/J8 index 88e78a35b7..75d0492a4e 100644 --- a/tests/v3d/vertex_edge/J8 +++ b/tests/v3d/vertex_edge/J8 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_edge/J9 b/tests/v3d/vertex_edge/J9 index d74059f452..0b3a9dfab0 100644 --- a/tests/v3d/vertex_edge/J9 +++ b/tests/v3d/vertex_edge/J9 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/K1 b/tests/v3d/vertex_edge/K1 index 6a350ee6f6..e793b7d8e8 100644 --- a/tests/v3d/vertex_edge/K1 +++ b/tests/v3d/vertex_edge/K1 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/K2 b/tests/v3d/vertex_edge/K2 index e8afb80075..276200da03 100644 --- a/tests/v3d/vertex_edge/K2 +++ b/tests/v3d/vertex_edge/K2 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/K3 b/tests/v3d/vertex_edge/K3 index 9ab848572e..91d4f80684 100644 --- a/tests/v3d/vertex_edge/K3 +++ b/tests/v3d/vertex_edge/K3 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_edge/K4 b/tests/v3d/vertex_edge/K4 index 4c6666bfe5..427fca346b 100644 --- a/tests/v3d/vertex_edge/K4 +++ b/tests/v3d/vertex_edge/K4 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_face/A3 b/tests/v3d/vertex_face/A3 index 04c2c9a6b9..0193ca9cc2 100644 --- a/tests/v3d/vertex_face/A3 +++ b/tests/v3d/vertex_face/A3 @@ -8,7 +8,7 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/A4 b/tests/v3d/vertex_face/A4 index 0eac5856a5..731563fb06 100644 --- a/tests/v3d/vertex_face/A4 +++ b/tests/v3d/vertex_face/A4 @@ -8,7 +8,7 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/A5 b/tests/v3d/vertex_face/A5 index 737f345003..12658bcdb1 100644 --- a/tests/v3d/vertex_face/A5 +++ b/tests/v3d/vertex_face/A5 @@ -8,7 +8,7 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/A6 b/tests/v3d/vertex_face/A6 index 5043fc49f7..fbde2dd959 100644 --- a/tests/v3d/vertex_face/A6 +++ b/tests/v3d/vertex_face/A6 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/A7 b/tests/v3d/vertex_face/A7 index 2b0dc81e49..450d279607 100644 --- a/tests/v3d/vertex_face/A7 +++ b/tests/v3d/vertex_face/A7 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/A8 b/tests/v3d/vertex_face/A8 index f9454cc318..b47eeb2057 100644 --- a/tests/v3d/vertex_face/A8 +++ b/tests/v3d/vertex_face/A8 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/A9 b/tests/v3d/vertex_face/A9 index 4308e4d83f..ac694162bf 100644 --- a/tests/v3d/vertex_face/A9 +++ b/tests/v3d/vertex_face/A9 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/B1 b/tests/v3d/vertex_face/B1 index e0cb5d13ec..c37fdcfc28 100644 --- a/tests/v3d/vertex_face/B1 +++ b/tests/v3d/vertex_face/B1 @@ -8,14 +8,14 @@ vselmode 4 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/C3 b/tests/v3d/vertex_face/C3 index f04c969d30..4cfeaf37d4 100644 --- a/tests/v3d/vertex_face/C3 +++ b/tests/v3d/vertex_face/C3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/C4 b/tests/v3d/vertex_face/C4 index 776c3e18f4..37f298e873 100644 --- a/tests/v3d/vertex_face/C4 +++ b/tests/v3d/vertex_face/C4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/C5 b/tests/v3d/vertex_face/C5 index 68d63fd65a..c98ebdfdca 100644 --- a/tests/v3d/vertex_face/C5 +++ b/tests/v3d/vertex_face/C5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/C6 b/tests/v3d/vertex_face/C6 index dbc95c1dc8..ca293c1bb1 100644 --- a/tests/v3d/vertex_face/C6 +++ b/tests/v3d/vertex_face/C6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/C7 b/tests/v3d/vertex_face/C7 index 98de19437b..6515a6e137 100644 --- a/tests/v3d/vertex_face/C7 +++ b/tests/v3d/vertex_face/C7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/C8 b/tests/v3d/vertex_face/C8 index 70f2a2e4f8..a579cad035 100644 --- a/tests/v3d/vertex_face/C8 +++ b/tests/v3d/vertex_face/C8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/C9 b/tests/v3d/vertex_face/C9 index ef7c6064b7..3fe23205bf 100644 --- a/tests/v3d/vertex_face/C9 +++ b/tests/v3d/vertex_face/C9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/D1 b/tests/v3d/vertex_face/D1 index ce6f3d20ee..b94e554f7b 100644 --- a/tests/v3d/vertex_face/D1 +++ b/tests/v3d/vertex_face/D1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/D2 b/tests/v3d/vertex_face/D2 index 505777affe..78db2949b3 100644 --- a/tests/v3d/vertex_face/D2 +++ b/tests/v3d/vertex_face/D2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/D3 b/tests/v3d/vertex_face/D3 index 0ed59b110c..31265d964a 100644 --- a/tests/v3d/vertex_face/D3 +++ b/tests/v3d/vertex_face/D3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/D4 b/tests/v3d/vertex_face/D4 index cb0cb3fcf7..36f96eee46 100644 --- a/tests/v3d/vertex_face/D4 +++ b/tests/v3d/vertex_face/D4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/D5 b/tests/v3d/vertex_face/D5 index e455774cc6..713eaacdf9 100644 --- a/tests/v3d/vertex_face/D5 +++ b/tests/v3d/vertex_face/D5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/D6 b/tests/v3d/vertex_face/D6 index 37991940f4..b39b3237af 100644 --- a/tests/v3d/vertex_face/D6 +++ b/tests/v3d/vertex_face/D6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/D7 b/tests/v3d/vertex_face/D7 index 306cfcf0a4..1293d0239a 100644 --- a/tests/v3d/vertex_face/D7 +++ b/tests/v3d/vertex_face/D7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/D8 b/tests/v3d/vertex_face/D8 index d9e24dbea9..d88607cab0 100644 --- a/tests/v3d/vertex_face/D8 +++ b/tests/v3d/vertex_face/D8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/D9 b/tests/v3d/vertex_face/D9 index 30edb21cd5..0f339d0989 100644 --- a/tests/v3d/vertex_face/D9 +++ b/tests/v3d/vertex_face/D9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/E1 b/tests/v3d/vertex_face/E1 index 53e439cc84..d832128191 100644 --- a/tests/v3d/vertex_face/E1 +++ b/tests/v3d/vertex_face/E1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/E2 b/tests/v3d/vertex_face/E2 index da80dabaae..f7e43fe3ac 100644 --- a/tests/v3d/vertex_face/E2 +++ b/tests/v3d/vertex_face/E2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/E3 b/tests/v3d/vertex_face/E3 index 157cc64262..03ec38fcc8 100644 --- a/tests/v3d/vertex_face/E3 +++ b/tests/v3d/vertex_face/E3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/E4 b/tests/v3d/vertex_face/E4 index 1325c72c46..ef3622953f 100644 --- a/tests/v3d/vertex_face/E4 +++ b/tests/v3d/vertex_face/E4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/E5 b/tests/v3d/vertex_face/E5 index 2da3db05ce..4982dc2884 100644 --- a/tests/v3d/vertex_face/E5 +++ b/tests/v3d/vertex_face/E5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/E6 b/tests/v3d/vertex_face/E6 index c3e764eb92..f586902766 100644 --- a/tests/v3d/vertex_face/E6 +++ b/tests/v3d/vertex_face/E6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/E7 b/tests/v3d/vertex_face/E7 index 38b14af287..6c8ff2ff54 100644 --- a/tests/v3d/vertex_face/E7 +++ b/tests/v3d/vertex_face/E7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/E8 b/tests/v3d/vertex_face/E8 index 747fa37446..345578758d 100644 --- a/tests/v3d/vertex_face/E8 +++ b/tests/v3d/vertex_face/E8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/E9 b/tests/v3d/vertex_face/E9 index 27d2f61a47..2e2554dbbe 100644 --- a/tests/v3d/vertex_face/E9 +++ b/tests/v3d/vertex_face/E9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/F1 b/tests/v3d/vertex_face/F1 index 9a15f320c5..7d68360a3b 100644 --- a/tests/v3d/vertex_face/F1 +++ b/tests/v3d/vertex_face/F1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/F2 b/tests/v3d/vertex_face/F2 index 89b4a0afc7..09c6fe540c 100644 --- a/tests/v3d/vertex_face/F2 +++ b/tests/v3d/vertex_face/F2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/F5 b/tests/v3d/vertex_face/F5 index f6579c30eb..9d614261c5 100644 --- a/tests/v3d/vertex_face/F5 +++ b/tests/v3d/vertex_face/F5 @@ -10,7 +10,7 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/F6 b/tests/v3d/vertex_face/F6 index cccadb24be..fc018bd4cf 100644 --- a/tests/v3d/vertex_face/F6 +++ b/tests/v3d/vertex_face/F6 @@ -10,7 +10,7 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/F7 b/tests/v3d/vertex_face/F7 index 0a05bf334d..ff5260f9c0 100644 --- a/tests/v3d/vertex_face/F7 +++ b/tests/v3d/vertex_face/F7 @@ -10,7 +10,7 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/F8 b/tests/v3d/vertex_face/F8 index 8536752fa1..2b451c36c3 100644 --- a/tests/v3d/vertex_face/F8 +++ b/tests/v3d/vertex_face/F8 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/F9 b/tests/v3d/vertex_face/F9 index 3d3cdc549c..0d182c5849 100644 --- a/tests/v3d/vertex_face/F9 +++ b/tests/v3d/vertex_face/F9 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/G1 b/tests/v3d/vertex_face/G1 index d9ca828643..997eb6f20b 100644 --- a/tests/v3d/vertex_face/G1 +++ b/tests/v3d/vertex_face/G1 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/G2 b/tests/v3d/vertex_face/G2 index c2d415c6bd..3cf6fb331e 100644 --- a/tests/v3d/vertex_face/G2 +++ b/tests/v3d/vertex_face/G2 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/G3 b/tests/v3d/vertex_face/G3 index 1a126f806c..42417534da 100644 --- a/tests/v3d/vertex_face/G3 +++ b/tests/v3d/vertex_face/G3 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/H5 b/tests/v3d/vertex_face/H5 index 706519a72f..e7319d922d 100644 --- a/tests/v3d/vertex_face/H5 +++ b/tests/v3d/vertex_face/H5 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/H6 b/tests/v3d/vertex_face/H6 index 9ecdf751fc..7a19d7d9c7 100644 --- a/tests/v3d/vertex_face/H6 +++ b/tests/v3d/vertex_face/H6 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/H7 b/tests/v3d/vertex_face/H7 index 6f0301bdfe..3142fd4d4d 100644 --- a/tests/v3d/vertex_face/H7 +++ b/tests/v3d/vertex_face/H7 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/H8 b/tests/v3d/vertex_face/H8 index bece2dca23..040f1b3c1d 100644 --- a/tests/v3d/vertex_face/H8 +++ b/tests/v3d/vertex_face/H8 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/H9 b/tests/v3d/vertex_face/H9 index dae176a32e..61b9d75604 100644 --- a/tests/v3d/vertex_face/H9 +++ b/tests/v3d/vertex_face/H9 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I1 b/tests/v3d/vertex_face/I1 index 683ee578da..fbdd0face5 100644 --- a/tests/v3d/vertex_face/I1 +++ b/tests/v3d/vertex_face/I1 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I2 b/tests/v3d/vertex_face/I2 index 19210532a4..dc08aa81c6 100644 --- a/tests/v3d/vertex_face/I2 +++ b/tests/v3d/vertex_face/I2 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I3 b/tests/v3d/vertex_face/I3 index 006dc76c9c..c49cd0ef0c 100644 --- a/tests/v3d/vertex_face/I3 +++ b/tests/v3d/vertex_face/I3 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I4 b/tests/v3d/vertex_face/I4 index 566ffca574..2a42b09b7e 100644 --- a/tests/v3d/vertex_face/I4 +++ b/tests/v3d/vertex_face/I4 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I5 b/tests/v3d/vertex_face/I5 index 0a1d0fd1aa..77a2138348 100644 --- a/tests/v3d/vertex_face/I5 +++ b/tests/v3d/vertex_face/I5 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I6 b/tests/v3d/vertex_face/I6 index 69ac37146d..6fbc005270 100644 --- a/tests/v3d/vertex_face/I6 +++ b/tests/v3d/vertex_face/I6 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I7 b/tests/v3d/vertex_face/I7 index 2ea24a4d55..f226fd3295 100644 --- a/tests/v3d/vertex_face/I7 +++ b/tests/v3d/vertex_face/I7 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I8 b/tests/v3d/vertex_face/I8 index 70001fec1f..98c2c6ba21 100644 --- a/tests/v3d/vertex_face/I8 +++ b/tests/v3d/vertex_face/I8 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_face/I9 b/tests/v3d/vertex_face/I9 index 8e4eb0c8ef..478f951736 100644 --- a/tests/v3d/vertex_face/I9 +++ b/tests/v3d/vertex_face/I9 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J1 b/tests/v3d/vertex_face/J1 index b88a137b21..1eb5851dd7 100644 --- a/tests/v3d/vertex_face/J1 +++ b/tests/v3d/vertex_face/J1 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J2 b/tests/v3d/vertex_face/J2 index da0118e069..71c42167da 100644 --- a/tests/v3d/vertex_face/J2 +++ b/tests/v3d/vertex_face/J2 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J3 b/tests/v3d/vertex_face/J3 index fe5b29846a..550e900189 100644 --- a/tests/v3d/vertex_face/J3 +++ b/tests/v3d/vertex_face/J3 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J4 b/tests/v3d/vertex_face/J4 index 50bf065e38..938af17015 100644 --- a/tests/v3d/vertex_face/J4 +++ b/tests/v3d/vertex_face/J4 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J5 b/tests/v3d/vertex_face/J5 index b3320694b1..456c2678c7 100644 --- a/tests/v3d/vertex_face/J5 +++ b/tests/v3d/vertex_face/J5 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J6 b/tests/v3d/vertex_face/J6 index ed019d6d3c..12ea39b575 100644 --- a/tests/v3d/vertex_face/J6 +++ b/tests/v3d/vertex_face/J6 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J7 b/tests/v3d/vertex_face/J7 index 5c7fc3faab..4cbb1aca4f 100644 --- a/tests/v3d/vertex_face/J7 +++ b/tests/v3d/vertex_face/J7 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J8 b/tests/v3d/vertex_face/J8 index 348db4808f..011b043a4c 100644 --- a/tests/v3d/vertex_face/J8 +++ b/tests/v3d/vertex_face/J8 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_face/J9 b/tests/v3d/vertex_face/J9 index 0b31782508..686934edaf 100644 --- a/tests/v3d/vertex_face/J9 +++ b/tests/v3d/vertex_face/J9 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/K1 b/tests/v3d/vertex_face/K1 index be2578abba..50d00873e9 100644 --- a/tests/v3d/vertex_face/K1 +++ b/tests/v3d/vertex_face/K1 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/K2 b/tests/v3d/vertex_face/K2 index 6ea71467de..d7d10c0180 100644 --- a/tests/v3d/vertex_face/K2 +++ b/tests/v3d/vertex_face/K2 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/K3 b/tests/v3d/vertex_face/K3 index bd18966aa0..8a7e0e1c7f 100644 --- a/tests/v3d/vertex_face/K3 +++ b/tests/v3d/vertex_face/K3 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_face/K4 b/tests/v3d/vertex_face/K4 index edf8280b0f..c8c8c6bade 100644 --- a/tests/v3d/vertex_face/K4 +++ b/tests/v3d/vertex_face/K4 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/A3 b/tests/v3d/vertex_solid/A3 index c53545fb7b..96794a9e07 100644 --- a/tests/v3d/vertex_solid/A3 +++ b/tests/v3d/vertex_solid/A3 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/A4 b/tests/v3d/vertex_solid/A4 index 48bcc5be73..05f8f55456 100644 --- a/tests/v3d/vertex_solid/A4 +++ b/tests/v3d/vertex_solid/A4 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/A5 b/tests/v3d/vertex_solid/A5 index 34b7f6aa33..06a543fc74 100644 --- a/tests/v3d/vertex_solid/A5 +++ b/tests/v3d/vertex_solid/A5 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/A6 b/tests/v3d/vertex_solid/A6 index bf3cbbeb29..0d20da1556 100644 --- a/tests/v3d/vertex_solid/A6 +++ b/tests/v3d/vertex_solid/A6 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/A7 b/tests/v3d/vertex_solid/A7 index 962a6a2ad8..95a6c5a5ca 100644 --- a/tests/v3d/vertex_solid/A7 +++ b/tests/v3d/vertex_solid/A7 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/A8 b/tests/v3d/vertex_solid/A8 index 1700883e99..0cfe6abb6b 100644 --- a/tests/v3d/vertex_solid/A8 +++ b/tests/v3d/vertex_solid/A8 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/A9 b/tests/v3d/vertex_solid/A9 index 49ec9da8ac..e1702644c4 100644 --- a/tests/v3d/vertex_solid/A9 +++ b/tests/v3d/vertex_solid/A9 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/B1 b/tests/v3d/vertex_solid/B1 index 4c442651fe..4073a4ff61 100644 --- a/tests/v3d/vertex_solid/B1 +++ b/tests/v3d/vertex_solid/B1 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 306 204 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/C3 b/tests/v3d/vertex_solid/C3 index fe4983f5ae..64bbbc6b65 100644 --- a/tests/v3d/vertex_solid/C3 +++ b/tests/v3d/vertex_solid/C3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/C4 b/tests/v3d/vertex_solid/C4 index a24a0303e4..5968a123a1 100644 --- a/tests/v3d/vertex_solid/C4 +++ b/tests/v3d/vertex_solid/C4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/C5 b/tests/v3d/vertex_solid/C5 index fdda470987..e30069ace3 100644 --- a/tests/v3d/vertex_solid/C5 +++ b/tests/v3d/vertex_solid/C5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/C6 b/tests/v3d/vertex_solid/C6 index 7a6752f099..d893a06faf 100644 --- a/tests/v3d/vertex_solid/C6 +++ b/tests/v3d/vertex_solid/C6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/C7 b/tests/v3d/vertex_solid/C7 index ed942c45d9..75c99674c7 100644 --- a/tests/v3d/vertex_solid/C7 +++ b/tests/v3d/vertex_solid/C7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/C8 b/tests/v3d/vertex_solid/C8 index 6b608f8a15..0ae6086a8d 100644 --- a/tests/v3d/vertex_solid/C8 +++ b/tests/v3d/vertex_solid/C8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/C9 b/tests/v3d/vertex_solid/C9 index 24f263914c..cc99dc5188 100644 --- a/tests/v3d/vertex_solid/C9 +++ b/tests/v3d/vertex_solid/C9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/D1 b/tests/v3d/vertex_solid/D1 index ae5250149f..111d5ad576 100644 --- a/tests/v3d/vertex_solid/D1 +++ b/tests/v3d/vertex_solid/D1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/D2 b/tests/v3d/vertex_solid/D2 index 7580c963b0..812b998a2a 100644 --- a/tests/v3d/vertex_solid/D2 +++ b/tests/v3d/vertex_solid/D2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/D3 b/tests/v3d/vertex_solid/D3 index 01d0565631..ab156b9771 100644 --- a/tests/v3d/vertex_solid/D3 +++ b/tests/v3d/vertex_solid/D3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/D4 b/tests/v3d/vertex_solid/D4 index a644722449..bb0b2750c9 100644 --- a/tests/v3d/vertex_solid/D4 +++ b/tests/v3d/vertex_solid/D4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/D5 b/tests/v3d/vertex_solid/D5 index f5df50cc5f..88d15a5d71 100644 --- a/tests/v3d/vertex_solid/D5 +++ b/tests/v3d/vertex_solid/D5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/D6 b/tests/v3d/vertex_solid/D6 index 8233b13f43..c3ef7457e4 100644 --- a/tests/v3d/vertex_solid/D6 +++ b/tests/v3d/vertex_solid/D6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/D7 b/tests/v3d/vertex_solid/D7 index 6458aae960..c5d9331349 100644 --- a/tests/v3d/vertex_solid/D7 +++ b/tests/v3d/vertex_solid/D7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/D8 b/tests/v3d/vertex_solid/D8 index 827a041919..17efbdc8bd 100644 --- a/tests/v3d/vertex_solid/D8 +++ b/tests/v3d/vertex_solid/D8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/D9 b/tests/v3d/vertex_solid/D9 index 39ac28586b..f864d43f0f 100644 --- a/tests/v3d/vertex_solid/D9 +++ b/tests/v3d/vertex_solid/D9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/E1 b/tests/v3d/vertex_solid/E1 index e15b13464a..cfaaed8115 100644 --- a/tests/v3d/vertex_solid/E1 +++ b/tests/v3d/vertex_solid/E1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/E2 b/tests/v3d/vertex_solid/E2 index 11e71121f5..88cad5d0f4 100644 --- a/tests/v3d/vertex_solid/E2 +++ b/tests/v3d/vertex_solid/E2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/E3 b/tests/v3d/vertex_solid/E3 index 0d05e39e15..b88568354e 100644 --- a/tests/v3d/vertex_solid/E3 +++ b/tests/v3d/vertex_solid/E3 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/E4 b/tests/v3d/vertex_solid/E4 index 1e36d8fe26..8e5c7198d5 100644 --- a/tests/v3d/vertex_solid/E4 +++ b/tests/v3d/vertex_solid/E4 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/E5 b/tests/v3d/vertex_solid/E5 index adf0001c29..51e5c1902c 100644 --- a/tests/v3d/vertex_solid/E5 +++ b/tests/v3d/vertex_solid/E5 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/E6 b/tests/v3d/vertex_solid/E6 index 448c710b43..dadcf1a3e2 100644 --- a/tests/v3d/vertex_solid/E6 +++ b/tests/v3d/vertex_solid/E6 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/E7 b/tests/v3d/vertex_solid/E7 index a629441b30..a7c42f93a1 100644 --- a/tests/v3d/vertex_solid/E7 +++ b/tests/v3d/vertex_solid/E7 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/E8 b/tests/v3d/vertex_solid/E8 index 3b14361bd0..e6eedd2990 100644 --- a/tests/v3d/vertex_solid/E8 +++ b/tests/v3d/vertex_solid/E8 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/E9 b/tests/v3d/vertex_solid/E9 index afece46c0d..fe4327a90f 100644 --- a/tests/v3d/vertex_solid/E9 +++ b/tests/v3d/vertex_solid/E9 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/F1 b/tests/v3d/vertex_solid/F1 index b9092a7757..a32a485d65 100644 --- a/tests/v3d/vertex_solid/F1 +++ b/tests/v3d/vertex_solid/F1 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/F2 b/tests/v3d/vertex_solid/F2 index 1572acc4f4..0083fbef03 100644 --- a/tests/v3d/vertex_solid/F2 +++ b/tests/v3d/vertex_solid/F2 @@ -19,7 +19,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -36,7 +36,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/F5 b/tests/v3d/vertex_solid/F5 index b0bf6c6f25..74771b65fe 100644 --- a/tests/v3d/vertex_solid/F5 +++ b/tests/v3d/vertex_solid/F5 @@ -10,7 +10,7 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/F6 b/tests/v3d/vertex_solid/F6 index b2ca14d06a..6a85038d81 100644 --- a/tests/v3d/vertex_solid/F6 +++ b/tests/v3d/vertex_solid/F6 @@ -10,7 +10,7 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/F7 b/tests/v3d/vertex_solid/F7 index 2617699529..0df2f939bd 100644 --- a/tests/v3d/vertex_solid/F7 +++ b/tests/v3d/vertex_solid/F7 @@ -10,7 +10,7 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/F8 b/tests/v3d/vertex_solid/F8 index c65f4fdd35..9d6b8eb089 100644 --- a/tests/v3d/vertex_solid/F8 +++ b/tests/v3d/vertex_solid/F8 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/F9 b/tests/v3d/vertex_solid/F9 index df2d1574a9..70ad3e2198 100644 --- a/tests/v3d/vertex_solid/F9 +++ b/tests/v3d/vertex_solid/F9 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/G1 b/tests/v3d/vertex_solid/G1 index e6c21835bc..a8c2c2b3ef 100644 --- a/tests/v3d/vertex_solid/G1 +++ b/tests/v3d/vertex_solid/G1 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/G2 b/tests/v3d/vertex_solid/G2 index 171c8153f3..1adee1c364 100644 --- a/tests/v3d/vertex_solid/G2 +++ b/tests/v3d/vertex_solid/G2 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/G3 b/tests/v3d/vertex_solid/G3 index 36b84b6e76..71d90f0fd0 100644 --- a/tests/v3d/vertex_solid/G3 +++ b/tests/v3d/vertex_solid/G3 @@ -10,14 +10,14 @@ vselect 306 204 vmoveto 0 0 vmoveto 26 305 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/H5 b/tests/v3d/vertex_solid/H5 index 08092524f6..90cb0ba117 100644 --- a/tests/v3d/vertex_solid/H5 +++ b/tests/v3d/vertex_solid/H5 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/H6 b/tests/v3d/vertex_solid/H6 index 416b222ba2..2aabb4a268 100644 --- a/tests/v3d/vertex_solid/H6 +++ b/tests/v3d/vertex_solid/H6 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/H7 b/tests/v3d/vertex_solid/H7 index 00690c39c9..c71ed7ac7b 100644 --- a/tests/v3d/vertex_solid/H7 +++ b/tests/v3d/vertex_solid/H7 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/H8 b/tests/v3d/vertex_solid/H8 index 17acfb92d7..63be73beaa 100644 --- a/tests/v3d/vertex_solid/H8 +++ b/tests/v3d/vertex_solid/H8 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/H9 b/tests/v3d/vertex_solid/H9 index 616c2f0713..453bb33daf 100644 --- a/tests/v3d/vertex_solid/H9 +++ b/tests/v3d/vertex_solid/H9 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I1 b/tests/v3d/vertex_solid/I1 index 05aac470c2..c2b48bb486 100644 --- a/tests/v3d/vertex_solid/I1 +++ b/tests/v3d/vertex_solid/I1 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I2 b/tests/v3d/vertex_solid/I2 index 454f02a17f..ffe3a4c9bb 100644 --- a/tests/v3d/vertex_solid/I2 +++ b/tests/v3d/vertex_solid/I2 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I3 b/tests/v3d/vertex_solid/I3 index d616a2c48a..ef98ade930 100644 --- a/tests/v3d/vertex_solid/I3 +++ b/tests/v3d/vertex_solid/I3 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I4 b/tests/v3d/vertex_solid/I4 index 9ff260b755..61bb268e85 100644 --- a/tests/v3d/vertex_solid/I4 +++ b/tests/v3d/vertex_solid/I4 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I5 b/tests/v3d/vertex_solid/I5 index 68c09c59c7..1e888b5ef8 100644 --- a/tests/v3d/vertex_solid/I5 +++ b/tests/v3d/vertex_solid/I5 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I6 b/tests/v3d/vertex_solid/I6 index be62ae76d4..dd044d40ca 100644 --- a/tests/v3d/vertex_solid/I6 +++ b/tests/v3d/vertex_solid/I6 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I7 b/tests/v3d/vertex_solid/I7 index d9b18fc078..b27352039a 100644 --- a/tests/v3d/vertex_solid/I7 +++ b/tests/v3d/vertex_solid/I7 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I8 b/tests/v3d/vertex_solid/I8 index 9e1014625d..25cfa14ff3 100644 --- a/tests/v3d/vertex_solid/I8 +++ b/tests/v3d/vertex_solid/I8 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 diff --git a/tests/v3d/vertex_solid/I9 b/tests/v3d/vertex_solid/I9 index 768d10a222..9c6f3dc212 100644 --- a/tests/v3d/vertex_solid/I9 +++ b/tests/v3d/vertex_solid/I9 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J1 b/tests/v3d/vertex_solid/J1 index ffbcd6fc09..083e86225d 100644 --- a/tests/v3d/vertex_solid/J1 +++ b/tests/v3d/vertex_solid/J1 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J2 b/tests/v3d/vertex_solid/J2 index ff19b87ddf..0cde5fab63 100644 --- a/tests/v3d/vertex_solid/J2 +++ b/tests/v3d/vertex_solid/J2 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J3 b/tests/v3d/vertex_solid/J3 index a2737627af..2466150af3 100644 --- a/tests/v3d/vertex_solid/J3 +++ b/tests/v3d/vertex_solid/J3 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J4 b/tests/v3d/vertex_solid/J4 index a67fed00b8..0e625ea144 100644 --- a/tests/v3d/vertex_solid/J4 +++ b/tests/v3d/vertex_solid/J4 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J5 b/tests/v3d/vertex_solid/J5 index ebe38e99cb..2e89641f44 100644 --- a/tests/v3d/vertex_solid/J5 +++ b/tests/v3d/vertex_solid/J5 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J6 b/tests/v3d/vertex_solid/J6 index aac789d6bc..6d06112857 100644 --- a/tests/v3d/vertex_solid/J6 +++ b/tests/v3d/vertex_solid/J6 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J7 b/tests/v3d/vertex_solid/J7 index 3153814f03..9b260b43da 100644 --- a/tests/v3d/vertex_solid/J7 +++ b/tests/v3d/vertex_solid/J7 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J8 b/tests/v3d/vertex_solid/J8 index 6e9fa88ebf..e786f1fcf2 100644 --- a/tests/v3d/vertex_solid/J8 +++ b/tests/v3d/vertex_solid/J8 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 diff --git a/tests/v3d/vertex_solid/J9 b/tests/v3d/vertex_solid/J9 index 65f4ec1fb5..f9dbdf553e 100644 --- a/tests/v3d/vertex_solid/J9 +++ b/tests/v3d/vertex_solid/J9 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/K1 b/tests/v3d/vertex_solid/K1 index 08698bd93d..83306df746 100644 --- a/tests/v3d/vertex_solid/K1 +++ b/tests/v3d/vertex_solid/K1 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/K2 b/tests/v3d/vertex_solid/K2 index 05d93d6782..288d7137e1 100644 --- a/tests/v3d/vertex_solid/K2 +++ b/tests/v3d/vertex_solid/K2 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/K3 b/tests/v3d/vertex_solid/K3 index 6f16e568eb..6fe215e743 100644 --- a/tests/v3d/vertex_solid/K3 +++ b/tests/v3d/vertex_solid/K3 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_solid/K4 b/tests/v3d/vertex_solid/K4 index 699d17f3de..9b9764ca34 100644 --- a/tests/v3d/vertex_solid/K4 +++ b/tests/v3d/vertex_solid/K4 @@ -21,7 +21,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 73 302 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 161 197 @@ -51,7 +51,7 @@ vselect 270 23 1 vmoveto 0 0 vmoveto 270 23 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 140 11 diff --git a/tests/v3d/vertex_wire/A3 b/tests/v3d/vertex_wire/A3 index 207e5e73ff..e807e498f7 100644 --- a/tests/v3d/vertex_wire/A3 +++ b/tests/v3d/vertex_wire/A3 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/A4 b/tests/v3d/vertex_wire/A4 index baed4421bf..2e3ec99620 100644 --- a/tests/v3d/vertex_wire/A4 +++ b/tests/v3d/vertex_wire/A4 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/A5 b/tests/v3d/vertex_wire/A5 index 7de85b9a7b..9fa4e4df23 100644 --- a/tests/v3d/vertex_wire/A5 +++ b/tests/v3d/vertex_wire/A5 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/A6 b/tests/v3d/vertex_wire/A6 index 48007cc9d1..6099670324 100644 --- a/tests/v3d/vertex_wire/A6 +++ b/tests/v3d/vertex_wire/A6 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/A7 b/tests/v3d/vertex_wire/A7 index 3899ef6cee..b4771b8553 100644 --- a/tests/v3d/vertex_wire/A7 +++ b/tests/v3d/vertex_wire/A7 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/A8 b/tests/v3d/vertex_wire/A8 index d33458a961..5053ad5dc0 100644 --- a/tests/v3d/vertex_wire/A8 +++ b/tests/v3d/vertex_wire/A8 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/A9 b/tests/v3d/vertex_wire/A9 index 63d91479c5..e9bdefb2f4 100644 --- a/tests/v3d/vertex_wire/A9 +++ b/tests/v3d/vertex_wire/A9 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/B1 b/tests/v3d/vertex_wire/B1 index 528165ab0d..6506137970 100644 --- a/tests/v3d/vertex_wire/B1 +++ b/tests/v3d/vertex_wire/B1 @@ -9,7 +9,7 @@ vselmode 3 1 vmoveto 295 54 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -17,7 +17,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/C3 b/tests/v3d/vertex_wire/C3 index dfd8f1f385..da61541162 100644 --- a/tests/v3d/vertex_wire/C3 +++ b/tests/v3d/vertex_wire/C3 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/C4 b/tests/v3d/vertex_wire/C4 index ddfd0cdcd9..c48ac2d634 100644 --- a/tests/v3d/vertex_wire/C4 +++ b/tests/v3d/vertex_wire/C4 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/C5 b/tests/v3d/vertex_wire/C5 index e33db4599c..ab41a5e275 100644 --- a/tests/v3d/vertex_wire/C5 +++ b/tests/v3d/vertex_wire/C5 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/C6 b/tests/v3d/vertex_wire/C6 index dd0b6080a6..177033d9f5 100644 --- a/tests/v3d/vertex_wire/C6 +++ b/tests/v3d/vertex_wire/C6 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/C7 b/tests/v3d/vertex_wire/C7 index e1fe6434df..11d87983df 100644 --- a/tests/v3d/vertex_wire/C7 +++ b/tests/v3d/vertex_wire/C7 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/C8 b/tests/v3d/vertex_wire/C8 index 6ae20e27fd..f62bbf171f 100644 --- a/tests/v3d/vertex_wire/C8 +++ b/tests/v3d/vertex_wire/C8 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/C9 b/tests/v3d/vertex_wire/C9 index 976a142439..82a205b8b0 100644 --- a/tests/v3d/vertex_wire/C9 +++ b/tests/v3d/vertex_wire/C9 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/D1 b/tests/v3d/vertex_wire/D1 index 4ea8553a9d..a7b899bc55 100644 --- a/tests/v3d/vertex_wire/D1 +++ b/tests/v3d/vertex_wire/D1 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/D2 b/tests/v3d/vertex_wire/D2 index 05f2b02770..03846adcd5 100644 --- a/tests/v3d/vertex_wire/D2 +++ b/tests/v3d/vertex_wire/D2 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/D3 b/tests/v3d/vertex_wire/D3 index f9a9907be2..431ca617e2 100644 --- a/tests/v3d/vertex_wire/D3 +++ b/tests/v3d/vertex_wire/D3 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/D4 b/tests/v3d/vertex_wire/D4 index dc58ce0e9f..5f107350d7 100644 --- a/tests/v3d/vertex_wire/D4 +++ b/tests/v3d/vertex_wire/D4 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/D5 b/tests/v3d/vertex_wire/D5 index 504c42fe2d..f9a160975d 100644 --- a/tests/v3d/vertex_wire/D5 +++ b/tests/v3d/vertex_wire/D5 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/D6 b/tests/v3d/vertex_wire/D6 index 579282de4a..20943f7bb1 100644 --- a/tests/v3d/vertex_wire/D6 +++ b/tests/v3d/vertex_wire/D6 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/D7 b/tests/v3d/vertex_wire/D7 index 9a0b404c17..c6157d0592 100644 --- a/tests/v3d/vertex_wire/D7 +++ b/tests/v3d/vertex_wire/D7 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/D8 b/tests/v3d/vertex_wire/D8 index dbabb90f58..06d44e4de9 100644 --- a/tests/v3d/vertex_wire/D8 +++ b/tests/v3d/vertex_wire/D8 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/D9 b/tests/v3d/vertex_wire/D9 index 62c8d2eab6..2c7f736e65 100644 --- a/tests/v3d/vertex_wire/D9 +++ b/tests/v3d/vertex_wire/D9 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/E1 b/tests/v3d/vertex_wire/E1 index 22a60d1eb3..0f75e24b08 100644 --- a/tests/v3d/vertex_wire/E1 +++ b/tests/v3d/vertex_wire/E1 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/E2 b/tests/v3d/vertex_wire/E2 index 2bd14bd673..cbd4aabf51 100644 --- a/tests/v3d/vertex_wire/E2 +++ b/tests/v3d/vertex_wire/E2 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/E3 b/tests/v3d/vertex_wire/E3 index c6cb62a749..8010855087 100644 --- a/tests/v3d/vertex_wire/E3 +++ b/tests/v3d/vertex_wire/E3 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/E4 b/tests/v3d/vertex_wire/E4 index 22f3b9c08b..0941fe729f 100644 --- a/tests/v3d/vertex_wire/E4 +++ b/tests/v3d/vertex_wire/E4 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/E5 b/tests/v3d/vertex_wire/E5 index 262b7322b6..7b8b551be5 100644 --- a/tests/v3d/vertex_wire/E5 +++ b/tests/v3d/vertex_wire/E5 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/E6 b/tests/v3d/vertex_wire/E6 index 154b736d00..35e005c514 100644 --- a/tests/v3d/vertex_wire/E6 +++ b/tests/v3d/vertex_wire/E6 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 diff --git a/tests/v3d/vertex_wire/E7 b/tests/v3d/vertex_wire/E7 index 5ae0cf470c..b11b981521 100644 --- a/tests/v3d/vertex_wire/E7 +++ b/tests/v3d/vertex_wire/E7 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/E8 b/tests/v3d/vertex_wire/E8 index 22dce260bd..aa80001a30 100644 --- a/tests/v3d/vertex_wire/E8 +++ b/tests/v3d/vertex_wire/E8 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/E9 b/tests/v3d/vertex_wire/E9 index ff85ac66a8..04e589fc09 100644 --- a/tests/v3d/vertex_wire/E9 +++ b/tests/v3d/vertex_wire/E9 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/F1 b/tests/v3d/vertex_wire/F1 index f93d3db5f0..154f1d1fe9 100644 --- a/tests/v3d/vertex_wire/F1 +++ b/tests/v3d/vertex_wire/F1 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/F2 b/tests/v3d/vertex_wire/F2 index 09b48e632b..9b697b04ec 100644 --- a/tests/v3d/vertex_wire/F2 +++ b/tests/v3d/vertex_wire/F2 @@ -20,7 +20,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -38,7 +38,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 144 350 @@ -52,7 +52,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/F5 b/tests/v3d/vertex_wire/F5 index 7e327ecf7f..306ed33d6d 100644 --- a/tests/v3d/vertex_wire/F5 +++ b/tests/v3d/vertex_wire/F5 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/F6 b/tests/v3d/vertex_wire/F6 index 4e797ccf53..759bf34a6a 100644 --- a/tests/v3d/vertex_wire/F6 +++ b/tests/v3d/vertex_wire/F6 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/F7 b/tests/v3d/vertex_wire/F7 index f0f92f84f9..a9fb95ffc6 100644 --- a/tests/v3d/vertex_wire/F7 +++ b/tests/v3d/vertex_wire/F7 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/F8 b/tests/v3d/vertex_wire/F8 index 68b5466f28..f54b4e48d2 100644 --- a/tests/v3d/vertex_wire/F8 +++ b/tests/v3d/vertex_wire/F8 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/F9 b/tests/v3d/vertex_wire/F9 index 5ab2fe70a3..7fac4ad79a 100644 --- a/tests/v3d/vertex_wire/F9 +++ b/tests/v3d/vertex_wire/F9 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/G1 b/tests/v3d/vertex_wire/G1 index 7cd1ecfa4e..820b7d7422 100644 --- a/tests/v3d/vertex_wire/G1 +++ b/tests/v3d/vertex_wire/G1 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/G2 b/tests/v3d/vertex_wire/G2 index a71c82b268..3e55b95ec2 100644 --- a/tests/v3d/vertex_wire/G2 +++ b/tests/v3d/vertex_wire/G2 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/G3 b/tests/v3d/vertex_wire/G3 index 8487fa28fd..8b77efca11 100644 --- a/tests/v3d/vertex_wire/G3 +++ b/tests/v3d/vertex_wire/G3 @@ -11,7 +11,7 @@ vselect 295 54 vmoveto 0 0 vmoveto 27 307 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -19,7 +19,7 @@ vmoveto 73 302 vmoveto 0 0 vselect 73 302 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/H5 b/tests/v3d/vertex_wire/H5 index aecfc42e25..03a99b85a2 100644 --- a/tests/v3d/vertex_wire/H5 +++ b/tests/v3d/vertex_wire/H5 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/H6 b/tests/v3d/vertex_wire/H6 index afb3e111da..5970649199 100644 --- a/tests/v3d/vertex_wire/H6 +++ b/tests/v3d/vertex_wire/H6 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/H7 b/tests/v3d/vertex_wire/H7 index 7ed74dcd38..24c7cbead1 100644 --- a/tests/v3d/vertex_wire/H7 +++ b/tests/v3d/vertex_wire/H7 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/H8 b/tests/v3d/vertex_wire/H8 index a6f0d0999e..0aa47d85d6 100644 --- a/tests/v3d/vertex_wire/H8 +++ b/tests/v3d/vertex_wire/H8 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/H9 b/tests/v3d/vertex_wire/H9 index 4930cae8c7..ed5da50d04 100644 --- a/tests/v3d/vertex_wire/H9 +++ b/tests/v3d/vertex_wire/H9 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I1 b/tests/v3d/vertex_wire/I1 index 2c43addbde..2975f71519 100644 --- a/tests/v3d/vertex_wire/I1 +++ b/tests/v3d/vertex_wire/I1 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I2 b/tests/v3d/vertex_wire/I2 index 6da6ad2ea4..edeadcb95b 100644 --- a/tests/v3d/vertex_wire/I2 +++ b/tests/v3d/vertex_wire/I2 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I3 b/tests/v3d/vertex_wire/I3 index b34c8be780..55b1ed4ccf 100644 --- a/tests/v3d/vertex_wire/I3 +++ b/tests/v3d/vertex_wire/I3 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I4 b/tests/v3d/vertex_wire/I4 index 30869b90b2..488b70eaa4 100644 --- a/tests/v3d/vertex_wire/I4 +++ b/tests/v3d/vertex_wire/I4 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I5 b/tests/v3d/vertex_wire/I5 index 881dec9d3d..0228afdc43 100644 --- a/tests/v3d/vertex_wire/I5 +++ b/tests/v3d/vertex_wire/I5 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I6 b/tests/v3d/vertex_wire/I6 index 9f14c43d37..e62d4b0957 100644 --- a/tests/v3d/vertex_wire/I6 +++ b/tests/v3d/vertex_wire/I6 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I7 b/tests/v3d/vertex_wire/I7 index 4f49fae10f..b4e3ea9338 100644 --- a/tests/v3d/vertex_wire/I7 +++ b/tests/v3d/vertex_wire/I7 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I8 b/tests/v3d/vertex_wire/I8 index a2d9b7b3fb..af65fa60ea 100644 --- a/tests/v3d/vertex_wire/I8 +++ b/tests/v3d/vertex_wire/I8 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 diff --git a/tests/v3d/vertex_wire/I9 b/tests/v3d/vertex_wire/I9 index 15bb71c1ae..8e991613aa 100644 --- a/tests/v3d/vertex_wire/I9 +++ b/tests/v3d/vertex_wire/I9 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J1 b/tests/v3d/vertex_wire/J1 index efd9e6ec99..07c41cc5bb 100644 --- a/tests/v3d/vertex_wire/J1 +++ b/tests/v3d/vertex_wire/J1 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J2 b/tests/v3d/vertex_wire/J2 index ae5877f31d..b4ad58f6f1 100644 --- a/tests/v3d/vertex_wire/J2 +++ b/tests/v3d/vertex_wire/J2 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J3 b/tests/v3d/vertex_wire/J3 index a3d0e77fb9..29ecf32a35 100644 --- a/tests/v3d/vertex_wire/J3 +++ b/tests/v3d/vertex_wire/J3 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J4 b/tests/v3d/vertex_wire/J4 index 3e9372f482..a96b403926 100644 --- a/tests/v3d/vertex_wire/J4 +++ b/tests/v3d/vertex_wire/J4 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J5 b/tests/v3d/vertex_wire/J5 index 18ed80a548..657a01b5cd 100644 --- a/tests/v3d/vertex_wire/J5 +++ b/tests/v3d/vertex_wire/J5 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J6 b/tests/v3d/vertex_wire/J6 index d59f0f0f68..337d2cadf2 100644 --- a/tests/v3d/vertex_wire/J6 +++ b/tests/v3d/vertex_wire/J6 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J7 b/tests/v3d/vertex_wire/J7 index b7c523ed1e..8302648f88 100644 --- a/tests/v3d/vertex_wire/J7 +++ b/tests/v3d/vertex_wire/J7 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J8 b/tests/v3d/vertex_wire/J8 index 7bdcd9766c..2dd49ed86e 100644 --- a/tests/v3d/vertex_wire/J8 +++ b/tests/v3d/vertex_wire/J8 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 diff --git a/tests/v3d/vertex_wire/J9 b/tests/v3d/vertex_wire/J9 index db4c17dbeb..be8a923a9c 100644 --- a/tests/v3d/vertex_wire/J9 +++ b/tests/v3d/vertex_wire/J9 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/K1 b/tests/v3d/vertex_wire/K1 index 6d4337a783..9195f91da6 100644 --- a/tests/v3d/vertex_wire/K1 +++ b/tests/v3d/vertex_wire/K1 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/K2 b/tests/v3d/vertex_wire/K2 index f7b8230904..7c192f59d8 100644 --- a/tests/v3d/vertex_wire/K2 +++ b/tests/v3d/vertex_wire/K2 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/K3 b/tests/v3d/vertex_wire/K3 index eaad656ba3..be875aa50a 100644 --- a/tests/v3d/vertex_wire/K3 +++ b/tests/v3d/vertex_wire/K3 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/vertex_wire/K4 b/tests/v3d/vertex_wire/K4 index 0f776b643b..0bf24c4d14 100644 --- a/tests/v3d/vertex_wire/K4 +++ b/tests/v3d/vertex_wire/K4 @@ -22,7 +22,7 @@ vmoveto 204 409 vmoveto 0 0 vmoveto 27 104 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 92 231 @@ -40,7 +40,7 @@ vmoveto 173 409 vmoveto 0 0 vmoveto 13 102 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 283 297 @@ -54,7 +54,7 @@ vselect 272 22 1 vmoveto 0 0 vmoveto 272 22 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 96 211 diff --git a/tests/v3d/wire/A3 b/tests/v3d/wire/A3 index 6953a09fb5..91cd6c95c3 100644 --- a/tests/v3d/wire/A3 +++ b/tests/v3d/wire/A3 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/A4 b/tests/v3d/wire/A4 index 1fcb864b05..44a6aa7126 100644 --- a/tests/v3d/wire/A4 +++ b/tests/v3d/wire/A4 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/A5 b/tests/v3d/wire/A5 index 60354bc73c..25de3b340c 100644 --- a/tests/v3d/wire/A5 +++ b/tests/v3d/wire/A5 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/A6 b/tests/v3d/wire/A6 index 11016c691a..2e0a56b1d8 100644 --- a/tests/v3d/wire/A6 +++ b/tests/v3d/wire/A6 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -15,7 +15,7 @@ vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/A7 b/tests/v3d/wire/A7 index 2cbe01358c..b6e702d54c 100644 --- a/tests/v3d/wire/A7 +++ b/tests/v3d/wire/A7 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -15,7 +15,7 @@ vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/A8 b/tests/v3d/wire/A8 index 212fbd3677..7d15084881 100644 --- a/tests/v3d/wire/A8 +++ b/tests/v3d/wire/A8 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -15,7 +15,7 @@ vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/A9 b/tests/v3d/wire/A9 index 2dee48ea5e..a245e7aaad 100644 --- a/tests/v3d/wire/A9 +++ b/tests/v3d/wire/A9 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -15,7 +15,7 @@ vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/B1 b/tests/v3d/wire/B1 index bcf7594229..37dc6b86b8 100644 --- a/tests/v3d/wire/B1 +++ b/tests/v3d/wire/B1 @@ -7,7 +7,7 @@ vselmode 3 1 vmoveto 140 100 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -15,7 +15,7 @@ vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/C3 b/tests/v3d/wire/C3 index 3c5b41ac3b..783a0642f8 100644 --- a/tests/v3d/wire/C3 +++ b/tests/v3d/wire/C3 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/C4 b/tests/v3d/wire/C4 index 8479f24645..9e4e4d4b14 100644 --- a/tests/v3d/wire/C4 +++ b/tests/v3d/wire/C4 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/C5 b/tests/v3d/wire/C5 index b215ffa6c9..04a3a4cf4a 100644 --- a/tests/v3d/wire/C5 +++ b/tests/v3d/wire/C5 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/C6 b/tests/v3d/wire/C6 index fe206985cc..dd5edb3dcb 100644 --- a/tests/v3d/wire/C6 +++ b/tests/v3d/wire/C6 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/C7 b/tests/v3d/wire/C7 index 748f36af0d..8749b7a830 100644 --- a/tests/v3d/wire/C7 +++ b/tests/v3d/wire/C7 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/C8 b/tests/v3d/wire/C8 index 26900b403f..4d04b45449 100644 --- a/tests/v3d/wire/C8 +++ b/tests/v3d/wire/C8 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/C9 b/tests/v3d/wire/C9 index bb0d096c59..9add831b00 100644 --- a/tests/v3d/wire/C9 +++ b/tests/v3d/wire/C9 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/D1 b/tests/v3d/wire/D1 index ca14d88c3f..3c98838d31 100644 --- a/tests/v3d/wire/D1 +++ b/tests/v3d/wire/D1 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/D2 b/tests/v3d/wire/D2 index 6d9bb82062..b88e8facd7 100644 --- a/tests/v3d/wire/D2 +++ b/tests/v3d/wire/D2 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/D3 b/tests/v3d/wire/D3 index 84bc33b607..5eb8aec1cf 100644 --- a/tests/v3d/wire/D3 +++ b/tests/v3d/wire/D3 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/D4 b/tests/v3d/wire/D4 index ccf4644a0d..44e4dc3908 100644 --- a/tests/v3d/wire/D4 +++ b/tests/v3d/wire/D4 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/D5 b/tests/v3d/wire/D5 index c4b21e2d33..01c1df91d5 100644 --- a/tests/v3d/wire/D5 +++ b/tests/v3d/wire/D5 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/D6 b/tests/v3d/wire/D6 index 8c0a0e056c..046d738e8b 100644 --- a/tests/v3d/wire/D6 +++ b/tests/v3d/wire/D6 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 diff --git a/tests/v3d/wire/D7 b/tests/v3d/wire/D7 index a5070d200c..b84da22c39 100644 --- a/tests/v3d/wire/D7 +++ b/tests/v3d/wire/D7 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/D8 b/tests/v3d/wire/D8 index 5994dc2dd7..7739b6cc07 100644 --- a/tests/v3d/wire/D8 +++ b/tests/v3d/wire/D8 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/D9 b/tests/v3d/wire/D9 index 02a8cfbe0c..9e80d3d58c 100644 --- a/tests/v3d/wire/D9 +++ b/tests/v3d/wire/D9 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/E1 b/tests/v3d/wire/E1 index 3742c264b6..067b6eeb74 100644 --- a/tests/v3d/wire/E1 +++ b/tests/v3d/wire/E1 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/E2 b/tests/v3d/wire/E2 index db9c55a6d2..4d1d046c68 100644 --- a/tests/v3d/wire/E2 +++ b/tests/v3d/wire/E2 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/E3 b/tests/v3d/wire/E3 index b5b711769c..745a624e6f 100644 --- a/tests/v3d/wire/E3 +++ b/tests/v3d/wire/E3 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/E4 b/tests/v3d/wire/E4 index 5f337fb9f0..7ed2be56dc 100644 --- a/tests/v3d/wire/E4 +++ b/tests/v3d/wire/E4 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/E5 b/tests/v3d/wire/E5 index cdd58c3de2..0875789259 100644 --- a/tests/v3d/wire/E5 +++ b/tests/v3d/wire/E5 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/E6 b/tests/v3d/wire/E6 index 36460f3693..a4472d8bc3 100644 --- a/tests/v3d/wire/E6 +++ b/tests/v3d/wire/E6 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 diff --git a/tests/v3d/wire/E7 b/tests/v3d/wire/E7 index f8c772c405..aca19d2a59 100644 --- a/tests/v3d/wire/E7 +++ b/tests/v3d/wire/E7 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/wire/E8 b/tests/v3d/wire/E8 index 137045a4a4..3b30ca14b5 100644 --- a/tests/v3d/wire/E8 +++ b/tests/v3d/wire/E8 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/wire/E9 b/tests/v3d/wire/E9 index 0e43d039f5..e0ad8cc9f8 100644 --- a/tests/v3d/wire/E9 +++ b/tests/v3d/wire/E9 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/wire/F1 b/tests/v3d/wire/F1 index 267425e11d..62c9f471c5 100644 --- a/tests/v3d/wire/F1 +++ b/tests/v3d/wire/F1 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/wire/F2 b/tests/v3d/wire/F2 index 02f5d5c6a3..81b16c69e6 100644 --- a/tests/v3d/wire/F2 +++ b/tests/v3d/wire/F2 @@ -18,7 +18,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 140 100 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 300 300 @@ -50,7 +50,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 200 200 diff --git a/tests/v3d/wire_solid/A3 b/tests/v3d/wire_solid/A3 index 6c90a38b5e..daebfe1e66 100644 --- a/tests/v3d/wire_solid/A3 +++ b/tests/v3d/wire_solid/A3 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/A4 b/tests/v3d/wire_solid/A4 index 6f67a7721c..85edb77c3d 100644 --- a/tests/v3d/wire_solid/A4 +++ b/tests/v3d/wire_solid/A4 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/A5 b/tests/v3d/wire_solid/A5 index c17f1bd2b1..000bb02824 100644 --- a/tests/v3d/wire_solid/A5 +++ b/tests/v3d/wire_solid/A5 @@ -8,7 +8,7 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/A6 b/tests/v3d/wire_solid/A6 index 000502ab3e..e6a7eb5d0e 100644 --- a/tests/v3d/wire_solid/A6 +++ b/tests/v3d/wire_solid/A6 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/A7 b/tests/v3d/wire_solid/A7 index 0e5e5f1439..88c1acebbd 100644 --- a/tests/v3d/wire_solid/A7 +++ b/tests/v3d/wire_solid/A7 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/A8 b/tests/v3d/wire_solid/A8 index da3da41b32..c1fd171681 100644 --- a/tests/v3d/wire_solid/A8 +++ b/tests/v3d/wire_solid/A8 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/A9 b/tests/v3d/wire_solid/A9 index f7dbeaf857..944cdf2349 100644 --- a/tests/v3d/wire_solid/A9 +++ b/tests/v3d/wire_solid/A9 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/B1 b/tests/v3d/wire_solid/B1 index 1966901b5e..35f498a6ab 100644 --- a/tests/v3d/wire_solid/B1 +++ b/tests/v3d/wire_solid/B1 @@ -8,14 +8,14 @@ vselmode 6 1 vmoveto 300 300 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/C3 b/tests/v3d/wire_solid/C3 index 94b1380bfc..8f83508757 100644 --- a/tests/v3d/wire_solid/C3 +++ b/tests/v3d/wire_solid/C3 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/C4 b/tests/v3d/wire_solid/C4 index c69e55cb4f..99deb33646 100644 --- a/tests/v3d/wire_solid/C4 +++ b/tests/v3d/wire_solid/C4 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/C5 b/tests/v3d/wire_solid/C5 index 440ea5f266..72ed9973bf 100644 --- a/tests/v3d/wire_solid/C5 +++ b/tests/v3d/wire_solid/C5 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/C6 b/tests/v3d/wire_solid/C6 index ca621720bd..1a07335219 100644 --- a/tests/v3d/wire_solid/C6 +++ b/tests/v3d/wire_solid/C6 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/C7 b/tests/v3d/wire_solid/C7 index 227bdd48e0..f16e5cf016 100644 --- a/tests/v3d/wire_solid/C7 +++ b/tests/v3d/wire_solid/C7 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/C8 b/tests/v3d/wire_solid/C8 index 2bd17c04c9..32e8f342bd 100644 --- a/tests/v3d/wire_solid/C8 +++ b/tests/v3d/wire_solid/C8 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/C9 b/tests/v3d/wire_solid/C9 index ca0bc3f400..5912c23366 100644 --- a/tests/v3d/wire_solid/C9 +++ b/tests/v3d/wire_solid/C9 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/D1 b/tests/v3d/wire_solid/D1 index b78ef72aa3..784dddf47b 100644 --- a/tests/v3d/wire_solid/D1 +++ b/tests/v3d/wire_solid/D1 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/D2 b/tests/v3d/wire_solid/D2 index 30ff0c32f6..6b424afd96 100644 --- a/tests/v3d/wire_solid/D2 +++ b/tests/v3d/wire_solid/D2 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/D3 b/tests/v3d/wire_solid/D3 index 8b78531879..5e61e23d1c 100644 --- a/tests/v3d/wire_solid/D3 +++ b/tests/v3d/wire_solid/D3 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/D4 b/tests/v3d/wire_solid/D4 index c91f026faa..f039a41ee9 100644 --- a/tests/v3d/wire_solid/D4 +++ b/tests/v3d/wire_solid/D4 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/D5 b/tests/v3d/wire_solid/D5 index 034d5c018a..99a3ef4df7 100644 --- a/tests/v3d/wire_solid/D5 +++ b/tests/v3d/wire_solid/D5 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/D6 b/tests/v3d/wire_solid/D6 index 985d065134..796525efcb 100644 --- a/tests/v3d/wire_solid/D6 +++ b/tests/v3d/wire_solid/D6 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/D7 b/tests/v3d/wire_solid/D7 index a60e46bd23..7842e059d1 100644 --- a/tests/v3d/wire_solid/D7 +++ b/tests/v3d/wire_solid/D7 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/D8 b/tests/v3d/wire_solid/D8 index 12dfeea138..aade28d177 100644 --- a/tests/v3d/wire_solid/D8 +++ b/tests/v3d/wire_solid/D8 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/D9 b/tests/v3d/wire_solid/D9 index a088b7e8cd..439993fc4a 100644 --- a/tests/v3d/wire_solid/D9 +++ b/tests/v3d/wire_solid/D9 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/E1 b/tests/v3d/wire_solid/E1 index c6e21ff27e..aaee39599c 100644 --- a/tests/v3d/wire_solid/E1 +++ b/tests/v3d/wire_solid/E1 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/E2 b/tests/v3d/wire_solid/E2 index 0c21f96a6c..9b88d6dd02 100644 --- a/tests/v3d/wire_solid/E2 +++ b/tests/v3d/wire_solid/E2 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/E3 b/tests/v3d/wire_solid/E3 index 7bfea29b6f..a9946374e7 100644 --- a/tests/v3d/wire_solid/E3 +++ b/tests/v3d/wire_solid/E3 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/E4 b/tests/v3d/wire_solid/E4 index 6a3d28769b..ce0cc3ba6c 100644 --- a/tests/v3d/wire_solid/E4 +++ b/tests/v3d/wire_solid/E4 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/E5 b/tests/v3d/wire_solid/E5 index bdb6d603a5..0d4691232a 100644 --- a/tests/v3d/wire_solid/E5 +++ b/tests/v3d/wire_solid/E5 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/E6 b/tests/v3d/wire_solid/E6 index 4ef40ad428..c6b9255bed 100644 --- a/tests/v3d/wire_solid/E6 +++ b/tests/v3d/wire_solid/E6 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/E7 b/tests/v3d/wire_solid/E7 index 8c1b7cd67e..675d890b1d 100644 --- a/tests/v3d/wire_solid/E7 +++ b/tests/v3d/wire_solid/E7 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/E8 b/tests/v3d/wire_solid/E8 index 400454c71d..ff5336fd84 100644 --- a/tests/v3d/wire_solid/E8 +++ b/tests/v3d/wire_solid/E8 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/E9 b/tests/v3d/wire_solid/E9 index b251833767..317379b257 100644 --- a/tests/v3d/wire_solid/E9 +++ b/tests/v3d/wire_solid/E9 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/F1 b/tests/v3d/wire_solid/F1 index ad586015e4..83234237af 100644 --- a/tests/v3d/wire_solid/F1 +++ b/tests/v3d/wire_solid/F1 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/F2 b/tests/v3d/wire_solid/F2 index 71e47b9311..c5a5cacf2e 100644 --- a/tests/v3d/wire_solid/F2 +++ b/tests/v3d/wire_solid/F2 @@ -19,7 +19,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -36,7 +36,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -49,7 +49,7 @@ vselect 0 0 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/F5 b/tests/v3d/wire_solid/F5 index b81338fc53..6e9137e8e3 100644 --- a/tests/v3d/wire_solid/F5 +++ b/tests/v3d/wire_solid/F5 @@ -10,7 +10,7 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/F6 b/tests/v3d/wire_solid/F6 index 134480a609..245b3ea28a 100644 --- a/tests/v3d/wire_solid/F6 +++ b/tests/v3d/wire_solid/F6 @@ -10,7 +10,7 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/F7 b/tests/v3d/wire_solid/F7 index e1b6e77b7e..d44404cb74 100644 --- a/tests/v3d/wire_solid/F7 +++ b/tests/v3d/wire_solid/F7 @@ -10,7 +10,7 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/F8 b/tests/v3d/wire_solid/F8 index 927df930c0..8d594abd54 100644 --- a/tests/v3d/wire_solid/F8 +++ b/tests/v3d/wire_solid/F8 @@ -10,14 +10,14 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/F9 b/tests/v3d/wire_solid/F9 index 88568b912b..5cfb878362 100644 --- a/tests/v3d/wire_solid/F9 +++ b/tests/v3d/wire_solid/F9 @@ -10,14 +10,14 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/G1 b/tests/v3d/wire_solid/G1 index 765ff5dc9e..5c2e4ce5ec 100644 --- a/tests/v3d/wire_solid/G1 +++ b/tests/v3d/wire_solid/G1 @@ -10,14 +10,14 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/G2 b/tests/v3d/wire_solid/G2 index 28e658eb2d..718031bd52 100644 --- a/tests/v3d/wire_solid/G2 +++ b/tests/v3d/wire_solid/G2 @@ -10,14 +10,14 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/G3 b/tests/v3d/wire_solid/G3 index 290e89a605..1cc8183f86 100644 --- a/tests/v3d/wire_solid/G3 +++ b/tests/v3d/wire_solid/G3 @@ -10,14 +10,14 @@ vselect 300 300 vmoveto 0 0 vmoveto 100 346 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 vmoveto 0 0 vselect 100 329 1 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 203 129 diff --git a/tests/v3d/wire_solid/H5 b/tests/v3d/wire_solid/H5 index 58cf1b0ee9..ad27537e01 100644 --- a/tests/v3d/wire_solid/H5 +++ b/tests/v3d/wire_solid/H5 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/H6 b/tests/v3d/wire_solid/H6 index fa26359c72..cf44e7f157 100644 --- a/tests/v3d/wire_solid/H6 +++ b/tests/v3d/wire_solid/H6 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/H7 b/tests/v3d/wire_solid/H7 index cb504ff65e..e37afa4de0 100644 --- a/tests/v3d/wire_solid/H7 +++ b/tests/v3d/wire_solid/H7 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/H8 b/tests/v3d/wire_solid/H8 index d0df0f8b02..9068227504 100644 --- a/tests/v3d/wire_solid/H8 +++ b/tests/v3d/wire_solid/H8 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/H9 b/tests/v3d/wire_solid/H9 index 63d4d13132..4a320bab93 100644 --- a/tests/v3d/wire_solid/H9 +++ b/tests/v3d/wire_solid/H9 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I1 b/tests/v3d/wire_solid/I1 index 73616c19fa..ede47cb601 100644 --- a/tests/v3d/wire_solid/I1 +++ b/tests/v3d/wire_solid/I1 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I2 b/tests/v3d/wire_solid/I2 index ab5d221f8e..b6c5f6acc6 100644 --- a/tests/v3d/wire_solid/I2 +++ b/tests/v3d/wire_solid/I2 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I3 b/tests/v3d/wire_solid/I3 index 07b6409df5..6fd1b90f33 100644 --- a/tests/v3d/wire_solid/I3 +++ b/tests/v3d/wire_solid/I3 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I4 b/tests/v3d/wire_solid/I4 index c93794ceda..e338807bb4 100644 --- a/tests/v3d/wire_solid/I4 +++ b/tests/v3d/wire_solid/I4 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I5 b/tests/v3d/wire_solid/I5 index 36c0724974..be551a4578 100644 --- a/tests/v3d/wire_solid/I5 +++ b/tests/v3d/wire_solid/I5 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I6 b/tests/v3d/wire_solid/I6 index f8cde05ff2..56e567948d 100644 --- a/tests/v3d/wire_solid/I6 +++ b/tests/v3d/wire_solid/I6 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I7 b/tests/v3d/wire_solid/I7 index 40df9b6c36..103b7dae54 100644 --- a/tests/v3d/wire_solid/I7 +++ b/tests/v3d/wire_solid/I7 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I8 b/tests/v3d/wire_solid/I8 index fe520eece1..5ea8de6716 100644 --- a/tests/v3d/wire_solid/I8 +++ b/tests/v3d/wire_solid/I8 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 diff --git a/tests/v3d/wire_solid/I9 b/tests/v3d/wire_solid/I9 index e5f1ee9b79..65a7e7632f 100644 --- a/tests/v3d/wire_solid/I9 +++ b/tests/v3d/wire_solid/I9 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J1 b/tests/v3d/wire_solid/J1 index a9e0fa9259..e571f4b87e 100644 --- a/tests/v3d/wire_solid/J1 +++ b/tests/v3d/wire_solid/J1 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J2 b/tests/v3d/wire_solid/J2 index c808f5cd2c..70f6719a2c 100644 --- a/tests/v3d/wire_solid/J2 +++ b/tests/v3d/wire_solid/J2 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J3 b/tests/v3d/wire_solid/J3 index 83cae0e495..b11ce1b919 100644 --- a/tests/v3d/wire_solid/J3 +++ b/tests/v3d/wire_solid/J3 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J4 b/tests/v3d/wire_solid/J4 index 565715419a..daa03cd486 100644 --- a/tests/v3d/wire_solid/J4 +++ b/tests/v3d/wire_solid/J4 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J5 b/tests/v3d/wire_solid/J5 index 7a4ddb8ea1..bb2d42f81e 100644 --- a/tests/v3d/wire_solid/J5 +++ b/tests/v3d/wire_solid/J5 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J6 b/tests/v3d/wire_solid/J6 index 0ece40d3e8..fdaa574e2d 100644 --- a/tests/v3d/wire_solid/J6 +++ b/tests/v3d/wire_solid/J6 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J7 b/tests/v3d/wire_solid/J7 index 74a0a110e3..db2731e8b1 100644 --- a/tests/v3d/wire_solid/J7 +++ b/tests/v3d/wire_solid/J7 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J8 b/tests/v3d/wire_solid/J8 index 352b336c60..5906fb1cac 100644 --- a/tests/v3d/wire_solid/J8 +++ b/tests/v3d/wire_solid/J8 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 diff --git a/tests/v3d/wire_solid/J9 b/tests/v3d/wire_solid/J9 index d0b04dcf3f..245893217c 100644 --- a/tests/v3d/wire_solid/J9 +++ b/tests/v3d/wire_solid/J9 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -51,7 +51,7 @@ vselect 104 203 1 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/K1 b/tests/v3d/wire_solid/K1 index de9b0373df..53582158ed 100644 --- a/tests/v3d/wire_solid/K1 +++ b/tests/v3d/wire_solid/K1 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -51,7 +51,7 @@ vselect 104 203 1 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/K2 b/tests/v3d/wire_solid/K2 index 12838c69c9..453fc58fb6 100644 --- a/tests/v3d/wire_solid/K2 +++ b/tests/v3d/wire_solid/K2 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -51,7 +51,7 @@ vselect 104 203 1 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/K3 b/tests/v3d/wire_solid/K3 index e54a76055d..6fbe703b9c 100644 --- a/tests/v3d/wire_solid/K3 +++ b/tests/v3d/wire_solid/K3 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -51,7 +51,7 @@ vselect 104 203 1 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210 diff --git a/tests/v3d/wire_solid/K4 b/tests/v3d/wire_solid/K4 index 1b6e9e0563..fe80307f31 100644 --- a/tests/v3d/wire_solid/K4 +++ b/tests/v3d/wire_solid/K4 @@ -21,7 +21,7 @@ vmoveto 130 247 vmoveto 0 0 vmoveto 300 351 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824844 0.817216 -0.217801 0.535373 -0.420838 0.411627 0.808368 15.640388 -23.138439 18.852196 +vviewparams -scale 6.063093 -proj 0.817216 -0.217801 0.535373 -up -0.420838 0.411627 0.808368 -at 26.4654518144607 56.2503832914726 34.5651685621603 vfit vmoveto 0 0 vmoveto 100 329 @@ -38,7 +38,7 @@ vmoveto 200 245 vmoveto 0 0 vmoveto 300 349 vmoveto 0 0 -vviewparams 6.063093 70.710655 41.047052 0.524772 0.731256 0.434393 0.716008 -0.104342 -0.691426 -40.284748 52.438004 4.063552 +vviewparams -scale 6.063093 -proj 0.524772 0.731256 0.434393 -up 0.716008 -0.104342 -0.691426 -at 21.6212460112894 0.5192504580656 16.591446657356 vfit vmoveto 0 0 vmoveto 214 112 @@ -51,7 +51,7 @@ vselect 104 203 1 vmoveto 0 0 vmoveto 104 203 vmoveto 0 0 -vviewparams 6.063093 70.710655 40.824853 -0.444872 -0.214876 0.86866 0.109494 -0.886324 -0.185966 129.745911 93.761650 49.194000 +vviewparams -scale 6.063093 -proj -0.444872 -0.214876 0.86866 -up 0.109494 -0.886324 -0.185966 -at 71.8115798514333 53.1349971091326 8.4539251074103 vfit vmoveto 0 0 vmoveto 404 210