Working on portrait mode
This commit is contained in:
1 parent
8c42179576
commit
b41e312511
19 files changed
+102
-636
No files matched your search
@@ -115,6 +115,8 @@ namespace ZL {
|
||||
hudStep5aRoot = loadUiFromFile("resources/w/ui/hud_step5a.json", renderer, zipFile);
|
||||
hudStep5bRoot = loadUiFromFile("resources/w/ui/hud_step5b.json", renderer, zipFile);
|
||||
hudStep5abRoot = loadUiFromFile("resources/w/ui/hud_step5ab.json", renderer, zipFile);
|
||||
//hudStep5abRoot = loadUiFromFile("resources/w/ui/portrait_hud_uni_int_full.json", renderer, zipFile);
|
||||
//hudStep5abRoot = loadUiFromFile("resources/w/ui/portrait_hud_uni_int_dark_full.json", renderer, zipFile);
|
||||
hudUniExtRoot = loadUiFromFile("resources/w/ui/hud_uni_ext.json", renderer, zipFile);
|
||||
hudUniIntStep10Root = loadUiFromFile("resources/w/ui/hud_uni_int_step10.json", renderer, zipFile);
|
||||
hudUniIntStep11Root = loadUiFromFile("resources/w/ui/hud_uni_int_step11.json", renderer, zipFile);
|
||||
|
||||
@@ -262,10 +262,14 @@ void DialogueOverlay::drawPortrait(Renderer& renderer, const PresentationModel&
|
||||
glBindTexture(GL_TEXTURE_2D, textboxChoiceTexture->getTexID());
|
||||
renderer.DrawVertexRenderStruct(portraitPanelQuad.mesh);
|
||||
|
||||
auto portrait = loadTextureCached(model.portraitPath);
|
||||
if (portrait) {
|
||||
glBindTexture(GL_TEXTURE_2D, portrait->getTexID());
|
||||
renderer.DrawVertexRenderStruct(portraitAbovePortraitQuad.mesh);
|
||||
if (model.portraitPath != "resources/dialogue/portrait_phone.png")
|
||||
{
|
||||
|
||||
auto portrait = loadTextureCached(model.portraitPath);
|
||||
if (portrait) {
|
||||
glBindTexture(GL_TEXTURE_2D, portrait->getTexID());
|
||||
renderer.DrawVertexRenderStruct(portraitAbovePortraitQuad.mesh);
|
||||
}
|
||||
}
|
||||
|
||||
renderer.PopMatrix();
|
||||
|
||||
Reference in new issue
Block a user