model: Recognize Valve BSP format. Add file format headers.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@13080 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/bspfile.h b/bspfile.h
index 1341b9e07aa8c470b6eb92e5860afb223ed4dfcc..7ab21a98446b691fc5f77ac46b1e2fd4e1e15c3c 100644 (file)
--- a/bspfile.h
+++ b/bspfile.h
@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define HLBSPVERSION 30
 #define _2PSBVERSION ('2' + 'P' * 256 + 'S' * 65536 + 'B' * 16777216)
 #define BSP2VERSION ('B' + 'S' * 256 + 'P' * 65536 + '2' * 16777216)
+#define VBSPVERSION ('V' + 'B' * 256 + 'S' * 65536 + 'P' * 16777216)
 
 typedef struct lump_s
 {

diff --git a/console.c b/console.c
index 219a68d7bca0d002cd6920652f15591f10e11315..a10259e2b1c35be7bd2908696114fe9767b70577 100644 (file)
--- a/console.c
+++ b/console.c
@@ -2205,9 +2205,12 @@ qbool GetMapList (const char *s, char *completedname, int completednamebufferlen
                                lumplen = BuffLittleLong(buf + 4 + 8 * LUMP_ENTITIES + 4);
                                dpsnprintf(desc, sizeof(desc), "BSP2RMQe");
                        }
-                       else
+                       else if(!memcmp(buf, "VBSP", 4))
                        {
-                               dpsnprintf(desc, sizeof(desc), "unknown%i", BuffLittleLong(buf));
+                               hl2dheader_t *header = (hl2dheader_t *)buf;
+                               lumpofs = LittleLong(header->lumps[HL2LUMP_ENTITIES].fileofs);
+                               lumplen = LittleLong(header->lumps[HL2LUMP_ENTITIES].filelen);
+                               dpsnprintf(desc, sizeof(desc), "VBSP%i", LittleLong(((int *)buf)[1]));
                        }
                        strlcpy(entfilename, t->filenames[i], sizeof(entfilename));
                        memcpy(entfilename + strlen(entfilename) - 4, ".ent", 5);

diff --git a/darkplaces-sdl2-vs2017.vcxproj b/darkplaces-sdl2-vs2017.vcxproj
index d4966429baa09294f56493fa17520738678a6e9d..511ea7c0bb4376c047be6c4a7c429a944b25a467 100644 (file)
--- a/darkplaces-sdl2-vs2017.vcxproj
+++ b/darkplaces-sdl2-vs2017.vcxproj
@@ -374,6 +374,7 @@
     <ClInclude Include="model_q1bsp.h" />\r
     <ClInclude Include="model_q2bsp.h" />\r
     <ClInclude Include="model_q3bsp.h" />\r
+    <ClInclude Include="model_vbsp.h" />\r
     <ClInclude Include="model_shared.h" />\r
     <ClInclude Include="model_sprite.h" />\r
     <ClInclude Include="model_zymotic.h" />\r

diff --git a/darkplaces-sdl2-vs2019.vcxproj b/darkplaces-sdl2-vs2019.vcxproj
index 805af09bfc68d4d7f78f477de8a0bf1c499edf7f..974db39daa1a877b47b4e16bd9f0646d03ced7ae 100644 (file)
--- a/darkplaces-sdl2-vs2019.vcxproj
+++ b/darkplaces-sdl2-vs2019.vcxproj
@@ -375,6 +375,7 @@
     <ClInclude Include="model_q1bsp.h" />\r
     <ClInclude Include="model_q2bsp.h" />\r
     <ClInclude Include="model_q3bsp.h" />\r
+    <ClInclude Include="model_vbsp.h" />\r
     <ClInclude Include="model_shared.h" />\r
     <ClInclude Include="model_sprite.h" />\r
     <ClInclude Include="model_zymotic.h" />\r

diff --git a/model_brush.c b/model_brush.c
index 0c9c81c6e559c95888f0eb840681cee1f93501b8..47e16229ad3e46e384e0bb1074f3ed9b16371d7e 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -7660,6 +7660,11 @@ void Mod_IBSP_Load(model_t *mod, void *buffer, void *bufferend)
                Host_Error("Mod_IBSP_Load: unknown/unsupported version %i", i);
 }
 
