Commit cf495f64 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

adding VAPrint for current working directory (important to find relative paths...

adding VAPrint for current working directory (important to find relative paths like data and config files and folders)
parent 3504c03c
......@@ -8,11 +8,6 @@
# If a file can not be found during runtime by local name, the core will try to locate it using the paths in ascending name order.
# Macros are not substituted, here.
InsideSceneData = D:\Users\stienen\Arbeitsumgebung\Inside\InsideSceneData
Cars = D:\Users\stienen\Arbeitsumgebung\Inside\InsideSceneData\Cars
VADataDir = D:\Users\stienen\Arbeitsumgebung\VA\VAData
VADataDirRelative = ../../../VAData
VAConfDirRelative = ../../../VACore/conf
conf_dir = conf
data_dir = data
......
......@@ -204,16 +204,14 @@ IVACore* VACore::CreateCoreInstance( const CVAStruct& oArgs )
}
IVACore* VACore::CreateCoreInstance( const std::string& sConfigFile )
{
/*
* TODO [fwe]: Diesen Abschnitt verbessern. Keine Tests auf zyklische Abhngigkeiten und Eindeutigkeit der Sections drin.
*/
{
CVAStruct oFinalCoreConfigStruct, oCurrentConfig;
std::list< VistaFileSystemFile > voConfigFiles;
std::vector< VistaFileSystemDirectory > voIncludePaths;
voConfigFiles.push_back( VistaFileSystemFile( sConfigFile ) );
VA_PRINT( "VA working directory: '" << VistaFileSystemDirectory::GetCurrentWorkingDirectory() << "'" );
while( voConfigFiles.empty() == false )
{
VistaFileSystemFile oCurrentConfigFile( voConfigFiles.front() );
......@@ -261,7 +259,8 @@ IVACore* VACore::CreateCoreInstance( const std::string& sConfigFile )
CVAStruct::const_iterator it = oPaths.Begin();
while( it != oPaths.End() )
{
const CVAStructValue& oIncludeFile( (it++)->second );
const CVAStructValue& oIncludeFile( (it++)->second );
voConfigFiles.push_back( VistaFileSystemFile( oIncludeFile ) );
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment