Mercurial > hg > orthanc-stone
annotate Framework/Scene2D/Internals/OpenGLLinesProgram.cpp @ 947:1091b2adeb5a toa2019081001
Fixed animation frame stopping when returning false + big work on the OpenGL
objects to make them lost context-safe + debug code to forcefully tag a
context as lost + debug macros
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Sat, 10 Aug 2019 13:07:31 +0200 |
| parents | 61ba4b504e9a |
| children | a7351ad54960 |
| 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 | |
| 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium | |
| 6 * | |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 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 | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "OpenGLLinesProgram.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
|
23 #include "OpenGLShaderVersionDirective.h" |
| 592 | 24 |
| 25 #include <Core/OrthancException.h> | |
| 26 | |
| 27 | |
| 28 static const unsigned int COMPONENTS_POSITION = 3; | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
29 static const unsigned int COMPONENTS_COLOR = 3; |
| 592 | 30 static const unsigned int COMPONENTS_MITER = 2; |
| 31 | |
| 32 | |
| 33 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
|
34 ORTHANC_STONE_OPENGL_SHADER_VERSION_DIRECTIVE |
| 592 | 35 "attribute vec2 a_miter_direction; \n" |
| 36 "attribute vec4 a_position; \n" | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
37 "attribute vec3 a_color; \n" |
| 592 | 38 "uniform float u_thickness; \n" |
| 39 "uniform mat4 u_matrix; \n" | |
| 40 "varying float v_distance; \n" | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
41 "varying vec3 v_color; \n" |
| 592 | 42 "void main() \n" |
| 43 "{ \n" | |
| 44 " v_distance = a_position.z; \n" | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
45 " v_color = a_color; \n" |
| 592 | 46 " gl_Position = u_matrix * vec4(a_position.xy + a_position.z * a_miter_direction * u_thickness, 0, 1); \n" |
| 47 "}"; | |
| 48 | |
| 49 | |
| 50 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
|
51 ORTHANC_STONE_OPENGL_SHADER_VERSION_DIRECTIVE |
| 592 | 52 "uniform bool u_antialiasing; \n" |
| 53 "uniform float u_antialiasing_start; \n" | |
| 54 "varying float v_distance; \n" // Distance of the point to the segment | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
55 "varying vec3 v_color; \n" |
| 592 | 56 "void main() \n" |
| 57 "{ \n" | |
| 58 " float d = abs(v_distance); \n" | |
| 59 " if (!u_antialiasing || \n" | |
| 60 " d <= u_antialiasing_start) \n" | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
61 " gl_FragColor = vec4(v_color, 1); \n" |
| 592 | 62 " else if (d >= 1.0) \n" |
| 63 " gl_FragColor = vec4(0, 0, 0, 0); \n" | |
| 64 " else \n" | |
| 65 " { \n" | |
| 66 " float alpha = 1.0 - smoothstep(u_antialiasing_start, 1.0, d); \n" | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
67 " gl_FragColor = vec4(v_color * alpha, alpha); \n" |
| 592 | 68 " } \n" |
| 69 "}"; | |
| 70 | |
| 71 | |
| 72 namespace OrthancStone | |
| 73 { | |
| 74 namespace Internals | |
| 75 { | |
| 76 class OpenGLLinesProgram::Data::Segment | |
| 77 { | |
| 78 private: | |
| 79 bool isEmpty_; | |
| 80 double x1_; | |
| 81 double y1_; | |
| 82 double x2_; | |
| 83 double y2_; | |
| 84 double miterX1_; | |
| 85 double miterY1_; | |
| 86 double miterX2_; | |
| 87 double miterY2_; | |
| 88 | |
| 89 Vector lineAbove_; // In homogeneous coordinates (size = 3) | |
| 90 Vector lineBelow_; | |
| 91 | |
| 92 public: | |
| 93 Segment(const PolylineSceneLayer::Chain& chain, | |
| 94 size_t index1, | |
| 95 size_t index2) : | |
| 96 isEmpty_(false) | |
| 97 { | |
| 98 if (index1 >= chain.size() || | |
| 99 index2 >= chain.size()) | |
| 100 { | |
| 101 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 102 } | |
| 103 else | |
| 104 { | |
| 105 const ScenePoint2D& p = chain[index1]; | |
| 106 const ScenePoint2D& q = chain[index2]; | |
| 107 | |
| 108 x1_ = p.GetX(); | |
| 109 y1_ = p.GetY(); | |
| 110 x2_ = q.GetX(); | |
| 111 y2_ = q.GetY(); | |
| 112 | |
| 113 const double dx = x2_ - x1_; | |
| 114 const double dy = y2_ - y1_; | |
| 115 const double norm = sqrt(dx * dx + dy * dy); | |
| 116 | |
| 117 if (LinearAlgebra::IsCloseToZero(norm)) | |
| 118 { | |
| 119 isEmpty_ = true; | |
| 120 } | |
| 121 else | |
| 122 { | |
| 123 isEmpty_ = false; | |
| 124 const double normalX = -dy / norm; | |
| 125 const double normalY = dx / norm; | |
| 126 | |
| 127 miterX1_ = normalX; | |
| 128 miterY1_ = normalY; | |
| 129 miterX2_ = normalX; | |
| 130 miterY2_ = normalY; | |
| 131 | |
| 132 Vector a = LinearAlgebra::CreateVector(x1_ + normalX, y1_ + normalY, 1); | |
| 133 Vector b = LinearAlgebra::CreateVector(x2_ + normalX, y2_ + normalY, 1); | |
| 134 LinearAlgebra::CrossProduct(lineAbove_, a, b); | |
| 135 | |
| 136 a = LinearAlgebra::CreateVector(x1_ - normalX, y1_ - normalY, 1); | |
| 137 b = LinearAlgebra::CreateVector(x2_ - normalX, y2_ - normalY, 1); | |
| 138 LinearAlgebra::CrossProduct(lineBelow_, a, b); | |
| 139 } | |
| 140 } | |
| 141 } | |
| 142 | |
| 143 bool IsEmpty() const | |
| 144 { | |
| 145 return isEmpty_; | |
| 146 } | |
| 147 | |
| 148 static double ComputeSignedArea(double x1, | |
| 149 double y1, | |
| 150 double x2, | |
| 151 double y2, | |
| 152 double x3, | |
| 153 double y3) | |
| 154 { | |
| 155 // This computes the signed area of a 2D triangle. This | |
| 156 // formula is e.g. used in the sorting algorithm of Graham's | |
| 157 // scan to compute the convex hull. | |
| 158 // https://en.wikipedia.org/wiki/Graham_scan | |
| 159 return (x2 - x1) * (y3 - y1) - (y2 - y1) * (x3 - x1); | |
| 160 } | |
| 161 | |
| 162 static void CreateMiter(Segment& left, | |
| 163 Segment& right) | |
| 164 { | |
| 165 if (!left.IsEmpty() && | |
| 166 !right.IsEmpty()) | |
| 167 { | |
| 168 Vector above, below; | |
| 169 LinearAlgebra::CrossProduct(above, left.lineAbove_, right.lineAbove_); | |
| 170 LinearAlgebra::CrossProduct(below, left.lineBelow_, right.lineBelow_); | |
| 171 | |
| 172 if (!LinearAlgebra::IsCloseToZero(above[2]) && | |
| 173 !LinearAlgebra::IsCloseToZero(below[2])) | |
| 174 { | |
| 175 // Back to inhomogeneous 2D coordinates | |
| 176 above /= above[2]; | |
| 177 below /= below[2]; | |
| 178 | |
| 179 // Check whether "above" and "below" intersection points | |
| 180 // are on the half-plane defined by the endpoints of the | |
| 181 // two segments. This is an indicator of whether the angle | |
| 182 // is too acute. | |
| 183 double s1 = ComputeSignedArea(left.x1_, left.y1_, | |
| 184 above[0], above[1], | |
| 185 right.x2_, right.y2_); | |
| 186 double s2 = ComputeSignedArea(left.x1_, left.y1_, | |
| 187 below[0], below[1], | |
| 188 right.x2_, right.y2_); | |
| 189 | |
| 190 // The two signed areas must have the same sign | |
| 191 if (s1 * s2 >= 0) | |
| 192 { | |
| 193 left.miterX2_ = above[0] - left.x2_; | |
| 194 left.miterY2_ = above[1] - left.y2_; | |
| 195 | |
| 196 right.miterX1_ = left.miterX2_; | |
| 197 right.miterY1_ = left.miterY2_; | |
| 198 } | |
| 199 } | |
| 200 } | |
| 201 } | |
| 202 | |
| 203 void AddTriangles(std::vector<float>& coords, | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
204 std::vector<float>& miterDirections, |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
205 std::vector<float>& colors, |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
206 const Color& color) |
| 592 | 207 { |
| 208 if (isEmpty_) | |
| 209 { | |
| 210 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 211 } | |
| 212 | |
| 213 // First triangle | |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
214 coords.push_back(static_cast<float>(x1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
215 coords.push_back(static_cast<float>(y1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
216 coords.push_back(static_cast<float>(1)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
217 coords.push_back(static_cast<float>(x2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
218 coords.push_back(static_cast<float>(y2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
219 coords.push_back(static_cast<float>(-1)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
220 coords.push_back(static_cast<float>(x2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
221 coords.push_back(static_cast<float>(y2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
222 coords.push_back(static_cast<float>(1)); |
| 592 | 223 |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
224 miterDirections.push_back(static_cast<float>(miterX1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
225 miterDirections.push_back(static_cast<float>(miterY1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
226 miterDirections.push_back(static_cast<float>(miterX2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
227 miterDirections.push_back(static_cast<float>(miterY2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
228 miterDirections.push_back(static_cast<float>(miterX2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
229 miterDirections.push_back(static_cast<float>(miterY2_)); |
| 592 | 230 |
| 231 // Second triangle | |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
232 coords.push_back(static_cast<float>(x1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
233 coords.push_back(static_cast<float>(y1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
234 coords.push_back(static_cast<float>(1)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
235 coords.push_back(static_cast<float>(x1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
236 coords.push_back(static_cast<float>(y1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
237 coords.push_back(static_cast<float>(-1)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
238 coords.push_back(static_cast<float>(x2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
239 coords.push_back(static_cast<float>(y2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
240 coords.push_back(static_cast<float>(-1)); |
| 592 | 241 |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
242 miterDirections.push_back(static_cast<float>(miterX1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
243 miterDirections.push_back(static_cast<float>(miterY1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
244 miterDirections.push_back(static_cast<float>(miterX1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
245 miterDirections.push_back(static_cast<float>(miterY1_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
246 miterDirections.push_back(static_cast<float>(miterX2_)); |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
247 miterDirections.push_back(static_cast<float>(miterY2_)); |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
248 |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
249 // Add the colors of the 2 triangles (leading to 2 * 3 values) |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
250 for (unsigned int i = 0; i < 6; i++) |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
251 { |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
252 colors.push_back(color.GetRedAsFloat()); |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
253 colors.push_back(color.GetGreenAsFloat()); |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
254 colors.push_back(color.GetBlueAsFloat()); |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
255 } |
| 592 | 256 } |
| 257 }; | |
| 258 | |
| 259 | |
| 260 OpenGLLinesProgram::Data::Data(OpenGL::IOpenGLContext& context, | |
| 261 const PolylineSceneLayer& layer) : | |
| 262 context_(context), | |
| 263 verticesCount_(0), | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
264 thickness_(static_cast<float>(layer.GetThickness())) |
| 592 | 265 { |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
266 if (!context_.IsContextLost()) |
| 592 | 267 { |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
268 // High-level reference: |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
269 // https://mattdesl.svbtle.com/drawing-lines-is-hard |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
270 // https://forum.libcinder.org/topic/smooth-thick-lines-using-geometry-shader |
| 592 | 271 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
272 size_t countVertices = 0; |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
273 for (size_t i = 0; i < layer.GetChainsCount(); i++) |
| 592 | 274 { |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
275 size_t countSegments = layer.GetChain(i).size() - 1; |
| 592 | 276 |
| 277 if (layer.IsClosedChain(i)) | |
| 278 { | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
279 countSegments++; |
| 592 | 280 } |
| 281 | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
282 // Each segment is made of 2 triangles. One triangle is |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
283 // defined by 3 points in 2D => 6 vertices per segment. |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
284 countVertices += countSegments * 2 * 3; |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
285 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
286 |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
287 std::vector<float> coords, colors, miterDirections; |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
288 coords.reserve(countVertices * COMPONENTS_POSITION); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
289 colors.reserve(countVertices * COMPONENTS_COLOR); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
290 miterDirections.reserve(countVertices * COMPONENTS_MITER); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
291 |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
292 for (size_t i = 0; i < layer.GetChainsCount(); i++) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
293 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
294 const PolylineSceneLayer::Chain& chain = layer.GetChain(i); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
295 |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
296 if (chain.size() > 1) |
| 592 | 297 { |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
298 std::vector<Segment> segments; |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
299 for (size_t j = 1; j < chain.size(); j++) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
300 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
301 segments.push_back(Segment(chain, j - 1, j)); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
302 } |
| 592 | 303 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
304 if (layer.IsClosedChain(i)) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
305 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
306 segments.push_back(Segment(chain, chain.size() - 1, 0)); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
307 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
308 |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
309 // Try and create nice miters |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
310 for (size_t j = 1; j < segments.size(); j++) |
| 592 | 311 { |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
312 Segment::CreateMiter(segments[j - 1], segments[j]); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
313 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
314 |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
315 if (layer.IsClosedChain(i)) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
316 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
317 Segment::CreateMiter(segments.back(), segments.front()); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
318 } |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
319 |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
320 for (size_t j = 0; j < segments.size(); j++) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
321 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
322 if (!segments[j].IsEmpty()) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
323 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
324 segments[j].AddTriangles(coords, miterDirections, colors, layer.GetColor(i)); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
325 } |
| 592 | 326 } |
| 327 } | |
| 328 } | |
| 329 | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
330 assert(coords.size() == colors.size()); |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
331 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
332 if (!coords.empty()) |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
333 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
334 verticesCount_ = coords.size() / COMPONENTS_POSITION; |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
335 |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
336 context_.MakeCurrent(); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
337 glGenBuffers(3, buffers_); |
| 592 | 338 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
339 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
|
340 glBufferData(GL_ARRAY_BUFFER, sizeof(float) * coords.size(), &coords[0], GL_STATIC_DRAW); |
| 592 | 341 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
342 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
|
343 glBufferData(GL_ARRAY_BUFFER, sizeof(float) * miterDirections.size(), &miterDirections[0], GL_STATIC_DRAW); |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
344 |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
345 glBindBuffer(GL_ARRAY_BUFFER, buffers_[2]); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
346 glBufferData(GL_ARRAY_BUFFER, sizeof(float) * colors.size(), &colors[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
|
347 } |
| 592 | 348 } |
| 349 } | |
| 350 | |
| 351 | |
| 352 OpenGLLinesProgram::Data::~Data() | |
| 353 { | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
354 if (!context_.IsContextLost() && !IsEmpty()) |
| 592 | 355 { |
| 356 context_.MakeCurrent(); | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
357 ORTHANC_OPENGL_TRACE_CURRENT_CONTEXT("About to call glDeleteBuffers"); |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
358 glDeleteBuffers(3, buffers_); |
| 592 | 359 } |
| 360 } | |
| 361 | |
| 362 GLuint OpenGLLinesProgram::Data::GetVerticesBuffer() const | |
| 363 { | |
| 364 if (IsEmpty()) | |
| 365 { | |
| 366 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 367 } | |
| 368 else | |
| 369 { | |
| 370 return buffers_[0]; | |
| 371 } | |
| 372 } | |
| 373 | |
| 374 | |
| 375 GLuint OpenGLLinesProgram::Data::GetMiterDirectionsBuffer() const | |
| 376 { | |
| 377 if (IsEmpty()) | |
| 378 { | |
| 379 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 380 } | |
| 381 else | |
| 382 { | |
| 383 return buffers_[1]; | |
| 384 } | |
| 385 } | |
| 386 | |
| 387 | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
388 GLuint OpenGLLinesProgram::Data::GetColorsBuffer() const |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
389 { |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
390 if (IsEmpty()) |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
391 { |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
392 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
393 } |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
394 else |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
395 { |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
396 return buffers_[2]; |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
397 } |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
398 } |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
399 |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
400 |
| 592 | 401 OpenGLLinesProgram::OpenGLLinesProgram(OpenGL::IOpenGLContext& context) : |
| 402 context_(context) | |
| 403 { | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
404 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
|
405 { |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
406 context_.MakeCurrent(); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
407 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
|
408 program_->CompileShaders(VERTEX_SHADER, FRAGMENT_SHADER); |
|
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
409 } |
| 592 | 410 } |
| 411 | |
| 412 void OpenGLLinesProgram::Apply(const Data& data, | |
| 413 const AffineTransform2D& transform, | |
| 414 bool antialiasing, | |
| 415 bool scaleIndependantThickness) | |
| 416 { | |
|
947
1091b2adeb5a
Fixed animation frame stopping when returning false + big work on the OpenGL
Benjamin Golinvaux <bgo@osimis.io>
parents:
804
diff
changeset
|
417 if (!context_.IsContextLost() && !data.IsEmpty()) |
| 592 | 418 { |
| 419 context_.MakeCurrent(); | |
| 420 program_->Use(); | |
| 421 | |
| 422 GLint locationPosition = program_->GetAttributeLocation("a_position"); | |
| 423 GLint locationMiterDirection = program_->GetAttributeLocation("a_miter_direction"); | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
424 GLint locationColor = program_->GetAttributeLocation("a_color"); |
| 592 | 425 |
| 426 float m[16]; | |
| 427 transform.ConvertToOpenGLMatrix(m, context_.GetCanvasWidth(), context_.GetCanvasHeight()); | |
| 428 | |
| 429 glUniformMatrix4fv(program_->GetUniformLocation("u_matrix"), 1, GL_FALSE, m); | |
| 430 | |
| 431 glBindBuffer(GL_ARRAY_BUFFER, data.GetVerticesBuffer()); | |
| 432 glEnableVertexAttribArray(locationPosition); | |
| 433 glVertexAttribPointer(locationPosition, COMPONENTS_POSITION, GL_FLOAT, GL_FALSE, 0, 0); | |
| 434 | |
| 435 glBindBuffer(GL_ARRAY_BUFFER, data.GetMiterDirectionsBuffer()); | |
| 436 glEnableVertexAttribArray(locationMiterDirection); | |
| 437 glVertexAttribPointer(locationMiterDirection, COMPONENTS_MITER, GL_FLOAT, GL_FALSE, 0, 0); | |
| 438 | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
439 glBindBuffer(GL_ARRAY_BUFFER, data.GetColorsBuffer()); |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
440 glEnableVertexAttribArray(locationColor); |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
441 glVertexAttribPointer(locationColor, COMPONENTS_COLOR, GL_FLOAT, GL_FALSE, 0, 0); |
|
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
442 |
| 592 | 443 glUniform1i(program_->GetUniformLocation("u_antialiasing"), (antialiasing ? 1 : 0)); |
| 444 | |
| 445 const double zoom = transform.ComputeZoom(); | |
| 446 const double thickness = data.GetThickness() / 2.0; | |
| 447 const double aliasingBorder = 2.0; // Border for antialiasing ramp, in pixels | |
| 448 assert(aliasingBorder > 0); // Prevent division by zero with "t1" | |
| 449 | |
| 450 if (scaleIndependantThickness) | |
| 451 { | |
| 452 if (antialiasing) | |
| 453 { | |
| 454 double t1 = std::max(thickness, aliasingBorder); | |
| 455 double t0 = std::max(0.0, thickness - aliasingBorder); | |
| 456 | |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
457 glUniform1f(program_->GetUniformLocation("u_thickness"), |
|
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
458 static_cast<GLfloat>(t1 / zoom)); |
|
694
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
459 glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
460 static_cast<GLfloat>(t0 / t1)); |
| 592 | 461 } |
| 462 else | |
| 463 { | |
|
694
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
464 glUniform1f(program_->GetUniformLocation("u_thickness"), |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
465 static_cast<GLfloat>(thickness / zoom)); |
| 592 | 466 } |
| 467 } | |
| 468 else | |
| 469 { | |
| 470 if (antialiasing) | |
| 471 { | |
| 472 double t1 = std::max(thickness, aliasingBorder / zoom); | |
| 473 double t0 = std::max(0.0, thickness - aliasingBorder / zoom); | |
| 474 | |
|
694
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
475 glUniform1f(program_->GetUniformLocation("u_thickness"), |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
476 static_cast<GLfloat>(t1)); |
|
694
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
477 glUniform1f(program_->GetUniformLocation("u_antialiasing_start"), |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
478 static_cast<GLfloat>(t0 / t1)); |
| 592 | 479 } |
| 480 else | |
| 481 { | |
|
694
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
482 glUniform1f(program_->GetUniformLocation("u_thickness"), |
|
693
9a474e90e832
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
611
diff
changeset
|
483 static_cast<GLfloat>(thickness)); |
| 592 | 484 } |
| 485 } | |
| 486 | |
| 487 if (antialiasing) | |
| 488 { | |
| 489 glEnable(GL_BLEND); | |
| 490 glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); | |
|
694
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
491 glDrawArrays(GL_TRIANGLES, 0, |
|
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
492 static_cast<GLsizei>(data.GetVerticesCount())); |
| 592 | 493 glDisable(GL_BLEND); |
| 494 } | |
| 495 else | |
| 496 { | |
|
694
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
497 glDrawArrays(GL_TRIANGLES, 0, |
|
7c6197d9acc9
Fixed a bunch of truncation warnings in various parts of the library
Benjamin Golinvaux <bgo@osimis.io>
parents:
693
diff
changeset
|
498 static_cast<GLsizei>(data.GetVerticesCount())); |
| 592 | 499 } |
| 500 | |
| 501 glDisableVertexAttribArray(locationPosition); | |
| 502 glDisableVertexAttribArray(locationMiterDirection); | |
|
804
61ba4b504e9a
PolylineSceneLayer now has one color per chain
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
702
diff
changeset
|
503 glDisableVertexAttribArray(locationColor); |
| 592 | 504 } |
| 505 } | |
| 506 } | |
| 507 } |