Skip to content

Commit cbca390

Browse files
committed
r81
1 parent 7417911 commit cbca390

File tree

4 files changed

+372
-397
lines changed

4 files changed

+372
-397
lines changed

build/three.js

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187

188188
} );
189189

190-
var REVISION = '81dev';
190+
var REVISION = '81';
191191
var MOUSE = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
192192
var CullFaceNone = 0;
193193
var CullFaceBack = 1;
@@ -10569,6 +10569,8 @@
1056910569

1057010570
this.userData = {};
1057110571

10572+
this.onBeforeRender = null;
10573+
1057210574
}
1057310575

1057410576
Object3D.DefaultUp = new Vector3( 0, 1, 0 );
@@ -17225,9 +17227,7 @@
1722517227
var b = array[ i + 1 ];
1722617228
var c = array[ i + 2 ];
1722717229

17228-
if ( checkEdge( edges, a, b ) ) indices.push( a, b );
17229-
if ( checkEdge( edges, b, c ) ) indices.push( b, c );
17230-
if ( checkEdge( edges, c, a ) ) indices.push( c, a );
17230+
indices.push( a, b, b, c, c, a );
1723117231

1723217232
}
1723317233

@@ -17260,34 +17260,6 @@
1726017260

1726117261
}
1726217262

17263-
function checkEdge( edges, a, b ) {
17264-
17265-
if ( a > b ) {
17266-
17267-
var tmp = a;
17268-
a = b;
17269-
b = tmp;
17270-
17271-
}
17272-
17273-
var list = edges[ a ];
17274-
17275-
if ( list === undefined ) {
17276-
17277-
edges[ a ] = [ b ];
17278-
return true;
17279-
17280-
} else if ( list.indexOf( b ) === -1 ) {
17281-
17282-
list.push( b );
17283-
return true;
17284-
17285-
}
17286-
17287-
return false;
17288-
17289-
}
17290-
1729117263
return {
1729217264

1729317265
getAttributeBuffer: getAttributeBuffer,
@@ -20147,10 +20119,12 @@
2014720119

2014820120
var index = geometry.index;
2014920121
var position = geometry.attributes.position;
20122+
var rangeFactor = 1;
2015020123

2015120124
if ( material.wireframe === true ) {
2015220125

2015320126
index = objects.getWireframeAttribute( geometry );
20127+
rangeFactor = 2;
2015420128

2015520129
}
2015620130

@@ -20181,7 +20155,6 @@
2018120155

2018220156
//
2018320157

20184-
var dataStart = 0;
2018520158
var dataCount = 0;
2018620159

2018720160
if ( index !== null ) {
@@ -20194,14 +20167,14 @@
2019420167

2019520168
}
2019620169

20197-
var rangeStart = geometry.drawRange.start;
20198-
var rangeCount = geometry.drawRange.count;
20170+
var rangeStart = geometry.drawRange.start * rangeFactor;
20171+
var rangeCount = geometry.drawRange.count * rangeFactor;
2019920172

20200-
var groupStart = group !== null ? group.start : 0;
20201-
var groupCount = group !== null ? group.count : Infinity;
20173+
var groupStart = group !== null ? group.start * rangeFactor : 0;
20174+
var groupCount = group !== null ? group.count * rangeFactor : Infinity;
2020220175

20203-
var drawStart = Math.max( dataStart, rangeStart, groupStart );
20204-
var drawEnd = Math.min( dataStart + dataCount, rangeStart + rangeCount, groupStart + groupCount ) - 1;
20176+
var drawStart = Math.max( rangeStart, groupStart );
20177+
var drawEnd = Math.min( dataCount, rangeStart + rangeCount, groupStart + groupCount ) - 1;
2020520178

2020620179
var drawCount = Math.max( 0, drawEnd - drawStart + 1 );
2020720180

@@ -20894,6 +20867,8 @@
2089420867

2089520868
} else {
2089620869

20870+
if ( object.onBeforeRender !== null ) object.onBeforeRender();
20871+
2089720872
_this.renderBufferDirect( camera, fog, geometry, material, object, group );
2089820873

2089920874
}
@@ -36105,10 +36080,11 @@
3610536080
// uuid.objectName[objectIndex].propertyName[propertyIndex]
3610636081
// parentName/nodeName.property
3610736082
// parentName/parentName/nodeName.property[index]
36108-
// .bone[Armature.DEF_cog].position
36083+
// .bone[Armature.DEF_cog].position
36084+
// scene:helium_balloon_model:helium_balloon_model.position
3610936085
// created and tested via https://regex101.com/#javascript
3611036086

36111-
var re = /^((?:\w+\/)*)(\w+)?(?:\.(\w+)(?:\[(.+)\])?)?\.(\w+)(?:\[(.+)\])?$/;
36087+
var re = /^((?:\w+[\/:])*)(\w+)?(?:\.(\w+)(?:\[(.+)\])?)?\.(\w+)(?:\[(.+)\])?$/;
3611236088
var matches = re.exec( trackName );
3611336089

3611436090
if ( ! matches ) {

0 commit comments

Comments
 (0)