Aurailus
/
ZephaModelTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Working Ray Interception Algorithm

master
Nicole Collings 2020-06-03 15:10:31 -07:00
parent d4c51d6056
commit 7e731cb6e9
3 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/input/Ray.h
View File

@ -17,27 +17,40 @@ namespace Ray {
1.f - (2.f * window.getInput().mousePos().y) / window.getSize().y, -1.f, 1.f }), -1.0, 0.0));
}
static float rayInterceptsRect(std::array<glm::vec3, 4> p, glm::vec3 rayOrigin, glm::vec3 rayDir) {
static float rayInterceptsRect(glm::vec3 rayOrigin, glm::vec3 rayDir, std::array<glm::vec3, 4> p, glm::vec3 pO = {}) {
rayDir = glm::normalize(rayDir);
rayOrigin -= pO;
glm::vec3 v1 = p[1] - p[0];
glm::vec3 v2 = p[3] - p[0];
glm::vec3 n = glm::normalize(glm::cross(v1, v2));
float A = p[0].y * (p[1].z - p[2].z) + p[1].y * (p[2].z - p[0].z) + p[2].y * (p[0].z - p[1].z);
float B = p[0].z * (p[1].x - p[2].x) + p[1].z * (p[2].x - p[0].x) + p[2].z * (p[0].x - p[1].x);
float C = p[0].x * (p[1].y - p[2].y) + p[1].x * (p[2].y - p[0].y) + p[2].x * (p[0].y - p[1].y);
float D = -p[0].x * (p[1].y * p[2].z - p[2].y * p[1].z) - p[1].x * (p[2].y * p[0].z - p[0].y * p[2].z) - p[2].x * (p[0].y * p[1].z - p[1].y * p[0].z);
float D = -glm::dot(n, p[0]);
float t = -(A * rayOrigin.x + B * rayOrigin.y + C * rayOrigin.z + D) / (A * rayDir.x + B * rayDir.y + C * rayDir.z);
float t = -(glm::dot(n, rayOrigin) + D) / (glm::dot(n, rayDir));
if (t < 0) return 0;
glm::vec3 intercepts = rayOrigin + rayDir * t;
// First pass
v1 = glm::normalize(v1);
glm::vec3 v3 = glm::normalize(p[3] - p[2]);
glm::vec3 v4 = glm::normalize(intercepts - p[0]);
glm::vec3 v5 = glm::normalize(intercepts - p[2]);
if (glm::dot(v1, v4) > 0 && glm::dot(v3, v5) > 0) return t;
return 0;
if (!(glm::dot(v1, v4) >= 0 && glm::dot(v3, v5) >= 0)) return 0;
// Second pass
v2 = glm::normalize(v2);
glm::vec3 v6 = glm::normalize(p[0] - p[3]);
glm::vec3 v7 = glm::normalize(intercepts - p[1]);
glm::vec3 v8 = glm::normalize(intercepts - p[3]);
if (!(glm::dot(v2, v7) >= 0 && glm::dot(v6, v8) >= 0)) return 0;
return t;
}
static bool rayInterceptsRects(glm::vec3 rayOrigin, glm::vec3 rayDir, std::vector<std::array<glm::vec3, 4>> pointsVec, glm::vec3 pO = {}) {
for (auto& p : pointsVec)
if (rayInterceptsRect(rayOrigin, rayDir, p, pO)) return true;
return false;
}
}

8
src/model/BlockModelManager.cpp
View File

@ -24,15 +24,15 @@ BlockModelManager::BlockModelManager(Camera* camera, Window* window) :
models.emplace_back(std::make_shared<BlockModel>());
instances.emplace_back(models[0]);
// instances.emplace_back(models[0]);
// instances.emplace_back(models[0]);
instances.emplace_back(models[0]);
instances.emplace_back(models[0]);
// instances.emplace_back(models[0]);
// instances.emplace_back(models[0]);
// instances.emplace_back(models[0]);
// instances.emplace_back(models[0]);
// instances[0].setPos({1, 0, 0});
// instances[1].setPos({-1, 0, 0});
instances[1].setPos({1, 0, 0});
instances[2].setPos({-1, 0, 0});
// instances[3].setPos({0, 0, 1});
// instances[4].setPos({0, 0, -1});
// instances[5].setPos({0, 1, 0});

34
src/model/EditingBlockModel.cpp
View File

@ -21,43 +21,11 @@ void EditingBlockModel::update(ViewportControl &viewport, Window &window, Camera
glm::vec3 dir = Ray::worldRayFromCursor(window, camera);
glm::vec3 ray = camera.getPos();
// bool found = false;
// float dis = 0.05f;
//
// while (dis < 20) {
// glm::vec3 end = ray + (dir * dis);
// glm::ivec3 blockSpace = glm::floor(end + glm::vec3(0.5));
//
// for (auto& face : model->faces) {
//// if (instance.getPos() == blockSpace) {
//// instance.setHighlighted(true);
//// if (input.keyPressed(GLFW_MOUSE_BUTTON_LEFT)) {
//// viewport.setViewFocus(instance.getPos());
//// setEditingModel(instance);
//// }
//// found = true;
//// break;
//// }
// }
//
// if (found) break;
// dis += 0.05;
// }
std::cout << Ray::rayInterceptsRect(this->model->faces[0].points, ray, dir) << std::endl;
int ind = -1;
float smallestDistance = 1000;
for (int i = 0; i < faces.size(); i++) {
facesHighlighted[i] = false;
float dist = Ray::rayInterceptsRect(this->model->faces[i].points
// {
// this->model->faces[i].points[3],
// this->model->faces[i].points[2],
// this->model->faces[i].points[1],
// this->model->faces[i].points[0]
// }
, ray, dir);
float dist = Ray::rayInterceptsRect(ray, dir, this->model->faces[i].points, pos);
if (dist != 0 && dist < smallestDistance) {
smallestDistance = dist;
ind = i;