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

[+] Recursive entity/collection support for gltf maps

Browse source 
[+] KHR_lights_punctual spotlight support
This commit is contained in:
HarrievG 2022-10-27 00:52:01 +02:00 committed by Robert Beckebans
parent 9589ea300d
commit 2cf8d5c8f9
2 changed files with 157 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

187
neo/idlib/MapFile_gltf.cpp
View file

@ -340,6 +340,137 @@ static void AddMeshesToWorldspawn_r( idMapEntity* entity, gltfNode* node, const
}
};
void ResolveLight( gltfData* data, idMapEntity* newEntity, gltfNode* node )
{
assert( node && node->extensions.KHR_lights_punctual );
int lightID = node->extensions.KHR_lights_punctual->light;
gltfExt_KHR_lights_punctual* light = nullptr;
auto& ext = data->ExtensionsList();
for( auto& it : ext )
{
if( it->KHR_lights_punctual.Num() )
{
assert( lightID + 1 <= it->KHR_lights_punctual.Num() );
light = it->KHR_lights_punctual[lightID];
}
}
assert( light );
switch( gltfExt_KHR_lights_punctual::resolveType( light->type ) )
{
default:
break;
case gltfExt_KHR_lights_punctual::Directional:
{
break;
}
case gltfExt_KHR_lights_punctual::Point:
{
break;
}
case gltfExt_KHR_lights_punctual::Spot:
{
idMat4 entityToWorldTransform = mat4_identity;
gltfData::ResolveNodeMatrix( node, &entityToWorldTransform );
idMat4 worldToEntityTransform = entityToWorldTransform.Inverse();
float fov = tan( light->spot.outerConeAngle ) / idMath::HALF_PI ;
idMat3 axis = idAngles( 0.0f, 90.0f, 90.0f ).ToMat3() * entityToWorldTransform.ToMat3();
newEntity->epairs.SetMatrix( "rotation", mat3_default );
newEntity->epairs.SetVector( "_color", light->color );
newEntity->epairs.SetVector( "light_target", axis[0] );
newEntity->epairs.SetVector( "light_right", axis[1] * -fov );
newEntity->epairs.SetVector( "light_up", axis[2] * fov );
newEntity->epairs.SetVector( "light_start", axis[0] * 16 );
newEntity->epairs.SetVector( "light_end", axis[0] * ( light->range - 16 ) );
newEntity->epairs.Set( "texture", "lights/spot01" );
break;
}
case gltfExt_KHR_lights_punctual::count:
break;
}
}
void ResolveEntity( gltfData* data, idMapEntity* newEntity, gltfNode* node )
{
const char* classname = node->extras.strPairs.GetString( "classname" );
if( node->name.Length() )
{
newEntity->epairs.Set( "name", node->name );
}
// copy custom properties filled in Blender
idDict newPairs = node->extras.strPairs;
newPairs.SetDefaults( &newEntity->epairs );
newEntity->epairs = newPairs;
// gather entity transform and bring it into id Tech 4 space
gltfData::ResolveNodeMatrix( node );
// set entity transform in a way the game and physics code understand it
idVec3 origin = blenderToDoomTransform * node->translation;
newEntity->epairs.SetVector( "origin", origin );
if( node->extensions.KHR_lights_punctual != nullptr )
{
ResolveLight( data, newEntity, node );
}
// TODO set rotation key to store rotation and scaling
//if (idStr::Icmp(classname, "info_player_start") == 0)
// if( !node->matrix.IsIdentity() )
//{
// newEntity->epairs.SetMatrix("rotation", axis );
//}
#if 0
for( int i = 0; i < newEntity->epairs.GetNumKeyVals(); i++ )
{
const idKeyValue* kv = newEntity->epairs.GetKeyVal( i );
idLib::Printf( "entity[ %s ] key = '%s' value = '%s'\n", node->name.c_str(), kv->GetKey().c_str(), kv->GetValue().c_str() );
}
#endif
}
int FindEntities( gltfData* data, idMapEntity::EntityListRef entities, gltfNode* node )
{
int entityCount = 0;
const char* classname = node->extras.strPairs.GetString( "classname" );
// skip all nodes with "worldspawn." or "BSP" in the name
if( idStr::Icmpn( node->name, "BSP", 3 ) != 0 && idStr::Icmpn( node->name, "worldspawn.", 11 ) != 0 )
{
idStr classnameStr = node->extras.strPairs.GetString( "classname" );
// skip everything that is not an entity
if( !classnameStr.IsEmpty() )
{
idMapEntity* newEntity = new( TAG_IDLIB_GLTF ) idMapEntity();
entities.Append( newEntity );
ResolveEntity( data, newEntity, node );
entityCount++;
}
}
for( auto& child : node->children )
{
entityCount += FindEntities( data, entities, data->NodeList()[child] );
}
return entityCount;
}
int idMapEntity::GetEntities( gltfData* data, EntityListRef entities, int sceneID )
{
idMapEntity* worldspawn = new( TAG_IDLIB_GLTF ) idMapEntity();
@ -371,61 +502,31 @@ int idMapEntity::GetEntities( gltfData* data, EntityListRef entities, int sceneI
else
{
idStr classnameStr = node->extras.strPairs.GetString( "classname" );
bool skipInline = !node->extras.strPairs.GetBool("inline",true);
bool skipInline = !node->extras.strPairs.GetBool( "inline", true );
// skip everything that is not an entity
if( !classnameStr.IsEmpty())
if( !classnameStr.IsEmpty() )
{
idMapEntity* newEntity = new( TAG_IDLIB_GLTF ) idMapEntity();
entities.Append( newEntity );
if( node->name.Length() )
{
newEntity->epairs.Set( "name", node->name );
}
// copy custom properties filled in Blender
idDict newPairs = node->extras.strPairs;
newPairs.SetDefaults( &newEntity->epairs );
newEntity->epairs = newPairs;
// gather entity transform and bring it into id Tech 4 space
gltfData::ResolveNodeMatrix( node );
idMat4 entityToWorldTransform = node->matrix;
idMat4 worldToEntityTransform = entityToWorldTransform.Inverse();
// set entity transform in a way the game and physics code understand it
idVec3 origin = blenderToDoomTransform * node->translation;
newEntity->epairs.SetVector( "origin", origin );
// TODO set rotation key to store rotation and scaling
#if 0
if( idStr::Icmp( classname, "info_player_start" ) != 0 )
//if( !node->matrix.IsIdentity() )
{
idMat3 rotation = entityToWorldTransform.ToMat3();
newEntity->epairs.SetMatrix( "rotation", rotation );
}
#endif
#if 0
for( int i = 0; i < newEntity->epairs.GetNumKeyVals(); i++ )
{
const idKeyValue* kv = newEntity->epairs.GetKeyVal( i );
idLib::Printf( "entity[ %s ] key = '%s' value = '%s'\n", node->name.c_str(), kv->GetKey().c_str(), kv->GetValue().c_str() );
}
#endif
ResolveEntity( data, newEntity, node );
// add meshes from all subnodes
if (!skipInline)
if( !skipInline )
{
ProcessSceneNode_r(newEntity, node, mat4_identity, worldToEntityTransform, data);
gltfData::ResolveNodeMatrix( node );
idMat4 entityToWorldTransform = node->matrix;
idMat4 worldToEntityTransform = entityToWorldTransform.Inverse();
ProcessSceneNode_r( newEntity, node, mat4_identity, worldToEntityTransform, data );
}
entityCount++;
}
// add entities from all subnodes
for( auto& child : node->children )
{
entityCount += FindEntities( data, entities, data->NodeList()[child] );
}
}
}
}

18
neo/idlib/gltfProperties.h
View file

@ -701,6 +701,13 @@ public:
class gltfExt_KHR_lights_punctual
{
public:
enum Type
{
Directional,
Point,
Spot,
count
};
gltfExt_KHR_lights_punctual() : color( vec3_one ), intensity( 1.0f ), range( -1.0f ), intType( -1 ) { }
idVec3 color;
float intensity;
@ -713,21 +720,22 @@ public:
int intType;
static int resolveType( idStr type )
static Type resolveType( idStr type )
{
if( type == "directional" )
{
return 0;
return Type::Directional;
}
else if( type == "point" )
{
return 1;
return Type::Point;
}
else if( type == "spot" )
{
return 2;
return Type::Spot;
}
return -1;
return Type::count;
}
};