id-software/DoomRTX
1
0
Fork 0
mirror of https://github.com/jmarshall23/DoomRTX.git synced 2026-08-12 08:11:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added material assignment in model view, citybuilder, and transalte scale and offset window to model view.

Browse Source
This commit is contained in:
Justin Marshall
2026-05-28 04:14:22 -07:00
parent a7e7e8edbc
commit 05d547a27b
20 changed files with 29018 additions and 17225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neo/doom3/game/anim/Anim_Blend.cpp
+10 -3
View File
@@ -2617,8 +2617,8 @@ bool idDeclModelDef::Parse( const char *text, const int textLength ) {
}
filename = token2;
filename.ExtractFileExtension( extension );
if ( extension != MD5_MESH_EXT ) {
src.Warning( "Invalid model for MD5 mesh" );
if ( extension != MD5_MESH_EXT && extension != MD5_STATIC_EXT ) {
src.Warning( "Invalid model for modelDef mesh" );
MakeDefault();
return false;
}
@@ -2638,7 +2638,9 @@ bool idDeclModelDef::Parse( const char *text, const int textLength ) {
// get the number of joints
num = modelHandle->NumJoints();
if ( !num ) {
src.Warning( "Model '%s' has no joints", filename.c_str() );
if ( extension == MD5_MESH_EXT ) {
src.Warning( "Model '%s' has no joints", filename.c_str() );
}
}
// set up the joint hierarchy
@@ -2693,6 +2695,11 @@ bool idDeclModelDef::Parse( const char *text, const int textLength ) {
MakeDefault();
return false;
}
if ( modelHandle->NumJoints() <= 0 ) {
src.Warning( "Static model '%s' cannot define anims", modelHandle->Name() );
MakeDefault();
return false;
}
if ( !ParseAnim( src, numDefaultAnims ) ) {
MakeDefault();
return false;