zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare BrushWrapper as todo

Browse Source
This commit is contained in:
Jan 2022-01-15 11:48:12 +01:00
parent 88771849fb
commit 16d421f22d
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/Game/IW4/IW4_Assets.h
View File

@ -159,7 +159,7 @@ namespace IW4
typedef tdef_align(16) float raw_float16; typedef tdef_align(16) float raw_float16;
typedef unsigned int raw_uint; typedef unsigned int raw_uint;
typedef tdef_align(128) unsigned int raw_uint128; typedef tdef_align(128) unsigned int raw_uint128;
typedef char cbrushedge_t; typedef unsigned char cbrushedge_t;
typedef unsigned short r_index_t; typedef unsigned short r_index_t;
typedef float vec2_t[2]; typedef float vec2_t[2];
typedef float vec3_t[3]; typedef float vec3_t[3];
@ -225,8 +225,8 @@ namespace IW4
cbrushside_t* sides; cbrushside_t* sides;
cbrushedge_t* baseAdjacentSide; cbrushedge_t* baseAdjacentSide;
int16_t axialMaterialNum[2][3]; int16_t axialMaterialNum[2][3];
char firstAdjacentSideOffsets[2][3]; unsigned char firstAdjacentSideOffsets[2][3];
char edgeCount[2][3]; unsigned char edgeCount[2][3];
}; };
struct BrushWrapper struct BrushWrapper

6
src/ObjWriting/Dumping/MapFile/MapFileDumper.cpp
View File

@ -65,6 +65,12 @@ void MapFileDumper::Init() const
m_stream << "\"The Map\" flags\n"; m_stream << "\"The Map\" flags\n";
} }
void MapFileDumper::WriteComment(const std::string& key) const
{
Indent();
m_stream << "// " << key << "\n";
}
void MapFileDumper::BeginEntity() void MapFileDumper::BeginEntity()
{ {
assert(!m_flags.m_in_entity); assert(!m_flags.m_in_entity);

1
src/ObjWriting/Dumping/MapFile/MapFileDumper.h
View File

@ -58,6 +58,7 @@ public:
explicit MapFileDumper(std::ostream& stream); explicit MapFileDumper(std::ostream& stream);
void Init() const; void Init() const;
void WriteComment(const std::string& key) const;
void BeginEntity(); void BeginEntity();
void EndEntity(); void EndEntity();

3
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperPhysCollmap.cpp
View File

@ -47,6 +47,8 @@ void AssetDumperPhysCollmap::DumpAsset(AssetDumpingContext& context, XAssetInfo<
switch (geom.type) switch (geom.type)
{ {
case PHYS_GEOM_NONE: case PHYS_GEOM_NONE:
// TODO: Dump BrushWrapper (probably GJK related)
mapFileDumper.WriteComment("TODO: Brush data");
break; break;
case PHYS_GEOM_BOX: case PHYS_GEOM_BOX:
mapFileDumper.WritePhysicsBox({ mapFileDumper.WritePhysicsBox({
@ -73,6 +75,7 @@ void AssetDumperPhysCollmap::DumpAsset(AssetDumpingContext& context, XAssetInfo<
case PHYS_GEOM_CAPSULE: case PHYS_GEOM_CAPSULE:
case PHYS_GEOM_GLASS: case PHYS_GEOM_GLASS:
default: default:
// These do not seem to appear inside any collmap assets
assert(false); assert(false);
break; break;
} }