[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43820] branches/bmesh/blender: svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
Campbell Barton
ideasman42 at gmail.com
Wed Feb 1 10:31:26 CET 2012
Revision: 43820
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43820
Author: campbellbarton
Date: 2012-02-01 09:31:13 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43751
Modified Paths:
--------------
branches/bmesh/blender/doc/python_api/rst/bge.logic.rst
branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst
branches/bmesh/blender/extern/carve/bundle.sh
branches/bmesh/blender/extern/carve/lib/intersect_face_division.cpp
branches/bmesh/blender/extern/carve/lib/triangulator.cpp
branches/bmesh/blender/intern/boolop/intern/BOP_CarveInterface.cpp
branches/bmesh/blender/intern/cycles/kernel/kernel_emission.h
branches/bmesh/blender/intern/cycles/kernel/kernel_path.h
branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h
branches/bmesh/blender/intern/memutil/MEM_CacheLimiter.h
branches/bmesh/blender/intern/memutil/MEM_CacheLimiterC-Api.h
branches/bmesh/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
branches/bmesh/blender/source/blender/blenkernel/BKE_anim.h
branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h
branches/bmesh/blender/source/blender/blenkernel/BKE_lattice.h
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/object/object_modifier.c
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/bmesh/blender/source/blender/imbuf/intern/moviecache.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_key.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_curve.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_tree.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/bmesh/blender/source/blender/python/mathutils/mathutils_noise.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/python/mathutils/mathutils_noise.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/release/scripts/
branches/bmesh/blender/release/scripts/modules/
branches/bmesh/blender/release/scripts/presets/
branches/bmesh/blender/release/scripts/startup/bl_operators/
branches/bmesh/blender/release/scripts/templates/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:ignore
- *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
graphicall_32b
graphicall_64b
graphicall_64b_debug
installer_32b
installer_64b
+ *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
Modified: svn:mergeinfo
- /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43751
+ /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43819
Modified: branches/bmesh/blender/doc/python_api/rst/bge.logic.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/bge.logic.rst 2012-02-01 08:35:16 UTC (rev 43819)
+++ branches/bmesh/blender/doc/python_api/rst/bge.logic.rst 2012-02-01 09:31:13 UTC (rev 43820)
@@ -69,11 +69,9 @@
:columns: 3
* :class:`~bge.types.BL_ActionActuator`
- * :class:`~bge.types.BL_ShapeActionActuator`
* :class:`~bge.types.KX_CameraActuator`
* :class:`~bge.types.KX_ConstraintActuator`
* :class:`~bge.types.KX_GameActuator`
- * :class:`~bge.types.KX_IpoActuator`
* :class:`~bge.types.KX_NetworkMessageActuator`
* :class:`~bge.types.KX_ObjectActuator`
* :class:`~bge.types.KX_ParentActuator`
@@ -477,6 +475,7 @@
See :class:`bge.types.BL_ActionActuator`
.. data:: KX_ACTIONACT_PLAY
+.. data:: KX_ACTIONACT_PINGPONG
.. data:: KX_ACTIONACT_FLIPPER
.. data:: KX_ACTIONACT_LOOPSTOP
.. data:: KX_ACTIONACT_LOOPEND
@@ -635,21 +634,6 @@
.. data:: KX_GAME_SAVECFG
.. data:: KX_GAME_LOADCFG
-.. _ipo-actuator:
-
-------------
-IPO Actuator
-------------
-
-See :class:`bge.types.KX_IpoActuator`
-
-.. data:: KX_IPOACT_PLAY
-.. data:: KX_IPOACT_PINGPONG
-.. data:: KX_IPOACT_FLIPPER
-.. data:: KX_IPOACT_LOOPSTOP
-.. data:: KX_IPOACT_LOOPEND
-.. data:: KX_IPOACT_FROM_PROP
-
---------------
Parent Actuator
---------------
@@ -691,20 +675,6 @@
.. data:: KX_SCENE_SUSPEND
.. data:: KX_SCENE_RESUME
-.. _shape-action-actuator:
-
----------------------
-Shape Action Actuator
----------------------
-
-See :class:`bge.types.BL_ActionActuator`
-
-.. data:: KX_ACTIONACT_PLAY
-.. data:: KX_ACTIONACT_FLIPPER
-.. data:: KX_ACTIONACT_LOOPSTOP
-.. data:: KX_ACTIONACT_LOOPEND
-.. data:: KX_ACTIONACT_PROPERTY
-
.. _logic-sound-actuator:
--------------
Modified: branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst 2012-02-01 08:35:16 UTC (rev 43819)
+++ branches/bmesh/blender/doc/python_api/rst/info_quickstart.rst 2012-02-01 09:31:13 UTC (rev 43820)
@@ -123,6 +123,29 @@
1.0
+Data Creation/Removal
+^^^^^^^^^^^^^^^^^^^^^
+
+Those of you familiar with other python api's may be surprised that new datablocks in the bpy api can't be created by calling the class:
+
+ >>> bpy.types.Mesh()
+ Traceback (most recent call last):
+ File "<blender_console>", line 1, in <module>
+ TypeError: bpy_struct.__new__(type): expected a single argument
+
+
+This is an intentional part of the API design.
+The blender/python api can't create blender data that exists outside the main blender database (accessed through bpy.data), because this data is managed by blender (save/load/undo/append... etc).
+
+Data is added and removed via methods on the collections in bpy.data, eg:
+
+ >>> mesh = bpy.data.meshes.new(name="MyMesh")
+ >>> print(mesh)
+ <bpy_struct, Mesh("MyMesh.001")>
+
+ >>> bpy.data.meshes.remove(mesh)
+
+
Custom Properties
^^^^^^^^^^^^^^^^^
Modified: branches/bmesh/blender/extern/carve/bundle.sh
===================================================================
--- branches/bmesh/blender/extern/carve/bundle.sh 2012-02-01 08:35:16 UTC (rev 43819)
+++ branches/bmesh/blender/extern/carve/bundle.sh 2012-02-01 09:31:13 UTC (rev 43820)
@@ -17,7 +17,7 @@
rm -rf include
rm -rf lib
-cat "files.txt" | while f=`line`; do
+cat "files.txt" | while read f; do
mkdir -p `dirname $f`
cp $tmp/carve/$f $f
done
Modified: branches/bmesh/blender/extern/carve/lib/intersect_face_division.cpp
===================================================================
--- branches/bmesh/blender/extern/carve/lib/intersect_face_division.cpp 2012-02-01 08:35:16 UTC (rev 43819)
+++ branches/bmesh/blender/extern/carve/lib/intersect_face_division.cpp 2012-02-01 09:31:13 UTC (rev 43820)
@@ -48,6 +48,63 @@
+#if defined(CARVE_DEBUG_WRITE_PLY_DATA)
+ template<typename iter_t>
+ void dumpFacesAndHoles(iter_t f_begin, iter_t f_end,
+ iter_t h_begin, iter_t h_end,
+ const std::string &fname) {
+ std::cerr << "dumping " << std::distance(f_begin, f_end) << " faces, " << std::distance(h_begin, h_end) << " holes." << std::endl;
+ std::map<carve::mesh::MeshSet<3>::vertex_t *, size_t> v_included;
+
+ for (iter_t i = f_begin; i != f_end; ++i) {
+ for (size_t j = 0; j < (*i).size(); ++j) {
+ if (v_included.find((*i)[j]) == v_included.end()) {
+ size_t &p = v_included[(*i)[j]];
+ p = v_included.size() - 1;
+ }
+ }
+ }
+
+ for (iter_t i = h_begin; i != h_end; ++i) {
+ for (size_t j = 0; j < (*i).size(); ++j) {
+ if (v_included.find((*i)[j]) == v_included.end()) {
+ size_t &p = v_included[(*i)[j]];
+ p = v_included.size() - 1;
+ }
+ }
+ }
+
+ carve::line::PolylineSet fh;
+ fh.vertices.resize(v_included.size());
+ for (std::map<carve::mesh::MeshSet<3>::vertex_t *, size_t>::const_iterator
+ i = v_included.begin(); i != v_included.end(); ++i) {
+ fh.vertices[(*i).second].v = (*i).first->v;
+ }
+
+ {
+ std::vector<size_t> connected;
+ for (iter_t i = f_begin; i != f_end; ++i) {
+ connected.clear();
+ for (size_t j = 0; j < (*i).size(); ++j) {
+ connected.push_back(v_included[(*i)[j]]);
+ }
+ fh.addPolyline(true, connected.begin(), connected.end());
+ }
+ for (iter_t i = h_begin; i != h_end; ++i) {
+ connected.clear();
+ for (size_t j = 0; j < (*i).size(); ++j) {
+ connected.push_back(v_included[(*i)[j]]);
+ }
+ fh.addPolyline(true, connected.begin(), connected.end());
+ }
+ }
+
+ ::writePLY(fname, &fh, true);
+ }
+#endif
+
+
+
template<typename T>
void populateVectorFromList(std::list<T> &l, std::vector<T> &v) {
v.clear();
@@ -433,6 +490,7 @@
face_loops_sorted[m].push_back(n);
}
face_loop_areas.push_back(carve::geom2d::signedArea(face_loops_projected[m]));
+
std::sort(face_loops_sorted[m].begin(), face_loops_sorted[m].end(),
carve::make_index_sort(face_loops[m].begin()));
face_loop_aabb[m].fit(face_loops_projected[m].begin(), face_loops_projected[m].end());
@@ -449,6 +507,7 @@
hole_loops_sorted[m].push_back(n);
}
hole_loop_areas.push_back(carve::geom2d::signedArea(hole_loops_projected[m]));
+
std::sort(hole_loops_sorted[m].begin(), hole_loops_sorted[m].end(),
carve::make_index_sort(hole_loops[m].begin()));
hole_loop_aabb[m].fit(hole_loops_projected[m].begin(), hole_loops_projected[m].end());
@@ -572,6 +631,10 @@
std::vector<std::vector<int> > containing_faces;
std::map<int, std::map<int, std::pair<unsigned, unsigned> > > hole_shared_vertices;
+#if defined(CARVE_DEBUG_WRITE_PLY_DATA)
+ dumpFacesAndHoles(f_loops.begin(), f_loops.end(), h_loops.begin(), h_loops.end(), "/tmp/pre_merge.ply");
+#endif
+
{
// move input face and hole loops to temp vectors.
size_t m;
@@ -720,6 +783,10 @@
}
}
#endif
+#if defined(CARVE_DEBUG_WRITE_PLY_DATA)
+ dumpFacesAndHoles(f_loops.begin(), f_loops.end(), h_loops.begin(), h_loops.end(), "/tmp/post_merge.ply");
+#endif
+
}
@@ -738,7 +805,7 @@
* on that edge.
* @param[out] base_loop A vector of the vertices of the base loop.
*/
- static void assembleBaseLoop(carve::mesh::MeshSet<3>::face_t *face,
+ static bool assembleBaseLoop(carve::mesh::MeshSet<3>::face_t *face,
const carve::csg::detail::Data &data,
std::vector<carve::mesh::MeshSet<3>::vertex_t *> &base_loop) {
base_loop.clear();
@@ -746,6 +813,7 @@
// XXX: assumes that face->edges is in the same order as
// face->vertices. (Which it is)
carve::mesh::MeshSet<3>::edge_t *e = face->edge;
+ bool face_edge_intersected = false;
do {
base_loop.push_back(carve::csg::map_vertex(data.vmap, e->vert));
@@ -757,9 +825,13 @@
for (size_t k = 0, ke = ev_vec.size(); k < ke;) {
base_loop.push_back(ev_vec[k++]);
}
+
+ face_edge_intersected = true;
}
e = e->next;
} while (e != face->edge);
+
+ return face_edge_intersected;
}
@@ -789,7 +861,6 @@
carve::csg::CSG::Hooks &hooks,
std::vector<carve::mesh::MeshSet<3>::vertex_t *> &base_loop,
std::vector<std::vector<carve::mesh::MeshSet<3>::vertex_t *> > &paths,
- std::vector<std::vector<carve::mesh::MeshSet<3>::vertex_t *> > &loops,
std::list<std::vector<carve::mesh::MeshSet<3>::vertex_t *> > &face_loops_out) {
const size_t N = base_loop.size();
std::vector<crossing_data> endpoint_indices;
@@ -800,6 +871,7 @@
endpoint_indices.push_back(crossing_data(&paths[i], N, N));
}
+ // Step 1:
// locate endpoints of paths on the base loop.
for (size_t i = 0; i < N; ++i) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list