Skip to content

Commit 593ed0e

Browse files
authored
Merge pull request #260 from vpython/dotcolor
Fix dot_color
2 parents ae900f0 + 7fcc90b commit 593ed0e

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

Diff for: vpython/vpython.py

+5
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,11 @@ class standardAttributes(baseObj):
500500
'make_trail', 'trail_type', 'interval',
501501
'retain', 'trail_color', 'trail_radius', 'texture', 'pickable'],
502502
['red', 'green', 'blue','length', 'width', 'height']],
503+
'group':[['pos', 'color', 'trail_color'],
504+
['axis', 'size', 'up'],
505+
['visible', 'make_trail', 'trail_type', 'interval',
506+
'retain', 'trail_color', 'trail_radius'],
507+
['red', 'green', 'blue','length', 'width', 'height']],
503508
'sphere':[['pos', 'color', 'trail_color'],
504509
['axis', 'size', 'up'],
505510
['visible', 'opacity','shininess', 'emissive',

Diff for: vpython/vpython_libraries/glow.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: vpython/vpython_libraries/glowcomm.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
400400
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
401401
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth', 'I':'round',
402-
'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw'
402+
'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw', 'N':'dot_color'
403403
}
404404

405405
// methods are X in {'m': '23X....'}

Diff for: vpython/vpython_libraries/glowcomm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ var attrsb = {'a':'userzoom', 'b':'userspin', 'c':'range', 'd':'autoscale', 'e':
446446
'u':'logx', 'v':'logy', 'w':'dot', 'x':'dot_radius',
447447
'y':'markers', 'z':'legend', 'A':'label','B':'delta', 'C':'marker_color',
448448
'D':'size_units', 'E':'userpan', 'F':'scroll', 'G':'choices', 'H':'depth', 'I':'round',
449-
'J':'name', 'K':'offset', 'L':'attach_idx','M':'ccw'
449+
'J':'name', 'K':'offset', 'L':'attach_idx', 'M':'ccw', 'N':'dot_color'
450450
}
451451

452452
// methods are X in {'m': '23X....'}

0 commit comments

Comments
 (0)