srctree

Robin Linden parent b020a720 ddc581b4
render: Also reset the ModelView matrix in render_setup()

This means it now also resets things like translations done in thebrowser. A lot more convenient than manually keeping track of howtranslated things are!

inline split

browser/gui.cpp added: 5, removed: 8, total 0

@@ -69,8 +69,6 @@ int main(int argc, char **argv) {

bool layout_needed{};

float scroll_offset{};

render::render_setup(window.getSize().x, window.getSize().y);

while (window.isOpen()) {

@@ -93,13 +91,11 @@ int main(int argc, char **argv) {

case sf::Keyboard::Key::J: {

float scroll = event.key.shift ? -20.f : -5.f;

glTranslatef(0, scroll, 0);

scroll_offset += scroll;

break;

}

case sf::Keyboard::Key::K: {

float scroll = event.key.shift ? 20.f : 5.f;

glTranslatef(0, scroll, 0);

scroll_offset += scroll;

break;

}

default: break;

@@ -203,8 +199,7 @@ int main(int argc, char **argv) {

}

if (layout_needed && styled) {

glTranslatef(0, -scroll_offset, 0);

scroll_offset = 0;

render::render_setup(window.getSize().x, window.getSize().y);

layout = layout::create_layout(*styled, window.getSize().x);

layout_str = layout::to_string(*layout);

layout_needed = false;

render/render.cpp added: 5, removed: 8, total 0

@@ -33,6 +33,8 @@ void render_setup(int width, int height) {

glLoadIdentity();

glOrtho(0, width, height, 0, -1.0, 1.0);

glViewport(0, 0, width, height);

glMatrixMode(GL_MODELVIEW);

glLoadIdentity();

}

void render_layout(layout::LayoutBox const &layout) {