Avkhokhlov/light for stanalone #198
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dtarakanov1
reviewed
Sep 19, 2018
|
|
||
| namespace | ||
| { | ||
| void LoadMateirals(std::string const& basepath, Scene1::Ptr scene) |
There was a problem hiding this comment.
Materials, not Mateirals
| else if (type == "ibl") | ||
| { | ||
| auto image_io = ImageIo::CreateImageIo(); | ||
| auto tex = image_io->LoadImage(elem->Attribute("tex")); |
There was a problem hiding this comment.
Can we support paths relative to the light_file path?
| } | ||
| else | ||
| { | ||
| throw std::runtime_error("Unknown light type"); |
| } | ||
|
|
||
| tinyxml2::XMLElement* elem = root->FirstChildElement("light"); | ||
| Light::Ptr light_instance; |
| Scene1::Ptr LoadScene(Baikal::AppSettings const& settings) | ||
| { | ||
| #ifdef WIN32 | ||
| std::string basepath = settings.path + "\\"; |
There was a problem hiding this comment.
Here we should, probably, check if settings.path has a trailing slash.
|
|
||
| if (scene == nullptr) | ||
| { | ||
| throw std::runtime_error("LoadScene(...): can not create scene"); |
| @@ -14,7 +14,9 @@ set(APPLICATION_SOURCES | |||
| Application/graph_scheme.h | |||
| Application/graph_scheme.cpp | |||
| Application/material_explorer.h | |||
| Application/material_explorer.cpp) | |||
| Application/material_explorer.cpp | |||
| Application/scene_load_utils.h | |||
| #include <memory> | ||
| #include "app_utils.h" | ||
|
|
||
| class Baikal::Scene1; |
There was a problem hiding this comment.
namespace Baikal {
class Scene1;
}There is a corresponding CI build error.
yozhijk
approved these changes
Sep 21, 2018
| { | ||
| if (light_file.empty()) | ||
| { | ||
| return; |
There was a problem hiding this comment.
User probably does not intend to pass an empty light file, should that throw an exception?
There was a problem hiding this comment.
Nope, it's valid case, right there is no light file at all
| throw std::runtime_error("Failed to open lights set file."); | ||
| } | ||
|
|
||
| tinyxml2::XMLElement* elem = root->FirstChildElement("light"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.