From 69984b54e5d3776c3f2ca1b20ab038fd6561399f Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 1 May 2016 16:49:44 -0400 Subject: [PATCH] Fixed aspect ratio storage. Adjusted indentation slightly. --- Outputs/CRT/Internals/TextureTarget.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Outputs/CRT/Internals/TextureTarget.cpp b/Outputs/CRT/Internals/TextureTarget.cpp index 603bc9821..9391dbfc1 100644 --- a/Outputs/CRT/Internals/TextureTarget.cpp +++ b/Outputs/CRT/Internals/TextureTarget.cpp @@ -85,7 +85,7 @@ void TextureTarget::draw(float aspect_ratio) "void main(void)" "{" - "fragColour = texture(texID, texCoordVarying);" + "fragColour = vec4(0.5);"//texture(texID, texCoordVarying);" "}"; _pixel_shader = std::unique_ptr(new Shader(vertex_shader, fragment_shader, nullptr)); @@ -111,7 +111,7 @@ void TextureTarget::draw(float aspect_ratio) if(_set_aspect_ratio != aspect_ratio) { - aspect_ratio = _set_aspect_ratio; + _set_aspect_ratio = aspect_ratio; int8_t buffer[12*4]; // establish texture coordinates @@ -127,18 +127,18 @@ void TextureTarget::draw(float aspect_ratio) if(aspect_ratio_ratio >= 1.0f) { // output is thinner than we are; letterbox - fl_buffer[0] = -1.0f; fl_buffer[1] = 1.0f / aspect_ratio_ratio; - fl_buffer[3] = -1.0f; fl_buffer[4] = -1.0f / aspect_ratio_ratio; - fl_buffer[6] = 1.0f; fl_buffer[7] = 1.0f / aspect_ratio_ratio; - fl_buffer[9] = 1.0f; fl_buffer[10] = -1.0f / aspect_ratio_ratio; + fl_buffer[0] = -1.0f; fl_buffer[1] = 1.0f / aspect_ratio_ratio; + fl_buffer[3] = -1.0f; fl_buffer[4] = -1.0f / aspect_ratio_ratio; + fl_buffer[6] = 1.0f; fl_buffer[7] = 1.0f / aspect_ratio_ratio; + fl_buffer[9] = 1.0f; fl_buffer[10] = -1.0f / aspect_ratio_ratio; } else { // output is wider than we are; pillarbox - fl_buffer[0] = -aspect_ratio_ratio; fl_buffer[1] = 1.0f; - fl_buffer[3] = -aspect_ratio_ratio; fl_buffer[4] = -1.0f; - fl_buffer[6] = aspect_ratio_ratio; fl_buffer[7] = 1.0f; - fl_buffer[9] = aspect_ratio_ratio; fl_buffer[10] = -1.0f; + fl_buffer[0] = -aspect_ratio_ratio; fl_buffer[1] = 1.0f; + fl_buffer[3] = -aspect_ratio_ratio; fl_buffer[4] = -1.0f; + fl_buffer[6] = aspect_ratio_ratio; fl_buffer[7] = 1.0f; + fl_buffer[9] = aspect_ratio_ratio; fl_buffer[10] = -1.0f; } // upload buffer