fix ltfaceQ2.novanillaWorldUnitsPerLuxel

- gamedef_t gets a num_styles() function; returns
  the size of this game's dface_t::styles array
- mface_t::styles is now dynamically sized,
  matching the target game's num_styles() value
- mface_t: remove stream_write(), stream_read() -
  these were unused and we don't want binary
  serialization of mface_t

Author: ericwa

bsputil/bsputil.cc

@@ -434,8 +434,8 @@ static void CheckBSPFile(const mbsp_t *bsp)
             logging::print("warning: face {} has edges out of range ({}..{} >= {})\n", i, face->firstedge,
                 face->firstedge + face->numedges - 1, bsp->dsurfedges.size());
 
-        for (int j = 0; j < 4; j++) {
-            used_lightstyles.insert(face->styles[j]);
+        for (uint8_t style : face->styles) {
+            used_lightstyles.insert(style);
         }
     }
 

common/bspfile.cc

@@ -456,6 +456,12 @@ struct gamedef_q1_like_t : public gamedef_t
         static const auto palette = make_palette(palette_bytes);
         return palette;
     }
+
+    size_t num_styles() const override
+    {
+        static constexpr size_t n = bsp29_dface_t().styles.size();
+        return n;
+    }
 };
 
 struct gamedef_h2_t : public gamedef_q1_like_t<GAME_HEXEN_II>
@@ -1031,6 +1037,12 @@ struct gamedef_q2_t : public gamedef_t
         static const auto palette = make_palette(palette_bytes);
         return palette;
     }
+
+    size_t num_styles() const override
+    {
+        static constexpr size_t n = q2_dface_t().styles.size();
+        return n;
+    }
 };
 
 struct gamedef_sin_t : public gamedef_t
@@ -1390,6 +1402,12 @@ struct gamedef_sin_t : public gamedef_t
         static const std::vector<qvec3b> palette;
         return palette;
     }
+
+    size_t num_styles() const override
+    {
+        static constexpr size_t n = sin_dface_t().styles.size();
+        return n;
+    }
 };
 
 // Game definitions, used for the bsp versions below

common/bspfile_generic.cc

@@ -254,17 +254,6 @@ void bsp2_dnode_t::stream_read(std::istream &s)
     s >= std::tie(planenum, children, mins, maxs, firstface, numfaces);
 }
 
-// mface_t
-
-void mface_t::stream_write(std::ostream &s) const
-{
-    s <= std::tie(planenum, side, firstedge, numedges, texinfo, styles, lightofs, lightinfo);
-}
-void mface_t::stream_read(std::istream &s)
-{
-    s >= std::tie(planenum, side, firstedge, numedges, texinfo, styles, lightofs, lightinfo);
-}
-
 // bsp2_dclipnode_t
 
 void bsp2_dclipnode_t::stream_write(std::ostream &s) const

common/bspfile_q1.cc

@@ -188,14 +188,14 @@ bsp29_dface_t::bsp29_dface_t(const mface_t &model)
       firstedge(model.firstedge),
       numedges(numeric_cast<int16_t>(model.numedges, "dface_t::numedges")),
       texinfo(numeric_cast<int16_t>(model.texinfo, "dface_t::texinfo")),
-      styles(array_cast<decltype(styles)>(model.styles)),
+      styles(styles_vec_to_array<decltype(styles)>(model.styles)),
       lightofs(model.lightofs)
 {
 }
 
 bsp29_dface_t::operator mface_t() const
 {
-    return {planenum, side, firstedge, numedges, texinfo, array_cast<decltype(mface_t::styles)>(styles), lightofs};
+    return {planenum, side, firstedge, numedges, texinfo, styles_array_to_vec(styles), lightofs};
 }
 
 void bsp29_dface_t::stream_write(std::ostream &s) const
@@ -216,14 +216,14 @@ bsp2_dface_t::bsp2_dface_t(const mface_t &model)
       firstedge(model.firstedge),
       numedges(model.numedges),
       texinfo(model.texinfo),
-      styles(array_cast<decltype(styles)>(model.styles)),
+      styles(styles_vec_to_array<decltype(styles)>(model.styles)),
       lightofs(model.lightofs)
 {
 }
 
 bsp2_dface_t::operator mface_t() const
 {
-    return {planenum, side, firstedge, numedges, texinfo, array_cast<decltype(mface_t::styles)>(styles), lightofs};
+    return {planenum, side, firstedge, numedges, texinfo, styles_array_to_vec(styles), lightofs};
 }
 
 void bsp2_dface_t::stream_write(std::ostream &s) const

common/bspfile_q2.cc

@@ -137,14 +137,14 @@ q2_dface_t::q2_dface_t(const mface_t &model)
       firstedge(model.firstedge),
       numedges(numeric_cast<int16_t>(model.numedges, "dface_t::numedges")),
       texinfo(numeric_cast<int16_t>(model.texinfo, "dface_t::texinfo")),
-      styles(array_cast<decltype(styles)>(model.styles)),
+      styles(styles_vec_to_array<decltype(styles)>(model.styles)),
       lightofs(model.lightofs)
 {
 }
 
 q2_dface_t::operator mface_t() const
 {
-    return {planenum, side, firstedge, numedges, texinfo, array_cast<decltype(mface_t::styles)>(styles), lightofs};
+    return {planenum, side, firstedge, numedges, texinfo, styles_array_to_vec(styles), lightofs};
 }
 
 void q2_dface_t::stream_write(std::ostream &s) const
