|
@@ -7719,6 +7719,9 @@
|
|
delete this.attributes[name];
|
|
delete this.attributes[name];
|
|
return this;
|
|
return this;
|
|
},
|
|
},
|
|
|
|
+ hasAttribute: function hasAttribute(name) {
|
|
|
|
+ return this.attributes[name] !== undefined;
|
|
|
|
+ },
|
|
addGroup: function addGroup(start, count, materialIndex) {
|
|
addGroup: function addGroup(start, count, materialIndex) {
|
|
this.groups.push({
|
|
this.groups.push({
|
|
start: start,
|
|
start: start,
|
|
@@ -12059,11 +12062,11 @@
|
|
morphInfluences[_i4] = value;
|
|
morphInfluences[_i4] = value;
|
|
morphInfluencesSum += value;
|
|
morphInfluencesSum += value;
|
|
} else {
|
|
} else {
|
|
- if (morphTargets && geometry.getAttribute('morphTarget' + _i4) !== undefined) {
|
|
|
|
|
|
+ if (morphTargets && geometry.hasAttribute('morphTarget' + _i4) === true) {
|
|
geometry.deleteAttribute('morphTarget' + _i4);
|
|
geometry.deleteAttribute('morphTarget' + _i4);
|
|
}
|
|
}
|
|
|
|
|
|
- if (morphNormals && geometry.getAttribute('morphNormal' + _i4) !== undefined) {
|
|
|
|
|
|
+ if (morphNormals && geometry.hasAttribute('morphNormal' + _i4) === true) {
|
|
geometry.deleteAttribute('morphNormal' + _i4);
|
|
geometry.deleteAttribute('morphNormal' + _i4);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -15231,9 +15234,20 @@
|
|
currentTextureSlot = null;
|
|
currentTextureSlot = null;
|
|
currentBoundTextures = {};
|
|
currentBoundTextures = {};
|
|
currentProgram = null;
|
|
currentProgram = null;
|
|
|
|
+ currentBlendingEnabled = null;
|
|
currentBlending = null;
|
|
currentBlending = null;
|
|
|
|
+ currentBlendEquation = null;
|
|
|
|
+ currentBlendSrc = null;
|
|
|
|
+ currentBlendDst = null;
|
|
|
|
+ currentBlendEquationAlpha = null;
|
|
|
|
+ currentBlendSrcAlpha = null;
|
|
|
|
+ currentBlendDstAlpha = null;
|
|
|
|
+ currentPremultipledAlpha = false;
|
|
currentFlipSided = null;
|
|
currentFlipSided = null;
|
|
currentCullFace = null;
|
|
currentCullFace = null;
|
|
|
|
+ currentLineWidth = null;
|
|
|
|
+ currentPolygonOffsetFactor = null;
|
|
|
|
+ currentPolygonOffsetUnits = null;
|
|
colorBuffer.reset();
|
|
colorBuffer.reset();
|
|
depthBuffer.reset();
|
|
depthBuffer.reset();
|
|
stencilBuffer.reset();
|
|
stencilBuffer.reset();
|
|
@@ -16372,7 +16386,7 @@
|
|
var grip = this._grip;
|
|
var grip = this._grip;
|
|
var hand = this._hand;
|
|
var hand = this._hand;
|
|
|
|
|
|
- if (inputSource) {
|
|
|
|
|
|
+ if (inputSource && frame.session.visibilityState !== 'visible-blurred') {
|
|
if (hand && inputSource.hand) {
|
|
if (hand && inputSource.hand) {
|
|
handPose = true;
|
|
handPose = true;
|
|
|
|
|