Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

image load correction and correction dump splatting with an unassigned texture #34

Merged
merged 6 commits into from
Sep 27, 2020
Merged

image load correction and correction dump splatting with an unassigned texture #34

merged 6 commits into from
Sep 27, 2020

Conversation

mitra-projects
Copy link
Contributor

two corrections;

  1. it was not possible load the png height files without adding specifiying the image format in the image::load function.
  2. splat return error when the texture selected was still not assigned to a layer (so program try to add a new layer). The normal map associated to the diffuse map selected was not ready, so the resource load return an exception. The original code assumes the normal map name is concatenated to the diffuse map name with a ";" as separator in the widget, so I changed using this logic

added file type to image load
added file type to image load during height file load
error in the management of diffuse texture.
check the normal texture is valorized in order to avoid exception in resource management
valorize normal map using assuming the naming convention with the diffuse map (the separator ";" was used by the standard code already ma normal map was never valorized -> dump with splatting )
Changed cast; the object is already a float* truing to convert it in an unsigned long generate an exception
@paroj
Copy link
Member

paroj commented Sep 27, 2020

👍 thanks. but please write your changes into the "subject line" of the commit next time, so the commit overview looks sane.

@paroj paroj merged commit e593231 into OGRECave:master Sep 27, 2020
@mitra-projects
Copy link
Contributor Author

mitra-projects commented Sep 28, 2020 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants