lightpreview: make bmodel faces clickable only when visable

Author: ericwa

lightpreview/glview.cpp

@@ -1497,6 +1497,7 @@ void GLView::renderBSP(const QString &file, const mbsp_t &bsp, const bspxentries
     {
         const mface_t *face;
         qvec3d model_offset;
+        int modelindex;
     };
 
     // collect faces grouped by material_key
@@ -1571,7 +1572,7 @@ void GLView::renderBSP(const QString &file, const mbsp_t &bsp, const bspxentries
             }
 
             material_key k = {.program = program, .texname = t, .opacity = opacity, .alpha_test = alpha_test};
-            faces_by_material_key[k].push_back({.face = &f, .model_offset = origin});
+            faces_by_material_key[k].push_back({.face = &f, .model_offset = origin, .modelindex = mi});
         }
     }
 
@@ -1704,7 +1705,7 @@ void GLView::renderBSP(const QString &file, const mbsp_t &bsp, const bspxentries
             qtexture = skybox_texture;
         }
 
-        for (const auto &[f, model_offset] : faces) {
+        for (const auto &[f, model_offset, modelindex] : faces) {
             const int fnum = Face_GetNum(&bsp, f);
             const auto plane_normal = Face_Normal(&bsp, f);
             qvec3f flat_color = qvec3f{Random(), Random(), Random()};
@@ -1765,12 +1766,19 @@ void GLView::renderBSP(const QString &file, const mbsp_t &bsp, const bspxentries
     }
 
     // populate spatial index
+
+    int worldfaces_begin = bsp.dmodels[0].firstface;
+    int worldfaces_end = worldfaces_begin + bsp.dmodels[0].numfaces;
+
     for (const auto &[k, faces] : faces_by_material_key) {
         for (const face_payload &facePayload : faces) {
             int face_num = Face_GetNum(&bsp, facePayload.face);
 
+            bool is_world = (facePayload.modelindex == 0);
+            uint32_t mask = is_world ? GEOM_MASK_WORLD : GEOM_MASK_BMODEL;
+
             // FIXME: face offset
-            m_spatialindex->add_poly(Face_Winding(&bsp, facePayload.face), std::make_any<int>(face_num));
+            m_spatialindex->add_poly(Face_Winding(&bsp, facePayload.face), std::make_any<int>(face_num), mask);
         }
     }
     m_spatialindex->commit();
@@ -2258,7 +2266,11 @@ void GLView::clickFace(QMouseEvent *event)
     QVector3D ray_dir = (ws2_a - ws_a).normalized();
 
     // trace a ray
-    auto hit = m_spatialindex->trace_ray(qvec3f(ws_a[0], ws_a[1], ws_a[2]), qvec3f(ray_dir[0], ray_dir[1], ray_dir[2]));
+    uint32_t ray_mask = GEOM_MASK_WORLD;
+    if (m_showBmodels)
+        ray_mask |= GEOM_MASK_BMODEL;
+
+    auto hit = m_spatialindex->trace_ray(qvec3f(ws_a[0], ws_a[1], ws_a[2]), qvec3f(ray_dir[0], ray_dir[1], ray_dir[2]), ray_mask);
 
     if (hit.hit) {
         m_selected_face = *std::any_cast<int>(hit.hitpayload);

lightpreview/glview.h

@@ -61,6 +61,9 @@ class GLView : public QOpenGLWidget, protected QOpenGLFunctions_3_3_Core
     std::optional<mbsp_t> m_bsp;
     std::unordered_map<int, std::vector<uint8_t>> m_decompressedVis;
 
+    static constexpr uint32_t GEOM_MASK_WORLD = 0x1;
+    static constexpr uint32_t GEOM_MASK_BMODEL = 0x2;
+
     std::unique_ptr<spatialindex_t> m_spatialindex;
     uint32_t m_keysPressed;
     std::optional<qtime_point> m_lastFrame;