|
1072 | 1072 | set: function ( value ) { |
1073 | 1073 |
|
1074 | 1074 | this._x = value; |
1075 | | - this.onChangeCallback(); |
| 1075 | + this._onChangeCallback(); |
1076 | 1076 |
|
1077 | 1077 | } |
1078 | 1078 |
|
|
1089 | 1089 | set: function ( value ) { |
1090 | 1090 |
|
1091 | 1091 | this._y = value; |
1092 | | - this.onChangeCallback(); |
| 1092 | + this._onChangeCallback(); |
1093 | 1093 |
|
1094 | 1094 | } |
1095 | 1095 |
|
|
1106 | 1106 | set: function ( value ) { |
1107 | 1107 |
|
1108 | 1108 | this._z = value; |
1109 | | - this.onChangeCallback(); |
| 1109 | + this._onChangeCallback(); |
1110 | 1110 |
|
1111 | 1111 | } |
1112 | 1112 |
|
|
1123 | 1123 | set: function ( value ) { |
1124 | 1124 |
|
1125 | 1125 | this._w = value; |
1126 | | - this.onChangeCallback(); |
| 1126 | + this._onChangeCallback(); |
1127 | 1127 |
|
1128 | 1128 | } |
1129 | 1129 |
|
|
1142 | 1142 | this._z = z; |
1143 | 1143 | this._w = w; |
1144 | 1144 |
|
1145 | | - this.onChangeCallback(); |
| 1145 | + this._onChangeCallback(); |
1146 | 1146 |
|
1147 | 1147 | return this; |
1148 | 1148 |
|
|
1161 | 1161 | this._z = quaternion.z; |
1162 | 1162 | this._w = quaternion.w; |
1163 | 1163 |
|
1164 | | - this.onChangeCallback(); |
| 1164 | + this._onChangeCallback(); |
1165 | 1165 |
|
1166 | 1166 | return this; |
1167 | 1167 |
|
|
1236 | 1236 |
|
1237 | 1237 | } |
1238 | 1238 |
|
1239 | | - if ( update !== false ) this.onChangeCallback(); |
| 1239 | + if ( update !== false ) this._onChangeCallback(); |
1240 | 1240 |
|
1241 | 1241 | return this; |
1242 | 1242 |
|
|
1255 | 1255 | this._z = axis.z * s; |
1256 | 1256 | this._w = Math.cos( halfAngle ); |
1257 | 1257 |
|
1258 | | - this.onChangeCallback(); |
| 1258 | + this._onChangeCallback(); |
1259 | 1259 |
|
1260 | 1260 | return this; |
1261 | 1261 |
|
|
1314 | 1314 |
|
1315 | 1315 | } |
1316 | 1316 |
|
1317 | | - this.onChangeCallback(); |
| 1317 | + this._onChangeCallback(); |
1318 | 1318 |
|
1319 | 1319 | return this; |
1320 | 1320 |
|
|
1397 | 1397 | this._y *= - 1; |
1398 | 1398 | this._z *= - 1; |
1399 | 1399 |
|
1400 | | - this.onChangeCallback(); |
| 1400 | + this._onChangeCallback(); |
1401 | 1401 |
|
1402 | 1402 | return this; |
1403 | 1403 |
|
|
1443 | 1443 |
|
1444 | 1444 | } |
1445 | 1445 |
|
1446 | | - this.onChangeCallback(); |
| 1446 | + this._onChangeCallback(); |
1447 | 1447 |
|
1448 | 1448 | return this; |
1449 | 1449 |
|
|
1480 | 1480 | this._z = qaz * qbw + qaw * qbz + qax * qby - qay * qbx; |
1481 | 1481 | this._w = qaw * qbw - qax * qbx - qay * qby - qaz * qbz; |
1482 | 1482 |
|
1483 | | - this.onChangeCallback(); |
| 1483 | + this._onChangeCallback(); |
1484 | 1484 |
|
1485 | 1485 | return this; |
1486 | 1486 |
|
|
1547 | 1547 | this._y = ( y * ratioA + this._y * ratioB ); |
1548 | 1548 | this._z = ( z * ratioA + this._z * ratioB ); |
1549 | 1549 |
|
1550 | | - this.onChangeCallback(); |
| 1550 | + this._onChangeCallback(); |
1551 | 1551 |
|
1552 | 1552 | return this; |
1553 | 1553 |
|
|
1568 | 1568 | this._z = array[ offset + 2 ]; |
1569 | 1569 | this._w = array[ offset + 3 ]; |
1570 | 1570 |
|
1571 | | - this.onChangeCallback(); |
| 1571 | + this._onChangeCallback(); |
1572 | 1572 |
|
1573 | 1573 | return this; |
1574 | 1574 |
|
|
1588 | 1588 |
|
1589 | 1589 | }, |
1590 | 1590 |
|
1591 | | - onChange: function ( callback ) { |
| 1591 | + _onChange: function ( callback ) { |
1592 | 1592 |
|
1593 | | - this.onChangeCallback = callback; |
| 1593 | + this._onChangeCallback = callback; |
1594 | 1594 |
|
1595 | 1595 | return this; |
1596 | 1596 |
|
1597 | 1597 | }, |
1598 | 1598 |
|
1599 | | - onChangeCallback: function () {} |
| 1599 | + _onChangeCallback: function () {} |
1600 | 1600 |
|
1601 | 1601 | } ); |
1602 | 1602 |
|
|
3089 | 3089 |
|
3090 | 3090 | } |
3091 | 3091 |
|
| 3092 | + Object.defineProperties( Vector4.prototype, { |
| 3093 | + |
| 3094 | + "width": { |
| 3095 | + |
| 3096 | + get: function () { |
| 3097 | + |
| 3098 | + return this.z; |
| 3099 | + |
| 3100 | + }, |
| 3101 | + |
| 3102 | + set: function ( value ) { |
| 3103 | + |
| 3104 | + this.z = value; |
| 3105 | + |
| 3106 | + } |
| 3107 | + |
| 3108 | + }, |
| 3109 | + |
| 3110 | + "height": { |
| 3111 | + |
| 3112 | + get: function () { |
| 3113 | + |
| 3114 | + return this.w; |
| 3115 | + |
| 3116 | + }, |
| 3117 | + |
| 3118 | + set: function ( value ) { |
| 3119 | + |
| 3120 | + this.w = value; |
| 3121 | + |
| 3122 | + } |
| 3123 | + |
| 3124 | + } |
| 3125 | + |
| 3126 | + } ); |
| 3127 | + |
3092 | 3128 | Object.assign( Vector4.prototype, { |
3093 | 3129 |
|
3094 | 3130 | isVector4: true, |
|
7915 | 7951 | set: function ( value ) { |
7916 | 7952 |
|
7917 | 7953 | this._x = value; |
7918 | | - this.onChangeCallback(); |
| 7954 | + this._onChangeCallback(); |
7919 | 7955 |
|
7920 | 7956 | } |
7921 | 7957 |
|
|
7932 | 7968 | set: function ( value ) { |
7933 | 7969 |
|
7934 | 7970 | this._y = value; |
7935 | | - this.onChangeCallback(); |
| 7971 | + this._onChangeCallback(); |
7936 | 7972 |
|
7937 | 7973 | } |
7938 | 7974 |
|
|
7949 | 7985 | set: function ( value ) { |
7950 | 7986 |
|
7951 | 7987 | this._z = value; |
7952 | | - this.onChangeCallback(); |
| 7988 | + this._onChangeCallback(); |
7953 | 7989 |
|
7954 | 7990 | } |
7955 | 7991 |
|
|
7966 | 8002 | set: function ( value ) { |
7967 | 8003 |
|
7968 | 8004 | this._order = value; |
7969 | | - this.onChangeCallback(); |
| 8005 | + this._onChangeCallback(); |
7970 | 8006 |
|
7971 | 8007 | } |
7972 | 8008 |
|
|
7985 | 8021 | this._z = z; |
7986 | 8022 | this._order = order || this._order; |
7987 | 8023 |
|
7988 | | - this.onChangeCallback(); |
| 8024 | + this._onChangeCallback(); |
7989 | 8025 |
|
7990 | 8026 | return this; |
7991 | 8027 |
|
|
8004 | 8040 | this._z = euler._z; |
8005 | 8041 | this._order = euler._order; |
8006 | 8042 |
|
8007 | | - this.onChangeCallback(); |
| 8043 | + this._onChangeCallback(); |
8008 | 8044 |
|
8009 | 8045 | return this; |
8010 | 8046 |
|
|
8127 | 8163 |
|
8128 | 8164 | this._order = order; |
8129 | 8165 |
|
8130 | | - if ( update !== false ) this.onChangeCallback(); |
| 8166 | + if ( update !== false ) this._onChangeCallback(); |
8131 | 8167 |
|
8132 | 8168 | return this; |
8133 | 8169 |
|
|
8182 | 8218 | this._z = array[ 2 ]; |
8183 | 8219 | if ( array[ 3 ] !== undefined ) this._order = array[ 3 ]; |
8184 | 8220 |
|
8185 | | - this.onChangeCallback(); |
| 8221 | + this._onChangeCallback(); |
8186 | 8222 |
|
8187 | 8223 | return this; |
8188 | 8224 |
|
|
8216 | 8252 |
|
8217 | 8253 | }, |
8218 | 8254 |
|
8219 | | - onChange: function ( callback ) { |
| 8255 | + _onChange: function ( callback ) { |
8220 | 8256 |
|
8221 | | - this.onChangeCallback = callback; |
| 8257 | + this._onChangeCallback = callback; |
8222 | 8258 |
|
8223 | 8259 | return this; |
8224 | 8260 |
|
8225 | 8261 | }, |
8226 | 8262 |
|
8227 | | - onChangeCallback: function () {} |
| 8263 | + _onChangeCallback: function () {} |
8228 | 8264 |
|
8229 | 8265 | } ); |
8230 | 8266 |
|
|
8313 | 8349 |
|
8314 | 8350 | } |
8315 | 8351 |
|
8316 | | - rotation.onChange( onRotationChange ); |
8317 | | - quaternion.onChange( onQuaternionChange ); |
| 8352 | + rotation._onChange( onRotationChange ); |
| 8353 | + quaternion._onChange( onQuaternionChange ); |
8318 | 8354 |
|
8319 | 8355 | Object.defineProperties( this, { |
8320 | 8356 | position: { |
|
20699 | 20735 |
|
20700 | 20736 | _gl.pixelStorei( 37440, texture.flipY ); |
20701 | 20737 |
|
20702 | | - var isCompressed = ( texture.image[ 0 ] && texture.image[ 0 ].isCompressedTexture ); |
| 20738 | + var isCompressed = ( texture && texture.isCompressedTexture ); |
20703 | 20739 | var isDataTexture = ( texture.image[ 0 ] && texture.image[ 0 ].isDataTexture ); |
20704 | 20740 |
|
20705 | 20741 | var cubeImage = []; |
|
0 commit comments