diff options
Diffstat (limited to 'src/ui.cpp')
| -rw-r--r-- | src/ui.cpp | 177 |
1 files changed, 1 insertions, 176 deletions
@@ -169,41 +169,6 @@ namespace ui { return ret; } - /*void importantText(const char *text, ...) { - va_list args; - - dialogBoxText.clear(); - - va_start(args, text); - auto s = uisprintf(text, args); - va_end(args); - - dialogBoxText = s; - - dialogBoxExists = true; - dialogImportant = true; - dialogPassive = false; - dialogPassiveTime = 0; - } - - void passiveImportantText(int duration, const char *text, ...) { - va_list args; - - dialogBoxText.clear(); - - va_start(args, text); - auto s = uisprintf(text, args); - va_end(args); - - dialogBoxText = s; - - dialogBoxExists = true; - dialogImportant = true; - dialogPassive = true; - dialogPassiveTime = duration; - }*/ - - void drawPage(const GLuint& tex) { pageTex = tex; pageTexReady = true; @@ -401,147 +366,7 @@ namespace ui { Render::textShader.disable(); Render::textShader.unuse(); - } /* else if (dialogBoxExists) { - rtext = typeOut(dialogBoxText); - - if (dialogImportant) { - setFontColor(255, 255, 255); - if (dialogPassive) { - dialogPassiveTime -= game::time::getDeltaTime() * 12; - if (dialogPassiveTime < 0) { - dialogPassive = false; - dialogImportant = false; - dialogBoxExists = false; - } - } - - *if (fadeIntensity == 255 || dialogPassive) { - setFontSize(24); - putStringCentered(offset.x,offset.y,rtext); - setFontSize(16); - }* - } else { //normal dialog box - - float y = offset.y + SCREEN_HEIGHT / 2 - HLINES(8); - float x = offset.x - 300; - - drawNiceBox(vec2 {x, y}, vec2 {x + 600, y - SCREEN_HEIGHT / 4}, -7.0); - - setFontZ(-7.2f); - rtext = typeOut(dialogBoxText); - UISystem::putString(vec2(x + HLINES(2), y - fontSize - game::HLINE), rtext); - - for (i = 0; i < dialogOptText.size(); i++) { - auto& sec = dialogOptText[i].second; - - setFontColor(255, 255, 255); - auto tmp = putStringCentered(offset.x, sec.y,dialogOptText[i].first); - sec.z = offset.x + tmp; - sec.x = offset.x - tmp; - sec.y = y - SCREEN_HEIGHT / 4 + (fontSize + game::HLINE) * (i + 1); - if (mouse.x > sec.x && mouse.x < sec.z && - mouse.y > sec.y && mouse.y < sec.y + 16) { // fontSize - setFontColor(255, 255, 0); - putStringCentered(offset.x, sec.y, dialogOptText[i].first); - } - } - - setFontColor(255, 255, 255); - } - - static unsigned int rtext_oldsize = 0; - if (rtext_oldsize != rtext.size()) { - if (!isspace(rtext[(rtext_oldsize = rtext.size()) - 1])) - Mix_PlayChannel(0, dialogClick, 0); - - } - - } else { - for (const auto &s : textToDraw) - putString(s.first.x, s.first.y, s.second); - }*/ - - //if (!fadeIntensity) { - /*vec2 hub = { - (SCREEN_WIDTH/2+offset.x)-fontSize*10, - (offset.y+SCREEN_HEIGHT/2)-fontSize - };*/ - - /*putText(hub.x,hub.y,"Health: %u/%u",player->health>0?(unsigned)player->health:0, - (unsigned)player->maxHealth - );*/ - /*static GLuint frontHealth = Texture::genColor(Color(255,0,0)); - static GLuint backHealth = Texture::genColor(Color(150,0,0)); - - if (player->isAlive()) { - hub.y-=fontSize*1.15; - - GLfloat tex[] = {0.0, 0.0, - 1.0, 0.0, - 0.0, 1.0, - 1.0, 1.0}; - - GLfloat back[] = {hub.x, hub.y, -7.0, - hub.x + 150, hub.y, -7.0, - hub.x, hub.y + 12, -7.0, - hub.x + 150, hub.y + 12, -7.0}; - - GLfloat front[] = {hub.x, hub.y, -7.1, - hub.x + 150, hub.y, -7.1, - hub.x, hub.y + 12, -7.1, - hub.x + 150, hub.y + 12, -7.1}; - - - glUniform1i(Render::textShader.uniform[WU_texture], 0); - - Render::textShader.use(); - Render::textShader.enable(); - - glBindTexture(GL_TEXTURE_2D, frontHealth); - - glVertexAttribPointer(Render::textShader.coord, 3, GL_FLOAT, GL_FALSE, 0, front); - glVertexAttribPointer(Render::textShader.tex, 2, GL_FLOAT, GL_FALSE, 0, tex); - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - glBindTexture(GL_TEXTURE_2D, backHealth); - - glVertexAttribPointer(Render::textShader.coord, 3, GL_FLOAT, GL_FALSE, 0, back); - glVertexAttribPointer(Render::textShader.tex, 2, GL_FLOAT, GL_FALSE, 0, tex); - glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - Render::textShader.disable(); - Render::textShader.unuse(); - }*/ - - /* - * Lists all of the quests the player is currently taking. - */ - - /*setFontColor(255,255,255,fontTransInv); - if (player->inv->invOpen) { - hub.y = player->loc.y + fontSize * 8; - hub.x = player->loc.x;// + player->width / 2; - - putStringCentered(hub.x,hub.y,"Current Quests:"); - - for(auto &c : player->qh.current) { - hub.y -= fontSize * 1.15; - putStringCentered(hub.x,hub.y,c.title); - } - - hub.y = offset.y + 40*1.2; - hub.x = offset.x + SCREEN_WIDTH/2 - 40*1.5; - - putStringCentered(hub.x,hub.y,"Equipment:"); - - hub.y = offset.y + SCREEN_HEIGHT/2 - 20; - hub.x = offset.x - SCREEN_WIDTH/2 + 45*4*1.5; - - putStringCentered(hub.x,hub.y,"Inventory:"); - }*/ - // setFontColor(255,255,255,255); - //} - + } menu::draw(); // draw the mouse |