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

Merged stuff from Iced-Hellfire-Dev branch, no specular fix

Browse source
This commit is contained in:
Robert Beckebans 2021-02-20 12:56:24 +01:00
parent c0376eacaf
commit b85db1e865
14 changed files with 64 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
neo/d3xp/EnvironmentProbe.h
View file

@ -135,7 +135,6 @@ private:
void Event_On();
void Event_Off();
void Event_ToggleOnOff( idEntity* activator );
void Event_SetSoundHandles();
void Event_FadeOut( float time );
void Event_FadeIn( float time );
};

4
neo/d3xp/menus/MenuScreen.h
View file

@ -29,7 +29,9 @@ If you have questions concerning this license or the applicable additional terms
#ifndef __MENUSCREEN_H__
#define __MENUSCREEN_H__
#include "../../renderer/RenderCommon.h"
#ifndef __TYPEINFOGEN__
#include "../../renderer/RenderCommon.h"
#endif
enum mainMenuTransition_t
{

6
neo/d3xp/script/Script_Interpreter.h
View file

@ -65,11 +65,13 @@ private:
idThread* thread;
void PopParms( int numParms );
void PushString( const char* string );
// RB begin
// RB: 64 bit fix, changed int to intptr_t
public:
void PushString( const char* string );
void Push( intptr_t value );
private:
// RB: added PushVector for new E_EVENT_SIZEOF_VEC
void PushVector( const idVec3& vector );
// RB end

5
neo/framework/CmdSystem.h
View file

@ -182,6 +182,7 @@ public:
virtual bool PostReloadEngine() = 0;
// Default argument completion functions.
static void ArgCompletion_DefFile( const idCmdArgs& args, void( *callback )( const char* s ) );
static void ArgCompletion_Boolean( const idCmdArgs& args, void( *callback )( const char* s ) );
template<int min, int max>
static void ArgCompletion_Integer( const idCmdArgs& args, void( *callback )( const char* s ) );
@ -203,6 +204,10 @@ public:
extern idCmdSystem* cmdSystem;
ID_INLINE void idCmdSystem::ArgCompletion_DefFile( const idCmdArgs& args, void( *callback )( const char* s ) )
{
cmdSystem->ArgCompletion_FolderExtension( args, callback, "def/", true, ".def", NULL );
}
ID_INLINE void idCmdSystem::ArgCompletion_Boolean( const idCmdArgs& args, void( *callback )( const char* s ) )
{

3
neo/framework/Common.cpp
View file

@ -1420,13 +1420,14 @@ void idCommonLocal::Init( int argc, const char* const* argv, const char* cmdline
AddStartupCommands();
StartMenu( true );
#ifndef ID_RETAIL
while( Sys_Milliseconds() - legalStartTime < legalMinTime )
{
RenderSplash();
Sys_GenerateEvents();
Sys_Sleep( 10 );
};
#endif
// print all warnings queued during initialization
PrintWarnings();

3
neo/framework/FileSystem.cpp
View file

@ -2989,7 +2989,7 @@ void idFileSystemLocal::AddGameDirectory( const char* path, const char* dir )
pakfile = BuildOSPath( path, dir, "" );
pakfile[ pakfile.Length() - 1 ] = 0; // strip the trailing slash
}
#ifndef TYPEINFOPROJECT
idStrList pakfiles;
ListOSFiles( pakfile, ".resources", pakfiles );
pakfiles.SortWithTemplate( idSort_PathStr() );
@ -3014,6 +3014,7 @@ void idFileSystemLocal::AddGameDirectory( const char* path, const char* dir )
}
}
}
#endif
}
// RB end
}

4
neo/framework/Licensee.h
View file

@ -43,6 +43,10 @@ If you have questions concerning this license or the applicable additional terms
#define ENGINE_VERSION "RBDOOM 3 BFG 1.3.0" // printed in console
// RB end
// jmarshall
#define ENGINE_BRANCH "master"
// jmarshall end
#define BASE_GAMEDIR "base"
#define CONFIG_FILE "D3BFGConfig.cfg"

7
neo/framework/Zip.h
View file

