Wed, 22 Jun 2022 16:13:01 +0300
Fix invertnext not working with circular primitives
| 24 | 1 | /* |
| 2 | * LDForge: LDraw parts authoring CAD | |
| 3 | * Copyright (C) 2013 - 2020 Teemu Piippo | |
| 4 | * | |
| 5 | * This program is free software: you can redistribute it and/or modify | |
| 6 | * it under the terms of the GNU General Public License as published by | |
| 7 | * the Free Software Foundation, either version 3 of the License, or | |
| 8 | * (at your option) any later version. | |
| 9 | * | |
| 10 | * This program is distributed in the hope that it will be useful, | |
| 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 | * GNU General Public License for more details. | |
| 14 | * | |
| 15 | * You should have received a copy of the GNU General Public License | |
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 17 | */ | |
| 18 | ||
| 28 | 19 | #include <glm/ext/matrix_transform.hpp> |
| 20 | #include <glm/ext/matrix_clip_space.hpp> | |
|
238
b8ad4c12d937
Fix pick scene rendering: we cannot use glReadPixels when using multisampling, so we need to render the pick scene to a separate frame buffer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
21 | #include <QOpenGLFramebufferObject> |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
22 | #include <QPainter> |
| 100 | 23 | #include <GL/glu.h> |
| 17 | 24 | #include <QMouseEvent> |
| 26 | 25 | #include <QMessageBox> |
| 47 | 26 | #include <QAbstractButton> |
| 55 | 27 | #include "geometry.h" |
| 17 | 28 | #include "partrenderer.h" |
|
77
028798a72591
added some meta stuff, simplified quadrilateral splitting and tested it
Teemu Piippo <teemu@hecknology.net>
parents:
73
diff
changeset
|
29 | #include "model.h" |
| 200 | 30 | #include "gl/compiler.h" |
|
237
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
31 | #include "gl/debug.h" |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
32 | #include "settings.h" |
| 17 | 33 | |
|
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
34 | static constexpr double MIN_ZOOM = -3.0; |
|
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
35 | static constexpr double MAX_ZOOM = 3.0; |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
36 | QOpenGLFunctions glfunc; |
|
120
8c9fff699241
rework rendering of vertices
Teemu Piippo <teemu@hecknology.net>
parents:
119
diff
changeset
|
37 | |
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
34
diff
changeset
|
38 | PartRenderer::PartRenderer( |
|
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
34
diff
changeset
|
39 | Model* model, |
|
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
34
diff
changeset
|
40 | DocumentManager* documents, |
| 205 | 41 | const ColorTable& colorTable, |
|
35
98906a94732f
renamed the linetypes namespace to ldraw namespace and added more structures to it
Teemu Piippo <teemu@hecknology.net>
parents:
34
diff
changeset
|
42 | QWidget* parent) : |
| 21 | 43 | QOpenGLWidget{parent}, |
| 44 | model{model}, | |
| 45 | documents{documents}, | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
46 | colorTable{colorTable} |
| 17 | 47 | { |
| 48 | this->setMouseTracking(true); | |
|
232
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
49 | this->setFocusPolicy(Qt::WheelFocus); |
|
246
86a35ce38773
Use crosshair cursor inside the renderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
238
diff
changeset
|
50 | this->setCursor(Qt::CrossCursor); |
|
234
87ee9824210b
Readd axis labels, fix antialiasing
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
232
diff
changeset
|
51 | QSurfaceFormat surfaceFormat; |
|
87ee9824210b
Readd axis labels, fix antialiasing
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
232
diff
changeset
|
52 | surfaceFormat.setSamples(8); |
|
87ee9824210b
Readd axis labels, fix antialiasing
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
232
diff
changeset
|
53 | this->setFormat(surfaceFormat); |
|
237
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
54 | connect(&this->logger, &QOpenGLDebugLogger::messageLogged, [&](const QOpenGLDebugMessage& glmessage){ |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
55 | Q_EMIT this->message(debugMessageToString(glmessage)); |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
56 | }); |
|
111
1f42c03fafca
Draw tool actually adds objects now
Teemu Piippo <teemu@hecknology.net>
parents:
107
diff
changeset
|
57 | connect(model, &Model::rowsInserted, [&]{ |
|
1f42c03fafca
Draw tool actually adds objects now
Teemu Piippo <teemu@hecknology.net>
parents:
107
diff
changeset
|
58 | this->needBuild = true; |
|
1f42c03fafca
Draw tool actually adds objects now
Teemu Piippo <teemu@hecknology.net>
parents:
107
diff
changeset
|
59 | }); |
|
1f42c03fafca
Draw tool actually adds objects now
Teemu Piippo <teemu@hecknology.net>
parents:
107
diff
changeset
|
60 | connect(model, &Model::rowsRemoved, [&]{ this->needBuild = true; }); |
|
215
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
61 | const auto updateLayerMvpMatrix = [this]{ |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
62 | const glm::mat4 newMvpMatrix = this->projectionMatrix * this->viewMatrix * this->modelMatrix; |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
63 | for (RenderLayer* layer : this->activeRenderLayers) { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
64 | layer->mvpMatrixChanged(newMvpMatrix); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
65 | } |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
66 | for (RenderLayer* layer : this->inactiveRenderLayers) { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
67 | layer->mvpMatrixChanged(newMvpMatrix); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
68 | } |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
69 | }; |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
70 | connect(this, &PartRenderer::modelMatrixChanged, updateLayerMvpMatrix); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
71 | connect(this, &PartRenderer::viewMatrixChanged, updateLayerMvpMatrix); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
72 | connect(this, &PartRenderer::projectionMatrixChanged, updateLayerMvpMatrix); |
| 17 | 73 | } |
| 74 | ||
| 26 | 75 | PartRenderer::~PartRenderer() |
| 76 | { | |
| 77 | } | |
| 78 | ||
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
79 | static QVector3D calcQVector3DFromQColor(const QColor& color) |
| 53 | 80 | { |
|
61
4585d8d7a7ec
moved GridProgram to Canvas
Teemu Piippo <teemu@hecknology.net>
parents:
60
diff
changeset
|
81 | return { |
|
206
654661eab7f3
More refactor, merged main.h, basics.h and utility.h into one header file basics.h and removed plenty of unused code
Teemu Piippo <teemu@hecknology.net>
parents:
205
diff
changeset
|
82 | float_cast(color.redF()), |
|
654661eab7f3
More refactor, merged main.h, basics.h and utility.h into one header file basics.h and removed plenty of unused code
Teemu Piippo <teemu@hecknology.net>
parents:
205
diff
changeset
|
83 | float_cast(color.greenF()), |
|
654661eab7f3
More refactor, merged main.h, basics.h and utility.h into one header file basics.h and removed plenty of unused code
Teemu Piippo <teemu@hecknology.net>
parents:
205
diff
changeset
|
84 | float_cast(color.blueF()), |
|
61
4585d8d7a7ec
moved GridProgram to Canvas
Teemu Piippo <teemu@hecknology.net>
parents:
60
diff
changeset
|
85 | }; |
| 53 | 86 | } |
| 87 | ||
| 17 | 88 | void PartRenderer::initializeGL() |
| 89 | { | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
90 | ::glfunc.initializeOpenGLFunctions(); |
|
22
6da867fa5429
commit work on GL rendering
Teemu Piippo <teemu@hecknology.net>
parents:
21
diff
changeset
|
91 | if (glGetError() != GL_NO_ERROR) |
| 17 | 92 | { |
| 93 | abort(); | |
| 94 | } | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
95 | gl::initializeModelShaders(&this->shaders); |
|
215
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
96 | for (RenderLayer* layer : this->activeRenderLayers) { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
97 | layer->initializeGL(); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
98 | } |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
99 | for (RenderLayer* layer : this->inactiveRenderLayers) { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
100 | layer->initializeGL(); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
101 | } |
|
237
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
102 | this->logger.initialize(); |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
103 | if (setting<Setting::LogOpenGLDebugMessages>()) { |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
104 | this->logger.startLogging(); |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
105 | } |
|
86
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
106 | connect(this->model, &Model::dataChanged, this, &PartRenderer::build); |
| 17 | 107 | this->initialized = true; |
| 32 | 108 | this->modelQuaternion = glm::angleAxis(glm::radians(30.0f), glm::vec3{-1, 0, 0}); |
| 109 | this->modelQuaternion *= glm::angleAxis(glm::radians(225.0f), glm::vec3{-0, 1, 0}); | |
| 55 | 110 | this->updateModelMatrix(); |
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
111 | this->updateViewMatrix(); |
| 30 | 112 | this->update(); |
| 17 | 113 | } |
| 114 | ||
| 115 | void PartRenderer::resizeGL(int width, int height) | |
| 116 | { | |
|
57
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
117 | this->viewportVector = {0, 0, width, height}; |
| 28 | 118 | glViewport(0, 0, width, height); |
| 119 | this->projectionMatrix = glm::perspective( | |
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
120 | glm::radians(45.0f), |
| 28 | 121 | static_cast<float>(width) / static_cast<float>(height), |
| 122 | 0.1f, | |
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
123 | 10000.f); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
124 | gl::setShaderUniformMatrix(&this->shaders, "projectionMatrix", this->projectionMatrix); |
| 112 | 125 | Q_EMIT projectionMatrixChanged(this->projectionMatrix); |
| 17 | 126 | } |
| 127 | ||
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
128 | static constexpr GLenum getGlTypeForArrayClass(const gl::ArrayClass vboClass) |
| 21 | 129 | { |
| 130 | switch (vboClass) | |
| 131 | { | |
| 26 | 132 | case gl::ArrayClass::Lines: |
| 133 | case gl::ArrayClass::ConditionalLines: | |
| 21 | 134 | return GL_LINES; |
| 26 | 135 | case gl::ArrayClass::Triangles: |
| 21 | 136 | return GL_TRIANGLES; |
| 26 | 137 | case gl::ArrayClass::Quads: |
| 21 | 138 | return GL_QUADS; |
| 139 | } | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
140 | throw std::runtime_error{"bad value for vboClass"}; |
| 21 | 141 | } |
| 142 | ||
| 17 | 143 | void PartRenderer::paintGL() |
| 144 | { | |
| 47 | 145 | glEnable(GL_DEPTH_TEST); |
| 146 | glShadeModel(GL_SMOOTH); | |
| 147 | this->renderScene(); | |
|
215
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
148 | for (RenderLayer* layer : this->activeRenderLayers) { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
149 | layer->paintGL(); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
150 | } |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
151 | QPainter painter{this}; |
|
234
87ee9824210b
Readd axis labels, fix antialiasing
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
232
diff
changeset
|
152 | painter.setRenderHint(QPainter::Antialiasing); |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
153 | for (RenderLayer* layer : this->activeRenderLayers) { |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
154 | layer->overpaint(&painter); |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
155 | } |
| 47 | 156 | } |
| 157 | ||
| 158 | void PartRenderer::renderScene() | |
| 159 | { | |
|
86
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
160 | if (this->needBuild) |
|
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
161 | { |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
162 | gl::build(&this->shaders, this->model, this->colorTable, this->documents, this->renderPreferences); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
163 | this->boundingBox = gl::boundingBoxForModel(this->model, this->documents); |
|
86
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
164 | this->needBuild = false; |
|
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
165 | } |
| 53 | 166 | this->checkForGLErrors(); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
167 | if (true |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
168 | and this->renderPreferences.lineAntiAliasing |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
169 | and this->renderPreferences.style != gl::RenderStyle::PickScene |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
170 | ) { |
|
45
272c84c7c87e
added configurable line anti-aliasing
Teemu Piippo <teemu@hecknology.net>
parents:
44
diff
changeset
|
171 | glEnable(GL_LINE_SMOOTH); |
|
272c84c7c87e
added configurable line anti-aliasing
Teemu Piippo <teemu@hecknology.net>
parents:
44
diff
changeset
|
172 | glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); |
|
272c84c7c87e
added configurable line anti-aliasing
Teemu Piippo <teemu@hecknology.net>
parents:
44
diff
changeset
|
173 | } |
|
272c84c7c87e
added configurable line anti-aliasing
Teemu Piippo <teemu@hecknology.net>
parents:
44
diff
changeset
|
174 | else { |
|
272c84c7c87e
added configurable line anti-aliasing
Teemu Piippo <teemu@hecknology.net>
parents:
44
diff
changeset
|
175 | glDisable(GL_LINE_SMOOTH); |
|
272c84c7c87e
added configurable line anti-aliasing
Teemu Piippo <teemu@hecknology.net>
parents:
44
diff
changeset
|
176 | } |
| 46 | 177 | if (this->renderPreferences.style != gl::RenderStyle::PickScene) |
| 178 | { | |
| 47 | 179 | const QColor& backgroundColor = this->renderPreferences.backgroundColor; |
| 46 | 180 | glClearColor( |
| 181 | static_cast<float>(backgroundColor.redF()), | |
| 182 | static_cast<float>(backgroundColor.greenF()), | |
| 183 | static_cast<float>(backgroundColor.blueF()), | |
| 184 | 1.0f); | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
185 | gl::setShaderUniform(&this->shaders, "useLighting", GL_TRUE); |
| 46 | 186 | } |
| 187 | else | |
| 188 | { | |
| 189 | glClearColor(0.0f, 0.0f, 0.0f, 1.0f); | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
190 | gl::setShaderUniform(&this->shaders, "useLighting", GL_FALSE); |
| 46 | 191 | } |
| 53 | 192 | this->checkForGLErrors(); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
193 | const QVector3D color = calcQVector3DFromQColor(this->renderPreferences.selectedColor); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
194 | gl::setShaderUniform(&this->shaders, "selectedColor", color); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
195 | gl::setShaderUniform(&this->shaders, "highlighted", this->highlighted.value); |
| 51 | 196 | this->checkForGLErrors(); |
| 26 | 197 | glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); |
| 198 | glEnable(GL_DEPTH_TEST); | |
| 199 | glEnable(GL_POLYGON_OFFSET_FILL); | |
| 200 | glPolygonOffset(1.0f, 1.0f); | |
|
44
c6114b3af3a6
added configurable line thickness
Teemu Piippo <teemu@hecknology.net>
parents:
40
diff
changeset
|
201 | glLineWidth(this->renderPreferences.lineThickness); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
202 | const auto renderAllArrays = [this](){ |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
203 | // Lines need to be rendered last so that anti-aliasing does not interfere with polygon rendering. |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
204 | this->renderVao(gl::ArrayClass::Triangles); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
205 | this->renderVao(gl::ArrayClass::Quads); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
206 | this->renderVao(gl::ArrayClass::Lines); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
207 | }; |
|
231
a9bf6bab5ea2
Add wireframe button
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
217
diff
changeset
|
208 | if (this->renderPreferences.wireframe and this->renderPreferences.style != gl::RenderStyle::PickScene) { |
|
a9bf6bab5ea2
Add wireframe button
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
217
diff
changeset
|
209 | glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); |
|
a9bf6bab5ea2
Add wireframe button
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
217
diff
changeset
|
210 | } |
|
39
caac957e9834
Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents:
37
diff
changeset
|
211 | switch (this->renderPreferences.style) |
| 18 | 212 | { |
| 213 | case gl::RenderStyle::Normal: | |
| 37 | 214 | this->setFragmentStyle(gl::FragmentStyle::Normal); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
215 | renderAllArrays(); |
| 37 | 216 | break; |
| 18 | 217 | case gl::RenderStyle::BfcRedGreen: |
| 37 | 218 | glEnable(GL_CULL_FACE); |
| 219 | glCullFace(GL_BACK); | |
| 220 | this->setFragmentStyle(gl::FragmentStyle::BfcGreen); | |
| 221 | renderVao(gl::ArrayClass::Triangles); | |
| 222 | renderVao(gl::ArrayClass::Quads); | |
| 223 | glCullFace(GL_FRONT); | |
| 224 | this->setFragmentStyle(gl::FragmentStyle::BfcRed); | |
| 225 | renderVao(gl::ArrayClass::Triangles); | |
| 226 | renderVao(gl::ArrayClass::Quads); | |
| 227 | glDisable(GL_CULL_FACE); | |
| 228 | this->setFragmentStyle(gl::FragmentStyle::Normal); | |
| 229 | renderVao(gl::ArrayClass::Lines); | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
230 | break; |
| 18 | 231 | case gl::RenderStyle::RandomColors: |
| 37 | 232 | this->setFragmentStyle(gl::FragmentStyle::RandomColors); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
233 | renderAllArrays(); |
| 18 | 234 | break; |
| 46 | 235 | case gl::RenderStyle::PickScene: |
| 236 | glLineWidth(3.0f); | |
| 237 | this->setFragmentStyle(gl::FragmentStyle::Id); | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
238 | renderAllArrays(); |
| 46 | 239 | break; |
| 119 | 240 | case gl::RenderStyle::VertexPickScene: |
| 241 | glLineWidth(1.0f); | |
| 242 | this->setFragmentStyle(gl::FragmentStyle::Black); | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
243 | renderAllArrays(); |
| 119 | 244 | break; |
| 18 | 245 | } |
| 37 | 246 | glDisable(GL_POLYGON_OFFSET_FILL); |
|
231
a9bf6bab5ea2
Add wireframe button
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
217
diff
changeset
|
247 | glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); |
| 37 | 248 | } |
| 249 | ||
| 250 | ||
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
251 | void PartRenderer::updateViewMatrix() |
|
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
252 | { |
|
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
253 | // I'm not quite sure why using the exponent function on the zoom factor causes linear zoom behavior |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
254 | const float modelDistance = longestMeasure(this->boundingBox); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
255 | const double z = 2.0 * std::exp(this->zoom) * (1 + static_cast<double>(modelDistance)); |
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
256 | this->viewMatrix = glm::lookAt(glm::vec3{0, 0, z}, {0, 0, 0}, {0, -1, 0}); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
257 | gl::setShaderUniformMatrix(&this->shaders, "viewMatrix", this->viewMatrix); |
| 112 | 258 | Q_EMIT this->viewMatrixChanged(this->viewMatrix); |
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
259 | } |
|
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
260 | |
| 55 | 261 | void PartRenderer::updateModelMatrix() |
| 262 | { | |
|
61
4585d8d7a7ec
moved GridProgram to Canvas
Teemu Piippo <teemu@hecknology.net>
parents:
60
diff
changeset
|
263 | this->modelMatrix = glm::mat4_cast(this->modelQuaternion); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
264 | gl::setShaderUniformMatrix(&this->shaders, "modelMatrix", modelMatrix); |
| 112 | 265 | Q_EMIT this->modelMatrixChanged(this->modelMatrix); |
| 55 | 266 | this->update(); |
| 267 | } | |
| 268 | ||
|
86
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
269 | void PartRenderer::build() |
|
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
270 | { |
|
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
271 | this->needBuild = true; |
|
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
272 | } |
|
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
273 | |
|
27
c57fb7a5ffa3
commit work done on plugging vao to the gl renderer, renders nonsense for now
Teemu Piippo <teemu@hecknology.net>
parents:
26
diff
changeset
|
274 | void PartRenderer::renderVao(const gl::ArrayClass arrayClass) |
| 26 | 275 | { |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
276 | gl::bindModelShaderVertexArray(&this->shaders, arrayClass); |
|
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
277 | const std::size_t vertexCount = gl::vertexCount(&this->shaders, arrayClass); |
| 51 | 278 | this->checkForGLErrors(); |
| 26 | 279 | glDrawArrays(getGlTypeForArrayClass(arrayClass), 0, static_cast<GLsizei>(vertexCount)); |
| 51 | 280 | this->checkForGLErrors(); |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
281 | gl::releaseModelShaderVertexArray(&this->shaders, arrayClass); |
| 26 | 282 | this->checkForGLErrors(); |
| 283 | } | |
| 284 | ||
| 285 | void PartRenderer::checkForGLErrors() | |
| 286 | { | |
| 53 | 287 | gl::checkForGLErrors(this); |
| 288 | } | |
| 289 | ||
| 290 | void gl::checkForGLErrors(QWidget* parent) | |
| 291 | { | |
| 26 | 292 | GLenum glError; |
| 293 | QStringList errors; | |
| 294 | while ((glError = glGetError()) != GL_NO_ERROR) | |
| 21 | 295 | { |
| 100 | 296 | const QString glErrorString = QString::fromLatin1(reinterpret_cast<const char*>(gluErrorString(glError))); |
| 26 | 297 | errors.append(glErrorString); |
| 298 | } | |
| 299 | if (not errors.isEmpty()) | |
| 300 | { | |
| 53 | 301 | QMessageBox box{parent}; |
| 47 | 302 | box.setIcon(QMessageBox::Critical); |
| 53 | 303 | box.setText(QObject::tr("OpenGL error: %1").arg(errors.join("\n"))); |
| 304 | box.setWindowTitle(QObject::tr("OpenGL error")); | |
| 47 | 305 | box.setStandardButtons(QMessageBox::Close); |
| 53 | 306 | box.button(QMessageBox::Close)->setText(QObject::tr("Damn it")); |
| 47 | 307 | box.exec(); |
| 21 | 308 | } |
| 17 | 309 | } |
| 310 | ||
| 311 | void PartRenderer::mouseMoveEvent(QMouseEvent* event) | |
| 312 | { | |
|
232
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
313 | if (not this->frozen) { |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
314 | const bool left = event->buttons() & Qt::LeftButton; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
315 | const QPoint move = event->pos() - this->lastMousePosition; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
316 | this->totalMouseMove += move.manhattanLength(); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
317 | if (left and not move.isNull()) |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
318 | { |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
319 | // q_x is the rotation of the brick along the vertical y-axis, because turning the |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
320 | // vertical axis causes horizontal (=x) rotation. Likewise q_y is the rotation of the |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
321 | // brick along the horizontal x-axis, which causes vertical rotation. |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
322 | const auto scalar = 0.006f; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
323 | const float move_x = static_cast<float>(move.x()); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
324 | const float move_y = static_cast<float>(move.y()); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
325 | const glm::quat q_x = glm::angleAxis(scalar * move_x, glm::vec3{0, -1, 0}); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
326 | const glm::quat q_y = glm::angleAxis(scalar * move_y, glm::vec3{-1, 0, 0}); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
327 | this->modelQuaternion = q_x * q_y * this->modelQuaternion; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
328 | this->updateModelMatrix(); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
329 | } |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
330 | this->lastMousePosition = event->pos(); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
331 | for (RenderLayer* layer : this->activeRenderLayers) { |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
332 | layer->mouseMoved(event); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
333 | } |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
334 | this->update(); |
| 17 | 335 | } |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
336 | } |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
337 | |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
338 | void PartRenderer::mousePressEvent(QMouseEvent* event) |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
339 | { |
|
232
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
340 | if (not this->frozen) { |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
341 | this->totalMouseMove = 0; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
342 | this->lastMousePosition = event->pos(); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
343 | } |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
344 | } |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
345 | |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
346 | void PartRenderer::mouseReleaseEvent(QMouseEvent* event) |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
347 | { |
|
232
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
348 | if (not frozen and this->totalMouseMove < (2.0 / sqrt(2)) * 5.0) |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
349 | { |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
350 | for (RenderLayer* layer : this->activeRenderLayers) { |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
351 | layer->mouseClick(event); |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
352 | } |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
353 | this->update(); |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
354 | } |
| 17 | 355 | } |
| 18 | 356 | |
|
232
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
357 | void PartRenderer::keyReleaseEvent(QKeyEvent* event) |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
358 | { |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
359 | if (event->key() == Qt::Key_Pause) { |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
360 | this->frozen = not this->frozen; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
361 | } |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
362 | } |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
363 | |
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
364 | void PartRenderer::wheelEvent(QWheelEvent* event) |
|
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
365 | { |
|
232
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
366 | if (not this->frozen) { |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
367 | static constexpr double WHEEL_STEP = 1 / 1000.0; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
368 | const double move = (-event->angleDelta().y()) * WHEEL_STEP; |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
369 | this->zoom = std::clamp(this->zoom + move, MIN_ZOOM, MAX_ZOOM); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
370 | this->updateViewMatrix(); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
371 | this->update(); |
|
8efa3a33172e
Add base code for circular primitives
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
231
diff
changeset
|
372 | } |
|
31
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
373 | } |
|
b6df269a2c6b
fix remaining rendering control issues
Teemu Piippo <teemu@hecknology.net>
parents:
30
diff
changeset
|
374 | |
|
215
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
375 | void PartRenderer::addRenderLayer(RenderLayer* layer) |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
376 | { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
377 | this->activeRenderLayers.push_back(layer); |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
378 | layer->setRendererPointer(this); |
|
215
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
379 | this->update(); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
380 | } |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
381 | |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
382 | void PartRenderer::setLayerEnabled(RenderLayer* layer, bool enabled) |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
383 | { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
384 | auto& from = enabled ? this->inactiveRenderLayers : this->activeRenderLayers; |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
385 | auto& to = enabled ? this->activeRenderLayers : this->inactiveRenderLayers; |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
386 | auto it = std::find(from.begin(), from.end(), layer); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
387 | if (it != from.end()) { |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
388 | from.erase(it); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
389 | to.push_back(layer); |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
390 | } |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
391 | } |
|
34c6e7bc4ee1
Reimplement the axes program as a layer that can be added to PartRenderer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
206
diff
changeset
|
392 | |
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
393 | /** |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
394 | * @brief Converts the specified on the screen into the 3D world. The point is unprojected twice into 3D and the |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
395 | * intersection of the resulting line with the specified plane is returned. If the intersection point lies behind |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
396 | * the camera, no value is returned. |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
397 | * @param point 2D window co-ordinates to convert. |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
398 | * @param plane Plane to raycast against |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
399 | * @return world co-ordinates, or no value if the point is behind the camera. |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
400 | */ |
|
206
654661eab7f3
More refactor, merged main.h, basics.h and utility.h into one header file basics.h and removed plenty of unused code
Teemu Piippo <teemu@hecknology.net>
parents:
205
diff
changeset
|
401 | std::optional<glm::vec3> PartRenderer::screenToModelCoordinates(const QPointF& point, const Plane& plane) const |
| 55 | 402 | { |
|
201
5d201ee4a9c3
Continue giant refactor
Teemu Piippo <teemu@hecknology.net>
parents:
200
diff
changeset
|
403 | const Line line = this->cameraLine(point); |
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
404 | std::optional<glm::vec3> result; |
|
201
5d201ee4a9c3
Continue giant refactor
Teemu Piippo <teemu@hecknology.net>
parents:
200
diff
changeset
|
405 | result = linePlaneIntersection(line, plane, 0.01f); |
|
59
60650929dc82
fixed testing of whether screenToModelCoordinates's result value is behind the camera
Teemu Piippo <teemu@hecknology.net>
parents:
58
diff
changeset
|
406 | // If the point lies behind the camera, do not return a result. |
|
66
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
407 | if (result.has_value() and glm::dot(line.direction, *result - line.anchor) < 0) |
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
408 | { |
|
59
60650929dc82
fixed testing of whether screenToModelCoordinates's result value is behind the camera
Teemu Piippo <teemu@hecknology.net>
parents:
58
diff
changeset
|
409 | result.reset(); |
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
410 | } |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
411 | return result; |
| 55 | 412 | } |
| 413 | ||
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
414 | /** |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
415 | * @brief Converts the specified point to 2D window coordinates, with Y-coordinate inverted for Qt |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
416 | * @param point Point to unproject |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
417 | * @return screen coordinates |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
418 | */ |
|
66
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
419 | QPointF PartRenderer::modelToScreenCoordinates(const glm::vec3& point) const |
| 55 | 420 | { |
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
421 | const glm::vec3 projected = glm::project( |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
422 | point, |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
423 | this->viewMatrix * this->modelMatrix, |
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
424 | this->projectionMatrix, |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
425 | this->viewportVector); |
| 60 | 426 | return toQPointF(glm::vec2{projected.x, this->height() - projected.y}); |
| 55 | 427 | } |
| 428 | ||
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
429 | bool PartRenderer::isDark() const |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
430 | { |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
431 | return luma(this->renderPreferences.backgroundColor) < 0.25; |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
432 | } |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
433 | |
|
206
654661eab7f3
More refactor, merged main.h, basics.h and utility.h into one header file basics.h and removed plenty of unused code
Teemu Piippo <teemu@hecknology.net>
parents:
205
diff
changeset
|
434 | Line<3> PartRenderer::cameraLine(const QPointF& point) const |
|
66
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
435 | { |
|
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
436 | const glm::vec3 p1 = this->unproject({point.x(), point.y(), 0}); |
|
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
437 | const glm::vec3 p2 = this->unproject({point.x(), point.y(), 1}); |
|
201
5d201ee4a9c3
Continue giant refactor
Teemu Piippo <teemu@hecknology.net>
parents:
200
diff
changeset
|
438 | return lineFromPoints(p1, p2); |
|
66
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
439 | } |
|
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
440 | |
|
58
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
441 | /** |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
442 | * @brief Unprojects the specified window coordinates to model coordinates |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
443 | * @param win Window coordinates to project. Z-coordinate indicates depth |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
444 | * @return model coordinates |
|
b7841cd31fb7
use glm::project instead of figuring out the conversion manually...
Teemu Piippo <teemu@hecknology.net>
parents:
57
diff
changeset
|
445 | */ |
|
66
77c819262b7a
added a method to find out if the view is perpendicular to grid
Teemu Piippo <teemu@hecknology.net>
parents:
61
diff
changeset
|
446 | glm::vec3 PartRenderer::unproject(const glm::vec3& win) const |
|
57
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
447 | { |
|
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
448 | return glm::unProject( |
|
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
449 | glm::vec3{win.x, this->height() - win.y, win.z}, |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
450 | this->viewMatrix * this->modelMatrix, |
|
57
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
451 | this->projectionMatrix, |
|
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
452 | viewportVector); |
|
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
453 | } |
|
5c0005f63319
use glm::unProject to implement screenToModelCoordinates
Teemu Piippo <teemu@hecknology.net>
parents:
56
diff
changeset
|
454 | |
| 200 | 455 | ModelId PartRenderer::pick(QPoint where) |
| 47 | 456 | { |
|
199
6988973515d2
Fix pick() picking from weird places on the screen with high DPI scaling
Teemu Piippo <teemu@hecknology.net>
parents:
189
diff
changeset
|
457 | // y is flipped, take that into account |
|
6988973515d2
Fix pick() picking from weird places on the screen with high DPI scaling
Teemu Piippo <teemu@hecknology.net>
parents:
189
diff
changeset
|
458 | where.setY(this->height() - where.y()); |
|
6988973515d2
Fix pick() picking from weird places on the screen with high DPI scaling
Teemu Piippo <teemu@hecknology.net>
parents:
189
diff
changeset
|
459 | // Since we are dealing with pixel data right from the framebuffer, its size |
|
6988973515d2
Fix pick() picking from weird places on the screen with high DPI scaling
Teemu Piippo <teemu@hecknology.net>
parents:
189
diff
changeset
|
460 | // will be affected by High DPI scaling. We need to take this into account |
|
6988973515d2
Fix pick() picking from weird places on the screen with high DPI scaling
Teemu Piippo <teemu@hecknology.net>
parents:
189
diff
changeset
|
461 | // and multiply the pixel positions by the screen pixel scaling factor. |
|
6988973515d2
Fix pick() picking from weird places on the screen with high DPI scaling
Teemu Piippo <teemu@hecknology.net>
parents:
189
diff
changeset
|
462 | where *= this->devicePixelRatioF(); |
| 47 | 463 | const gl::RenderStyle oldRenderStyle = this->renderPreferences.style; |
| 464 | this->renderPreferences.style = gl::RenderStyle::PickScene; | |
| 465 | this->makeCurrent(); | |
|
238
b8ad4c12d937
Fix pick scene rendering: we cannot use glReadPixels when using multisampling, so we need to render the pick scene to a separate frame buffer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
466 | QOpenGLFramebufferObject fbo{this->width(), this->height(), QOpenGLFramebufferObject::CombinedDepthStencil}; |
|
b8ad4c12d937
Fix pick scene rendering: we cannot use glReadPixels when using multisampling, so we need to render the pick scene to a separate frame buffer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
467 | fbo.bind(); |
| 47 | 468 | this->renderScene(); |
|
78
97c3ce5aa498
fixed signed vs unsigned nonsense in gl::Compiler::idFromColor
Teemu Piippo <teemu@hecknology.net>
parents:
77
diff
changeset
|
469 | std::array<GLubyte, 3> data; |
| 51 | 470 | this->checkForGLErrors(); |
|
199
6988973515d2
Fix pick() picking from weird places on the screen with high DPI scaling
Teemu Piippo <teemu@hecknology.net>
parents:
189
diff
changeset
|
471 | glfunc.glReadPixels(where.x(), where.y(), 1, 1, GL_RGB, GL_UNSIGNED_BYTE, &data[0]); |
| 51 | 472 | this->checkForGLErrors(); |
|
238
b8ad4c12d937
Fix pick scene rendering: we cannot use glReadPixels when using multisampling, so we need to render the pick scene to a separate frame buffer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
237
diff
changeset
|
473 | fbo.release(); |
| 47 | 474 | this->renderPreferences.style = oldRenderStyle; |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
475 | return gl::idFromColor(data); |
| 47 | 476 | } |
| 477 | ||
| 37 | 478 | /** |
| 479 | * @brief Changes the color of rendered fragments | |
| 480 | * @param newFragmentStyle new fragment style to use | |
| 481 | */ | |
| 482 | void PartRenderer::setFragmentStyle(gl::FragmentStyle newFragmentStyle) | |
| 483 | { | |
|
189
815fbaae9cb2
cleanup, gl::Compiler changed to gl::ModelShaders
Teemu Piippo <teemu@hecknology.net>
parents:
150
diff
changeset
|
484 | gl::setShaderUniform(&this->shaders, "fragmentStyle", static_cast<int>(newFragmentStyle)); |
| 37 | 485 | } |
| 486 | ||
| 487 | /** | |
| 488 | * @brief Changes the way the scene is rendered | |
| 489 | * @param newStyle new render style to use | |
| 490 | */ | |
|
39
caac957e9834
Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents:
37
diff
changeset
|
491 | void PartRenderer::setRenderPreferences(const gl::RenderPreferences& newPreferences) |
| 18 | 492 | { |
|
39
caac957e9834
Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents:
37
diff
changeset
|
493 | bool mainColorChanged = this->renderPreferences.mainColor != newPreferences.mainColor; |
|
44
c6114b3af3a6
added configurable line thickness
Teemu Piippo <teemu@hecknology.net>
parents:
40
diff
changeset
|
494 | bool backgroundColorChanged = this->renderPreferences.backgroundColor != newPreferences.backgroundColor; |
|
39
caac957e9834
Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents:
37
diff
changeset
|
495 | this->renderPreferences = newPreferences; |
|
44
c6114b3af3a6
added configurable line thickness
Teemu Piippo <teemu@hecknology.net>
parents:
40
diff
changeset
|
496 | if (mainColorChanged or backgroundColorChanged) |
|
39
caac957e9834
Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents:
37
diff
changeset
|
497 | { |
|
86
4bec0525ef1b
PolygonObjectEditor can now modify the object properly
Teemu Piippo <teemu@hecknology.net>
parents:
78
diff
changeset
|
498 | this->build(); |
|
39
caac957e9834
Main color is now configurable
Teemu Piippo <teemu@hecknology.net>
parents:
37
diff
changeset
|
499 | } |
|
237
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
500 | if (this->initialized) { |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
501 | this->makeCurrent(); |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
502 | if (setting<Setting::LogOpenGLDebugMessages>()) { |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
503 | this->logger.startLogging(); |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
504 | } |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
505 | else { |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
506 | this->logger.stopLogging(); |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
507 | } |
|
10a6298f636f
Add an option to log opengl messages
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
234
diff
changeset
|
508 | } |
| 112 | 509 | Q_EMIT this->renderPreferencesChanged(); |
| 18 | 510 | this->update(); |
| 511 | } | |
|
107
02f142b399b1
Move selection logic into select tool
Teemu Piippo <teemu@hecknology.net>
parents:
100
diff
changeset
|
512 | |
|
02f142b399b1
Move selection logic into select tool
Teemu Piippo <teemu@hecknology.net>
parents:
100
diff
changeset
|
513 | /** |
|
02f142b399b1
Move selection logic into select tool
Teemu Piippo <teemu@hecknology.net>
parents:
100
diff
changeset
|
514 | * @return the currently highlighted object |
|
02f142b399b1
Move selection logic into select tool
Teemu Piippo <teemu@hecknology.net>
parents:
100
diff
changeset
|
515 | */ |
| 200 | 516 | ModelId PartRenderer::getHighlightedObject() const |
|
107
02f142b399b1
Move selection logic into select tool
Teemu Piippo <teemu@hecknology.net>
parents:
100
diff
changeset
|
517 | { |
|
02f142b399b1
Move selection logic into select tool
Teemu Piippo <teemu@hecknology.net>
parents:
100
diff
changeset
|
518 | return this->highlighted; |
|
02f142b399b1
Move selection logic into select tool
Teemu Piippo <teemu@hecknology.net>
parents:
100
diff
changeset
|
519 | } |
|
217
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
520 | |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
521 | void PartRenderer::setSelection(const QSet<ModelId>& selection) |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
522 | { |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
523 | Q_ASSERT(not selection.contains({0})); |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
524 | gl::setModelShaderSelectedObjects(&this->shaders, selection); |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
525 | this->update(); |
|
6d95c1a41e6e
reimplement EditTools as a render layer
Teemu Piippo <teemu.s.piippo@gmail.com>
parents:
215
diff
changeset
|
526 | } |