@@ -165,14 +165,14 @@ q2_dface_qbism_t::q2_dface_qbism_t(const mface_t &model)
       firstedge(model.firstedge),
       numedges(model.numedges),
       texinfo(model.texinfo),
-      styles(array_cast<decltype(styles)>(model.styles)),
+      styles(styles_vec_to_array<decltype(styles)>(model.styles)),
       lightofs(model.lightofs)
 {
 }
 
 q2_dface_qbism_t::operator mface_t() const
 {
-    return {planenum, side, firstedge, numedges, texinfo, array_cast<decltype(mface_t::styles)>(styles), lightofs};
+    return {planenum, side, firstedge, numedges, texinfo, styles_array_to_vec(styles), lightofs};
 }
 
 void q2_dface_qbism_t::stream_write(std::ostream &s) const

common/bspfile_sin.cc

@@ -104,15 +104,15 @@ sin_dface_t::sin_dface_t(const mface_t &face)
       firstedge(face.firstedge),
       numedges(numeric_cast<int16_t>(face.numedges, "dface_t::numedges")),
       texinfo(numeric_cast<int16_t>(face.texinfo, "dface_t::texinfo")),
-      styles(face.styles),
+      styles(styles_vec_to_array<decltype(styles)>(face.styles)),
       lightofs(face.lightofs),
       lightinfo(face.lightinfo)
 {
 }
 
 sin_dface_t::operator mface_t() const
 {
-    return {planenum, side, firstedge, numedges, texinfo, styles, lightofs, lightinfo};
+    return {planenum, side, firstedge, numedges, texinfo, styles_array_to_vec(styles), lightofs, lightinfo};
 }
 
 void sin_dface_t::stream_write(std::ostream &s) const

common/bspinfo.cc

@@ -303,7 +303,7 @@ full_atlas_t build_lightmap_atlas(const mbsp_t &bsp, const bspxentries_t &bspx,
     }
 
     std::vector<uint16_t> bspx_lmstyle16;
-    int max_styles_per_face = MAXLIGHTMAPS;
+    int max_styles_per_face = bsp.loadversion->game->num_styles();
 
     if (bspx.contains("LMSTYLE16")) {
         auto &lmstyle16 = bspx.at("LMSTYLE16");
@@ -552,7 +552,8 @@ full_atlas_t build_lightmap_atlas(const mbsp_t &bsp, const bspxentries_t &bspx,
         result.facenum_to_lightmap_uvs[Face_GetNum(bsp, face.face)] = std::move(face_lightmap_uvs);
 
         auto face_idx = (intptr_t) (face.face - bsp->dfaces.data());
-        std::array<uint8_t, MAXLIGHTMAPS> s;
+        std::vector<uint8_t> s;
+        s.resize(face.face->styles.size());
 
         if (!bspx_lmstyle16.empty()) {
             const uint16_t *styles = bspx_lmstyle16.data() + face_idx * max_styles_per_face;

include/common/bspfile_common.hh

@@ -496,6 +496,8 @@ struct gamedef_t
         const std::string &texname, const surfflags_t &flags, contentflags_t contents, bool transwater) const = 0;
     virtual void init_filesystem(const fs::path &source, const settings::common_settings &settings) const = 0;
     virtual const std::vector<qvec3b> &get_default_palette() const = 0;
+    // size of this game's dface_t::styles array
+    virtual size_t num_styles() const = 0;
 };
 
 // Lump specification; stores the name and size

include/common/bspfile_generic.hh

@@ -253,9 +253,6 @@ struct mtexinfo_t
     std::array<char, 32> groupname;
 };
 
-// SiN TODO: this is 16 in SiN but 4 in Quake;
-// need to expose to gamedef
-constexpr size_t MAXLIGHTMAPS = 16;
 constexpr uint16_t INVALID_LIGHTSTYLE_OLD = 0xffu;
 
 struct mface_t
@@ -267,16 +264,16 @@ struct mface_t
     int32_t texinfo;
 
     /* lighting info */
-    std::array<uint8_t, MAXLIGHTMAPS> styles;
+    // TODO: change to a boost::static_vector to avoid heap allocation
+    // the size of this vector always matches the game-specific dface_t's `styles` array
+    // (see gamedef_t::num_styles()).
+    // when creating a mface_t, you must resize this to match the game you eventually intend export to.
+    std::vector<uint8_t> styles;
     // start of [numstyles*surfsize] samples. byte offset into bsp.dlightdata.
     int32_t lightofs;
 
     // SiN
     int32_t lightinfo;
-
-    // serialize for streams
-    void stream_write(std::ostream &s) const;
-    void stream_read(std::istream &s);
 };
 
 /*

include/common/bspfile_sin.hh

@@ -225,6 +225,8 @@ struct sin_texinfo_t
     void stream_read(std::istream &s);
 };
 
+constexpr size_t SIN_MAXLIGHTMAPS = 16;
+
 struct sin_dface_t
 {
     uint16_t planenum; // NOTE: only difference from bsp29_dface_t
@@ -234,7 +236,7 @@ struct sin_dface_t
     int16_t texinfo;
 
     // lighting info
-    std::array<uint8_t, MAXLIGHTMAPS> styles;
+    std::array<uint8_t, SIN_MAXLIGHTMAPS> styles;
     int32_t lightofs; // start of [numstyles*surfsize] samples
     int32_t lightinfo;