Skip to content

Commit ccffcda

Browse files
committed
ошибка установки drawRange
1 parent 7463940 commit ccffcda

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

getPosition.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,24 @@ export function getObjectLocalPosition( object, index ) {
3131
position = itemSize >= 4 ? new THREE.Vector4( 0, 0, 0, 0 ) : new THREE.Vector3(),
3232
drawRange = object.geometry.drawRange,
3333
offset = index * itemSize;
34-
if ( object.geometry.index === null ) {
34+
if ( geometry.index === null ) {
3535

3636
//Отображаются вершины
37+
/*
3738
let sError;
3839
if ( geometry.index === null ) {
3940
if ( ( drawRange.count != Infinity ) && ( ( index < drawRange.start ) || ( index >= ( drawRange.start + drawRange.count ) ) ) )
4041
sError = '';
4142
} else if ( ( drawRange.count != Infinity ) && ( ( offset < drawRange.start ) || ( offset >= ( drawRange.start + drawRange.count ) ) ) ){
4243
43-
// console.error( 'getObjectLocalPosition: index = ' + index + '. offset = ' + offset + ' is out of range = { start: ' + drawRange.start + ', count: ' + drawRange.count + ' }' );
44-
// return;
4544
sError = '. offset = ' + offset;
4645
4746
}
4847
if ( sError != undefined ) console.error( 'getObjectLocalPosition: index = ' + index + sError + ' is out of range = { start: ' + drawRange.start + ', count: ' + drawRange.count + ' }' );
49-
48+
*/
49+
if ( ( drawRange.count != Infinity ) && ( ( index < drawRange.start ) || ( index >= ( drawRange.start + drawRange.count ) ) ) )
50+
console.error( 'getObjectLocalPosition: index = ' + index + ' is out of range = { start: ' + drawRange.start + ', count: ' + drawRange.count + ' }' );
51+
5052
} else {
5153

5254
//Отображаются ребра. Индекс вершины index не в ходит в диапазон видимых ребер drawRange

myObject.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,19 +499,18 @@ class MyObject {
499499
const drawRange = settings.bufferGeometry.drawRange;
500500
if ((drawRange.count === Infinity) || (((drawRange.start + drawRange.count) * ((settings.bufferGeometry.index === null) ? itemSize : 1)) < positionId)){
501501

502-
this.setVerticesRange(drawRange.start, (positionId - drawRange.start + 1) / itemSize);
502+
// this.setVerticesRange(drawRange.start, (positionId - drawRange.start + 1) / itemSize);
503+
this.setVerticesRange(drawRange.start, (positionId + 1) / itemSize - drawRange.start);
503504
if (!Number.isInteger(drawRange.count) && (drawRange.count != Infinity)) console.error(sMyObject + '.setPositionAttributeFromPoint failed. Invalid drawRange.count = ' + drawRange.count);
504505

505506
}
506507

507508
//gui
508509
const guiSelectPoint = settings.options.guiSelectPoint,
509510
object3D = this.object3D;
510-
// object3D = this.object ? this.object() : this.object3D;
511511
if (guiSelectPoint && (guiSelectPoint.getSelectedPointIndexShort() === i) && guiSelectPoint.isSelectedMesh(object3D)) {
512512

513513
guiSelectPoint.setPosition( { index: i, object: object3D });
514-
// guiSelectPoint.setPosition( { index: i, object: this.object ? this.object() : this.object3D });
515514
if (object3D && object3D.userData.gui) object3D.userData.gui.reset()//в hyperSphere обновить выделенные ребра, среднюю вершину и плоскости вращения углов
516515

517516
}

0 commit comments

Comments
 (0)