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

editLights supports .glb maps via _extra_ents.map file

Browse source
This commit is contained in:
Robert Beckebans 2025-02-01 17:47:46 +01:00
parent c353de22e3
commit bedf459907
4 changed files with 140 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/d3xp/GameEdit.cpp
View file

@ -1205,7 +1205,7 @@ void idGameEdit::MapSave( const char* path ) const
{
// RB: can't write .glb so we write a _extra_ents.map which acts like a patch
idMapFile* origFile = new( TAG_GAME ) idMapFile;
if( origFile->Parse( mapFile->GetName() ) )
if( origFile->Parse( mapFile->GetName(), true, false, true ) )
{
idStr filename = mapFile->GetName();
filename += "_extra_ents";

206
neo/idlib/MapFile.cpp
View file

@ -1595,7 +1595,7 @@ void idMapEntity::CalculateBrushOrigin()
idMapFile::Parse
===============
*/
bool idMapFile::Parse( const char* filename, bool ignoreRegion, bool osPath )
bool idMapFile::Parse( const char* filename, bool ignoreRegion, bool osPath, bool ignoreExtraEnts )
{
// no string concatenation for epairs and allow path names for materials
idLexer src( LEXFL_NOSTRINGCONCAT | LEXFL_NOSTRINGESCAPECHARS | LEXFL_ALLOWPATHNAMES );
@ -1835,53 +1835,62 @@ bool idMapFile::Parse( const char* filename, bool ignoreRegion, bool osPath )
}
// RB: <name>_extra_ents.map allows to add and override existing entities
idMapFile extrasMap;
fullName = name;
//fullName.StripFileExtension();
fullName += "_extra_ents.map";
if( extrasMap.Parse( fullName, ignoreRegion, osPath ) )
if( !ignoreExtraEnts )
{
for( i = 0; i < extrasMap.entities.Num(); i++ )
idMapFile extrasMap;
fullName = name;
//fullName.StripFileExtension();
fullName += "_extra_ents.map";
if( extrasMap.Parse( fullName, ignoreRegion, osPath ) )
{
idMapEntity* extraEnt = extrasMap.entities[i];
const idKeyValue* kv = extraEnt->epairs.FindKey( "name" );
if( kv && kv->GetValue().Length() )
for( i = 0; i < extrasMap.entities.Num(); i++ )
{
mapEnt = FindEntity( kv->GetValue().c_str() );
if( mapEnt )
{
// allow override old settings
for( int j = 0; j < extraEnt->epairs.GetNumKeyVals(); j++ )
{
const idKeyValue* pair = extraEnt->epairs.GetKeyVal( j );
if( pair && pair->GetValue().Length() )
{
mapEnt->epairs.Set( pair->GetKey(), pair->GetValue() );
}
}
idMapEntity* extraEnt = extrasMap.entities[i];
continue;
const idKeyValue* kv = extraEnt->epairs.FindKey( "name" );
if( kv && kv->GetValue().Length() )
{
mapEnt = FindEntity( kv->GetValue().c_str() );
if( mapEnt )
{
// allow override old settings
for( int j = 0; j < extraEnt->epairs.GetNumKeyVals(); j++ )
{
const idKeyValue* kv2 = extraEnt->epairs.GetKeyVal( j );
const char* key = kv2->GetKey();
const char* val = kv2->GetValue();
if( idStr::Icmp( key, "name" ) != 0 )
{
// DG: if val is "", delete key from the entity
// => same behavior as EntityChangeSpawnArgs()
if( val[0] == '\0' )
{
mapEnt->epairs.Delete( key );
}
else
{
mapEnt->epairs.Set( key, val );
}
}
}
continue;
}
}
// entity wasn't found so add new one
if( idStr::Icmp( extraEnt->epairs.GetString( "classname" ), "worldspawn" ) != 0 )
{
mapEnt = new( TAG_SYSTEM ) idMapEntity();
entities.Append( mapEnt );
// don't grab brushes or polys
mapEnt->epairs.Copy( extraEnt->epairs );
}
}
if( idStr::Icmp( extraEnt->epairs.GetString( "classname" ), "worldspawn" ) != 0 )
{
mapEnt = new( TAG_SYSTEM ) idMapEntity();
entities.Append( mapEnt );
// don't grab brushes or polys
mapEnt->epairs.Copy( extraEnt->epairs );
}
}
#if 0
fullName = name;
fullName += "_extra_debug.map";
Write( fullName, ".map" );
#endif
}
hasPrimitiveData = true;
@ -1982,11 +1991,6 @@ bool idMapFile::WriteJSON( const char* fileName, const char* ext, bool fromBaseP
return true;
}
/*
============
idMapFile::WriteDiff
============
*/
bool idMapFile::WriteDiff( const idMapFile* otherMap, const char* fileName, const char* ext, bool fromBasePath )
{
int i;
@ -2022,6 +2026,8 @@ bool idMapFile::WriteDiff( const idMapFile* otherMap, const char* fileName, cons
fp->WriteFloatString( "Version %d\n", CURRENT_MAP_VERSION );
}
static const char* DELETE_VAL = "";
for( i = 1; i < otherMap->entities.Num(); i++ )
{
idMapEntity* otherEnt = otherMap->entities[i];
@ -2035,11 +2041,88 @@ bool idMapFile::WriteDiff( const idMapFile* otherMap, const char* fileName, cons
idMapEntity* origEnt = FindEntity( kv->GetValue().c_str() );
if( origEnt )
{
// TODO diff epairs
// delete all entries that have been deleted
for( int d = 0; d < origEnt->epairs.GetNumKeyVals(); d++ )
{
const idKeyValue* kv = origEnt->epairs.GetKeyVal( d );
const char* key = kv->GetKey();
if( !otherEnt->epairs.FindKey( key ) )
{
epairs.Set( key, DELETE_VAL );
}
}
// update new entries
#if 1
// more compact
bool haveEpairsChanged = epairs.GetNumKeyVals() > 0;
// scan for changes
for( int d = 0; d < otherEnt->epairs.GetNumKeyVals(); d++ )
{
const idKeyValue* kv = otherEnt->epairs.GetKeyVal( d );
const char* key = kv->GetKey();
const char* val = kv->GetValue();
const idKeyValue* kv2 = origEnt->epairs.FindKey( key );
if( kv2 )
{
const char* val2 = kv2->GetValue();
if( idStr::Cmp( val, val2 ) != 0 )
{
haveEpairsChanged = true;
break;
}
}
else
{
haveEpairsChanged = true;
break;
}
}
// apply changes
if( haveEpairsChanged )
{
for( int d = 0; d < otherEnt->epairs.GetNumKeyVals(); d++ )
{
const idKeyValue* kv = otherEnt->epairs.GetKeyVal( d );
const char* key = kv->GetKey();
const char* val = kv->GetValue();
if( idStr::Icmp( key, "name" ) == 0 )
{
epairs.Set( key, val );
}
else
{
const idKeyValue* kv2 = origEnt->epairs.FindKey( key );
if( kv2 )
{
const char* val2 = kv2->GetValue();
if( idStr::Cmp( val, val2 ) != 0 )
{
epairs.Set( key, val );
}
}
else
{
// new key
epairs.Set( key, val );
}
}
}
}
#else
// better if you want to read the values in TrenchBroom
if( origEnt->epairs.GetNumKeyVals() != otherEnt->epairs.GetNumKeyVals() )
{
epairs.Copy( otherEnt->epairs );
}
#endif
}
else
{
@ -2064,37 +2147,8 @@ bool idMapFile::WriteDiff( const idMapFile* otherMap, const char* fileName, cons
fp->WriteFloatString( "}\n" );
}
/*
const idKeyValue* kv = extraEnt->epairs.FindKey( "name" );
if( kv && kv->GetValue().Length() )
{
mapEnt = FindEntity( kv->GetValue().c_str() );
if( mapEnt )
{
// allow override old settings
for( int j = 0; j < extraEnt->epairs.GetNumKeyVals(); j++ )
{
const idKeyValue* pair = extraEnt->epairs.GetKeyVal( j );
if( pair && pair->GetValue().Length() )
{
mapEnt->epairs.Set( pair->GetKey(), pair->GetValue() );
}
}
continue;
}
}
*/
}
/*
for( i = 0; i < entities.Num(); i++ )
{
entities[i]->Write( fp, i, valve220Format );
}
*/
idLib::fileSystem->CloseFile( fp );
return true;

2
neo/idlib/MapFile.h
View file

@ -498,7 +498,7 @@ public:
// normally this will use a .reg file instead of a .map file if it exists,
// which is what the game and dmap want, but the editor will want to always
// load a .map file
bool Parse( const char* filename, bool ignoreRegion = false, bool osPath = false );
bool Parse( const char* filename, bool ignoreRegion = false, bool osPath = false, bool ignoreExtraEnts = false );
bool Write( const char* fileName, const char* ext, bool fromBasePath = true );
// RB begin

10
neo/tools/imgui/lighteditor/LightEditor.cpp
View file

@ -340,9 +340,15 @@ void LightInfo::ToDict( idDict* e )
e->SetAngles( "light_angles", angles );
}
else
//if( angles.yaw != 0.0f || angles.pitch != 0.0f || angles.roll != 0.0f )
{
e->SetAngles( "angles", angles );
if( angles.yaw != 0.0f || angles.pitch != 0.0f || angles.roll != 0.0f )
{
e->SetAngles( "angles", angles );
}
else
{
e->Set( "angles", DELETE_VAL );
}
}
}