Revert "Arch: Turned jreinhardt's fix to webGL into an option"

This reverts commit 90f2fc2034.

Conflicts:
	src/Mod/Arch/Arch_rc.py
	src/Mod/Arch/Resources/ui/archprefs-import.ui
This commit is contained in:
Johannes Reinhardt 2014-08-14 11:39:52 +02:00 committed by wmayer
parent 7eaa4fff74
commit 8189dddec1
3 changed files with 5 additions and 44 deletions

File diff suppressed because one or more lines are too long

View File

@ -223,35 +223,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>WebGL export</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_15">
<item>
<widget class="Gui::PrefCheckBox" name="checkBox_5">
<property name="toolTip">
<string>If this is checked, wires will be discretized, which results in more accurate curves, but heavier files.</string>
</property>
<property name="text">
<string>Discretize wires</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>webGlDiscretizeCurves</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Arch</cstring>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">

View File

@ -38,9 +38,6 @@ else:
def translate(ctxt,txt):
return txt
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch")
DISCRETIZE = p.GetBool("webGlDiscretizeCurves",False)
tab = " " # the tab size
wireframeStyle = "faceloop" # this can be "faceloop", "multimaterial" or None
cameraPosition = None # set this to a tuple to change, for ex. (0,0,0)
@ -175,14 +172,7 @@ def getObjectData(obj,wireframeMode=wireframeStyle):
for f in obj.Shape.Faces:
for w in f.Wires:
wo = Part.Wire(DraftGeomUtils.sortEdges(w.Edges))
if DISCRETIZE:
wires.append(wo.discretize(0.1))
else:
p = []
for v in wo.Vertexes:
p.append(v.Point)
p.append(wo.Vertexes[0].Point)
wires.append(p)
wires.append(wo.discretize(0.1))
elif obj.isDerivedFrom("Mesh::Feature"):
mesh = obj.Mesh