Set proper dependencies for packed collision build

ryzomclassic-develop
kaetemi 5 years ago
parent f32a5d95d4
commit def3d25249

@ -118,6 +118,7 @@ int main(int argc, char* argv[])
CPath::remapExtension("dds", "png", true); CPath::remapExtension("dds", "png", true);
// //
R2::CScenarioEntryPoints &sep = R2::CScenarioEntryPoints::getInstance(); R2::CScenarioEntryPoints &sep = R2::CScenarioEntryPoints::getInstance();
sep.setFiles(builderConfig.CompleteIslandsFile, builderConfig.EntryPointsFile);
try try
{ {
sep.loadCompleteIslands(); sep.loadCompleteIslands();

@ -28,6 +28,8 @@ CBuilderConfig::CBuilderConfig()
CachePath = "island_packed_zones_cache"; CachePath = "island_packed_zones_cache";
CWMapCachePath = "island_cwmap_cache"; CWMapCachePath = "island_cwmap_cache";
OutputPath = "islands_col_meshes"; OutputPath = "islands_col_meshes";
CompleteIslandsFile = "r2_islands.xml";
EntryPointsFile = "r2_entry_points.txt";
CamSpeed = 100; CamSpeed = 100;
Fly = false; Fly = false;
HeightMapsAsTga = false; HeightMapsAsTga = false;
@ -76,6 +78,18 @@ void CBuilderConfig::build(NLMISC::CConfigFile &cf)
} }
} }
// //
CConfigFile::CVar *completeIslandsFileVar = cf.getVarPtr("CompleteIslandsFile");
if (completeIslandsFileVar)
{
CompleteIslandsFile = completeIslandsFileVar->asString();
}
//
CConfigFile::CVar *entryPointsFileVar = cf.getVarPtr("EntryPointsFile");
if (entryPointsFileVar)
{
EntryPointsFile = entryPointsFileVar->asString();
}
//
CConfigFile::CVar *camSpeedVar = cf.getVarPtr("CamSpeed"); CConfigFile::CVar *camSpeedVar = cf.getVarPtr("CamSpeed");
if (camSpeedVar) if (camSpeedVar)
{ {

@ -31,6 +31,8 @@ public:
std::vector<std::string> SearchPaths; std::vector<std::string> SearchPaths;
std::vector<std::string> CWMapList; std::vector<std::string> CWMapList;
std::string CWMapCachePath; std::string CWMapCachePath;
std::string CompleteIslandsFile;
std::string EntryPointsFile;
float CamSpeed; float CamSpeed;
bool Fly; bool Fly;
bool HeightMapsAsTga; bool HeightMapsAsTga;

Loading…
Cancel
Save