1
This commit is contained in:
parent
6ed7e738b0
commit
638122e556
@ -88,6 +88,7 @@ namespace mc
|
|||||||
{
|
{
|
||||||
glm::vec3 center = glm::vec3(0.0f, 0.0f, 0.0f);
|
glm::vec3 center = glm::vec3(0.0f, 0.0f, 0.0f);
|
||||||
glm::vec3 size = glm::vec3(0.0f, 0.0f, 0.0f);
|
glm::vec3 size = glm::vec3(0.0f, 0.0f, 0.0f);
|
||||||
|
std::vector<Triangle> triangles;
|
||||||
virtual void Read(std::shared_ptr<a8::XObject> xobj) override;
|
virtual void Read(std::shared_ptr<a8::XObject> xobj) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -849,7 +849,19 @@ void MapInstance::LoadHouse()
|
|||||||
tri.max_y += 1.0f;
|
tri.max_y += 1.0f;
|
||||||
map_service_->AddTriangle(&tri);
|
map_service_->AddTriangle(&tri);
|
||||||
}//end for i
|
}//end for i
|
||||||
}//end if
|
} else if (c->type == mc::kBoxCollider) {
|
||||||
|
mc::BoxCollider* box_collider = (mc::BoxCollider*)c;
|
||||||
|
std::vector<glm::vec3> new_points;
|
||||||
|
mc::RotateBounds(box_collider->center,
|
||||||
|
box_collider->size,
|
||||||
|
node->transform.local_rotation,
|
||||||
|
new_points
|
||||||
|
);
|
||||||
|
box_collider->triangles.reserve(2 * 6);
|
||||||
|
auto& tri = a8::FastAppend(box_collider->triangles);
|
||||||
|
tri.node = node;
|
||||||
|
map_service_->AddTriangle(&tri);
|
||||||
|
}//endif
|
||||||
}//end forc
|
}//end forc
|
||||||
things_.push_back(node);
|
things_.push_back(node);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user