Changeset e82692b in opengl-game

Timestamp:

Mar 23, 2018, 4:06:56 AM (7 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

b73cb3b

Parents:

5c9d193

Message:

Pass a reference to faceClicked that will be set to the clicked point in world space, and fix the click detection algorithm to set the closest visible object to the camera as having been clicked.

File:

• new-game.cpp (modified) (9 diffs)

new-game.cpp

@@ -35 +35 @@
 
 struct ObjectFace {
-   unsigned int objectId;
+   unsigned int object_id;
    array<vec3, 3> points;
 };
@@ -54 +54 @@
 SceneObject* selectedObject = NULL;
 
-bool faceClicked(ObjectFace* face, vec4 world_ray, vec4 cam);
+bool faceClicked(ObjectFace* face, vec4 world_ray, vec4 cam, vec4& click_point);
 bool insideTriangle(vec3 p, array<vec3, 3> triangle_points);
 
@@ -238 +238 @@
       cout << "Camera -> (" << cam_pos_temp.x << "," << cam_pos_temp.y << "," << cam_pos_temp.z << ")" << endl;
 
+      vec4 click_point;
+      vec3 closest_point;
+      int closest_face_id = -1;
+
       // Need to account for faces that are behind one another
       // Using an iterator for the loop makes it difficult to get a reference to each face (for the faceClicked function)
       for (int i = 0; i<faces.size(); i++) {
-         if (faceClicked(&faces[i], ray_world, cam_pos_temp)) {
-            clickedObject = &objects[faces[i].objectId];
-            cout << "Clicked object: " << faces[i].objectId << endl;
-            break;
+         if (faceClicked(&faces[i], ray_world, cam_pos_temp, click_point)) {
+            click_point = view_mat * click_point;
+
+            // Check against clipping planes once I start applying the projection matrix
+            // if (NEAR_CLIP <= click_point.z && click_point.z < FAR_CLIP && ...) {
+            if (-1.0f <= click_point.z && click_point.z < 1.0f && click_point.z < closest_point.z) {
+               closest_point = click_point.xyz();
+               closest_face_id = i;
+            }
          }
       }
 
-      if (clickedObject == NULL) {
+      if (closest_face_id == -1) {
          cout << "No object was clicked" << endl;
+      } else {
+         clickedObject = &objects[faces[closest_face_id].object_id];
+         cout << "Clicked object: " << faces[closest_face_id].object_id << endl;
+         printVector("Click point", closest_point);
       }
    }
@@ -409 +422 @@
    mat4 R_model = rotate(mat4(), 4.0f, vec3(0.0f, 1.0f, 0.0f));
    */
-   T_model = translate(mat4(), vec3(0.5f, 0.0f, 0.0f));
+   T_model = translate(mat4(), vec3(0.0f, 0.0f, 0.0f));
    R_model = rotate(mat4(), 0.0f, vec3(0.0f, 1.0f, 0.0f));
    objects[0].model_mat = T_model*R_model;
 
    faces.push_back(ObjectFace());
-   faces[0].objectId = 0;
+   faces[0].object_id = 0;
    faces[0].points = {
       vec3(points[0], points[1], points[2]),
@@ -425 +438 @@
 
    // mat4 T_model2 = translate(mat4(), vec3(-1.0f, 0.0f, 0.0f));
-   T_model = translate(mat4(), vec3(-0.5f, 0.0f, 0.0f));
+   T_model = translate(mat4(), vec3(-0.5f, 0.0f, 0.1f));
    R_model = rotate(mat4(), 0.0f, vec3(0.0f, 1.0f, 0.0f));
    objects[1].model_mat = T_model*R_model;
 
    faces.push_back(ObjectFace());
-   faces[1].objectId = 1;
+   faces[1].object_id = 1;
    faces[1].points = {
       vec3(points2[0], points2[1], points2[2]),
@@ -438 +451 @@
 
    faces.push_back(ObjectFace());
-   faces[2].objectId = 1;
+   faces[2].object_id = 1;
    faces[2].points = {
       vec3(points2[9], points2[10], points2[11]),
@@ -729 +742 @@
 }
 
-bool faceClicked(ObjectFace* face, vec4 world_ray, vec4 cam) {
+bool faceClicked(ObjectFace* face, vec4 world_ray, vec4 cam, vec4& click_point) {
    cout << "Points on the plane" << endl;
    printVector("fp1", face->points[0]);
@@ -750 +763 @@
    printVector("Cross", normal);
 
-   SceneObject* obj = &objects[face->objectId];
+   SceneObject* obj = &objects[face->object_id];
    vec3 local_ray = (inverse(obj->model_mat) * world_ray).xyz();
    vec3 local_cam = (inverse(obj->model_mat) * cam).xyz();
@@ -767 +780 @@
    printVector("Intersection", intersection);
 
-   return insideTriangle(intersection, face->points);
+   if (insideTriangle(intersection, face->points)) {
+      click_point = obj->model_mat * vec4(intersection, 1.0f);
+      return true;
+   } else {
+      return false;
+   }
 }