Fix spurious blank lines on stdout.

[movit] / widgets.cpp

diff --git a/widgets.cpp b/widgets.cpp
index 53b0eacbc5811d3b72fcbcfefe4dc53e039d2115..85fa04899697d35602c1a8c25f2b348b512f294a 100644 (file)
--- a/widgets.cpp
+++ b/widgets.cpp
@@ -1,24 +1,22 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <math.h>
-#include <GL/gl.h>
-#include <GL/glext.h>
 
 #include "widgets.h"
 #include "util.h"
-#include "texture_enum.h"
+#include "opengl.h"
 
 #define HSV_WHEEL_SIZE 128
 
+GLuint hsv_wheel_num;
+
 void draw_hsv_wheel(float y, float rad, float theta, float value)
 {
-       glUseProgramObjectARB(0);
+       glUseProgram(0);
        check_error();
        glActiveTexture(GL_TEXTURE0);
        check_error();
        glEnable(GL_TEXTURE_2D);
        check_error();
-       glBindTexture(GL_TEXTURE_2D, HSV_WHEEL);
+       glBindTexture(GL_TEXTURE_2D, hsv_wheel_num);
        check_error();
        glActiveTexture(GL_TEXTURE1);
        check_error();
@@ -81,7 +79,7 @@ void draw_hsv_wheel(float y, float rad, float theta, float value)
 
 void draw_saturation_bar(float y, float saturation)
 {
-       glUseProgramObjectARB(0);
+       glUseProgram(0);
        check_error();
 
        // value slider
@@ -110,6 +108,8 @@ void draw_saturation_bar(float y, float saturation)
 
 void make_hsv_wheel_texture()
 {
+       glGenTextures(1, &hsv_wheel_num);
+
        static unsigned char hsv_pix[HSV_WHEEL_SIZE * HSV_WHEEL_SIZE * 4];
        for (int y = 0; y < HSV_WHEEL_SIZE; ++y) {
                for (int x = 0; x < HSV_WHEEL_SIZE; ++x) {
@@ -130,10 +130,9 @@ void make_hsv_wheel_texture()
                                hsv_pix[(y * HSV_WHEEL_SIZE + x) * 4 + 3] = 255;
                        }
                }
-               printf("\n");
        }
 
-       glBindTexture(GL_TEXTURE_2D, HSV_WHEEL);
+       glBindTexture(GL_TEXTURE_2D, hsv_wheel_num);
        check_error();
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
        check_error();