AstralTransRocketries/mcedit
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: TypeError in frustum.visible1

Browse Source 
Was calling builtin sum() and any() when numpy's routines are needed.
This commit is contained in:
David Vierra 2012-11-26 12:04:19 -10:00
parent 2a1a6aafa7
commit aa6a9524e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frustum.py
View File

@ -85,14 +85,14 @@ class Frustum (object):
frustcullaccel C extension module) frustcullaccel C extension module)
""" """
distances = sum(self.planes[numpy.newaxis, :, :] * points[:, numpy.newaxis, :], -1) distances = numpy.sum(self.planes[numpy.newaxis, :, :] * points[:, numpy.newaxis, :], -1)
return ~any(distances < -radius, -1) return ~numpy.any(distances < -radius, -1)
def visible1(self, point, radius): def visible1(self, point, radius):
#return self.visible(array(point[numpy.newaxis, :]), radius) #return self.visible(array(point[numpy.newaxis, :]), radius)
distance = sum(self.planes * point, -1) distance = numpy.sum(self.planes * point, -1)
vis = ~any(distance < -radius) vis = ~numpy.any(distance < -radius, -1)
#assert vis == self.visible(array(point)[numpy.newaxis, :], radius) #assert vis == self.visible(array(point)[numpy.newaxis, :], radius)
return vis return vis