Fix build against OCE 0.17 and Python3.5

tenko · Jan 10, 2016 · 3a5e528 · 3a5e528
1 parent 82b37ad
commit 3a5e528
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 118 deletions.
diff --git a/Makefile b/Makefile
@@ -2,13 +2,13 @@
 # File:  Makefile (for library)
 #
 # The variables 'PYTHON' and 'PYVER' can be modified by
-# passing parameters to make: make PYTHON=python PYVER=2.6
+# passing parameters to make: make PYTHON=python PYVER=2.7
 #
-PYTHON=python2
-PYVER=2.7
+PYTHON=python3
+PYVER=3.5
 
 CC=g++
-CFLAGS=-Wall -fPIC -O2 -frtti -fexceptions -Isrc -I/usr/include/oce
+CFLAGS=-Wall -fPIC -O2 -frtti -fexceptions -Isrc -I/mingw64/include/oce
 LIB=occmodel/liboccmodel.a
 
 LIBSRC = $(wildcard occmodel/@src/*.cpp)

diff --git a/occmodel/@src/OCCBase.cpp b/occmodel/@src/OCCBase.cpp
@@ -30,8 +30,7 @@ int OCCBase::transform(DVec mat, OCCBase *target)
             trans.SetValues(
                 mat[0], mat[1], mat[2], mat[3], 
                 mat[4], mat[5], mat[6], mat[7], 
-                mat[8], mat[9], mat[10], mat[11], 
-                0.00001,0.00001
+                mat[8], mat[9], mat[10], mat[11]
             );
             BRepBuilderAPI_Transform aTrans(shape, trans, Standard_True);
             aTrans.Build();

diff --git a/occmodel/@src/OCCFace.cpp b/occmodel/@src/OCCFace.cpp
@@ -453,7 +453,7 @@ OCCMesh *OCCFace::createMesh(double factor, double angle, bool qualityNormals =
 
         MSH.Perform(this->getShape());
 
-        BRepMesh::Mesh(this->getShape(),factor*maxd);
+        BRepMesh_IncrementalMesh(this->getShape(),factor*maxd);
 
         if (this->getShape().ShapeType() != TopAbs_FACE) {
             TopExp_Explorer exFace;