|
@@ -17478,7 +17478,7 @@
|
|
//interactables中是否能找到this
|
|
//interactables中是否能找到this
|
|
var finded;
|
|
var finded;
|
|
object.traverse(object => {
|
|
object.traverse(object => {
|
|
- if (object == this) {
|
|
|
|
|
|
+ if (object == this.root) {
|
|
finded = true;
|
|
finded = true;
|
|
return {
|
|
return {
|
|
stopContinue: true
|
|
stopContinue: true
|
|
@@ -17500,8 +17500,8 @@
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
var v = true;
|
|
var v = true;
|
|
- var parent = this.parent;
|
|
|
|
- var lastParent = this;
|
|
|
|
|
|
+ var parent = this.root.parent;
|
|
|
|
+ var lastParent = this.root;
|
|
while (parent) {
|
|
while (parent) {
|
|
if (parent.visible === false) {
|
|
if (parent.visible === false) {
|
|
v = false;
|
|
v = false;
|
|
@@ -56591,7 +56591,7 @@
|
|
var endPos = this.normal.clone().multiplyScalar(this.lineLength);
|
|
var endPos = this.normal.clone().multiplyScalar(this.lineLength);
|
|
LineDraw.updateLine(this.line, [new Vector3(0, 0, 0), endPos]);
|
|
LineDraw.updateLine(this.line, [new Vector3(0, 0, 0), endPos]);
|
|
this.titleLabel.parent.position.copy(endPos);
|
|
this.titleLabel.parent.position.copy(endPos);
|
|
- this.titleLabel.sprite.waitUpdate();
|
|
|
|
|
|
+ this.titleLabel.updatePose();
|
|
viewer.dispatchEvent('content_changed');
|
|
viewer.dispatchEvent('content_changed');
|
|
}
|
|
}
|
|
changeLineLen(len) {
|
|
changeLineLen(len) {
|