diff options
author | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-08-18 09:24:15 +0000 |
commit | f030154fe727e25a2afe1f78b3998c2d2dba95e4 (patch) | |
tree | cd92baf9e4fa8a136523b9eb570e9811846c9250 /src/ui/modelview.cc | |
parent | 5636fad174f0bcff857c357c394c4cc8d424b302 (diff) |
astyle cleanup, corrects not loading of material textures
Diffstat (limited to 'src/ui/modelview.cc')
-rwxr-xr-x | src/ui/modelview.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/modelview.cc b/src/ui/modelview.cc index b913060..f247e5b 100755 --- a/src/ui/modelview.cc +++ b/src/ui/modelview.cc @@ -20,7 +20,7 @@ ModelView::ModelView(Widget *parent, const char *modelname) : Widget(parent) set_border(false); set_background(false); set_label("modelview"); - + set_modelname(modelname); modelview_zoom = 1.0f; @@ -60,7 +60,7 @@ void ModelView::set_zoom(const float zoom) } bool ModelView::on_keypress(const int key, const unsigned int modifier) -{ +{ if (key == 512 + SDL_BUTTON_WHEELUP) { modelview_zoom -= 0.1f; if (modelview_zoom < 1.0f) @@ -84,7 +84,7 @@ void ModelView::draw() paint::color(1.0f, 1.0f, 1.0f); model::Model *model = model::Model::find(modelview_modelname); - if (!model) { + if (!model) { paint::bitmap(global_location(), size(), "bitmap/notex"); return; } @@ -118,7 +118,7 @@ void ModelView::draw() gl::disable(GL_LIGHTING); gl::disable(GL_COLOR_MATERIAL); // disable color tracking gl::disable(GL_CULL_FACE); // disable culling - + gl::depthmask(GL_TRUE); // enable depth buffer writing gl::disable(GL_DEPTH_TEST); // disable depth buffer testing @@ -131,7 +131,7 @@ void ModelView::draw() void ModelView::draw_border() { paint::color(palette()->foreground()); - paint::border(global_location(), size()); + paint::border(global_location(), size()); } } |