kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: issue #6488: Cone surface returns wrong dv derivative

Browse Source 
This is a workaround to fix a bug in ElSLib::ConeDN
This commit is contained in:
wmayer
2022-03-01 14:59:26 +01:00
parent 6afab502ca
commit 9252f5f9ec
3 changed files with 65 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Mod/Part/App/Geometry.cpp
View File

@@ -4246,6 +4246,12 @@ bool GeomSurface::normal(double u, double v, gp_Dir& dir) const
return false;
}
gp_Vec GeomSurface::getDN(double u, double v, int Nu, int Nv) const
{
Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(handle());
return s->DN(u, v, Nu, Nv);
}
bool GeomSurface::isUmbillic(double u, double v) const
{
Handle(Geom_Surface) s = Handle(Geom_Surface)::DownCast(handle());
@@ -4499,6 +4505,50 @@ PyObject *GeomCone::getPyObject(void)
return new ConePy(static_cast<GeomCone*>(this->clone()));
}
gp_Vec GeomCone::getDN(double u, double v, int Nu, int Nv) const
{
// Copied from ElSLib::ConeDN() and applied the needed fix
auto ElSLib__ConeDN = [](const Standard_Real U,
const Standard_Real V,
const gp_Ax3& Pos,
const Standard_Real Radius,
const Standard_Real SAngle,
const Standard_Integer Nu,
const Standard_Integer Nv)
{
gp_XYZ Xdir = Pos.XDirection().XYZ();
gp_XYZ Ydir = Pos.YDirection().XYZ();
gp_XYZ ZDir = Pos.Direction ().XYZ();
Standard_Real Um = U + Nu * M_PI_2; // M_PI * 0.5
Xdir.Multiply(cos(Um));
Ydir.Multiply(sin(Um));
Xdir.Add(Ydir);
if(Nv == 0) {
Xdir.Multiply(Radius + V * sin(SAngle));
if(Nu == 0) Xdir.Add(Pos.Location().XYZ());
return gp_Vec(Xdir);
}
else if(Nv == 1) {
Xdir.Multiply(sin(SAngle));
ZDir.Multiply(cos(SAngle));
Xdir.Add(ZDir);
return gp_Vec(Xdir);
}
return gp_Vec(0.0,0.0,0.0);
};
// Workaround for cones to get the correct derivatives
// https://forum.freecadweb.org/viewtopic.php?f=10&t=66677
Handle(Geom_ConicalSurface) s = Handle(Geom_ConicalSurface)::DownCast(handle());
Standard_RangeError_Raise_if (Nu + Nv < 1 || Nu < 0 || Nv < 0, " ");
if (Nv > 1) {
return gp_Vec (0.0, 0.0, 0.0);
}
else {
return ElSLib__ConeDN(u, v, s->Position(), s->RefRadius(), s->SemiAngle(), Nu, Nv);
}
}
// -------------------------------------------------
TYPESYSTEM_SOURCE(Part::GeomToroid,Part::GeomSurface)