Object3Dが階層構造を持つとき、bs(BoundingSphere)の計算が間違っていた。(RadishForAndroidの修正の反映)
1 parent 8134ec1 commit afba2563f11c0f7002b3e1f4cf9db060ecb61335
n-nittta authored on 20 Dec 2019
Showing 1 changed file
View
18
app/src/main/java/com/google/ar/core/examples/java/common/framework/physics/BoundingBoxVisitor.java
private ArrayList<OBB> obbList = new ArrayList<OBB>(); // 全構成要素のOBBのリスト
private ArrayList<BoundingSphere> bsStack = new ArrayList<BoundingSphere>(); // オブジェクトの階層毎のBoundingSphereのスタック
private String partName = null; // 部品を指定する場合に使う
private boolean inPart = false;
 
public BoundingBoxVisitor() {
partName = null;
}
 
public BoundingBoxVisitor(String partName) {
this.partName = partName;
}
 
public void preVisit(Object3D obj) {
pushTransform(obj);
if (partName != null && obj.name.equals(partName)) {
inPart = true;
if (obb != null) {
if (obj.bs == null) {
obj.bs = obb.getBoundingSphere();
}
 
obb = (OBB)obb.clone();
BoundingSphere bs = (BoundingSphere)obj.bs.clone();
for (int i = stackList.size() - 1; i >= 0; i--) {
obb.transform(stackList.get(i));
bs.transform(stackList.get(i));
if (i >= stackList.size() - 4) bs.transform(stackList.get(i));
}
if (partName == null || partName.length() == 0 || inPart) {
obbList.add(obb); // Transform3Dを適応させたBoundsをboundsListに追加
int stackTop = bsStack.size() - 1;
obj.bs = bsStack.remove(stackTop);
stackTop--;
}
if (obj.bs != null && stackTop >= 0) {
BoundingSphere bs = (BoundingSphere)obj.bs.clone();
for (int i = stackList.size() - 1; i >= stackList.size() - 4; i--) {
bs.transform(stackList.get(i));
}
if (bsStack.get(stackTop) == null) {
// その階層の最初のオブジェクトの場合、nullを置き換え
bsStack.set(stackTop, obj.bs);
bsStack.set(stackTop, bs);
} else {
// その階層の2番目以降のオブジェクトの場合、結合
bsStack.get(stackTop).combine(obj.bs);
bsStack.get(stackTop).combine(bs);
}
}
}
popTransform();