Mercurial > hg > orthanc-stone
annotate OrthancStone/Sources/Scene2D/Internals/OpenGLTextProgram.cpp @ 1624:59f95b9ea858
fix build
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 06 Nov 2020 17:30:36 +0100 |
| parents | 8563ea5d8ae4 |
| children | 9ac2a65d4172 |
| rev | line source |
|---|---|
| 592 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
1270
2d8ab34c8c91
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 592 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public License |
| 592 | 9 * as published by the Free Software Foundation, either version 3 of |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
15 * Lesser General Public License for more details. |
|
1596
4fb8fdf03314
removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1576
diff
changeset
|
16 * |
|
1598
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
18 * License along with this program. If not, see |
|
8563ea5d8ae4
relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
19 * <http://www.gnu.org/licenses/>. |
| 592 | 20 **/ |
| 21 | |
| 22 | |
| 23 #include "OpenGLTextProgram.h" | |
|
611
e3f21a265be5
Added version directive to GLSL shader code + glew init function in sample code
Benjamin Golinvaux <bgo@osimis.io>
parents:
592
diff
changeset
|
24 #include "OpenGLShaderVersionDirective.h" |
| 592 | 25 |
| 26 #include "../../Fonts/OpenGLTextCoordinates.h" | |
| 27 | |
| 1624 | 28 #include <Logging.h> |
|
1455
30deba7bc8e2
simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1270
diff
changeset
|
29 #include <OrthancException.h> |
| 592 | 30 |
| 31 | |
| 32 static const unsigned int COMPONENTS = 2; | |
| 33 | |
| 34 static const char* VERTEX_SHADER = | |
|
611
e3f21a265be5
Added version directive to GLSL shader code + glew init function in sample code
Benjamin Golinvaux <bgo@osimis.io>
parents:
592
diff
changeset
|
35 ORTHANC_STONE_OPENGL_SHADER_VERSION_DIRECTIVE |
| 592 | 36 "attribute vec2 a_texcoord; \n" |
| 37 "attribute vec4 a_position; \n" | |
| 38 "uniform mat4 u_matrix; \n" | |
| 39 "varying vec2 v_texcoord; \n" | |
| 40 "void main() \n" | |
| 41 "{ \n" | |
| 42 " gl_Position = u_matrix * a_position; \n" | |
| 43 " v_texcoord = a_texcoord; \n" | |
| 44 "}"; | |
| 45 | |
| 46 static const char* FRAGMENT_SHADER = | |
|
611
e3f21a265be5
Added version directive to GLSL shader code + glew init function in sample code
Benjamin Golinvaux <bgo@osimis.io>
parents:
592
diff
changeset
|
47 ORTHANC_STONE_OPENGL_SHADER_VERSION_DIRECTIVE |
| 592 | 48 "uniform sampler2D u_texture; \n" |
| 49 "uniform vec3 u_color; \n" | |
| 50 "varying vec2 v_texcoord; \n" | |
| 51 "void main() \n" | |
| 52 "{ \n" | |
| 53 " vec4 v = texture2D(u_texture, v_texcoord); \n" | |
| 54 " gl_FragColor = vec4(u_color * v.w, v.w); \n" // Premultiplied alpha | |
| 55 "}"; | |
| 56 | |
| 57 | |
| 58 namespace OrthancStone | |
| 59 { | |
| 60 namespace Internals | |
| 61 { | |
| 62 OpenGLTextProgram::OpenGLTextProgram(OpenGL::IOpenGLContext& context) : | |
| 63 context_(context) | |
| 64 { | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
65 if (!context_.IsContextLost()) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
66 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
67 context_.MakeCurrent(); |
| 592 | 68 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
69 program_.reset(new OpenGL::OpenGLProgram(context_)); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
70 program_->CompileShaders(VERTEX_SHADER, FRAGMENT_SHADER); |
| 592 | 71 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
72 positionLocation_ = program_->GetAttributeLocation("a_position"); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
73 textureLocation_ = program_->GetAttributeLocation("a_texcoord"); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
74 } |
| 592 | 75 } |
| 76 | |
| 77 | |
| 78 OpenGLTextProgram::Data::Data(OpenGL::IOpenGLContext& context, | |
| 79 const GlyphTextureAlphabet& alphabet, | |
| 80 const TextSceneLayer& layer) : | |
| 81 context_(context), | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
699
diff
changeset
|
82 red_(layer.GetColor().GetRedAsFloat()), |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
699
diff
changeset
|
83 green_(layer.GetColor().GetGreenAsFloat()), |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
699
diff
changeset
|
84 blue_(layer.GetColor().GetBlueAsFloat()), |
| 592 | 85 x_(layer.GetX()), |
| 86 y_(layer.GetY()), | |
| 87 border_(layer.GetBorder()), | |
| 88 anchor_(layer.GetAnchor()) | |
| 89 { | |
| 90 OpenGL::OpenGLTextCoordinates coordinates(alphabet, layer.GetText()); | |
| 91 textWidth_ = coordinates.GetTextWidth(); | |
| 92 textHeight_ = coordinates.GetTextHeight(); | |
| 93 | |
| 94 if (coordinates.IsEmpty()) | |
| 95 { | |
| 96 coordinatesCount_ = 0; | |
| 97 } | |
| 98 else | |
| 99 { | |
| 100 coordinatesCount_ = coordinates.GetRenderingCoords().size(); | |
| 101 | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
102 if (!context_.IsContextLost()) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
103 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
104 context_.MakeCurrent(); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
105 glGenBuffers(2, buffers_); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
106 ORTHANC_OPENGL_CHECK("glGenBuffers"); |
| 592 | 107 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
108 glBindBuffer(GL_ARRAY_BUFFER, buffers_[0]); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
109 ORTHANC_OPENGL_CHECK("glBindBuffer"); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
110 glBufferData(GL_ARRAY_BUFFER, sizeof(float) * coordinatesCount_, |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
111 &coordinates.GetRenderingCoords()[0], GL_STATIC_DRAW); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
112 ORTHANC_OPENGL_CHECK("glBufferData"); |
| 592 | 113 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
114 glBindBuffer(GL_ARRAY_BUFFER, buffers_[1]); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
115 ORTHANC_OPENGL_CHECK("glBindBuffer"); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
116 glBufferData(GL_ARRAY_BUFFER, sizeof(float) * coordinatesCount_, |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
117 &coordinates.GetTextureCoords()[0], GL_STATIC_DRAW); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
118 ORTHANC_OPENGL_CHECK("glBufferData"); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
119 } |
| 592 | 120 } |
| 121 } | |
| 122 | |
| 123 | |
| 124 OpenGLTextProgram::Data::~Data() | |
| 125 { | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
126 if (!context_.IsContextLost() && !IsEmpty()) |
| 592 | 127 { |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
128 try |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
129 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
130 context_.MakeCurrent(); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
131 ORTHANC_OPENGL_TRACE_CURRENT_CONTEXT("About to call glDeleteBuffers"); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
132 glDeleteBuffers(2, buffers_); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
133 ORTHANC_OPENGL_CHECK("glDeleteBuffers"); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
134 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
135 catch (const Orthanc::OrthancException& e) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
136 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
137 if (e.HasDetails()) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
138 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
139 LOG(ERROR) << "OrthancException in ~Data: " << e.What() << " Details: " << e.GetDetails(); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
140 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
141 else |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
142 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
143 LOG(ERROR) << "OrthancException in ~Data: " << e.What(); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
144 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
145 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
146 catch (const std::exception& e) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
147 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
148 LOG(ERROR) << "std::exception in ~Data: " << e.what(); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
149 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
150 catch (...) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
151 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
152 LOG(ERROR) << "Unknown exception in ~Data"; |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
153 } |
| 592 | 154 } |
| 155 } | |
| 156 | |
| 157 | |
| 158 GLuint OpenGLTextProgram::Data::GetSceneLocationsBuffer() const | |
| 159 { | |
| 160 if (IsEmpty()) | |
| 161 { | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
947
diff
changeset
|
162 LOG(ERROR) << "OpenGLTextProgram::Data::GetSceneLocationsBuffer(): (IsEmpty())"; |
| 592 | 163 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 164 } | |
| 165 else | |
| 166 { | |
| 167 return buffers_[0]; | |
| 168 } | |
| 169 } | |
| 170 | |
| 171 GLuint OpenGLTextProgram::Data::GetTextureLocationsBuffer() const | |
| 172 { | |
| 173 if (IsEmpty()) | |
| 174 { | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
947
diff
changeset
|
175 LOG(ERROR) << "OpenGLTextProgram::Data::GetTextureLocationsBuffer(): (IsEmpty())"; |
| 592 | 176 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 177 } | |
| 178 else | |
| 179 { | |
| 180 return buffers_[1]; | |
| 181 } | |
| 182 } | |
| 183 | |
| 184 void OpenGLTextProgram::Apply(OpenGL::OpenGLTexture& fontTexture, | |
| 185 const Data& data, | |
|
1576
92fca2b3ba3d
sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
186 const AffineTransform2D& transform, |
|
92fca2b3ba3d
sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
187 unsigned int canvasWidth, |
|
92fca2b3ba3d
sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
188 unsigned int canvasHeight) |
| 592 | 189 { |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
190 if (!context_.IsContextLost() && !data.IsEmpty()) |
| 592 | 191 { |
| 192 context_.MakeCurrent(); | |
| 193 program_->Use(); | |
| 194 | |
| 195 double dx, dy; // In pixels | |
| 196 ComputeAnchorTranslation(dx, dy, data.GetAnchor(), | |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
197 data.GetTextWidth(), data.GetTextHeight(), |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
198 static_cast<unsigned int>(data.GetBorder())); |
| 592 | 199 |
| 200 double x = data.GetX(); | |
| 201 double y = data.GetY(); | |
| 202 transform.Apply(x, y); | |
| 203 | |
| 204 const AffineTransform2D t = AffineTransform2D::CreateOffset(x + dx, y + dy); | |
| 205 | |
| 206 float m[16]; | |
|
1576
92fca2b3ba3d
sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
207 t.ConvertToOpenGLMatrix(m, canvasWidth, canvasHeight); |
| 592 | 208 |
| 209 fontTexture.Bind(program_->GetUniformLocation("u_texture")); | |
| 210 glUniformMatrix4fv(program_->GetUniformLocation("u_matrix"), 1, GL_FALSE, m); | |
| 211 glUniform3f(program_->GetUniformLocation("u_color"), | |
| 212 data.GetRed(), data.GetGreen(), data.GetBlue()); | |
| 213 | |
| 214 glBindBuffer(GL_ARRAY_BUFFER, data.GetSceneLocationsBuffer()); | |
| 215 glEnableVertexAttribArray(positionLocation_); | |
| 216 glVertexAttribPointer(positionLocation_, COMPONENTS, GL_FLOAT, GL_FALSE, 0, 0); | |
| 217 | |
| 218 glBindBuffer(GL_ARRAY_BUFFER, data.GetTextureLocationsBuffer()); | |
| 219 glEnableVertexAttribArray(textureLocation_); | |
| 220 glVertexAttribPointer(textureLocation_, COMPONENTS, GL_FLOAT, GL_FALSE, 0, 0); | |
| 221 | |
| 222 glEnable(GL_BLEND); | |
| 223 glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); | |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
224 glDrawArrays(GL_TRIANGLES, 0, |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
225 static_cast<GLsizei>(data.GetCoordinatesCount() / COMPONENTS)); |
| 592 | 226 glDisable(GL_BLEND); |
| 227 | |
| 228 glDisableVertexAttribArray(positionLocation_); | |
| 229 glDisableVertexAttribArray(textureLocation_); | |
| 230 } | |
| 231 } | |
| 232 } | |
| 233 } |