@ -31,7 +31,9 @@ If you have questions concerning this license or the applicable additional terms
#include <zlib.h>
// DG: all the zip access stuff from minizip is now in minizip/zip.h
#include "libs/zlib/minizip/zip.h"
#ifndef TYPEINFOPROJECT
#include "libs/zlib/minizip/zip.h"
#endif
/*
@ -71,10 +73,11 @@ public:
void CleanSourceFolder();
bool CreateZipFileFromFileList( const char* name, const idList< idFile_Memory* >& srcFiles );
#ifndef TYPEINFOPROJECT
zipFile CreateZipFile( const char* name );
bool AddFile( zipFile zf, idFile_Memory* fm, bool deleteFile );
void CloseZipFile( zipFile zf );
#endif
private:
bool CreateZipFile( bool appendFiles );
bool CreateZipFileFromFiles( const idList< idFile_Memory* >& srcFiles );

3
neo/idlib/Lib.cpp
View file

@ -126,6 +126,9 @@ idVec4 colorBrown = idVec4( 0.40f, 0.35f, 0.08f, 1.00f );
idVec4 colorLtGrey = idVec4( 0.75f, 0.75f, 0.75f, 1.00f );
idVec4 colorMdGrey = idVec4( 0.50f, 0.50f, 0.50f, 1.00f );
idVec4 colorDkGrey = idVec4( 0.25f, 0.25f, 0.25f, 1.00f );
// jmarshall
idVec4 colorGold = idVec4( 0.68, 0.63, 0.36, 1.00f );
// jmarshall end
/*
================

3
neo/idlib/Lib.h
View file

@ -128,6 +128,9 @@ extern idVec4 colorBrown;
extern idVec4 colorLtGrey;
extern idVec4 colorMdGrey;
extern idVec4 colorDkGrey;
// jmarshall
extern idVec4 colorGold;
// jmarshall end
// packs color floats in the range [0,1] into an integer
dword PackColor( const idVec3& color );

23
neo/idlib/math/Matrix.h
View file

@ -960,7 +960,9 @@ public:
const float* ToFloatPtr() const;
float* ToFloatPtr();
const char* ToString( int precision = 2 ) const;
// jmarshall
idMat3 ToMat3( void ) const;
// jmarshall end
private:
idVec4 mat[ 4 ];
};
@ -969,6 +971,25 @@ extern idMat4 mat4_zero;
extern idMat4 mat4_identity;
#define mat4_default mat4_identity
// jmarshall
ID_INLINE idMat3 idMat4::ToMat3( void ) const
{
idMat3 m;
m[0][0] = mat[0][0];
m[0][1] = mat[0][1];
m[0][2] = mat[0][2];
m[1][0] = mat[1][0];
m[1][1] = mat[1][1];
m[1][2] = mat[1][2];
m[2][0] = mat[2][0];
m[2][1] = mat[2][1];
m[2][2] = mat[2][2];
return m;
}
// jmarshall end
ID_INLINE idMat4::idMat4()
{
}

2
neo/libs/zlib/trees.c
View file

@ -38,7 +38,9 @@
// RB: avoid problems with SourceAnnotations.h
#define VERIFY_FORMAT_STRING
#ifndef TYPEINFOPROJECT
#include "idlib/sys/sys_defines.h"
#endif
#ifdef DEBUG
# include <ctype.h>

2
neo/renderer/Model_obj.h
View file

@ -60,4 +60,4 @@ struct objModel_t
objModel_t* OBJ_Load( const char* fileName );
void OBJ_Free( objModel_t* obj );
#endif /* !__MODEL_ASE_H__ */
#endif /* !__MODEL_OBJ_H__ */

9
neo/renderer/RenderBackend.cpp
View file

@ -1746,7 +1746,14 @@ void idRenderBackend::RenderInteractions( const drawSurf_t* surfList, const view
// apply the world-global overbright and the 2x factor for specular
const idVec4 diffuseColor = lightColor;
const idVec4 specularColor = lightColor * 2.0f;
// jmarshall
idVec4 specularColor = lightColor * 2.0f;
if( vLight->lightDef->parms.noSpecular )
{
specularColor.Zero();
}
// jmarshall end
float lightTextureMatrix[16];
if( lightStage->texture.hasMatrix )