Skip to content
Snippets Groups Projects
Commit 5e4830a3 authored by Ansgar Philippsen's avatar Ansgar Philippsen
Browse files

fixed primlist python args from col/rad to color/radius for better readability

parent 42d2bc6a
No related branches found
No related tags found
No related merge requests found
...@@ -196,45 +196,45 @@ def _to_vec3(p): ...@@ -196,45 +196,45 @@ def _to_vec3(p):
raise TypeError("expected either a sequence or a geom.Vec3 object") raise TypeError("expected either a sequence or a geom.Vec3 object")
def _primlist_add_point(self,pos,col=None): def _primlist_add_point(self,pos,color=None):
pos=_to_vec3(pos) pos=_to_vec3(pos)
if not col: if not color:
col=WHITE color=WHITE
self._add_point(pos,col) self._add_point(pos,color)
def _primlist_add_line(self,pos1,pos2,col=None,col1=None,col2=None): def _primlist_add_line(self,pos1,pos2,color=None,color1=None,color2=None):
pos1=_to_vec3(pos1) pos1=_to_vec3(pos1)
pos2=_to_vec3(pos2) pos2=_to_vec3(pos2)
if not col: if not color:
col=WHITE color=WHITE
if not col1: if not color1:
col1=col color1=color
if not col2: if not color2:
col2=col color2=color
self._add_line(pos1,pos2,col1,col2) self._add_line(pos1,pos2,color1,color2)
def _primlist_add_sphere(self,cen,rad=1.0,col=None): def _primlist_add_sphere(self,cen,radius=1.0,color=None):
pos=_to_vec3(cen) pos=_to_vec3(cen)
if not col: if not color:
col=WHITE color=WHITE
self._add_sphere(pos,rad,col) self._add_sphere(pos,radius,color)
def _primlist_add_cyl(self,pos1,pos2,rad=None,rad1=None,rad2=None,col=None,col1=None,col2=None): def _primlist_add_cyl(self,pos1,pos2,radius=None,radius1=None,radius2=None,color=None,color1=None,color2=None):
pos1=_to_vec3(pos1) pos1=_to_vec3(pos1)
pos2=_to_vec3(pos2) pos2=_to_vec3(pos2)
if rad is None: if radius is None:
rad=1.0 radius=1.0
if rad1 is None: if radius1 is None:
rad1=rad radius1=radius
if rad2 is None: if radius2 is None:
rad2=rad radius2=radius
if not col: if not color:
col=WHITE color=WHITE
if not col1: if not color1:
col1=col color1=color
if not col2: if not color2:
col2=col color2=color
self._add_cyl(pos1,pos2,rad1,rad2,col1,col2) self._add_cyl(pos1,pos2,radius1,radius2,color1,color2)
PrimList.AddPoint=_primlist_add_point PrimList.AddPoint=_primlist_add_point
PrimList.AddLine=_primlist_add_line PrimList.AddLine=_primlist_add_line
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment