forked from bartvdbraak/blender
geometry module
- rename functions from camel case. - added docs for undocumented methods. - minor functional changes with exceptions and accepting 3d/4d vectors where it makes no difference. Renamed: - geometry.Intersect -> intersect_ray_tri - geometry.ClosestPointOnLine -> intersect_point_line - geometry.PointInTriangle2D -> intersect_point_tri_2d - geometry.PointInQuad2D -> intersect_point_quad_2d - geometry.LineIntersect -> intersect_line_line - geometry.LineIntersect2D -> intersect_line_line_2d - geometry.BezierInterp -> interpolate_bezier - geometry.TriangleArea -> area_tri - geometry.QuadNormal, TriangleNormal -> normal - geometry.PolyFill -> tesselate_polygon - geometry.BoxPack2D -> box_pack_2d - geometry.BarycentricTransform -> barycentric_transform
This commit is contained in:
parent
577e3b435e
commit
129b6190ed
@ -35,7 +35,7 @@ import os
|
||||
import time
|
||||
import bpy
|
||||
import mathutils
|
||||
from mathutils.geometry import PolyFill
|
||||
from mathutils.geometry import tesselate_polygon
|
||||
from io_utils import load_image, unpack_list, unpack_face_list
|
||||
|
||||
|
||||
@ -84,7 +84,7 @@ def BPyMesh_ngon(from_data, indices, PREF_FIX_LOOPS= True):
|
||||
if verts[i][1]==verts[i-1][0]:
|
||||
verts.pop(i-1)
|
||||
|
||||
fill= PolyFill([verts])
|
||||
fill= fill_polygon([verts])
|
||||
|
||||
else:
|
||||
'''
|
||||
@ -192,7 +192,7 @@ def BPyMesh_ngon(from_data, indices, PREF_FIX_LOOPS= True):
|
||||
vert_map[i+ii]= vert[2]
|
||||
ii+=len(verts)
|
||||
|
||||
fill= PolyFill([ [v[0] for v in loop] for loop in loop_list ])
|
||||
fill= tesselate_polygon([ [v[0] for v in loop] for loop in loop_list ])
|
||||
#draw_loops(loop_list)
|
||||
#raise 'done loop'
|
||||
# map to original indicies
|
||||
|
@ -257,7 +257,7 @@ class ShapeTransfer(bpy.types.Operator):
|
||||
ob.active_shape_key_index = len(me.shape_keys.keys) - 1
|
||||
ob.show_only_shape_key = True
|
||||
|
||||
from mathutils.geometry import BarycentricTransform
|
||||
from mathutils.geometry import barycentric_transform
|
||||
from mathutils import Vector
|
||||
|
||||
if use_clamp and mode == 'OFFSET':
|
||||
@ -300,38 +300,38 @@ class ShapeTransfer(bpy.types.Operator):
|
||||
for face in me.faces:
|
||||
i1, i2, i3, i4 = face.vertices_raw
|
||||
if i4 != 0:
|
||||
pt = BarycentricTransform(orig_shape_coords[i1],
|
||||
pt = barycentric_transform(orig_shape_coords[i1],
|
||||
orig_coords[i4], orig_coords[i1], orig_coords[i2],
|
||||
target_coords[i4], target_coords[i1], target_coords[i2])
|
||||
median_coords[i1].append(pt)
|
||||
|
||||
pt = BarycentricTransform(orig_shape_coords[i2],
|
||||
pt = barycentric_transform(orig_shape_coords[i2],
|
||||
orig_coords[i1], orig_coords[i2], orig_coords[i3],
|
||||
target_coords[i1], target_coords[i2], target_coords[i3])
|
||||
median_coords[i2].append(pt)
|
||||
|
||||
pt = BarycentricTransform(orig_shape_coords[i3],
|
||||
pt = barycentric_transform(orig_shape_coords[i3],
|
||||
orig_coords[i2], orig_coords[i3], orig_coords[i4],
|
||||
target_coords[i2], target_coords[i3], target_coords[i4])
|
||||
median_coords[i3].append(pt)
|
||||
|
||||
pt = BarycentricTransform(orig_shape_coords[i4],
|
||||
pt = barycentric_transform(orig_shape_coords[i4],
|
||||
orig_coords[i3], orig_coords[i4], orig_coords[i1],
|
||||
target_coords[i3], target_coords[i4], target_coords[i1])
|
||||
median_coords[i4].append(pt)
|
||||
|
||||
else:
|
||||
pt = BarycentricTransform(orig_shape_coords[i1],
|
||||
pt = barycentric_transform(orig_shape_coords[i1],
|
||||
orig_coords[i3], orig_coords[i1], orig_coords[i2],
|
||||
target_coords[i3], target_coords[i1], target_coords[i2])
|
||||
median_coords[i1].append(pt)
|
||||
|
||||
pt = BarycentricTransform(orig_shape_coords[i2],
|
||||
pt = barycentric_transform(orig_shape_coords[i2],
|
||||
orig_coords[i1], orig_coords[i2], orig_coords[i3],
|
||||
target_coords[i1], target_coords[i2], target_coords[i3])
|
||||
median_coords[i2].append(pt)
|
||||
|
||||
pt = BarycentricTransform(orig_shape_coords[i3],
|
||||
pt = barycentric_transform(orig_shape_coords[i3],
|
||||
orig_coords[i2], orig_coords[i3], orig_coords[i1],
|
||||
target_coords[i2], target_coords[i3], target_coords[i1])
|
||||
median_coords[i3].append(pt)
|
||||
@ -350,12 +350,12 @@ class ShapeTransfer(bpy.types.Operator):
|
||||
n1loc_to = v1_to + target_normals[i1] * edlen_to
|
||||
n2loc_to = v2_to + target_normals[i2] * edlen_to
|
||||
|
||||
pt = BarycentricTransform(orig_shape_coords[i1],
|
||||
pt = barycentric_transform(orig_shape_coords[i1],
|
||||
v2, v1, n1loc,
|
||||
v2_to, v1_to, n1loc_to)
|
||||
median_coords[i1].append(pt)
|
||||
|
||||
pt = BarycentricTransform(orig_shape_coords[i2],
|
||||
pt = barycentric_transform(orig_shape_coords[i2],
|
||||
v1, v2, n2loc,
|
||||
v1_to, v2_to, n2loc_to)
|
||||
median_coords[i2].append(pt)
|
||||
|
@ -225,7 +225,7 @@ def islandIntersectUvIsland(source, target, SourceOffset):
|
||||
# Edge intersect test
|
||||
for ed in edgeLoopsSource:
|
||||
for seg in edgeLoopsTarget:
|
||||
i = geometry.LineIntersect2D(\
|
||||
i = geometry.intersect_line_line_2d(\
|
||||
seg[0], seg[1], SourceOffset+ed[0], SourceOffset+ed[1])
|
||||
if i:
|
||||
return 1 # LINE INTERSECTION
|
||||
@ -739,7 +739,7 @@ def packIslands(islandList):
|
||||
#XXX Window.DrawProgressBar(0.7, 'Packing %i UV Islands...' % len(packBoxes) )
|
||||
|
||||
time1 = time.time()
|
||||
packWidth, packHeight = geometry.BoxPack2D(packBoxes)
|
||||
packWidth, packHeight = geometry.box_pack_2d(packBoxes)
|
||||
|
||||
# print 'Box Packing Time:', time.time() - time1
|
||||
|
||||
|
@ -55,6 +55,18 @@
|
||||
* - Mathutils.OrthoProjectionMatrix -> mathutils.Matrix.OrthoProjection
|
||||
*
|
||||
* Moved to Geometry module: Intersect, TriangleArea, TriangleNormal, QuadNormal, LineIntersect
|
||||
* - geometry.Intersect -> intersect_ray_tri
|
||||
* - geometry.ClosestPointOnLine -> intersect_point_line
|
||||
* - geometry.PointInTriangle2D -> intersect_point_tri_2d
|
||||
* - geometry.PointInQuad2D -> intersect_point_quad_2d
|
||||
* - geometry.LineIntersect -> intersect_line_line
|
||||
* - geometry.LineIntersect2D -> intersect_line_line_2d
|
||||
* - geometry.BezierInterp -> interpolate_bezier
|
||||
* - geometry.TriangleArea -> area_tri
|
||||
* - geometry.QuadNormal, TriangleNormal -> normal
|
||||
* - geometry.PolyFill -> tesselate_polygon
|
||||
* - geometry.BoxPack2D -> box_pack_2d
|
||||
* - geometry.BarycentricTransform -> barycentric_transform
|
||||
*/
|
||||
|
||||
#include "mathutils.h"
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user