Skip to content

Commit 0ee2ca3

Browse files
authored
Merge pull request #153 from aothms/patch-2
Fix picking on empty uv coords
2 parents 5601211 + aa824ad commit 0ee2ca3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

js/src/controls/Picker.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ function getinfo(o) {
113113
if (o !== null) {
114114
var v;
115115
var verts;
116-
if (o.object.geometry.isBufferGeometry) {
116+
if (o.face && o.object.geometry.isBufferGeometry) {
117117
v = o.object.geometry.attributes.position.array;
118118
verts = [[v[o.face.a], v[o.face.a] + 1, v[o.face.a] + 2],
119119
[v[o.face.b], v[o.face.b] + 1, v[o.face.b] + 2],
120120
[v[o.face.c], v[o.face.c] + 1, v[o.face.c] + 2]];
121-
} else {
121+
} else if (o.face) {
122122
v = o.object.geometry.vertices;
123123
verts = [[v[o.face.a].x, v[o.face.a].y, v[o.face.a].z],
124124
[v[o.face.b].x, v[o.face.b].y, v[o.face.b].z],
@@ -127,13 +127,13 @@ function getinfo(o) {
127127
return {
128128
point: [o.point.x, o.point.y, o.point.z],
129129
distance: o.distance,
130-
face: [o.face.a, o.face.b, o.face.c],
131-
faceVertices: verts,
130+
face: o.face ? [o.face.a, o.face.b, o.face.c] : [0, 0, 0],
131+
faceVertices: verts || [],
132132
indices: o.indices || [],
133-
faceNormal: [o.face.normal.x, o.face.normal.y, o.face.normal.z],
133+
faceNormal: o.face ? [o.face.normal.x, o.face.normal.y, o.face.normal.z] : [0, 0, 0],
134134
faceIndex: o.faceIndex !== undefined && o.faceIndex !== null ? o.faceIndex : null,
135135
object: o.object.ipymodel,
136-
uv: [o.uv.x, o.uv.y] || [0, 0],
136+
uv: o.uv ? [o.uv.x, o.uv.y] : [0, 0],
137137
};
138138
}
139139
return {

0 commit comments

Comments
 (0)