OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-10 18:51:21 +03:00
Code

0028780: HLR with focus does not seem to work

Browse Source 
Method HLRBRep_Curve::D1() is corrected to apply transformation to a point according to current projection parameters
This commit is contained in:
abv 2017-08-25 16:23:05 +03:00 committed by bugmaster
parent 2fa4d230bb
commit 2111e96703
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/HLRBRep/HLRBRep_Curve.cxx
View File

@ -345,27 +345,15 @@ void HLRBRep_Curve::D1 (const Standard_Real U,
// 1 - ---- f (1 - ----) // 1 - ---- f (1 - ----)
// f f // f f
/* gp_Pnt P3D;
gp_Vec V13D;
HLRBRep_BCurveTool::D1(myCurve,U,P3D,V13D);
P3D .Transform(((HLRAlgo_Projector*) myProj)->Transformation());
V13D.Transform(((HLRAlgo_Projector*) myProj)->Transformation());
if (((HLRAlgo_Projector*) myProj)->Perspective()) {
Standard_Real f = ((HLRAlgo_Projector*) myProj)->Focus();
Standard_Real R = 1. - P3D.Z()/f;
Standard_Real e = V13D.Z()/(f*R*R);
P.SetCoord(P3D .X()/R , P3D .Y()/R );
V.SetCoord(V13D.X()/R + P3D.X()*e, V13D.Y()/R + P3D.Y()*e);
}
else {
P.SetCoord(P3D .X(),P3D .Y());
V.SetCoord(V13D.X(),V13D.Y());
} */
gp_Pnt P3D; gp_Pnt P3D;
gp_Vec V13D; gp_Vec V13D;
HLRBRep_BCurveTool::D1(myCurve,U,P3D,V13D); HLRBRep_BCurveTool::D1(myCurve,U,P3D,V13D);
if (((HLRAlgo_Projector*) myProj)->Perspective()) { if (myProj->Perspective())
Standard_Real f = ((HLRAlgo_Projector*) myProj)->Focus(); {
P3D .Transform(myProj->Transformation());
V13D.Transform(myProj->Transformation());
Standard_Real f = myProj->Focus();
Standard_Real R = 1. - P3D.Z()/f; Standard_Real R = 1. - P3D.Z()/f;
Standard_Real e = V13D.Z()/(f*R*R); Standard_Real e = V13D.Z()/(f*R*R);
P.SetCoord(P3D .X()/R , P3D .Y()/R ); P.SetCoord(P3D .X()/R , P3D .Y()/R );
@ -373,12 +361,7 @@ void HLRBRep_Curve::D1 (const Standard_Real U,
} }
else { else {
//OCC155 //OCC155
((HLRAlgo_Projector*) myProj)->Project(P3D,V13D,P,V); myProj->Project(P3D,V13D,P,V);
/* ((HLRAlgo_Projector*) myProj)->Project(P3D,P);
gp_Pnt2d opop;
gp_Pnt uiui(V13D.X(),V13D.Y(),V13D.Z());
((HLRAlgo_Projector*) myProj)->Project(uiui,opop);
V.SetCoord(opop.X(),opop.Y()); */
} }
} }
@ -402,11 +385,12 @@ void HLRBRep_Curve::D2 (const Standard_Real U,
gp_Pnt P3D; gp_Pnt P3D;
gp_Vec V13D,V23D; gp_Vec V13D,V23D;
HLRBRep_BCurveTool::D2(myCurve,U,P3D,V13D,V23D); HLRBRep_BCurveTool::D2(myCurve,U,P3D,V13D,V23D);
P3D .Transform(((HLRAlgo_Projector*) myProj)->Transformation()); P3D .Transform(myProj->Transformation());
V13D.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); V13D.Transform(myProj->Transformation());
V23D.Transform(((HLRAlgo_Projector*) myProj)->Transformation()); V23D.Transform(myProj->Transformation());
if (((HLRAlgo_Projector*) myProj)->Perspective()) { if (myProj->Perspective())
Standard_Real f = ((HLRAlgo_Projector*) myProj)->Focus(); {
Standard_Real f = myProj->Focus();
Standard_Real R = 1. - P3D.Z() / f; Standard_Real R = 1. - P3D.Z() / f;
Standard_Real q = f*R*R; Standard_Real q = f*R*R;
Standard_Real e = V13D.Z()/q; Standard_Real e = V13D.Z()/q;

17
tests/bugs/modalg_7/bug28780 Normal file
View File

@ -0,0 +1,17 @@
puts "======="
puts "0028780"
puts "======="
puts ""
##################################################
# HLR with focus does not seem to work
##################################################
box a 10 20 50
vdisplay a
vtop
vfit
vcamera -persp
vhlrtype algo
vhlr on
checkview -screenshot -3d -path ${imagedir}/${test_image}.png