Skip to content

Commit 239d5e5

Browse files
committed
- rename texture set flags
1 parent aba9e53 commit 239d5e5

3 files changed

Lines changed: 12 additions & 13 deletions

File tree

DriverLevelTool/driver_routines/d2_types.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,28 @@
1010
#define TEXPAGE_4BIT_SIZE (TEXPAGE_SIZE_X*TEXPAGE_SIZE_Y)
1111
#define TEXPAGE_SIZE (TEXPAGE_SIZE_Y*TEXPAGE_SIZE_Y)
1212

13-
enum EPageStorage
13+
enum ETextureSetFlags
1414
{
15-
TPAGE_PERMANENT = (1 << 0), // permanently loaded into VRAM
16-
TPAGE_AREADATA = (1 << 1), // spooled and uncompressed
17-
TPAGE_SPECPAGES = (1 << 2), // special car texture page
15+
TEX_PERMANENT = 0x1, // permanently loaded into VRAM
16+
TEX_SWAPABLE = 0x2, // spooled and uncompressed
17+
TEX_SPECIAL = 0x4, // special car texture page in D2
18+
TEX_DAMAGED = 0x8,
19+
TEX_8BIT = 0x10, // two 8bit TSets make up a single bitmap
20+
TEX_PALNUM = 0x20, // mask out for palette number (0-1)
21+
TEX_PARENT = 0x40,
1822
};
1923

2024
struct TEXINF
2125
{
2226
uint16 id;
2327
uint16 nameoffset;
24-
uint8 x;
25-
uint8 y;
26-
uint8 width;
27-
uint8 height;
28+
uint8 x, y, width, height;
2829
};
2930

3031
struct TEXPAGE_POS // og name: TP
3132
{
32-
uint flags; // size=0, offset=0
33-
uint offset; // size=0, offset=4
33+
uint flags;
34+
uint offset;
3435
};
3536

3637
struct TEXCLUT

DriverLevelTool/viewer/renderlevel.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ struct PCO_PAIR_D2
7171
{
7272
PACKED_CELL_OBJECT* pco;
7373
XZPAIR nearCell;
74-
bool editorEvent;
7574
};
7675

7776
//-------------------------------------------------------
@@ -169,7 +168,6 @@ void DrawLevelDriver2(const Vector3D& cameraPos, float cameraAngleY, const Volum
169168
PCO_PAIR_D2 pair;
170169
pair.nearCell = ci.nearCell;
171170
pair.pco = ppco;
172-
pair.editorEvent = (ci.listType) == (100 | 0x4000);
173171

174172
drawObjects.append(pair);
175173

DriverLevelTool/viewer/viewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ void DisplayUI(float deltaTime)
605605
// shape flags
606606
ImGui::CheckboxFlags("Lit", &shape_flags, SHAPE_FLAG_LITPOLY); ImGui::SameLine();
607607
ImGui::CheckboxFlags("BSP", &shape_flags, SHAPE_FLAG_BSPDATA); ImGui::SameLine();
608-
ImGui::CheckboxFlags("Quiet", &shape_flags, SHAPE_FLAG_TRANS); ImGui::SameLine();
608+
ImGui::CheckboxFlags("Trans", &shape_flags, SHAPE_FLAG_TRANS); ImGui::SameLine();
609609

610610
ImGui::CheckboxFlags("Water", &shape_flags, SHAPE_FLAG_WATER); ImGui::SameLine();
611611
ImGui::CheckboxFlags("Amb2", &shape_flags, SHAPE_FLAG_AMBIENT2);

0 commit comments

Comments
 (0)