Merge pull request #9812 from 0penBrain/sketcherBackEdit
Sketcher: bugfixes and improvements in backside edit and section view
This commit is contained in:
@@ -450,14 +450,12 @@ class TempoVis(object):
|
||||
toggle = {False: 0, True: 1, None: -1}[enable]
|
||||
|
||||
if reverted:
|
||||
skNorm = pla.Rotation.multVec(App.Vector(0,0,1))
|
||||
skInvNorm = skNorm.negative()
|
||||
pla = pla * App.Rotation(skNorm, skInvNorm)
|
||||
pla = pla * App.Rotation(0, 1, 0, 0)
|
||||
|
||||
if enable: # clip plane shall be disabled so new placement can be applied
|
||||
self.modify(ClipPlane(doc, 0))
|
||||
|
||||
self.modify(ClipPlane(doc, toggle, pla, 0.02))
|
||||
self.modify(ClipPlane(doc, toggle, pla, 0.001))
|
||||
sketch.ViewObject.SectionView = enable if enable is not None else not sketch.ViewObject.SectionView
|
||||
|
||||
def activateWorkbench(self, wb_name):
|
||||
|
||||
@@ -67,8 +67,8 @@ struct DrawingParameters
|
||||
/** @name Rendering Heights - virtual height introduced in the scenegraph to determine what is
|
||||
* drawn on top of what*/
|
||||
//@{
|
||||
const float zEdit = 0.001f; // Height used by temporal edit curves
|
||||
const float zCross = 0.001f; // Height used by the Axes
|
||||
const float zEdit = 0.002f; // Height used by temporal edit curves
|
||||
const float zCross = 0.002f; // Height used by the Axes
|
||||
const float zInfo = 0.004f; // Height used by the Overlay information layer
|
||||
const float zLowLines = 0.005f; // Height used for bottom rendered lines
|
||||
const float zMidLines = 0.006f; // Height used for in-the-middle rendered lines
|
||||
|
||||
@@ -279,7 +279,7 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
|
||||
|
||||
pcolor[preselectpointmfid.fieldIndex] = drawingParameters.PreselectColor;
|
||||
|
||||
raisePoint(pverts[preselectpointmfid.fieldIndex], drawingParameters.zHighlight);
|
||||
raisePoint(pverts[preselectpointmfid.fieldIndex], viewOrientationFactor * drawingParameters.zHighlight);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,7 +292,8 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
|
||||
layerId = l,
|
||||
&coinMapping = coinMapping,
|
||||
drawingParameters = this->drawingParameters,
|
||||
raisePoint](const int i) {
|
||||
raisePoint,
|
||||
viewOrientationFactor](const int i) {
|
||||
auto pointindex = coinMapping.getIndexLayer(i);
|
||||
if (layerId == pointindex.layerId && pointindex.fieldIndex >= 0
|
||||
&& pointindex.fieldIndex < PtNum) {
|
||||
@@ -300,7 +301,7 @@ void EditModeGeometryCoinManager::updateGeometryColor(const GeoListFacade& geoli
|
||||
? drawingParameters.PreselectSelectedColor
|
||||
: drawingParameters.SelectColor;
|
||||
|
||||
raisePoint(pverts[pointindex.fieldIndex], drawingParameters.zHighlight);
|
||||
raisePoint(pverts[pointindex.fieldIndex], viewOrientationFactor * drawingParameters.zHighlight);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user