Merge commit '67b34008c514359dc8ef3c440de02127f970b0ed' into NewLink
This commit is contained in:
+6
-2
@@ -2727,11 +2727,15 @@ Operation::CalculateClPathRobotAxesValues( int nClPathId, double dAngDeltaMinFor
|
||||
Vector3d vtDir = pCamData->GetToolDir() ;
|
||||
Vector3d vtAux ;
|
||||
if ( ! bUseRefAux) {
|
||||
if ( nSolCh == MCH_SCC_ADIR_NEAR || nSolCh == MCH_SCC_ADIR_FAR) {
|
||||
if (( nSolCh == MCH_SCC_ADIR_NEAR || nSolCh == MCH_SCC_STD) && ! pCamData->GetAuxDir().IsSmall()) {
|
||||
vtAux = OrthoCompo( pCamData->GetAuxDir(), vtDir) ;
|
||||
vtAux.Normalize() ;
|
||||
}
|
||||
else {
|
||||
else if (( nSolCh == MCH_SCC_ADIR_FAR || nSolCh == MCH_SCC_OPPOSITE) && ! pCamData->GetAuxDir().IsSmall()) {
|
||||
vtAux = - OrthoCompo( pCamData->GetAuxDir(), vtDir) ;
|
||||
vtAux.Normalize() ;
|
||||
}
|
||||
else { // MCH_SCC_NONE (o riconducibili a questo)
|
||||
Frame3d frTool ;
|
||||
frTool.Set( ORIG, vtDir) ;
|
||||
frTool.Rotate( frTool.Orig(), frTool.VersZ(), 0, 1) ;
|
||||
|
||||
Reference in New Issue
Block a user