diff --git a/App.h b/App.h index 4900173..5e2bd98 100644 --- a/App.h +++ b/App.h @@ -10,7 +10,7 @@ #include #include "stfu/stf.hpp" -#include "pngwriter/pngwriter.h" +//#include "pngwriter/pngwriter.h" #include "bmp.h" #include "shader.h" @@ -237,11 +237,13 @@ public: } void scene() { - if(mouse_buttons[0] || mouse_buttons[1] || mouse_buttons[2]){ + if(true || mouse_buttons[0] || mouse_buttons[1] || mouse_buttons[2]){ mshader.set_uniform("steps", counter/10); mshader.set_uniform("button", (mouse_buttons[0] ? 0 : (mouse_buttons[1] ? 1 : 2))); glEnableClientState(GL_VERTEX_ARRAY); + mouse[0] = 0.5; + mouse[1] = 0.5; glVertexPointer(2, GL_FLOAT, 0, &mouse[0]); glPointSize(50.0/1.0); glDrawArrays(GL_POINTS, 0, 1); @@ -260,6 +262,7 @@ public: } void save_screen(){ +#if 0 unsigned char data[width*height*6]; glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_SHORT, data); @@ -268,6 +271,7 @@ public: pngwriter png(width, height, &data[0], filename); png.close(); +#endif } void save_bmp(){ diff --git a/fbo.h b/fbo.h index 85c4998..a7a9b27 100644 --- a/fbo.h +++ b/fbo.h @@ -5,6 +5,8 @@ #include #include +//#import +//#import class fbo { public: @@ -60,7 +62,7 @@ public: std::cout << "sfb: " << savedFramebuffer << ", fbo: " << fbo_number << std::endl;*/ } - void end(){ + void end(){ unbind(); //glPopAttrib(); } @@ -91,7 +93,7 @@ private: void check_status() { GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); switch(status) { - case GL_FRAMEBUFFER_COMPLETE: + case GL_FRAMEBUFFER_COMPLETE: std::cout << "FRAMEBUFFER_COMPLETE - OK" << std::endl; return; case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT: