From 73da8c0445b3d121fa26ef8653eecf0a79f501d0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 5 Jul 2005 23:48:31 +0000 Subject: [PATCH] remove .model --- stepmania/src/Model.cpp | 31 ------------------------------- stepmania/src/Model.h | 1 - 2 files changed, 32 deletions(-) diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index f8b0fae2af..d55fd81d0f 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -61,41 +61,10 @@ void Model::Load( CString sFile ) sExt.MakeLower(); if( sExt=="txt" ) LoadMilkshapeAscii( sFile ); - else if( sExt=="model" ) - LoadFromModelFile( sFile ); } #define THROW RageException::Throw( "Parse error in \"%s\" at line %d: '%s'", sPath.c_str(), iLineNum, sLine.c_str() ) -void Model::LoadFromModelFile( CString sPath ) -{ - Clear(); - - IniFile ini; - if( !ini.ReadFile( sPath ) ) - RageException::Throw( "Model::LoadFromModelFile: Could not open \"%s\": %s", sPath.c_str(), ini.GetError().c_str() ); - - CString sDir = Dirname( sPath ); - - CString sMeshes, sMaterials, sBones; - if( !ini.GetValue( "Model", "Meshes", sMeshes ) ) - RageException::Throw( "The model file '%s' is missing the value [Model] Meshes.", sPath.c_str() ); - if( !ini.GetValue( "Model", "Materials", sMaterials ) ) - RageException::Throw( "The model file '%s' is missing the value [Model] Materials.", sPath.c_str() ); - if( !ini.GetValue( "Model", "Bones", sBones ) ) - RageException::Throw( "The model file '%s' is missing the value [Model] Bones.", sPath.c_str() ); - - sMeshes = sDir+sMeshes; - sMaterials = sDir+sMaterials; - sBones = sDir+sBones; - - CollapsePath( sMeshes ); - CollapsePath( sMaterials ); - CollapsePath( sBones ); - - LoadPieces( sMeshes, sMaterials, sBones ); -} - void Model::LoadMilkshapeAscii( CString sPath ) { LoadPieces( sPath, sPath, sPath ); diff --git a/stepmania/src/Model.h b/stepmania/src/Model.h index 5030804cab..1394f9397f 100644 --- a/stepmania/src/Model.h +++ b/stepmania/src/Model.h @@ -20,7 +20,6 @@ public: void Load( CString sFile ); void LoadPieces( CString sMeshesPath, CString sMaterialsPath, CString sBomesPath ); - void LoadFromModelFile( CString sFile ); void LoadMilkshapeAscii( CString sFile ); void LoadMaterialsFromMilkshapeAscii( CString sPath ); bool LoadMilkshapeAsciiBones( CString sAniName, CString sPath );