diff --git a/base/renderConfig.cpp b/base/renderConfig.cpp index 3d12e06..b1ba75b 100644 --- a/base/renderConfig.cpp +++ b/base/renderConfig.cpp @@ -52,7 +52,14 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string settings.debugMode = toml::find(debug, "debugMode"); //settings.cleanUpImageSequece = toml::find_or(debug, "cleanUpImageSequece"); - // + /* + get fielPath + */ + + auto& tomlFilePath = toml::find(config, "filePath"); + + // gltf model path + /* conversion: type and coordinate system @@ -125,6 +132,20 @@ void PlumageConfig::PlumageConfiguration::readConfigurationFromToml(std::string //settings.cY = settings.cY * ratioY; } +std::string PlumageConfig::PlumageConfiguration::checkFilePath(std::string configFilePath) +{ + std::filesystem::path filesystemConfigFilePath = configFilePath; + if (std::filesystem::exists(filesystemConfigFilePath)) + { + return filesystemConfigFilePath.generic_string(); + } + else + { + filesystemConfigFilePath = getAssetPath() + configFilePath; + return filesystemConfigFilePath.generic_string(); + } +} + glm::vec3 PlumageConfig::PlumageConfiguration::getTranslatedVector(glm::vec3 currentVector,glm::vec3 targetVector) { glm::vec3 translate = glm::vec3(0.f,0.f,0.f) - targetVector; diff --git a/base/renderConfig.h b/base/renderConfig.h index e000c5b..91d0cde 100644 --- a/base/renderConfig.h +++ b/base/renderConfig.h @@ -153,6 +153,8 @@ namespace PlumageConfig void readConfigurationFromToml(std::string configFilePath,Settings& settings); + std::string checkFilePath(std::string configFilePath); + void convertIntToVkSampleCount(uint32_t sampleCount); glm::vec3 getTranslatedVector(glm::vec3 beforeVector, glm::vec3 afterVector); diff --git a/data/models/yukino_zheng.ply b/data/models/yukino_zheng.ply new file mode 100644 index 0000000..d570cf6 Binary files /dev/null and b/data/models/yukino_zheng.ply differ