+void Mod_VBSP_Load(model_t *mod, void *buffer, void *bufferend)
+{
+       Host_Error("Mod_VBSP_Load: not yet implemented");
+}
+
 void Mod_MAP_Load(model_t *mod, void *buffer, void *bufferend)
 {
        Host_Error("Mod_MAP_Load: not yet implemented");

diff --git a/model_shared.c b/model_shared.c
index e29e3f8dac4ddaa21f24770bbd263c6985b39a39..e70f47c2fb26359862c6b52a7c55242dd8e1712d 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -55,6 +55,7 @@ static modloader_t loader[] =
        {NULL, "BSP2", 4, Mod_BSP2_Load},
        {NULL, "2PSB", 4, Mod_2PSB_Load},
        {NULL, "IBSP", 4, Mod_IBSP_Load},
+       {NULL, "VBSP", 4, Mod_VBSP_Load},
        {NULL, "ZYMOTICMODEL", 13, Mod_ZYMOTICMODEL_Load},
        {NULL, "DARKPLACESMODEL", 16, Mod_DARKPLACESMODEL_Load},
        {NULL, "PSKMODEL", 9, Mod_PSKMODEL_Load},

diff --git a/model_shared.h b/model_shared.h
index d131fb8bccf9f0e5bfa756775ec67ad5ecb28f37..bb0cd540cbd597fa4bbde15908bb84ed3099445c 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -413,6 +413,7 @@ msurface_t;
 #include "model_q1bsp.h"
 #include "model_q2bsp.h"
 #include "model_q3bsp.h"
+#include "model_vbsp.h"
 #include "model_sprite.h"
 #include "model_alias.h"
 
@@ -745,6 +746,7 @@ void Mod_BSP2_Load(model_t *mod, void *buffer, void *bufferend);
 void Mod_HLBSP_Load(model_t *mod, void *buffer, void *bufferend);
 void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend);
 void Mod_IBSP_Load(model_t *mod, void *buffer, void *bufferend);
+void Mod_VBSP_Load(model_t *mod, void *buffer, void *bufferend);
 void Mod_MAP_Load(model_t *mod, void *buffer, void *bufferend);
 void Mod_OBJ_Load(model_t *mod, void *buffer, void *bufferend);
 void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend);

