[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54848] branches/soc-2011-tomato: Merging r54846 through r54847 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Mon Feb 25 11:14:40 CET 2013
Revision: 54848
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54848
Author: nazgul
Date: 2013-02-25 10:14:40 +0000 (Mon, 25 Feb 2013)
Log Message:
-----------
Merging r54846 through r54847 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54846
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54847
Modified Paths:
--------------
branches/soc-2011-tomato/extern/carve/bundle.sh
branches/soc-2011-tomato/extern/carve/files.txt
branches/soc-2011-tomato/extern/carve/include/carve/csg_triangulator.hpp
branches/soc-2011-tomato/extern/carve/include/carve/geom3d.hpp
branches/soc-2011-tomato/extern/carve/include/carve/geom_impl.hpp
branches/soc-2011-tomato/extern/carve/include/carve/input.hpp
branches/soc-2011-tomato/extern/carve/include/carve/mesh.hpp
branches/soc-2011-tomato/extern/carve/include/carve/mesh_impl.hpp
branches/soc-2011-tomato/extern/carve/lib/intersect.cpp
branches/soc-2011-tomato/extern/carve/lib/intersect_face_division.cpp
branches/soc-2011-tomato/extern/carve/lib/mesh.cpp
branches/soc-2011-tomato/extern/carve/lib/polyhedron.cpp
branches/soc-2011-tomato/extern/carve/patches/series
Removed Paths:
-------------
branches/soc-2011-tomato/extern/carve/patches/strict_flags.patch
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-54845
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-54847
Modified: branches/soc-2011-tomato/extern/carve/bundle.sh
===================================================================
--- branches/soc-2011-tomato/extern/carve/bundle.sh 2013-02-25 10:11:22 UTC (rev 54847)
+++ branches/soc-2011-tomato/extern/carve/bundle.sh 2013-02-25 10:14:40 UTC (rev 54848)
@@ -91,7 +91,7 @@
-DCARVE_SYSTEM_BOOST
)
- list(APPEND INC
+ list(APPEND INC_SYS
\${BOOST_INCLUDE_DIR}
)
endif()
Modified: branches/soc-2011-tomato/extern/carve/files.txt
===================================================================
--- branches/soc-2011-tomato/extern/carve/files.txt 2013-02-25 10:11:22 UTC (rev 54847)
+++ branches/soc-2011-tomato/extern/carve/files.txt 2013-02-25 10:14:40 UTC (rev 54848)
@@ -1,107 +1,109 @@
-include/carve/polyhedron_decl.hpp
-include/carve/geom2d.hpp
-include/carve/exact.hpp
+include/carve/vertex_impl.hpp
+include/carve/aabb_impl.hpp
+include/carve/csg.hpp
+include/carve/pointset_iter.hpp
+include/carve/debug_hooks.hpp
+include/carve/mesh.hpp
include/carve/triangulator_impl.hpp
-include/carve/collection.hpp
-include/carve/pointset.hpp
-include/carve/djset.hpp
-include/carve/kd_node.hpp
+include/carve/edge_decl.hpp
+include/carve/collection/unordered.hpp
+include/carve/collection/unordered/tr1_impl.hpp
+include/carve/collection/unordered/fallback_impl.hpp
+include/carve/collection/unordered/std_impl.hpp
+include/carve/collection/unordered/vcpp_impl.hpp
+include/carve/collection/unordered/libstdcpp_impl.hpp
+include/carve/collection/unordered/boost_impl.hpp
+include/carve/convex_hull.hpp
+include/carve/geom.hpp
+include/carve/collection_types.hpp
+include/carve/cbrt.h
+include/carve/util.hpp
+include/carve/iobj.hpp
+include/carve/polyline_decl.hpp
+include/carve/polyline_impl.hpp
+include/carve/win32.h
+include/carve/edge_impl.hpp
+include/carve/carve.hpp
include/carve/polyline.hpp
-include/carve/polyline_iter.hpp
-include/carve/geom3d.hpp
-include/carve/edge_decl.hpp
+include/carve/config.h
include/carve/face_decl.hpp
-include/carve/aabb_impl.hpp
-include/carve/colour.hpp
-include/carve/pointset_iter.hpp
-include/carve/polyline_decl.hpp
-include/carve/rescale.hpp
+include/carve/matrix.hpp
+include/carve/classification.hpp
+include/carve/geom_impl.hpp
+include/carve/faceloop.hpp
+include/carve/mesh_ops.hpp
+include/carve/tree.hpp
+include/carve/geom2d.hpp
+include/carve/face_impl.hpp
+include/carve/polyhedron_decl.hpp
+include/carve/interpolator.hpp
+include/carve/poly_decl.hpp
include/carve/mesh_impl.hpp
-include/carve/classification.hpp
-include/carve/util.hpp
+include/carve/gnu_cxx.h
+include/carve/mesh_simplify.hpp
include/carve/triangulator.hpp
-include/carve/polyhedron_base.hpp
+include/carve/pointset_impl.hpp
include/carve/rtree.hpp
+include/carve/math_constants.hpp
+include/carve/vector.hpp
+include/carve/octree_impl.hpp
+include/carve/pointset.hpp
include/carve/math.hpp
-include/carve/math_constants.hpp
-include/carve/octree_decl.hpp
+include/carve/intersection.hpp
+include/carve/colour.hpp
+include/carve/kd_node.hpp
include/carve/input.hpp
-include/carve/mesh_ops.hpp
-include/carve/debug_hooks.hpp
-include/carve/mesh_simplify.hpp
-include/carve/interpolator.hpp
-include/carve/poly_decl.hpp
-include/carve/csg.hpp
-include/carve/mesh.hpp
-include/carve/carve.hpp
-include/carve/gnu_cxx.h
+include/carve/geom3d.hpp
+include/carve/exact.hpp
+include/carve/rescale.hpp
+include/carve/polyhedron_base.hpp
+include/carve/heap.hpp
+include/carve/spacetree.hpp
include/carve/polyhedron_impl.hpp
-include/carve/poly_impl.hpp
+include/carve/vcpp_config.h
include/carve/aabb.hpp
-include/carve/convex_hull.hpp
+include/carve/polyline_iter.hpp
+include/carve/djset.hpp
include/carve/vertex_decl.hpp
-include/carve/win32.h
-include/carve/edge_impl.hpp
-include/carve/tag.hpp
-include/carve/tree.hpp
-include/carve/heap.hpp
-include/carve/matrix.hpp
+include/carve/csg_triangulator.hpp
include/carve/poly.hpp
-include/carve/vector.hpp
-include/carve/intersection.hpp
-include/carve/faceloop.hpp
-include/carve/geom_impl.hpp
-include/carve/octree_impl.hpp
-include/carve/spacetree.hpp
-include/carve/collection/unordered/std_impl.hpp
-include/carve/collection/unordered/tr1_impl.hpp
-include/carve/collection/unordered/libstdcpp_impl.hpp
-include/carve/collection/unordered/boost_impl.hpp
-include/carve/collection/unordered/vcpp_impl.hpp
-include/carve/collection/unordered/fallback_impl.hpp
-include/carve/collection/unordered.hpp
-include/carve/face_impl.hpp
-include/carve/pointset_impl.hpp
-include/carve/cbrt.h
-include/carve/vcpp_config.h
-include/carve/geom.hpp
-include/carve/vertex_impl.hpp
-include/carve/polyline_impl.hpp
+include/carve/external/boost/random.hpp
+include/carve/timing.hpp
+include/carve/octree_decl.hpp
include/carve/pointset_decl.hpp
-include/carve/timing.hpp
-include/carve/csg_triangulator.hpp
-include/carve/iobj.hpp
-include/carve/collection_types.hpp
-lib/carve.cpp
-lib/mesh.cpp
-lib/intersect_group.cpp
+include/carve/tag.hpp
+include/carve/collection.hpp
+include/carve/poly_impl.hpp
+lib/intersection.cpp
+lib/intersect.cpp
+lib/triangulator.cpp
+lib/intersect_debug.hpp
+lib/csg_collector.hpp
+lib/csg_data.hpp
+lib/convex_hull.cpp
lib/intersect_classify_common.hpp
-lib/intersect_classify_edge.cpp
-lib/intersect_classify_group.cpp
-lib/csg_data.hpp
+lib/intersect_common.hpp
lib/polyhedron.cpp
-lib/csg_collector.hpp
-lib/geom3d.cpp
lib/polyline.cpp
-lib/csg_collector.cpp
-lib/triangulator.cpp
+lib/pointset.cpp
+lib/geom2d.cpp
+lib/math.cpp
+lib/intersect_half_classify_group.cpp
lib/intersect_face_division.cpp
-lib/intersect_half_classify_group.cpp
-lib/edge.cpp
-lib/math.cpp
-lib/geom2d.cpp
lib/tag.cpp
-lib/intersection.cpp
-lib/convex_hull.cpp
-lib/intersect_common.hpp
-lib/intersect_classify_common_impl.hpp
+lib/aabb.cpp
+lib/intersect_classify_group.cpp
+lib/csg_detail.hpp
+lib/mesh.cpp
+lib/timing.cpp
+lib/geom3d.cpp
+lib/intersect_group.cpp
+lib/carve.cpp
+lib/intersect_classify_edge.cpp
lib/csg.cpp
-lib/intersect.cpp
-lib/csg_detail.hpp
lib/face.cpp
-lib/pointset.cpp
-lib/timing.cpp
+lib/csg_collector.cpp
+lib/intersect_debug.cpp
+lib/edge.cpp
+lib/intersect_classify_common_impl.hpp
lib/octree.cpp
-lib/aabb.cpp
-lib/intersect_debug.hpp
-lib/intersect_debug.cpp
Modified: branches/soc-2011-tomato/extern/carve/include/carve/csg_triangulator.hpp
===================================================================
--- branches/soc-2011-tomato/extern/carve/include/carve/csg_triangulator.hpp 2013-02-25 10:11:22 UTC (rev 54847)
+++ branches/soc-2011-tomato/extern/carve/include/carve/csg_triangulator.hpp 2013-02-25 10:14:40 UTC (rev 54848)
@@ -174,7 +174,7 @@
double scoreQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
if (!(*i).second.first || !(*i).second.second) return -1;
- return 0;
+ return -1;
}
carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) {
Modified: branches/soc-2011-tomato/extern/carve/include/carve/geom3d.hpp
===================================================================
--- branches/soc-2011-tomato/extern/carve/include/carve/geom3d.hpp 2013-02-25 10:11:22 UTC (rev 54847)
+++ branches/soc-2011-tomato/extern/carve/include/carve/geom3d.hpp 2013-02-25 10:14:40 UTC (rev 54848)
@@ -206,10 +206,23 @@
* * +1, if a is ordered after b around, rotating about direction.
*/
inline int compareAngles(const Vector &direction, const Vector &base, const Vector &a, const Vector &b) {
- const double d1 = carve::geom3d::orient3d(carve::geom::VECTOR(0,0,0), direction, a, b);
- const double d2 = carve::geom3d::orient3d(carve::geom::VECTOR(0,0,0), direction, base, a);
- const double d3 = carve::geom3d::orient3d(carve::geom::VECTOR(0,0,0), direction, base, b);
+ // double d1 = carve::geom3d::orient3d(carve::geom::VECTOR(0,0,0), direction, a, b);
+ // double d2 = carve::geom3d::orient3d(carve::geom::VECTOR(0,0,0), direction, base, a);
+ // double d3 = carve::geom3d::orient3d(carve::geom::VECTOR(0,0,0), direction, base, b);
+#if defined(CARVE_USE_EXACT_PREDICATES)
+ // which is equivalent to the following (which eliminates a
+ // vector subtraction):
+ double d1 = carve::geom3d::orient3d(direction, b, a, carve::geom::VECTOR(0,0,0));
+ double d2 = carve::geom3d::orient3d(direction, a, base, carve::geom::VECTOR(0,0,0));
+ double d3 = carve::geom3d::orient3d(direction, b, base, carve::geom::VECTOR(0,0,0));
+#else
+ // dotcross = a . (b x c)
+ double d1 = carve::geom::dotcross(direction, b, a );
+ double d2 = carve::geom::dotcross(direction, a, base);
+ double d3 = carve::geom::dotcross(direction, b, base);
+#endif
+
// CASE: a and b are coplanar wrt. direction.
if (d1 == 0.0) {
// a and b point in the same direction.
Modified: branches/soc-2011-tomato/extern/carve/include/carve/geom_impl.hpp
===================================================================
--- branches/soc-2011-tomato/extern/carve/include/carve/geom_impl.hpp 2013-02-25 10:11:22 UTC (rev 54847)
+++ branches/soc-2011-tomato/extern/carve/include/carve/geom_impl.hpp 2013-02-25 10:14:40 UTC (rev 54848)
@@ -396,7 +396,7 @@
// Compute a . (b x c)
return
(a.x * b.y * c.z + a.y * b.z * c.x + a.z * b.x * c.y) -
- (a.x * b.z * c.y + a.y * b.x * c.z + a.z * b.y * c.x);
+ (a.x * c.y * b.z + a.y * c.z * b.x + a.z * c.x * b.y);
}
Modified: branches/soc-2011-tomato/extern/carve/include/carve/input.hpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list