bb48de8265
* Part: Fix Part_Extrude taper angle regression for internal faces
The taper angle for holes (inner wires) in `Part_Extrude` was not being
negated after the toponaming refactor, causing internal faces to taper
in the wrong direction compared to v0.21.2.
The original makeDraft function correctly handled inner wires by:
- Negating taper for all inner wires in Part_Extrude
- Negating taper only for multi-edge inner wires in PartDesign
This logic was controlled via an isPartDesign function parameter.
When makeElementDraft was introduced for toponaming support, it was
designed to use innerTaperAngleFwd/innerTaperAngleRev fields that were
never ported from realthunder's branch. The cleanup (commit c31ebeeee6)
removed references to these non-existent fields, leaving makeElementDraft
with no inner wire taper handling at all.
So, this fix ports the makeDraft inner wire logic to makeElementDraft by
adding the flag, and counting wires and then triggering proper angle
flip depending on the flag/wire situation.
---------
Co-authored-by: Chris Hennes <chennes@pioneerlibrarysystem.org>
126 lines
4.4 KiB
C++
126 lines
4.4 KiB
C++
// SPDX-License-Identifier: LGPL-2.1-or-later
|
|
|
|
/***************************************************************************
|
|
* Copyright (c) 2022 Uwe Stöhr <uwestoehr@lyx.org> *
|
|
* *
|
|
* This file is part of the FreeCAD CAx development system. *
|
|
* *
|
|
* This library is free software; you can redistribute it and/or *
|
|
* modify it under the terms of the GNU Library General Public *
|
|
* License as published by the Free Software Foundation; either *
|
|
* version 2 of the License, or (at your option) any later version. *
|
|
* *
|
|
* This library is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* GNU Library General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU Library General Public *
|
|
* License along with this library; see the file COPYING.LIB. If not, *
|
|
* write to the Free Software Foundation, Inc., 59 Temple Place, *
|
|
* Suite 330, Boston, MA 02111-1307, USA *
|
|
* *
|
|
***************************************************************************/
|
|
|
|
#ifndef PART_EXTRUSIONHELPER_H
|
|
#define PART_EXTRUSIONHELPER_H
|
|
|
|
#include <cstdint>
|
|
#include <list>
|
|
#include <vector>
|
|
#include <gp_Dir.hxx>
|
|
#include <TopoDS_Shape.hxx>
|
|
|
|
#include <Mod/Part/PartGlobal.h>
|
|
#include "TopoShape.h"
|
|
|
|
|
|
namespace Part
|
|
{
|
|
|
|
class TopoShape;
|
|
|
|
/**
|
|
* @brief Controls how taper is applied to inner wires (holes) during extrusion.
|
|
*/
|
|
enum class InnerWireTaper : std::uint8_t
|
|
{
|
|
Inverted,
|
|
SameAsOuter,
|
|
};
|
|
|
|
/**
|
|
* @brief The ExtrusionParameters struct is supposed to be filled with final
|
|
* extrusion parameters, after resolving links, applying mode logic,
|
|
* reversing, etc., and be passed to extrudeShape.
|
|
*/
|
|
struct ExtrusionParameters
|
|
{
|
|
gp_Dir dir;
|
|
double lengthFwd {0};
|
|
double lengthRev {0};
|
|
bool solid {false};
|
|
double taperAngleFwd {0}; // in radians
|
|
double taperAngleRev {0};
|
|
std::string faceMakerClass;
|
|
InnerWireTaper innerWireTaper {InnerWireTaper::Inverted};
|
|
};
|
|
|
|
class PartExport ExtrusionHelper
|
|
{
|
|
public:
|
|
ExtrusionHelper();
|
|
|
|
/**
|
|
* @brief makeDraft: creates a drafted extrusion shape out of the input 2D shape
|
|
*/
|
|
static void makeDraft(
|
|
const TopoDS_Shape& shape,
|
|
const gp_Dir& direction,
|
|
const double LengthFwd,
|
|
const double LengthRev,
|
|
const double AngleFwd,
|
|
const double AngleRev,
|
|
bool isSolid,
|
|
std::list<TopoDS_Shape>& drafts,
|
|
bool isPartDesign
|
|
);
|
|
/**
|
|
* @brief checkInnerWires: Checks what wires are inner ones by taking a set of prisms created
|
|
* with every wire. The prisms are cut from each other. If the moment of inertia thereby
|
|
* changes, the prism wire is an inner wire. Inner wires can have nested inner wires that are
|
|
* then in fact outer wires. Therefore checkInnerWires is called recursively until all wires are
|
|
* checked.
|
|
*/
|
|
static void checkInnerWires(
|
|
std::vector<bool>& isInnerWire,
|
|
const gp_Dir direction,
|
|
std::vector<bool>& checklist,
|
|
bool forInner,
|
|
std::vector<TopoDS_Shape> prisms
|
|
);
|
|
/**
|
|
* @brief createTaperedPrismOffset: creates an offset wire from the sourceWire in the specified
|
|
* translation. isSecond determines if the wire is used for the 2nd extrusion direction.
|
|
*/
|
|
static void createTaperedPrismOffset(
|
|
TopoDS_Wire sourceWire,
|
|
const gp_Vec& translation,
|
|
double offset,
|
|
bool isSecond,
|
|
TopoDS_Wire& result
|
|
);
|
|
/** Same as makeDraft() with support of element mapping
|
|
*/
|
|
static void makeElementDraft(
|
|
const ExtrusionParameters& params,
|
|
const TopoShape&,
|
|
std::vector<TopoShape>&,
|
|
App::StringHasherRef hasher
|
|
);
|
|
};
|
|
|
|
} // namespace Part
|
|
|
|
#endif // PART_EXTRUSIONHELPER_H
|