diff --git a/model_vbsp.h b/model_vbsp.h
new file mode 100644 (file)
index 0000000..c350e65
--- /dev/null
+++ b/model_vbsp.h
@@ -0,0 +1,156 @@
+/*
+Copyright (C) 2021 David Knapp (Cloudwalk)
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
+#include "qtypes.h"
+#include "qdefs.h"
+
+/*
+ * The Valve BSP format, used by Source engine, has some interesting
+ * advantages, but makes it quite messy.
+ *
+ * Notably, it supports version numbers for its lumps. Some games may introduce
+ * new features to a lump and increment its version number while leaving the
+ * VBSP version number the same.
+ */
+
+// Content flags
+#define HL2CONTENTS_NONE 0
+#define HL2CONTENTS_SOLID 0x1
+#define HL2CONTENTS_WINDOW 0x2
+#define HL2CONTENTS_AUX 0x4
+#define HL2CONTENTS_GRATE 0x8
+#define HL2CONTENTS_SLIME 0x10
+#define HL2CONTENTS_WATER 0x20
+#define HL2CONTENTS_MIST 0x40
+#define HL2CONTENTS_OPAQUE 0x80
+#define HL2CONTENTS_TESTFOGVOLUME 0x100
+#define HL2CONTENTS_TEAM1 0x800
+#define HL2CONTENTS_TEAM2 0x1000
+#define HL2CONTENTS_IGNORE_NODRAW_OPAQUE 0x2000
+#define HL2CONTENTS_MOVEABLE 0x4000
+#define HL2CONTENTS_AREAPORTAL 0x8000
+#define HL2CONTENTS_PLAYERCLIP 0x10000
+#define HL2CONTENTS_MONSTERCLIP 0x20000
+#define HL2CONTENTS_CURRENT_0 0x40000
+#define HL2CONTENTS_CURRENT_90 0x80000
+#define HL2CONTENTS_CURRENT_180 0x100000
+#define HL2CONTENTS_CURRENT_270 0x200000
+#define HL2CONTENTS_CURRENT_UP 0x400000
+#define HL2CONTENTS_CURRENT_DOWN 0x800000
+#define HL2CONTENTS_ORIGIN 0x1000000
+#define HL2CONTENTS_MONSTER 0x2000000
+#define HL2CONTENTS_DEBRIS 0x4000000
+#define HL2CONTENTS_DETAIL 0x8000000
+#define HL2CONTENTS_TRANSLUCENT 0x10000000
+#define HL2CONTENTS_LADDER 0x20000000
+#define HL2CONTENTS_HITBOX 0x40000000
+
+// Lumps
+
+#define HL2HEADER_LUMPS 64
+
+#define HL2LUMP_ENTITIES 0
+#define HL2LUMP_PLANES 1
+#define HL2LUMP_TEXDATA 2
+#define HL2LUMP_VERTEXES 3
+#define HL2LUMP_VISIBILITY 4
+#define HL2LUMP_NODES 5
+#define HL2LUMP_TEXINFO 6
+#define HL2LUMP_FACES 7
+#define HL2LUMP_LIGHTING 8
+#define HL2LUMP_OCCLUSION 9
+#define HL2LUMP_LEAFS 10
+#define HL2LUMP_FACEIDS 11
+#define HL2LUMP_EDGES 12
+#define HL2LUMP_SURFEDGES 13
+#define HL2LUMP_MODELS 14
+#define HL2LUMP_WORLDLIGHTS 15
+#define HL2LUMP_LEAFFACES 16
+#define HL2LUMP_LEAFBRUSHES 17
+#define HL2LUMP_BRUSHES 18
+#define HL2LUMP_BRUSHSIDES 19
+#define HL2LUMP_AREAS 20
+#define HL2LUMP_AREAPORTALS 21
+// These are unused in VBSP 20
+#define HL2LUMP_PORTALS 22 // VBSP 19
+#define HL2LUMP_PROPCOLLISION 22 // VBSP 21+
+#define HL2LUMP_CLUSTERS 23 // VBSP 19
+#define HL2LUMP_PROPHULLS 23 // VBSP 21+
+#define HL2LUMP_PORTALVERTS 24 // VBSP 19
+#define HL2LUMP_PROPHULLVERTS 24 // VBSP 21+
+#define HL2LUMP_CLUSTERPORTALS 25 // VBSP 19
+#define HL2LUMP_PROPTRIS 25 // VBSP 21+
+// End unused
+#define HL2LUMP_DISPINFO 26
+#define HL2LUMP_ORIGINALFACES 27
+#define HL2LUMP_PHYSDISP 28 // VBSP 20+ only
+#define HL2LUMP_PHYSCOLLIDE 29
+#define HL2LUMP_VERTNORMALS 30
+#define HL2LUMP_VERTNORMALINDICES 31
+#define HL2LUMP_DISP_LIGHTMAP_ALPHAS 32
+#define HL2LUMP_DISP_VERTS 33
+#define HL2LUMP_DISP_LIGHTMAP_SAMPLE_POSITIONS 34
+#define HL2LUMP_GAME_LUMP 35
+#define HL2LUMP_LEAFWATERDATA 36
+#define HL2LUMP_PRIMITIVES 37
+#define HL2LUMP_PRIMVERTS 38
+#define HL2LUMP_PRIMINDICES 39
+#define HL2LUMP_PAKFILE 40
+#define HL2LUMP_CLIPPORTALVERTS 41
+#define HL2LUMP_CUBEMAPS 42
+#define HL2LUMP_TEXDATA_STRING_DATA 43
+#define HL2LUMP_TEXDATA_STRING_TABLE 44
+#define HL2LUMP_OVERLAYS 45
+#define HL2LUMP_LEAFMINDISTTOWATER 46
+#define HL2LUMP_FACE_MACRO_TEXTURE_INFO 47
+#define HL2LUMP_DISP_TRIS 48
+#define HL2LUMP_PHYSCOLLIDESURFACE 49 // VBSP 19 and 20
+#define HL2LUMP_PROP_BLOB 49 // VBSP 21+
+// Everything from here is VBSP 20+ only
+#define HL2LUMP_WATEROVERLAYS 50
+#define HL2LUMP_LEAF_AMBIENT_INDEX_HDR 51
+#define HL2LUMP_LEAF_AMBIENT_INDEX 52
+#define HL2LUMP_LIGHTING_HDR 53
+#define HL2LUMP_WORLDLIGHTS_HDR 54
+#define HL2LUMP_LEAF_AMBIENT_LIGHTING_HDR 55
+#define HL2LUMP_LEAF_AMBIENT_LIGHTING 56
+#define HL2LUMP_XZIPPAKFILE 57
+#define HL2LUMP_FACES_HDR 58
+#define HL2LUMP_MAP_FLAGS 59
+#define HL2LUMP_OVERLAY_FADES 60
+#define HL2LUMP_OVERLAY_SYSTEM_LEVELS 61
+// VBSP 21+
+#define HL2LUMP_PHYSLEVEL 62
+#define HL2LUMP_DISP_MULTIBLEND 63
+
+typedef struct hl2lump_s
+{
+       int32_t fileofs, filelen;
+       int32_t version;
+       int32_t id;
+} hl2lump_t;
+
+typedef struct hl2dheader_s
+{
+       int32_t id;
+       int32_t version;
+       hl2lump_t lumps[HL2HEADER_LUMPS];
+       int32_t revision;
+} hl2dheader_t;