mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 10:32:13 +08:00
111 lines
5.3 KiB
Diff
111 lines
5.3 KiB
Diff
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp
|
|
--- FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-04 21:20:01.762755107 +0100
|
|
+++ FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-04 21:23:57.808143007 +0100
|
|
@@ -25,6 +25,16 @@
|
|
#if defined(__MINGW32__)
|
|
# include <GL/gl.h>
|
|
# include <GL/glext.h>
|
|
+#elif defined (FC_OS_MACOSX)
|
|
+# include <OpenGL/gl.h>
|
|
+# include <OpenGL/glu.h>
|
|
+#elif defined (FC_OS_WIN32)
|
|
+# include <Windows.h>
|
|
+# include <GL/gl.h>
|
|
+# include <GL/glu.h>
|
|
+#else
|
|
+# include <GL/gl.h>
|
|
+# include <GL/glu.h>
|
|
#endif
|
|
|
|
#include "GLImageBox.h"
|
|
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/AppPartPy.cpp FreeCAD-0.12.5284/src/Mod/Part/App/AppPartPy.cpp
|
|
--- FreeCAD-0.12.5284.orig/src/Mod/Part/App/AppPartPy.cpp 2012-01-04 21:20:01.919420925 +0100
|
|
+++ FreeCAD-0.12.5284/src/Mod/Part/App/AppPartPy.cpp 2012-01-04 21:27:16.473733409 +0100
|
|
@@ -492,7 +492,7 @@
|
|
d.SetCoord(vec.x, vec.y, vec.z);
|
|
}
|
|
Handle_Geom_Plane aPlane = new Geom_Plane(p, d);
|
|
- BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width);
|
|
+ BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width, Precision::Confusion());
|
|
return new TopoShapeFacePy(new TopoShape((Face.Face())));
|
|
}
|
|
catch (Standard_DomainError) {
|
|
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/Geometry.cpp FreeCAD-0.12.5284/src/Mod/Part/App/Geometry.cpp
|
|
--- FreeCAD-0.12.5284.orig/src/Mod/Part/App/Geometry.cpp 2012-01-04 21:20:01.916087610 +0100
|
|
+++ FreeCAD-0.12.5284/src/Mod/Part/App/Geometry.cpp 2012-01-04 21:28:01.363490221 +0100
|
|
@@ -1252,7 +1252,7 @@
|
|
Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle());
|
|
Standard_Real u1,u2,v1,v2;
|
|
s->Bounds(u1,u2,v1,v2);
|
|
- BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2);
|
|
+ BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion());
|
|
return mkBuilder.Shape();
|
|
}
|
|
|
|
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/GeometrySurfacePyImp.cpp FreeCAD-0.12.5284/src/Mod/Part/App/GeometrySurfacePyImp.cpp
|
|
--- FreeCAD-0.12.5284.orig/src/Mod/Part/App/GeometrySurfacePyImp.cpp 2012-01-04 21:20:01.919420925 +0100
|
|
+++ FreeCAD-0.12.5284/src/Mod/Part/App/GeometrySurfacePyImp.cpp 2012-01-04 21:29:16.406417012 +0100
|
|
@@ -79,7 +79,7 @@
|
|
s->Bounds(u1,u2,v1,v2);
|
|
if (!PyArg_ParseTuple(args, "|dddd", &u1,&u2,&v1,&v2))
|
|
return 0;
|
|
- BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2);
|
|
+ BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion());
|
|
TopoDS_Shape sh = mkBuilder.Shape();
|
|
return new TopoShapeFacePy(new TopoShape(sh));
|
|
}
|
|
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/PrimitiveFeature.cpp FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp
|
|
--- FreeCAD-0.12.5284.orig/src/Mod/Part/App/PrimitiveFeature.cpp 2012-01-04 21:20:01.916087610 +0100
|
|
+++ FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp 2012-01-04 21:30:26.759369209 +0100
|
|
@@ -191,7 +191,7 @@
|
|
gp_Pnt pnt(0.0,0.0,0.0);
|
|
gp_Dir dir(0.0,0.0,1.0);
|
|
Handle_Geom_Plane aPlane = new Geom_Plane(pnt, dir);
|
|
- BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W);
|
|
+ BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W, Precision::Confusion());
|
|
|
|
const char *error=0;
|
|
switch (mkFace.Error())
|
|
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShape.cpp FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp
|
|
--- FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShape.cpp 2012-01-04 21:20:01.922754240 +0100
|
|
+++ FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp 2012-01-05 00:54:08.116493768 +0100
|
|
@@ -1335,7 +1335,7 @@
|
|
double u1,u2,v1,v2;
|
|
surf->Bounds(u1,u2,v1,v2);
|
|
|
|
- BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2);
|
|
+ BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2, Precision::Confusion());
|
|
return mkBuilder.Face();
|
|
}
|
|
|
|
@@ -1388,7 +1388,7 @@
|
|
|
|
Standard_Real u1,u2,v1,v2;
|
|
mySurface->Bounds(u1,u2,v1,v2);
|
|
- BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2);
|
|
+ BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2, Precision::Confusion());
|
|
return mkBuilder.Shape();
|
|
}
|
|
|
|
@@ -1440,7 +1440,7 @@
|
|
mkSweep.Perform(tol, Standard_False, GeomAbs_C1, BSplCLib::MaxDegree(), 1000);
|
|
|
|
const Handle_Geom_Surface& surf = mkSweep.Surface();
|
|
- BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax);
|
|
+ BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax, Precision::Confusion());
|
|
return mkBuilder.Face();
|
|
}
|
|
|
|
diff -Naur FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShapeFacePyImp.cpp FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeFacePyImp.cpp
|
|
--- FreeCAD-0.12.5284.orig/src/Mod/Part/App/TopoShapeFacePyImp.cpp 2012-01-04 21:20:01.919420925 +0100
|
|
+++ FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeFacePyImp.cpp 2012-01-04 21:33:14.611793209 +0100
|
|
@@ -135,7 +135,7 @@
|
|
return -1;
|
|
}
|
|
|
|
- BRepBuilderAPI_MakeFace mkFace(S);
|
|
+ BRepBuilderAPI_MakeFace mkFace(S, Precision::Confusion());
|
|
if (bound) {
|
|
Py::List list(bound);
|
|
for (Py::List::iterator it = list.begin(); it != list.end(); ++it) {
|