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

-Fixed timestamp check while loading a camera animation from a gltf file

Browse source 
- Set gltfCamera fov to framefov during anim

# Conflicts:
#	neo/d3xp/Camera.cpp
This commit is contained in:
HarrievG 2023-04-23 22:17:00 +02:00 committed by Robert Beckebans
parent ce050ea6c0
commit 03bbf9aaf4
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
neo/d3xp/Camera.cpp
View file

@ -425,7 +425,7 @@ void idCameraAnim::LoadAnim()
ID_TIME_T sourceTimeStamp = currentTimeStamp;
if( ( generatedTimeStamp != FILE_NOT_FOUND_TIMESTAMP ) && ( sourceTimeStamp != 0 ) && ( sourceTimeStamp != generatedTimeStamp ) )
if( ( generatedTimeStamp != FILE_NOT_FOUND_TIMESTAMP ) && ( sourceTimeStamp != 0 ) && ( sourceTimeStamp < generatedTimeStamp ) )
{
idFileLocal file( fileSystem->OpenFileReadMemory( generatedFileName ) );
LoadBinaryCamAnim( file, currentTimeStamp );
@ -755,11 +755,9 @@ void idCameraAnim::Event_Activate( idEntity* _activator )
void idCameraAnim::gltfLoadAnim( idStr gltfFileName, idStr animName )
{
// we dont want to load the gltb all the time. write custom binary format !
GLTF_Parser gltf;
if( gltf.Load( gltfFileName ) )
{
ID_TIME_T timeStamp = fileSystem->GetTimestamp( gltfFileName );
gltfData* data = gltf.currentAsset;
auto& accessors = data->AccessorList();
auto& nodes = data->NodeList();
@ -791,7 +789,7 @@ void idCameraAnim::gltfLoadAnim( idStr gltfFileName, idStr animName )
if( !camera.Num() )
{
cameraFrame_t t;
t.fov = 90;
t.fov = data->CameraList()[target->camera]->perspective.yfov * 100.0f;
t.q = mat3_identity.ToCQuat();
t.t = vec3_origin;
for( int i = 0; i < frames; i++ )
@ -800,11 +798,12 @@ void idCameraAnim::gltfLoadAnim( idStr gltfFileName, idStr animName )
}
}
//This has to be replaced for correct interpolation between frames
// but, if exported with frame sampling set to 1, were all good :D
for( int i = 0; i < frames; i++ )
{
cameraFrame_t& cameraFrame = camera[i];
cameraFrame.fov = 90.0f;
cameraFrame.fov = data->CameraList()[target->camera]->perspective.yfov * 100.0f;
switch( channel->target.TRS )
{
default:
@ -816,7 +815,6 @@ void idCameraAnim::gltfLoadAnim( idStr gltfFileName, idStr animName )
idList<idQuat*>& values = data->GetAccessorView<idQuat>( output );
if( values.Num() > i )
{
idQuat q = ( *values[i] );
q = idAngles( 90.0f, 0.0, -90.0f ).ToQuat()
* q.Inverse()