aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2012-09-07 01:40:13 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2013-01-13 22:40:53 +0100
commit1afc45aaae50ab208f75e27e7a4d88004402023e (patch)
tree88f9ff3cd45d52374966d1c0165e2f2947b8c08f
parent3032acedd104dccd6755d942671e25d2a7ba358f (diff)
downloadusdx-1afc45aaae50ab208f75e27e7a4d88004402023e.tar.gz
usdx-1afc45aaae50ab208f75e27e7a4d88004402023e.tar.xz
usdx-1afc45aaae50ab208f75e27e7a4d88004402023e.zip
menu/static: code style: remove this/getter if not needed
-rw-r--r--src/menu/static.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/menu/static.cpp b/src/menu/static.cpp
index 8bd61ff1..40ff3f6e 100644
--- a/src/menu/static.cpp
+++ b/src/menu/static.cpp
@@ -85,8 +85,7 @@ namespace usdx
void Static::draw(void)
{
// shortcut if not initilized or nothing to draw
- if ((this->vertices == NULL)
- || (!this->get_filled() && !this->get_stroked()))
+ if ((vertices == NULL) || !(filled || stroked))
return;
glEnableClientState(GL_VERTEX_ARRAY);
@@ -94,7 +93,7 @@ namespace usdx
glVertexPointer(2, GL_FLOAT, 0, vertices);
- if (this->get_filled()) {
+ if (filled) {
// draw filling
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -106,7 +105,7 @@ namespace usdx
glDisable(GL_BLEND);
}
- if (this->get_stroked()) {
+ if (stroked) {
// draw border
glColorPointer(stroke.get_array_comonent_count(), GL_UNSIGNED_BYTE,
0, stroke.get_array(vertices_count));