id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-13 22:22:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged some smaller changes and fixes from icedhellfire

Browse source
This commit is contained in:
Robert Beckebans 2024-06-29 18:02:48 +02:00
parent ca72a728fe
commit b52d2eece3
10 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/cm/CollisionModel.h
View file

@ -146,6 +146,8 @@ public:
const idTraceModel* trm, const idMat3& trmAxis, int contentMask,
cmHandle_t model, const idVec3& modelOrigin, const idMat3& modelAxis ) = 0;
virtual int PointContents( const idVec3 p, cmHandle_t model ) = 0;
// Tests collision detection.
virtual void DebugOutput( const idVec3& origin ) = 0;

3
neo/cm/CollisionModel_local.h
View file

@ -338,6 +338,8 @@ public:
// create trace model from a collision model, returns true if succesfull
bool TrmFromModel( const char* modelName, idTraceModel& trm );
virtual int PointContents( const idVec3 p, cmHandle_t model );
// name of the model
const char* GetModelName( cmHandle_t model ) const;
// bounds of the model
@ -421,7 +423,6 @@ private: // CollisionMap_contents.cpp
bool TestTrmVertsInBrush( cm_traceWork_t* tw, cm_brush_t* b );
bool TestTrmInPolygon( cm_traceWork_t* tw, cm_polygon_t* p );
cm_node_t* PointNode( const idVec3& p, cm_model_t* model );
int PointContents( const idVec3 p, cmHandle_t model );
int TransformedPointContents( const idVec3& p, cmHandle_t model, const idVec3& origin, const idMat3& modelAxis );
int ContentsTrm( trace_t* results, const idVec3& start,
const idTraceModel* trm, const idMat3& trmAxis, int contentMask,

4
neo/framework/File.cpp
View file

@ -1712,8 +1712,6 @@ idFile_InZip
=================================================================================
*/
#if !defined( TYPEINFOPROJECT )
/*
=================
idFile_InZip::idFile_InZip
@ -1874,8 +1872,6 @@ int idFile_InZip::Seek( long offset, fsOrigin_t origin )
return -1;
}
#endif
/*
=================================================================================

2
neo/framework/File.h
View file

@ -330,7 +330,6 @@ private:
};
#if !defined( TYPEINFOPROJECT )
class idFile_InZip : public idFile
{
//friend class idFileSystemLocal;
@ -366,7 +365,6 @@ private:
int fileSize; // size of the file
void* z; // unzip info
};
#endif
class idFile_InnerResource : public idFile
{

11
neo/framework/FileSystem.cpp
View file

@ -30,15 +30,10 @@ If you have questions concerning this license or the applicable additional terms
#include "precompiled.h"
#pragma hdrstop
#if !defined( TYPEINFOPROJECT ) && !defined( DMAP )
#include "Unzip.h"
#include "Zip.h"
#else
#include "Unzip.h"
#include "Unzip.h"
#if !defined( DMAP )
#include "Zip.h"
#endif
#if !defined( TYPEINFOPROJECT ) && !defined( DMAP )
#include "Zip.h"
#endif
#ifdef WIN32

2
neo/framework/File_Zip.cpp
View file

@ -59,7 +59,7 @@ bool idZipContainer::Init( const char* _fileName )
idFileLocal f = fileSystem->OpenExplicitFileRead( _fileName );
if( !f )
{
return NULL;
return false;
}
f->Seek( 0, FS_SEEK_END );
len = f->Tell();

4
neo/idStuff.natvis
View file

@ -16,6 +16,10 @@
</Expand>
</Type>
<Type Name="idVec3">
<DisplayString>{{{x,g},{y,g},{z,g}}}</DisplayString>
</Type>
<Type Name="idVec4">
<DisplayString>{{{x,g},{y,g},{z,g},{w,g}}}</DisplayString>
</Type>

6
neo/renderer/Material.h
View file

@ -386,6 +386,12 @@ typedef enum
CONTENTS_AAS_OBSTACLE = BIT( 14 ), // used to compile an obstacle into AAS that can be enabled/disabled
CONTENTS_FLASHLIGHT_TRIGGER = BIT( 15 ), // used for triggers that are activated by the flashlight
// jmarshall: used by Quake 3 bots
CONTENTS_SLIME = BIT( 16 ), // used for slime
CONTENTS_FOG = BIT( 17 ), // used for fog
CONTENTS_LAVA = BIT( 18 ),
// jmarshall end
// contents used by utils
CONTENTS_AREAPORTAL = BIT( 20 ), // portal separating renderer areas
CONTENTS_NOCSG = BIT( 21 ), // don't cut this brush with CSG operations in the editor

16
neo/tools/compilers/main.cpp
View file

@ -957,15 +957,15 @@ public:
};
virtual void QueueShowShell() { }; // Will activate the shell on the next frame.
void InitTool( const toolFlag_t, const idDict*, idEntity* ) {}
virtual void InitTool( const toolFlag_t, const idDict*, idEntity* ) {}
void LoadPacifierBinarizeFilename( const char* filename, const char* reason ) {}
void LoadPacifierBinarizeInfo( const char* info ) {}
void LoadPacifierBinarizeMiplevel( int level, int maxLevel ) {}
void LoadPacifierBinarizeProgress( float progress ) {}
void LoadPacifierBinarizeEnd() { };
void LoadPacifierBinarizeProgressTotal( int total ) {}
void LoadPacifierBinarizeProgressIncrement( int step ) {}
virtual void LoadPacifierBinarizeFilename( const char* filename, const char* reason ) {}
virtual void LoadPacifierBinarizeInfo( const char* info ) {}
virtual void LoadPacifierBinarizeMiplevel( int level, int maxLevel ) {}
virtual void LoadPacifierBinarizeProgress( float progress ) {}
virtual void LoadPacifierBinarizeEnd() { };
virtual void LoadPacifierBinarizeProgressTotal( int total ) {}
virtual void LoadPacifierBinarizeProgressIncrement( int step ) {}
virtual void DmapPacifierFilename( const char* filename, const char* reason )
{

16
neo/tools/compilers/main_posix.cpp
View file

@ -1111,15 +1111,15 @@ public:
};
virtual void QueueShowShell() { }; // Will activate the shell on the next frame.
void InitTool( const toolFlag_t, const idDict*, idEntity* ) {}
virtual void InitTool( const toolFlag_t, const idDict*, idEntity* ) {}
void LoadPacifierBinarizeFilename( const char* filename, const char* reason ) {}
void LoadPacifierBinarizeInfo( const char* info ) {}
void LoadPacifierBinarizeMiplevel( int level, int maxLevel ) {}
void LoadPacifierBinarizeProgress( float progress ) {}
void LoadPacifierBinarizeEnd() { };
void LoadPacifierBinarizeProgressTotal( int total ) {}
void LoadPacifierBinarizeProgressIncrement( int step ) {}
virtual void LoadPacifierBinarizeFilename( const char* filename, const char* reason ) {}
virtual void LoadPacifierBinarizeInfo( const char* info ) {}
virtual void LoadPacifierBinarizeMiplevel( int level, int maxLevel ) {}
virtual void LoadPacifierBinarizeProgress( float progress ) {}
virtual void LoadPacifierBinarizeEnd() { };
virtual void LoadPacifierBinarizeProgressTotal( int total ) {}
virtual void LoadPacifierBinarizeProgressIncrement( int step ) {}
virtual void DmapPacifierFilename( const char* filename, const char* reason )
{