From c39c430ca0afd93a7b9199292fca5c613384441f Mon Sep 17 00:00:00 2001 From: don bright Date: Wed, 18 Jul 2012 21:05:04 -0500 Subject: add crashing scad example to testdata diff --git a/testdata/scad/bugs/issue148.scad b/testdata/scad/bugs/issue148.scad new file mode 100644 index 0000000..29ccd51 --- /dev/null +++ b/testdata/scad/bugs/issue148.scad @@ -0,0 +1,2 @@ +scale([8,8,0]) + linear_extrude(file="../../circle.dxf"); -- cgit v0.10.1 From 4750709867e0f5743934a20250ca0990472b7a4f Mon Sep 17 00:00:00 2001 From: don bright Date: Fri, 20 Jul 2012 08:49:27 +0200 Subject: fix crashbug, rept by MichaelAtOz, issue 148. add test. diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index a570df4..1b307be 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -253,7 +253,7 @@ Response CGALEvaluator::visit(State &state, const TransformNode &node) testmat << node.matrix(0,0), node.matrix(0,1), node.matrix(1,0), node.matrix(1,1); if (testmat.determinant() == 0) { PRINT("Warning: Scaling a 2D object with 0 - removing object"); - N.p2.reset(); + N.reset(); } else { CGAL_Aff_transformation2 t( @@ -279,7 +279,7 @@ Response CGALEvaluator::visit(State &state, const TransformNode &node) else if (N.dim == 3) { if (node.matrix.matrix().determinant() == 0) { PRINT("Warning: Scaling a 3D object with 0 - removing object"); - N.p3.reset(); + N.reset(); } else { CGAL_Aff_transformation t( diff --git a/src/CGAL_Nef_polyhedron.h b/src/CGAL_Nef_polyhedron.h index 0b0784e..64ee9eb 100644 --- a/src/CGAL_Nef_polyhedron.h +++ b/src/CGAL_Nef_polyhedron.h @@ -14,6 +14,7 @@ public: ~CGAL_Nef_polyhedron() {} bool empty() const { return (dim == 0 || (!p2 && !p3)); } + void reset() { dim=0; p2.rest(); p3.reset(); } CGAL_Nef_polyhedron &operator+=(const CGAL_Nef_polyhedron &other); CGAL_Nef_polyhedron &operator*=(const CGAL_Nef_polyhedron &other); CGAL_Nef_polyhedron &operator-=(const CGAL_Nef_polyhedron &other); diff --git a/testdata/scad/bugs/issue148.scad b/testdata/scad/bugs/issue148.scad deleted file mode 100644 index 29ccd51..0000000 --- a/testdata/scad/bugs/issue148.scad +++ /dev/null @@ -1,2 +0,0 @@ -scale([8,8,0]) - linear_extrude(file="../../circle.dxf"); diff --git a/testdata/scad/dxf/scale-with-0.scad b/testdata/scad/dxf/scale-with-0.scad new file mode 100644 index 0000000..c4f6a9d --- /dev/null +++ b/testdata/scad/dxf/scale-with-0.scad @@ -0,0 +1,3 @@ +// https://github.com/openscad/openscad/issues/148 +scale([8,8,0]) + linear_extrude(file="../../circle.dxf"); -- cgit v0.10.1 From f0215e86c8baa1a45af9c2c9828398d29e425beb Mon Sep 17 00:00:00 2001 From: don bright Date: Fri, 20 Jul 2012 08:51:50 +0200 Subject: remove test pending decision on backwards compatability diff --git a/testdata/scad/dxf/scale-with-0.scad b/testdata/scad/dxf/scale-with-0.scad deleted file mode 100644 index c4f6a9d..0000000 --- a/testdata/scad/dxf/scale-with-0.scad +++ /dev/null @@ -1,3 +0,0 @@ -// https://github.com/openscad/openscad/issues/148 -scale([8,8,0]) - linear_extrude(file="../../circle.dxf"); -- cgit v0.10.1 From 8e9b2d2c491ccafd5cb14919f750aa537ebdcc04 Mon Sep 17 00:00:00 2001 From: don bright Date: Fri, 20 Jul 2012 09:00:14 +0200 Subject: fix typo diff --git a/src/CGAL_Nef_polyhedron.h b/src/CGAL_Nef_polyhedron.h index 64ee9eb..694b420 100644 --- a/src/CGAL_Nef_polyhedron.h +++ b/src/CGAL_Nef_polyhedron.h @@ -14,7 +14,7 @@ public: ~CGAL_Nef_polyhedron() {} bool empty() const { return (dim == 0 || (!p2 && !p3)); } - void reset() { dim=0; p2.rest(); p3.reset(); } + void reset() { dim=0; p2.reset(); p3.reset(); } CGAL_Nef_polyhedron &operator+=(const CGAL_Nef_polyhedron &other); CGAL_Nef_polyhedron &operator*=(const CGAL_Nef_polyhedron &other); CGAL_Nef_polyhedron &operator-=(const CGAL_Nef_polyhedron &other); -- cgit v0.10.1 From fbdce170f4a2c1bd289023a48120296aed7f5771 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 25 Jul 2012 22:31:36 -0400 Subject: Updated Macports dependencies diff --git a/doc/checklist-macosx.txt b/doc/checklist-macosx.txt index ff1c7ea..a72a8d3 100644 --- a/doc/checklist-macosx.txt +++ b/doc/checklist-macosx.txt @@ -3,8 +3,8 @@ NB! This is the Mac OS X deployment checklist. OpenSCAD for your system only without manually compiling all dependencies. -o MacPorts libs - port install eigen +o Macports: + sudo port install cmake ImageMagick o Qt4 - Download and install the combined 32-bit and 64-bit build for 10.5-10.6 from here: -- cgit v0.10.1 From 4b2b7cb4a18b2fe127654fef52197c2cb4e825f4 Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Wed, 25 Jul 2012 22:31:17 -0400 Subject: Upgraded CGAL to 4.0.2 diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index 0ce9908..f7b6b18 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -200,8 +200,9 @@ build_cgal() cd $BASEDIR/src rm -rf CGAL-$version if [ ! -f CGAL-$version.tar.gz ]; then - #4.0 - curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz + # 4.0.2 + curl -O https://gforge.inria.fr/frs/download.php/31175/CGAL-$version.tar.gz + # 4.0 curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz # 3.9 curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz # 3.8 curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz # 3.7 curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz @@ -301,6 +302,6 @@ build_gmp 5.0.5 build_mpfr 3.1.0 build_boost 1.47.0 # NB! For CGAL, also update the actual download URL in the function -build_cgal 4.0 +build_cgal 4.0.2 build_glew 1.7.0 build_opencsg 1.3.2 -- cgit v0.10.1 From 5d0825efd71d93776a01dfb5bd33bbd513b8748e Mon Sep 17 00:00:00 2001 From: Marius Kintel Date: Sun, 27 May 2012 17:09:39 +0200 Subject: No need to link OpenCSG with Qt diff --git a/patches/OpenCSG-1.3.2-MacOSX-port.patch b/patches/OpenCSG-1.3.2-MacOSX-port.patch index ba4bcc4..7262307 100644 --- a/patches/OpenCSG-1.3.2-MacOSX-port.patch +++ b/patches/OpenCSG-1.3.2-MacOSX-port.patch @@ -34,7 +34,7 @@ diff --git a/src/src.pro b/src/src.pro index 4843a12..04d3f4d 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -1,10 +1,31 @@ +@@ -1,10 +1,32 @@ TEMPLATE = lib TARGET = opencsg VERSION = 1.3.2 @@ -43,6 +43,7 @@ index 4843a12..04d3f4d 100644 CONFIG += opengl warn_on release -INCLUDEPATH += ../include ../glew/include ../ +INCLUDEPATH += ../include ../ ++CONFIG -= qt + +# Optionally specify deployment location using the +# OPENSCAD_LIBRARIES env. variable -- cgit v0.10.1 From 24fbfdf9551915918f43650057fea74b1ad76286 Mon Sep 17 00:00:00 2001 From: don bright Date: Wed, 1 Aug 2012 14:57:38 -0500 Subject: fix broken mousewheel scrolling (bug introduced by ctrl-wheel-zoom feature) diff --git a/src/editor.cc b/src/editor.cc index bba8d4f..92aeefe 100644 --- a/src/editor.cc +++ b/src/editor.cc @@ -104,6 +104,8 @@ void Editor::wheelEvent ( QWheelEvent * event ) zoomIn(); else if (event->delta() < 0 ) zoomOut(); + } else { + QTextEdit::wheelEvent( event ); } } -- cgit v0.10.1