[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34011] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 34010.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Jan 2 19:34:32 CET 2011
Revision: 34011
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34011
Author: kjym3
Date: 2011-01-02 19:34:32 +0100 (Sun, 02 Jan 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 34010.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34010
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/doc/manpage/blender.1
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/tools/bpy_introspect_ui.py
branches/soc-2008-mxcurioni/intern/tools/pydna.py
branches/soc-2008-mxcurioni/release/VERSION
branches/soc-2008-mxcurioni/release/datafiles/prvicons
branches/soc-2008-mxcurioni/release/datafiles/splash.png
branches/soc-2008-mxcurioni/release/getversion.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/__init__.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/balancing.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master_html.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/netrender.js
branches/soc-2008-mxcurioni/release/scripts/io/netrender/operators.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_builtins.py
branches/soc-2008-mxcurioni/release/scripts/modules/animsys_refactor.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/ops.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/path.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/sys_info.py
branches/soc-2008-mxcurioni/release/scripts/op/animsys_update.py
branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/import_bvh.py
branches/soc-2008-mxcurioni/release/scripts/op/io_mesh_ply/export_ply.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_3ds/export_3ds.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/export_obj.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2008-mxcurioni/release/scripts/op/io_scene_x3d/export_x3d.py
branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/export_mdd.py
branches/soc-2008-mxcurioni/release/scripts/op/io_shape_mdd/import_mdd.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/object_align.py
branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_filebrowser.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/test/pep8.py
branches/soc-2008-mxcurioni/release/text/readme.html
branches/soc-2008-mxcurioni/release/windows/installer/00.sconsblender.nsi
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_boxpack2d.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/splash.png.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_fileglobal_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_define.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_property.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_text.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_array.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/gameengine/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBase.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/scripts/io/netrender/thumbnail.py
branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/export_bvh.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/doc/python_api/epy/Geometry.py
branches/soc-2008-mxcurioni/doc/python_api/epy/Mathutils.py
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-01-02 18:10:33 UTC (rev 34010)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-01-02 18:34:32 UTC (rev 34011)
@@ -690,7 +690,7 @@
endif()
# used in many places so include globally, like OpenGL
- blender_include_dirs(${PTHREADS_INC})
+ blender_include_dirs("${PTHREADS_INC}")
elseif(APPLE)
@@ -945,7 +945,7 @@
#-----------------------------------------------------------------------------
# Configure OpenGL.
find_package(OpenGL)
-blender_include_dirs(${OPENGL_INCLUDE_DIR})
+blender_include_dirs("${OPENGL_INCLUDE_DIR}")
# unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake
# unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2011-01-02 18:10:33 UTC (rev 34010)
+++ branches/soc-2008-mxcurioni/SConstruct 2011-01-02 18:34:32 UTC (rev 34011)
@@ -412,7 +412,7 @@
playerlist += B.create_blender_liblist(env, 'player2')
playerlist += B.create_blender_liblist(env, 'intern')
playerlist += B.create_blender_liblist(env, 'extern')
- env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+ env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
##### Now define some targets
Modified: branches/soc-2008-mxcurioni/doc/manpage/blender.1
===================================================================
(Binary files differ)
Deleted: branches/soc-2008-mxcurioni/doc/python_api/epy/Geometry.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/epy/Geometry.py 2011-01-02 18:10:33 UTC (rev 34010)
+++ branches/soc-2008-mxcurioni/doc/python_api/epy/Geometry.py 2011-01-02 18:34:32 UTC (rev 34011)
@@ -1,189 +0,0 @@
-# Blender.Geometry module and its subtypes
-
-"""
-The Blender.Geometry submodule.
-
-Geometry
-========
-(when accessing it from the Game Engine use Geometry instead of Blender.Geometry)
-
-This new module provides access to a geometry function.
-"""
-
-def Intersect(vec1, vec2, vec3, ray, orig, clip=1):
- """
- Return the intersection between a ray and a triangle, if possible, return None otherwise.
- @type vec1: Vector object.
- @param vec1: A 3d vector, one corner of the triangle.
- @type vec2: Vector object.
- @param vec2: A 3d vector, one corner of the triangle.
- @type vec3: Vector object.
- @param vec3: A 3d vector, one corner of the triangle.
- @type ray: Vector object.
- @param ray: A 3d vector, the orientation of the ray. the length of the ray is not used, only the direction.
- @type orig: Vector object.
- @param orig: A 3d vector, the origin of the ray.
- @type clip: integer
- @param clip: if 0, don't restrict the intersection to the area of the triangle, use the infinite plane defined by the triangle.
- @rtype: Vector object
- @return: The intersection between a ray and a triangle, if possible, None otherwise.
- """
-
-def TriangleArea(vec1, vec2, vec3):
- """
- Return the area size of the 2D or 3D triangle defined.
- @type vec1: Vector object.
- @param vec1: A 2d or 3d vector, one corner of the triangle.
- @type vec2: Vector object.
- @param vec2: A 2d or 3d vector, one corner of the triangle.
- @type vec3: Vector object.
- @param vec3: A 2d or 3d vector, one corner of the triangle.
- @rtype: float
- @return: The area size of the 2D or 3D triangle defined.
- """
-
-def TriangleNormal(vec1, vec2, vec3):
- """
- Return the normal of the 3D triangle defined.
- @type vec1: Vector object.
- @param vec1: A 3d vector, one corner of the triangle.
- @type vec2: Vector object.
- @param vec2: A 3d vector, one corner of the triangle.
- @type vec3: Vector object.
- @param vec3: A 3d vector, one corner of the triangle.
- @rtype: float
- @return: The normal of the 3D triangle defined.
- """
-
-def QuadNormal(vec1, vec2, vec3, vec4):
- """
- Return the normal of the 3D quad defined.
- @type vec1: Vector object.
- @param vec1: A 3d vector, the first vertex of the quad.
- @type vec2: Vector object.
- @param vec2: A 3d vector, the second vertex of the quad.
- @type vec3: Vector object.
- @param vec3: A 3d vector, the third vertex of the quad.
- @type vec4: Vector object.
- @param vec4: A 3d vector, the fourth vertex of the quad.
- @rtype: float
- @return: The normal of the 3D quad defined.
- """
-
-def LineIntersect(vec1, vec2, vec3, vec4):
- """
- Return a tuple with the points on each line respectively closest to the other
- (when both lines intersect, both vector hold the same value).
- The lines are evaluated as infinite lines in space, the values returned may not be between the 2 points given for each line.
- @type vec1: Vector object.
- @param vec1: A 3d vector, one point on the first line.
- @type vec2: Vector object.
- @param vec2: A 3d vector, another point on the first line.
- @type vec3: Vector object.
- @param vec3: A 3d vector, one point on the second line.
- @type vec4: Vector object.
- @param vec4: A 3d vector, another point on the second line.
- @rtype: (Vector object, Vector object)
- @return: A tuple with the points on each line respectively closest to the other.
- """
-
-def PolyFill(polylines):
- """
- Takes a list of polylines and calculates triangles that would fill in the polylines.
- Multiple lines can be used to make holes inside a polyline, or fill in 2 separate lines at once.
- @type polylines: List of lists containing vectors, each representing a closed polyline.
- @rtype: list
- @return: a list if tuples each a tuple of 3 ints representing a triangle indexing the points given.
- @note: 2D Vectors will have an assumed Z axis of zero, 4D Vectors W axis is ignored.
- @note: The order of points in a polyline effect the direction returned triangles face, reverse the order of a polyline to flip the normal of returned faces.
-
- I{B{Example:}}
-
- The example below creates 2 polylines and fills them in with faces, then makes a mesh in the current scene::
- import Blender
- Vector= Blender.mathutils.Vector
-
- # Outline of 5 points
- polyline1= [Vector(-2.0, 1.0, 1.0), Vector(-1.0, 2.0, 1.0), Vector(1.0, 2.0, 1.0), Vector(1.0, -1.0, 1.0), Vector(-1.0, -1.0, 1.0)]
- polyline2= [Vector(-1, 1, 1.0), Vector(0, 1, 1.0), Vector(0, 0, 1.0), Vector(-1.0, 0.0, 1.0)]
- fill= Blender.Geometry.PolyFill([polyline1, polyline2])
-
- # Make a new mesh and add the truangles into it
- me= Blender.Mesh.New()
- me.verts.extend(polyline1)
- me.verts.extend(polyline2)
- me.faces.extend(fill) # Add the faces, they reference the verts in polyline 1 and 2
-
- scn = Blender.Scene.GetCurrent()
- ob = scn.objects.new(me)
- Blender.Redraw()
- """
-
-def LineIntersect2D(vec1, vec2, vec3, vec4):
- """
- Takes 2 lines vec1, vec2 for the 2 points of the first line and vec2, vec3 for the 2 points of the second line.
- @rtype: Vector
- @return: a 2D Vector for the intersection or None where there is no intersection.
- """
-
-def ClosestPointOnLine(pt, vec1, vec2):
- """
- Takes 2 lines vec1, vec2 for the 2 points of the first line and vec2, vec3 for the 2 points of the second line.
- @rtype: tuple
- @return: a tuple containing a vector and a float, the vector is the closest point on the line, the float is the position on the line, between 0 and 1 the point is on the line.
- """
-
-def PointInTriangle2D(pt, tri_pt1, tri_pt2, tri_pt3):
- """
- Takes 4 vectors (one for the test point and 3 for the triangle)
- This is a 2d function so only X and Y are used, Z and W will be ignored.
- @rtype: int
- @return: 1 for a clockwise intersection, -1 for counter clockwise intersection, 0 when there is no intersection.
- """
-
-def PointInQuad2D(pt, quad_pt1, quad_pt2, quad_pt3):
- """
- Takes 5 vectors (one for the test point and 5 for the quad)
- This is a 2d function so only X and Y are used, Z and W will be ignored.
- @rtype: int
- @return: 1 for a clockwise intersection, -1 for counter clockwise intersection, 0 when there is no intersection.
- """
-
-def BoxPack2D(boxlist):
- """
- Takes a list of 2D boxes and packs them into a square.
- Each box in boxlist must be a list of at least 4 items - [x,y,w,h], after running this script,
- the X and Y values in each box will be moved to packed, non overlapping locations.
-
- Example::
-
- # Make 500 random boxes, pack them and make a mesh from it
- from Blender import Geometry, Scene, Mesh
- import random
- boxes = []
- for i in xrange(500):
- boxes.append( [0,0, random.random()+0.1, random.random()+0.1] )
- boxsize = Geometry.BoxPack2D(boxes)
- print 'BoxSize', boxsize
- me = Mesh.New()
- for x in boxes:
- me.verts.extend([(x[0],x[1], 0), (x[0],x[1]+x[3], 0), (x[0]+x[2],x[1]+x[3], 0), (x[0]+x[2],x[1], 0) ])
- v1= me.verts[-1]
- v2= me.verts[-2]
- v3= me.verts[-3]
- v4= me.verts[-4]
- me.faces.extend([(v1,v2,v3,v4)])
- scn = Scene.GetCurrent()
- scn.objects.new(me)
-
- @note: Each boxlist item can be longer then 4, the extra items are ignored and stay untouched.
- @rtype: tuple
- @return: a tuple pair - (width, height) of all the packed boxes.
- """
-def BezierInterp(vec_knot_1, vec_handle_1, vec_handle_2, vec_knot_2, resolution):
- """
- Takes 4 vectors representing a bezier curve and returns a list of vector points.
- @note: any vector size is supported, the largest dimension from the input will be used for all returned vectors/
- @rtype: list
- @return: a list of vectors the size of resolution including the start and end points (vec_knot_1 and vec_knot_2)
- """
Deleted: branches/soc-2008-mxcurioni/doc/python_api/epy/Mathutils.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/epy/Mathutils.py 2011-01-02 18:10:33 UTC (rev 34010)
+++ branches/soc-2008-mxcurioni/doc/python_api/epy/Mathutils.py 2011-01-02 18:34:32 UTC (rev 34011)
@@ -1,156 +0,0 @@
-# Blender.mathutils module and its subtypes
-
-
-
-class Vector:
- """
-
- @attention: Vector data can be wrapped or non-wrapped. When a object is wrapped it
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list