Skip to content

Commit 1438afe

Browse files
committed
Less changes
1 parent b42b27f commit 1438afe

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

pythreejs/traits.py

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,52 +37,58 @@ class Vector2(Tuple):
3737
"""A trait for a 2-tuple corresponding to a three.js Vector2.
3838
"""
3939

40-
_default_value = (0, 0)
40+
default_value = (0, 0)
4141
info_text = 'a two-element vector'
4242

4343
def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
4444
if trait is Undefined:
4545
trait = CFloat()
4646
if default_value is Undefined:
47-
default_value = self._default_value
47+
default_value = self.default_value
48+
else:
49+
self.default_value = default_value
4850
super(Vector2, self).__init__(*(trait, trait), default_value=default_value, **kwargs)
4951

5052

5153
class Vector3(Tuple):
5254
"""A trait for a 3-tuple corresponding to a three.js Vector3.
5355
"""
5456

55-
_default_value = (0, 0, 0)
57+
default_value = (0, 0, 0)
5658
info_text = 'a three-element vector'
5759

5860
def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
5961
if trait is Undefined:
6062
trait = CFloat()
6163
if default_value is Undefined:
62-
default_value = self._default_value
64+
default_value = self.default_value
65+
else:
66+
self.default_value = default_value
6367
super(Vector3, self).__init__(*(trait, trait, trait), default_value=default_value, **kwargs)
6468

6569

6670
class Vector4(Tuple):
6771
"""A trait for a 4-tuple corresponding to a three.js Vector4.
6872
"""
6973

70-
_default_value = (0, 0, 0, 0)
74+
default_value = (0, 0, 0, 0)
7175
info_text = 'a four-element vector'
7276

7377
def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
7478
if trait is Undefined:
7579
trait = CFloat()
7680
if default_value is Undefined:
77-
default_value = self._default_value
81+
default_value = self.default_value
82+
else:
83+
self.default_value = default_value
7884
super(Vector4, self).__init__(*(trait, trait, trait, trait), default_value=default_value, **kwargs)
7985

8086

8187
class Matrix3(Tuple):
8288
"""A trait for a 9-tuple corresponding to a three.js Matrix3.
8389
"""
8490

85-
_default_value = (
91+
default_value = (
8692
1, 0, 0,
8793
0, 1, 0,
8894
0, 0, 1
@@ -93,15 +99,17 @@ def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
9399
if trait is Undefined:
94100
trait = CFloat()
95101
if default_value is Undefined:
96-
default_value = self._default_value
102+
default_value = self.default_value
103+
else:
104+
self.default_value = default_value
97105
super(Matrix3, self).__init__(*((trait,) * 9), default_value=default_value, **kwargs)
98106

99107

100108
class Matrix4(Tuple):
101109
"""A trait for a 16-tuple corresponding to a three.js Matrix4.
102110
"""
103111

104-
_default_value = (
112+
default_value = (
105113
1, 0, 0, 0,
106114
0, 1, 0, 0,
107115
0, 0, 1, 0,
@@ -113,7 +121,9 @@ def __init__(self, trait=Undefined, default_value=Undefined, **kwargs):
113121
if trait is Undefined:
114122
trait = CFloat()
115123
if default_value is Undefined:
116-
default_value = self._default_value
124+
default_value = self.default_value
125+
else:
126+
self.default_value = default_value
117127
super(Matrix4, self).__init__(*((trait,) * 16), default_value=default_value, **kwargs)
118128

119129

@@ -154,13 +164,15 @@ class Euler(Tuple):
154164
"""
155165

156166
info_text = 'a set of Euler angles'
157-
_default_value = (0, 0, 0, 'XYZ')
167+
default_value = (0, 0, 0, 'XYZ')
158168

159169
_accepted_orders = ['XYZ', 'YZX', 'ZXY', 'XZY', 'YXZ', 'ZYX']
160170

161171
def __init__(self, default_value=Undefined, **kwargs):
162172
if default_value is Undefined:
163-
default_value = self._default_value
173+
default_value = self.default_value
174+
else:
175+
self.default_value = default_value
164176
super(Euler, self).__init__(
165177
CFloat(), CFloat(), CFloat(),
166178
Enum(self._accepted_orders, self._accepted_orders[0]),

0 commit comments

Comments
 (0)