sm/surfaces
1
0
Fork 0
Code Issues Pull Requests Activity

cleaned up some pep8/pyflakes violations

Browse Source
This commit is contained in:
Stephen M. McQuay 2012-03-19 22:18:02 -06:00
parent 303dd9e8d0
commit 62efeb12b3
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
setup( setup(
name= 'smbsurf', name='smbsurf',
description='', description='',
version='0.0', version='0.0',
packages=find_packages(), packages=find_packages(),

12
surf/geometry.py
View File

@ -1,6 +1,4 @@
from __future__ import division
import pprint import pprint
import json
''' '''
http://en.wikipedia.org/wiki/Polygon_mesh http://en.wikipedia.org/wiki/Polygon_mesh
@ -95,9 +93,16 @@ class Vertex(object):
self.y = y self.y = y
self.z = z self.z = z
self.edges = [] self.edges = []
def __eq__(self, other):
if(self.x == other.x and self.y == other.y and self.z == other.z):
return True
else:
return False
def __repr__(self): def __repr__(self):
return "<%.2f, %.2f, %.2f>" % (self.x, self.y, self.z) return "[%.2f, %.2f, %.2f]" % (self.x, self.y, self.z)
def __add__(self, other): def __add__(self, other):
# for now just assume type(other) = Vertex... bad, I know # for now just assume type(other) = Vertex... bad, I know
@ -115,6 +120,7 @@ class Vertex(object):
def __div__(self, other): def __div__(self, other):
# same assumption as __mult__ # same assumption as __mult__
other = float(other)
return Vertex(self.x / other, self.y / other, self.z / other) return Vertex(self.x / other, self.y / other, self.z / other)
class Edge(object): class Edge(object):

2
surf/subd/cc.py
View File

@ -1,4 +1,4 @@
from surf.geometry import * from surf.geometry import Vertex, Polygon
def refine(poly): def refine(poly):
''' '''

3
surf/util.py
View File

@ -1,12 +1,13 @@
from surf.geometry import Vertex, Edge, Face, Polygon from surf.geometry import Vertex, Edge, Face, Polygon
def cube(): def cube():
v = [] v = []
v.append(Vertex(0.0, 1.0, 0.0)) v.append(Vertex(0.0, 1.0, 0.0))
v.append(Vertex(1.0, 1.0, 0.0)) v.append(Vertex(1.0, 1.0, 0.0))
v.append(Vertex(1.0, 0.0, 0.0)) v.append(Vertex(1.0, 0.0, 0.0))
v.append(Vertex(0.0, 0.0, 0.0)) v.append(Vertex(0.0, 0.0, 0.0))
v.append(Vertex(0.0, 1.0, 1.0)) v.append(Vertex(0.0, 1.0, 1.0))
v.append(Vertex(1.0, 1.0, 1.0)) v.append(Vertex(1.0, 1.0, 1.0))
v.append(Vertex(1.0, 0.0, 1.0)) v.append(Vertex(1.0, 0.0, 1.0))

8
test/test00.py
View File

@ -1,4 +1,4 @@
from surf.util import cube from surf.util import cube
from surf.subd import cc from surf.subd import cc
polygon = cube() polygon = cube()
refined_poly = cc.refine(polygon) refined_poly = cc.refine(polygon)
@ -6,11 +6,11 @@ refined_poly = cc.refine(polygon)
print polygon print polygon
print refined_poly print refined_poly
# #
# #
# import pylab # import pylab
# import mpl_toolkits.mplot3d.axes3d as p3 # import mpl_toolkits.mplot3d.axes3d as p3
# #
# fig = pylab.figure() # fig = pylab.figure()
# ax = p3.Axes3D(fig) # ax = p3.Axes3D(fig)
# for edge in newPolygon.edges: # for edge in newPolygon.edges:

3
test/test01.py
View File

@ -1,7 +1,6 @@
from __future__ import division
from surf.geometry import Vertex from surf.geometry import Vertex
v1 = Vertex(0.5, 0.25, 1/3.0) v1 = Vertex(0.5, 0.25, 1 / 3.0)
v2 = Vertex(1, 1, 1) v2 = Vertex(1, 1, 1)
print v1, v2, (v1 + v2) / 2 print v1, v2, (v1 + v2) / 2