Mon, 10 Mar 2014 14:12:28 +0200
- refactor
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1 | /* | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2 | * LDForge: LDraw parts authoring CAD | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
3 | * Copyright (C) 2013, 2014 Santeri Piippo | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
4 | * | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
5 | * This program is free software: you can redistribute it and/or modify | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
6 | * it under the terms of the GNU General Public License as published by | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
7 | * the Free Software Foundation, either version 3 of the License, or | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
8 | * (at your option) any later version. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
9 | * | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
10 | * This program is distributed in the hope that it will be useful, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
13 | * GNU General Public License for more details. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
14 | * | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
15 | * You should have received a copy of the GNU General Public License | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
17 | */ | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
18 | |
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
19 | #define GL_GLEXT_PROTOTYPES | 
| 
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
20 | #include <GL/glu.h> | 
| 
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
21 | #include <GL/glext.h> | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
22 | #include <QGLWidget> | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
23 | #include <QWheelEvent> | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
24 | #include <QMouseEvent> | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
25 | #include <QContextMenuEvent> | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
26 | #include <QInputDialog> | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
27 | #include <QToolTip> | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
28 | #include <qtextdocument.h> | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
29 | #include <QTimer> | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
30 | #include "Main.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
31 | #include "Configuration.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
32 | #include "Document.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
33 | #include "GLRenderer.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
34 | #include "Colors.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
35 | #include "MainWindow.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
36 | #include "Misc.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
37 | #include "EditHistory.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
38 | #include "Dialogs.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
39 | #include "AddObjectDialog.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
40 | #include "MessageLog.h" | 
| 
675
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
41 | #include "GLCompiler.h" | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
42 | #include "Primitives.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
43 | #include "misc/RingFinder.h" | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
44 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
45 | static const LDFixedCameraInfo g_FixedCameras[6] = | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
46 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
47 | {{ 1, 0, 0 }, X, Z, false, false }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
48 | {{ 0, 0, 0 }, X, Y, false, true }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
49 | {{ 0, 1, 0 }, Z, Y, true, true }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
50 | {{ -1, 0, 0 }, X, Z, false, true }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
51 | {{ 0, 0, 0 }, X, Y, true, true }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
52 | {{ 0, -1, 0 }, Z, Y, false, true }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
53 | }; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
54 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
55 | // Matrix templates for circle drawing. 2 is substituted with | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
56 | // the scale value, 1 is inverted to -1 if needed. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
57 | static const Matrix g_circleDrawMatrixTemplates[3] = | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
58 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
59 | { 2, 0, 0, 0, 1, 0, 0, 0, 2 }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
60 | { 2, 0, 0, 0, 0, 2, 0, 1, 0 }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
61 | { 0, 1, 0, 2, 0, 0, 0, 0, 2 }, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
62 | }; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
63 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
64 | cfg (String, gl_bgcolor, "#FFFFFF") | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
65 | cfg (String, gl_maincolor, "#A0A0A0") | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
66 | cfg (Float, gl_maincolor_alpha, 1.0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
67 | cfg (Int, gl_linethickness, 2) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
68 | cfg (Bool, gl_colorbfc, false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
69 | cfg (Int, gl_camera, GLRenderer::EFreeCamera) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
70 | cfg (Bool, gl_blackedges, false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
71 | cfg (Bool, gl_axes, false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
72 | cfg (Bool, gl_wireframe, false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
73 | cfg (Bool, gl_logostuds, false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
74 | cfg (Bool, gl_aa, true) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
75 | cfg (Bool, gl_linelengths, true) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
76 | cfg (Bool, gl_drawangles, false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
77 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
78 | // argh | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
79 | const char* g_CameraNames[7] = | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
80 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
81 | QT_TRANSLATE_NOOP ("GLRenderer", "Top"), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
82 | QT_TRANSLATE_NOOP ("GLRenderer", "Front"), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
83 | QT_TRANSLATE_NOOP ("GLRenderer", "Left"), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
84 | QT_TRANSLATE_NOOP ("GLRenderer", "Bottom"), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
85 | QT_TRANSLATE_NOOP ("GLRenderer", "Back"), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
86 | QT_TRANSLATE_NOOP ("GLRenderer", "Right"), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
87 | QT_TRANSLATE_NOOP ("GLRenderer", "Free") | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
88 | }; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
89 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
90 | const GL::EFixedCamera g_Cameras[7] = | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
91 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
92 | GL::ETopCamera, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
93 | GL::EFrontCamera, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
94 | GL::ELeftCamera, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
95 | GL::EBottomCamera, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
96 | GL::EBackCamera, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
97 | GL::ERightCamera, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
98 | GL::EFreeCamera | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
99 | }; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
100 | |
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
101 | struct LDGLAxis | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
102 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
103 | const QColor col; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
104 | const Vertex vert; | 
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
105 | }; | 
| 
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
106 | |
| 
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
107 | // Definitions for visual axes, drawn on the screen | 
| 
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
108 | static const LDGLAxis g_GLAxes[3] = | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
109 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
110 | { QColor (255, 0, 0), Vertex (10000, 0, 0) }, // X | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
111 | { QColor (80, 192, 0), Vertex (0, 10000, 0) }, // Y | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
112 | { QColor (0, 160, 192), Vertex (0, 0, 10000) }, // Z | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
113 | }; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
114 | |
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
115 | static GLuint g_GLAxes_VBO; | 
| 
687
 
77d7c22ec9f3
- axes are now drawn properly again
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
684 
diff
changeset
 | 
116 | static GLuint g_GLAxes_ColorVBO; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
117 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
118 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
119 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
120 | GLRenderer::GLRenderer (QWidget* parent) : QGLWidget (parent) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
121 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
122 | m_isPicking = m_rangepick = false; | 
| 689 | 123 | m_camera = (EFixedCamera) gl_camera; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
124 | m_drawToolTip = false; | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
125 | m_editMode = ESelectMode; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
126 | m_rectdraw = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
127 | m_panning = false; | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
128 | m_compiler = new GLCompiler; | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
129 | setDocument (null); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
130 | setDrawOnly (false); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
131 | setMessageLog (null); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
132 | m_width = m_height = -1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
133 | m_hoverpos = g_origin; | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
134 | m_compiler = new GLCompiler; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
135 | m_toolTipTimer = new QTimer (this); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
136 | m_toolTipTimer->setSingleShot (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
137 | connect (m_toolTipTimer, SIGNAL (timeout()), this, SLOT (slot_toolTipTimer())); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
138 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
139 | m_thickBorderPen = QPen (QColor (0, 0, 0, 208), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
140 | m_thinBorderPen = m_thickBorderPen; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
141 | m_thinBorderPen.setWidth (1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
142 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
143 | // Init camera icons | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
144 | for (const GL::EFixedCamera cam : g_Cameras) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
145 | { | 
| 
644
 
93dcd1a0e4bd
- replaced the fmt/log/dlog/fprint macros in favor of template functions. renamed to format, print, dprint and fprint respectively.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
642 
diff
changeset
 | 
146 | QString iconname = format ("camera-%1", tr (g_CameraNames[cam]).toLower()); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
147 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
148 | CameraIcon* info = &m_cameraIcons[cam]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
149 | info->img = new QPixmap (getIcon (iconname)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
150 | info->cam = cam; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
151 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
152 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
153 | calcCameraIcons(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
154 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
155 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
156 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
157 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
158 | GLRenderer::~GLRenderer() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
159 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
160 | for (int i = 0; i < 6; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
161 | delete currentDocumentData().overlays[i].img; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
162 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
163 | for (CameraIcon& info : m_cameraIcons) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
164 | delete info.img; | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
165 | |
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
166 | delete m_compiler; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
167 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
168 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
169 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
170 | // Calculates the "hitboxes" of the camera icons so that we can tell when the | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
171 | // cursor is pointing at the camera icon. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
172 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
173 | void GLRenderer::calcCameraIcons() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
174 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
175 | int i = 0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
176 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
177 | for (CameraIcon& info : m_cameraIcons) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
178 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
179 | // MATH | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
180 | const long x1 = (m_width - (info.cam != EFreeCamera ? 48 : 16)) + ((i % 3) * 16) - 1, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
181 | y1 = ((i / 3) * 16) + 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
182 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
183 | info.srcRect = QRect (0, 0, 16, 16); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
184 | info.destRect = QRect (x1, y1, 16, 16); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
185 | info.selRect = QRect ( | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
186 | info.destRect.x(), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
187 | info.destRect.y(), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
188 | info.destRect.width() + 1, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
189 | info.destRect.height() + 1 | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
190 | ); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
191 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
192 | ++i; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
193 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
194 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
195 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
196 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
197 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
198 | void GLRenderer::initGLData() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
199 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
200 | glEnable (GL_BLEND); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
201 | glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
202 | glEnable (GL_POLYGON_OFFSET_FILL); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
203 | glPolygonOffset (1.0f, 1.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
204 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
205 | glEnable (GL_DEPTH_TEST); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
206 | glShadeModel (GL_SMOOTH); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
207 | glEnable (GL_MULTISAMPLE); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
208 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
209 | if (gl_aa) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
210 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
211 | glEnable (GL_LINE_SMOOTH); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
212 | glEnable (GL_POLYGON_SMOOTH); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
213 | glHint (GL_LINE_SMOOTH_HINT, GL_NICEST); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
214 | glHint (GL_POLYGON_SMOOTH_HINT, GL_NICEST); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
215 | } else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
216 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
217 | glDisable (GL_LINE_SMOOTH); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
218 | glDisable (GL_POLYGON_SMOOTH); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
219 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
220 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
221 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
222 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
223 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
224 | void GLRenderer::resetAngles() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
225 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
226 | rot (X) = 30.0f; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
227 | rot (Y) = 325.f; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
228 | pan (X) = pan (Y) = rot (Z) = 0.0f; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
229 | zoomToFit(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
230 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
231 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
232 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
233 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
234 | void GLRenderer::resetAllAngles() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
235 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
236 | EFixedCamera oldcam = camera(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
237 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
238 | for (int i = 0; i < 7; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
239 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
240 | setCamera ((EFixedCamera) i); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
241 | resetAngles(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
242 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
243 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
244 | setCamera (oldcam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
245 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
246 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
247 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
248 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
249 | void GLRenderer::initializeGL() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
250 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
251 | setBackground(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
252 | glLineWidth (gl_linethickness); | 
| 
675
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
253 | glLineStipple (1, 0x6666); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
254 | setAutoFillBackground (false); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
255 | setMouseTracking (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
256 | setFocusPolicy (Qt::WheelFocus); | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
257 | compiler()->initialize(); | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
258 | initializeAxes(); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
259 | } | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
260 | |
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
261 | // ============================================================================= | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
262 | // | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
263 | void GLRenderer::initializeAxes() | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
264 | { | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
265 | float axesdata[18]; | 
| 
687
 
77d7c22ec9f3
- axes are now drawn properly again
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
684 
diff
changeset
 | 
266 | float colordata[18]; | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
267 | memset (axesdata, 0, sizeof axesdata); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
268 | |
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
269 | for (int i = 0; i < 3; ++i) | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
270 | { | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
271 | for (int j = 0; j < 3; ++j) | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
272 | { | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
273 | axesdata[(i * 6) + j] = g_GLAxes[i].vert.getCoordinate (j); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
274 | axesdata[(i * 6) + 3 + j] = -g_GLAxes[i].vert.getCoordinate (j); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
275 | } | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
276 | |
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
277 | for (int j = 0; j < 2; ++j) | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
278 | { | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
279 | colordata[(i * 6) + (j * 3) + 0] = g_GLAxes[i].col.red(); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
280 | colordata[(i * 6) + (j * 3) + 1] = g_GLAxes[i].col.green(); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
281 | colordata[(i * 6) + (j * 3) + 2] = g_GLAxes[i].col.blue(); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
282 | } | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
283 | } | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
284 | |
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
285 | glGenBuffers (1, &g_GLAxes_VBO); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
286 | glBindBuffer (GL_ARRAY_BUFFER, g_GLAxes_VBO); | 
| 
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
287 | glBufferData (GL_ARRAY_BUFFER, sizeof axesdata, axesdata, GL_STATIC_DRAW); | 
| 
687
 
77d7c22ec9f3
- axes are now drawn properly again
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
684 
diff
changeset
 | 
288 | glGenBuffers (1, &g_GLAxes_ColorVBO); | 
| 
 
77d7c22ec9f3
- axes are now drawn properly again
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
684 
diff
changeset
 | 
289 | glBindBuffer (GL_ARRAY_BUFFER, g_GLAxes_ColorVBO); | 
| 
 
77d7c22ec9f3
- axes are now drawn properly again
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
684 
diff
changeset
 | 
290 | glBufferData (GL_ARRAY_BUFFER, sizeof colordata, colordata, GL_STATIC_DRAW); | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
291 | glBindBuffer (GL_ARRAY_BUFFER, 0); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
292 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
293 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
294 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
295 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
296 | QColor GLRenderer::getMainColor() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
297 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
298 | QColor col (gl_maincolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
299 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
300 | if (!col.isValid()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
301 | return QColor (0, 0, 0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
302 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
303 | col.setAlpha (gl_maincolor_alpha * 255.f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
304 | return col; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
305 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
306 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
307 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
308 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
309 | void GLRenderer::setBackground() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
310 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
311 | QColor col (gl_bgcolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
312 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
313 | if (!col.isValid()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
314 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
315 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
316 | col.setAlpha (255); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
317 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
318 | m_darkbg = luma (col) < 80; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
319 | m_bgcolor = col; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
320 | qglClearColor (col); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
321 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
322 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
323 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
324 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
325 | void GLRenderer::refresh() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
326 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
327 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
328 | swapBuffers(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
329 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
330 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
331 | // ============================================================================= | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
332 | // | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
333 | void GLRenderer::hardRefresh() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
334 | { | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
335 | compiler()->compileDocument (getCurrentDocument()); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
336 | refresh(); | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
337 | glLineWidth (gl_linethickness); // TODO: ...? | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
338 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
339 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
340 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
341 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
342 | void GLRenderer::resizeGL (int w, int h) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
343 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
344 | m_width = w; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
345 | m_height = h; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
346 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
347 | calcCameraIcons(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
348 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
349 | glViewport (0, 0, w, h); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
350 | glMatrixMode (GL_PROJECTION); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
351 | glLoadIdentity(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
352 | gluPerspective (45.0f, (double) w / (double) h, 1.0f, 10000.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
353 | glMatrixMode (GL_MODELVIEW); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
354 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
355 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
356 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
357 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
358 | void GLRenderer::drawGLScene() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
359 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
360 | if (document() == null) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
361 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
362 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
363 | if (gl_wireframe && !isPicking()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
364 | glPolygonMode (GL_FRONT_AND_BACK, GL_LINE); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
365 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
366 | glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
367 | glEnable (GL_DEPTH_TEST); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
368 | |
| 689 | 369 | if (camera() != EFreeCamera) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
370 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
371 | glMatrixMode (GL_PROJECTION); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
372 | glPushMatrix(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
373 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
374 | glLoadIdentity(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
375 | glOrtho (-m_virtWidth, m_virtWidth, -m_virtHeight, m_virtHeight, -100.0f, 100.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
376 | glTranslatef (pan (X), pan (Y), 0.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
377 | |
| 689 | 378 | if (camera() != EFrontCamera && camera() != EBackCamera) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
379 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
380 | glRotatef (90.0f, g_FixedCameras[camera()].glrotate[0], | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
381 | g_FixedCameras[camera()].glrotate[1], | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
382 | g_FixedCameras[camera()].glrotate[2]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
383 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
384 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
385 | // Back camera needs to be handled differently | 
| 689 | 386 | if (camera() == EBackCamera) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
387 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
388 | glRotatef (180.0f, 1.0f, 0.0f, 0.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
389 | glRotatef (180.0f, 0.0f, 0.0f, 1.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
390 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
391 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
392 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
393 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
394 | glMatrixMode (GL_MODELVIEW); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
395 | glPushMatrix(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
396 | glLoadIdentity(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
397 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
398 | glTranslatef (0.0f, 0.0f, -2.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
399 | glTranslatef (pan (X), pan (Y), -zoom()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
400 | glRotatef (rot (X), 1.0f, 0.0f, 0.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
401 | glRotatef (rot (Y), 0.0f, 1.0f, 0.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
402 | glRotatef (rot (Z), 0.0f, 0.0f, 1.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
403 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
404 | |
| 
675
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
405 | glEnableClientState (GL_VERTEX_ARRAY); | 
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
406 | glEnableClientState (GL_COLOR_ARRAY); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
407 | |
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
408 | if (isPicking()) | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
409 | { | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
410 | drawVBOs (vboTriangles, vboPickColors, GL_TRIANGLES); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
411 | drawVBOs (vboQuads, vboPickColors, GL_QUADS); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
412 | drawVBOs (vboLines, vboPickColors, GL_LINES); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
413 | drawVBOs (vboCondLines, vboPickColors, GL_LINES); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
414 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
415 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
416 | { | 
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
417 | if (gl_colorbfc) | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
418 | { | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
419 | glEnable (GL_CULL_FACE); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
420 | glCullFace (GL_BACK); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
421 | drawVBOs (vboTriangles, vboBFCFrontColors, GL_TRIANGLES); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
422 | drawVBOs (vboQuads, vboBFCFrontColors, GL_QUADS); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
423 | glCullFace (GL_FRONT); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
424 | drawVBOs (vboTriangles, vboBFCBackColors, GL_TRIANGLES); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
425 | drawVBOs (vboQuads, vboBFCBackColors, GL_QUADS); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
426 | glDisable (GL_CULL_FACE); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
427 | } | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
428 | else | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
429 | { | 
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
430 | drawVBOs (vboTriangles, vboNormalColors, GL_TRIANGLES); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
431 | drawVBOs (vboQuads, vboNormalColors, GL_QUADS); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
432 | } | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
433 | |
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
434 | drawVBOs (vboLines, vboNormalColors, GL_LINES); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
435 | drawVBOs (vboCondLines, vboNormalColors, GL_LINES); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
436 | |
| 
688
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
437 | if (gl_axes) | 
| 
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
438 | { | 
| 
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
439 | glBindBuffer (GL_ARRAY_BUFFER, g_GLAxes_VBO); | 
| 
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
440 | glVertexPointer (3, GL_FLOAT, 0, NULL); | 
| 
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
441 | glBindBuffer (GL_ARRAY_BUFFER, g_GLAxes_VBO); | 
| 
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
442 | glColorPointer (3, GL_FLOAT, 0, NULL); | 
| 
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
443 | glDrawArrays (GL_LINES, 0, 6); | 
| 
 
2f4dcc323a85
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
687 
diff
changeset
 | 
444 | checkGLError(); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
445 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
446 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
447 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
448 | glPopMatrix(); | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
449 | glBindBuffer (GL_ARRAY_BUFFER, 0); | 
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
450 | glDisableClientState (GL_VERTEX_ARRAY); | 
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
451 | glDisableClientState (GL_COLOR_ARRAY); | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
452 | checkGLError(); | 
| 
675
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
453 | glDisable (GL_CULL_FACE); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
454 | glMatrixMode (GL_MODELVIEW); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
455 | glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
456 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
457 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
458 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
459 | // | 
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
460 | void GLRenderer::drawVBOs (EVBOSurface surface, EVBOComplement colors, GLenum type) | 
| 
675
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
461 | { | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
462 | int surfacenum = m_compiler->getVBONumber (surface, vboSurfaces); | 
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
463 | int colornum = m_compiler->getVBONumber (surface, colors); | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
464 | |
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
465 | m_compiler->prepareVBO (surfacenum); | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
466 | m_compiler->prepareVBO (colornum); | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
467 | GLuint surfacevbo = m_compiler->getVBO (surfacenum); | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
468 | GLuint colorvbo = m_compiler->getVBO (colornum); | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
469 | GLsizei count = m_compiler->getVBOCount (surfacevbo); | 
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
470 | |
| 
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
471 | if (count > 0) | 
| 
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
472 | { | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
473 | glBindBuffer (GL_ARRAY_BUFFER, surfacevbo); | 
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
474 | glVertexPointer (3, GL_FLOAT, 0, null); | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
475 | checkGLError(); | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
476 | glBindBuffer (GL_ARRAY_BUFFER, colorvbo); | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
477 | glColorPointer (4, GL_FLOAT, 0, null); | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
478 | checkGLError(); | 
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
479 | glDrawArrays (type, 0, count); | 
| 
679
 
dd7545e00a8f
- now actually renders stuff correctly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
676 
diff
changeset
 | 
480 | checkGLError(); | 
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
481 | } | 
| 
675
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
482 | } | 
| 
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
483 | |
| 
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
484 | // ============================================================================= | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
485 | // This converts a 2D point on the screen to a 3D point in the model. If 'snap' | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
486 | // is true, the 3D point will snap to the current grid. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
487 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
488 | Vertex GLRenderer::coordconv2_3 (const QPoint& pos2d, bool snap) const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
489 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
490 | assert (camera() != EFreeCamera); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
491 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
492 | Vertex pos3d; | 
| 689 | 493 | const LDFixedCameraInfo* cam = &g_FixedCameras[camera()]; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
494 | const Axis axisX = cam->axisX; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
495 | const Axis axisY = cam->axisY; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
496 | const int negXFac = cam->negX ? -1 : 1, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
497 | negYFac = cam->negY ? -1 : 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
498 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
499 | // Calculate cx and cy - these are the LDraw unit coords the cursor is at. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
500 | double cx = (-m_virtWidth + ((2 * pos2d.x() * m_virtWidth) / m_width) - pan (X)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
501 | double cy = (m_virtHeight - ((2 * pos2d.y() * m_virtHeight) / m_height) - pan (Y)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
502 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
503 | if (snap) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
504 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
505 | cx = Grid::snap (cx, (Grid::Config) axisX); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
506 | cy = Grid::snap (cy, (Grid::Config) axisY); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
507 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
508 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
509 | cx *= negXFac; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
510 | cy *= negYFac; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
511 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
512 | roundToDecimals (cx, 4); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
513 | roundToDecimals (cy, 4); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
514 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
515 | // Create the vertex from the coordinates | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
516 | pos3d[axisX] = cx; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
517 | pos3d[axisY] = cy; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
518 | pos3d[3 - axisX - axisY] = getDepthValue(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
519 | return pos3d; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
520 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
521 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
522 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
523 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
524 | // Inverse operation for the above - convert a 3D position to a 2D screen | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
525 | // position. Don't ask me how this code manages to work, I don't even know. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
526 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
527 | QPoint GLRenderer::coordconv3_2 (const Vertex& pos3d) const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
528 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
529 | GLfloat m[16]; | 
| 689 | 530 | const LDFixedCameraInfo* cam = &g_FixedCameras[camera()]; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
531 | const Axis axisX = cam->axisX; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
532 | const Axis axisY = cam->axisY; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
533 | const int negXFac = cam->negX ? -1 : 1, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
534 | negYFac = cam->negY ? -1 : 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
535 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
536 | glGetFloatv (GL_MODELVIEW_MATRIX, m); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
537 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
538 | const double x = pos3d.x(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
539 | const double y = pos3d.y(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
540 | const double z = pos3d.z(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
541 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
542 | Vertex transformed; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
543 | transformed[X] = (m[0] * x) + (m[1] * y) + (m[2] * z) + m[3]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
544 | transformed[Y] = (m[4] * x) + (m[5] * y) + (m[6] * z) + m[7]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
545 | transformed[Z] = (m[8] * x) + (m[9] * y) + (m[10] * z) + m[11]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
546 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
547 | double rx = (((transformed[axisX] * negXFac) + m_virtWidth + pan (X)) * m_width) / (2 * m_virtWidth); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
548 | double ry = (((transformed[axisY] * negYFac) - m_virtHeight + pan (Y)) * m_height) / (2 * m_virtHeight); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
549 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
550 | return QPoint (rx, -ry); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
551 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
552 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
553 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
554 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
555 | void GLRenderer::paintEvent (QPaintEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
556 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
557 | Q_UNUSED (ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
558 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
559 | makeCurrent(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
560 | m_virtWidth = zoom(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
561 | m_virtHeight = (m_height * m_virtWidth) / m_width; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
562 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
563 | initGLData(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
564 | drawGLScene(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
565 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
566 | const QPen textpen (m_darkbg ? Qt::white : Qt::black); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
567 | const QBrush polybrush (QColor (64, 192, 0, 128)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
568 | QPainter paint (this); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
569 | QFontMetrics metrics = QFontMetrics (QFont()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
570 | paint.setRenderHint (QPainter::HighQualityAntialiasing); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
571 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
572 | // If we wish to only draw the brick, stop here | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
573 | if (isDrawOnly()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
574 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
575 | |
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
576 | #ifndef RELEASE | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
577 | if (isPicking() == false) | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
578 | { | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
579 | QString text = format ("Rotation: (%1, %2, %3)\nPanning: (%4, %5), Zoom: %6", | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
580 | rot(X), rot(Y), rot(Z), pan(X), pan(Y), zoom()); | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
581 | QRect textSize = metrics.boundingRect (0, 0, m_width, m_height, Qt::AlignCenter, text); | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
582 | |
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
583 | paint.drawText ((width() - textSize.width()) / 2, height() - textSize.height(), textSize.width(), | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
584 | textSize.height(), Qt::AlignCenter, text); | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
585 | } | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
586 | #endif | 
| 
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
587 | |
| 689 | 588 | if (camera() != EFreeCamera && !isPicking()) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
589 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
590 | // Paint the overlay image if we have one | 
| 689 | 591 | const LDGLOverlay& overlay = currentDocumentData().overlays[camera()]; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
592 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
593 | if (overlay.img != null) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
594 | { | 
| 689 | 595 | QPoint v0 = coordconv3_2 (currentDocumentData().overlays[camera()].v0), | 
| 596 | v1 = coordconv3_2 (currentDocumentData().overlays[camera()].v1); | |
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
597 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
598 | QRect targRect (v0.x(), v0.y(), abs (v1.x() - v0.x()), abs (v1.y() - v0.y())), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
599 | srcRect (0, 0, overlay.img->width(), overlay.img->height()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
600 | paint.drawImage (targRect, *overlay.img, srcRect); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
601 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
602 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
603 | // Paint the coordinates onto the screen. | 
| 
644
 
93dcd1a0e4bd
- replaced the fmt/log/dlog/fprint macros in favor of template functions. renamed to format, print, dprint and fprint respectively.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
642 
diff
changeset
 | 
604 | QString text = format (tr ("X: %1, Y: %2, Z: %3"), m_hoverpos[X], m_hoverpos[Y], m_hoverpos[Z]); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
605 | QFontMetrics metrics = QFontMetrics (font()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
606 | QRect textSize = metrics.boundingRect (0, 0, m_width, m_height, Qt::AlignCenter, text); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
607 | paint.setPen (textpen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
608 | paint.drawText (m_width - textSize.width(), m_height - 16, textSize.width(), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
609 | textSize.height(), Qt::AlignCenter, text); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
610 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
611 | QPen linepen = m_thinBorderPen; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
612 | linepen.setWidth (2); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
613 | linepen.setColor (luma (m_bgcolor) < 40 ? Qt::white : Qt::black); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
614 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
615 | // Mode-specific rendering | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
616 | if (editMode() == EDrawMode) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
617 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
618 | QPoint poly[4]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
619 | Vertex poly3d[4]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
620 | int numverts = 4; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
621 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
622 | // Calculate polygon data | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
623 | if (!m_rectdraw) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
624 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
625 | numverts = m_drawedVerts.size() + 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
626 | int i = 0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
627 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
628 | for (Vertex& vert : m_drawedVerts) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
629 | poly3d[i++] = vert; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
630 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
631 | // Draw the cursor vertex as the last one in the list. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
632 | if (numverts <= 4) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
633 | poly3d[i] = m_hoverpos; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
634 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
635 | numverts = 4; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
636 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
637 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
638 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
639 | // Get vertex information from m_rectverts | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
640 | if (m_drawedVerts.size() > 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
641 | for (int i = 0; i < numverts; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
642 | poly3d[i] = m_rectverts[i]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
643 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
644 | poly3d[0] = m_hoverpos; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
645 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
646 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
647 | // Convert to 2D | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
648 | for (int i = 0; i < numverts; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
649 | poly[i] = coordconv3_2 (poly3d[i]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
650 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
651 | if (numverts > 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
652 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
653 | // Draw the polygon-to-be | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
654 | paint.setBrush (polybrush); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
655 | paint.drawPolygon (poly, numverts); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
656 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
657 | // Draw vertex blips | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
658 | for (int i = 0; i < numverts; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
659 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
660 | QPoint& blip = poly[i]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
661 | paint.setPen (linepen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
662 | drawBlip (paint, blip); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
663 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
664 | // Draw their coordinates | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
665 | paint.setPen (textpen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
666 | paint.drawText (blip.x(), blip.y() - 8, poly3d[i].toString (true)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
667 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
668 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
669 | // Draw line lenghts and angle info if appropriate | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
670 | if (numverts >= 2) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
671 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
672 | int numlines = (m_drawedVerts.size() == 1) ? 1 : m_drawedVerts.size() + 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
673 | paint.setPen (textpen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
674 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
675 | for (int i = 0; i < numlines; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
676 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
677 | const int j = (i + 1 < numverts) ? i + 1 : 0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
678 | const int h = (i - 1 >= 0) ? i - 1 : numverts - 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
679 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
680 | if (gl_linelengths) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
681 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
682 | const QString label = QString::number (poly3d[i].distanceTo (poly3d[j])); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
683 | QPoint origin = QLineF (poly[i], poly[j]).pointAt (0.5).toPoint(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
684 | paint.drawText (origin, label); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
685 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
686 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
687 | if (gl_drawangles) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
688 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
689 | QLineF l0 (poly[h], poly[i]), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
690 | l1 (poly[i], poly[j]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
691 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
692 | double angle = 180 - l0.angleTo (l1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
693 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
694 | if (angle < 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
695 | angle = 180 - l1.angleTo (l0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
696 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
697 | QString label = QString::number (angle) + QString::fromUtf8 (QByteArray ("\302\260")); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
698 | QPoint pos = poly[i]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
699 | pos.setY (pos.y() + metrics.height()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
700 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
701 | paint.drawText (pos, label); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
702 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
703 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
704 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
705 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
706 | } | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
707 | elif (editMode() == ECircleMode) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
708 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
709 | // If we have not specified the center point of the circle yet, preview it on the screen. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
710 | if (m_drawedVerts.isEmpty()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
711 | drawBlip (paint, coordconv3_2 (m_hoverpos)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
712 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
713 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
714 | QVector<Vertex> verts, verts2; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
715 | const double dist0 = getCircleDrawDist (0), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
716 | dist1 = (m_drawedVerts.size() >= 2) ? getCircleDrawDist (1) : -1; | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
717 | const int segs = g_lores; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
718 | const double angleUnit = (2 * pi) / segs; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
719 | Axis relX, relY; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
720 | QVector<QPoint> ringpoints, circlepoints, circle2points; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
721 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
722 | getRelativeAxes (relX, relY); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
723 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
724 | // Calculate the preview positions of vertices | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
725 | for (int i = 0; i < segs; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
726 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
727 | Vertex v = g_origin; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
728 | v[relX] = m_drawedVerts[0][relX] + (cos (i * angleUnit) * dist0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
729 | v[relY] = m_drawedVerts[0][relY] + (sin (i * angleUnit) * dist0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
730 | verts << v; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
731 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
732 | if (dist1 != -1) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
733 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
734 | v[relX] = m_drawedVerts[0][relX] + (cos (i * angleUnit) * dist1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
735 | v[relY] = m_drawedVerts[0][relY] + (sin (i * angleUnit) * dist1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
736 | verts2 << v; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
737 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
738 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
739 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
740 | int i = 0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
741 | for (const Vertex& v : verts + verts2) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
742 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
743 | // Calculate the 2D point of the vertex | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
744 | QPoint point = coordconv3_2 (v); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
745 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
746 | // Draw a green blip at where it is | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
747 | drawBlip (paint, point); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
748 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
749 | // Add it to the list of points for the green ring fill. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
750 | ringpoints << point; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
751 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
752 | // Also add the circle points to separate lists | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
753 | if (i < verts.size()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
754 | circlepoints << point; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
755 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
756 | circle2points << point; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
757 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
758 | ++i; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
759 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
760 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
761 | // Insert the first point as the seventeenth one so that | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
762 | // the ring polygon is closed properly. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
763 | if (ringpoints.size() >= 16) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
764 | ringpoints.insert (16, ringpoints[0]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
765 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
766 | // Same for the outer ring. Note that the indices are offset by 1 | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
767 | // because of the insertion done above bumps the values. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
768 | if (ringpoints.size() >= 33) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
769 | ringpoints.insert (33, ringpoints[17]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
770 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
771 | // Draw the ring | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
772 | paint.setBrush ((m_drawedVerts.size() >= 2) ? polybrush : Qt::NoBrush); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
773 | paint.setPen (Qt::NoPen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
774 | paint.drawPolygon (QPolygon (ringpoints)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
775 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
776 | // Draw the circles | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
777 | paint.setBrush (Qt::NoBrush); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
778 | paint.setPen (linepen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
779 | paint.drawPolygon (QPolygon (circlepoints)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
780 | paint.drawPolygon (QPolygon (circle2points)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
781 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
782 | { // Draw the current radius in the middle of the circle. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
783 | QPoint origin = coordconv3_2 (m_drawedVerts[0]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
784 | QString label = QString::number (dist0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
785 | paint.setPen (textpen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
786 | paint.drawText (origin.x() - (metrics.width (label) / 2), origin.y(), label); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
787 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
788 | if (m_drawedVerts.size() >= 2) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
789 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
790 | label = QString::number (dist1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
791 | paint.drawText (origin.x() - (metrics.width (label) / 2), origin.y() + metrics.height(), label); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
792 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
793 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
794 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
795 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
796 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
797 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
798 | // Camera icons | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
799 | if (!isPicking()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
800 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
801 | // Draw a background for the selected camera | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
802 | paint.setPen (m_thinBorderPen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
803 | paint.setBrush (QBrush (QColor (0, 128, 160, 128))); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
804 | paint.drawRect (m_cameraIcons[camera()].selRect); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
805 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
806 | // Draw the actual icons | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
807 | for (CameraIcon& info : m_cameraIcons) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
808 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
809 | // Don't draw the free camera icon when in draw mode | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
810 | if (&info == &m_cameraIcons[GL::EFreeCamera] && editMode() != ESelectMode) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
811 | continue; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
812 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
813 | paint.drawPixmap (info.destRect, *info.img, info.srcRect); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
814 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
815 | |
| 
644
 
93dcd1a0e4bd
- replaced the fmt/log/dlog/fprint macros in favor of template functions. renamed to format, print, dprint and fprint respectively.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
642 
diff
changeset
 | 
816 | QString formatstr = tr ("%1 Camera"); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
817 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
818 | // Draw a label for the current camera in the bottom left corner | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
819 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
820 | const int margin = 4; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
821 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
822 | QString label; | 
| 
644
 
93dcd1a0e4bd
- replaced the fmt/log/dlog/fprint macros in favor of template functions. renamed to format, print, dprint and fprint respectively.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
642 
diff
changeset
 | 
823 | label = format (formatstr, tr (g_CameraNames[camera()])); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
824 | paint.setPen (textpen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
825 | paint.drawText (QPoint (margin, height() - (margin + metrics.descent())), label); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
826 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
827 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
828 | // Tool tips | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
829 | if (m_drawToolTip) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
830 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
831 | if (m_cameraIcons[m_toolTipCamera].destRect.contains (m_pos) == false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
832 | m_drawToolTip = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
833 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
834 | { | 
| 
644
 
93dcd1a0e4bd
- replaced the fmt/log/dlog/fprint macros in favor of template functions. renamed to format, print, dprint and fprint respectively.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
642 
diff
changeset
 | 
835 | QString label = format (formatstr, tr (g_CameraNames[m_toolTipCamera])); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
836 | QToolTip::showText (m_globalpos, label); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
837 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
838 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
839 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
840 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
841 | // Message log | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
842 | if (messageLog()) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
843 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
844 | int y = 0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
845 | const int margin = 2; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
846 | QColor penColor = textpen.color(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
847 | |
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
848 | for (const MessageManager::Line& line : messageLog()->getLines()) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
849 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
850 | penColor.setAlphaF (line.alpha); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
851 | paint.setPen (penColor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
852 | paint.drawText (QPoint (margin, y + margin + metrics.ascent()), line.text); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
853 | y += metrics.height(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
854 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
855 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
856 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
857 | // If we're range-picking, draw a rectangle encompassing the selection area. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
858 | if (m_rangepick && !isPicking() && m_totalmove >= 10) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
859 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
860 | int x0 = m_rangeStart.x(), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
861 | y0 = m_rangeStart.y(), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
862 | x1 = m_pos.x(), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
863 | y1 = m_pos.y(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
864 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
865 | QRect rect (x0, y0, x1 - x0, y1 - y0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
866 | QColor fillColor = (m_addpick ? "#40FF00" : "#00CCFF"); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
867 | fillColor.setAlphaF (0.2f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
868 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
869 | paint.setPen (m_thickBorderPen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
870 | paint.setBrush (QBrush (fillColor)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
871 | paint.drawRect (rect); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
872 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
873 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
874 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
875 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
876 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
877 | void GLRenderer::drawBlip (QPainter& paint, QPoint pos) const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
878 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
879 | QPen pen = m_thinBorderPen; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
880 | const int blipsize = 8; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
881 | pen.setWidth (1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
882 | paint.setPen (pen); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
883 | paint.setBrush (QColor (64, 192, 0)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
884 | paint.drawEllipse (pos.x() - blipsize / 2, pos.y() - blipsize / 2, blipsize, blipsize); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
885 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
886 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
887 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
888 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
889 | void GLRenderer::clampAngle (double& angle) const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
890 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
891 | while (angle < 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
892 | angle += 360.0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
893 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
894 | while (angle > 360.0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
895 | angle -= 360.0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
896 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
897 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
898 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
899 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
900 | void GLRenderer::addDrawnVertex (Vertex pos) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
901 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
902 | // If we picked an already-existing vertex, stop drawing | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
903 | if (editMode() == EDrawMode) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
904 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
905 | for (Vertex& vert : m_drawedVerts) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
906 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
907 | if (vert == pos) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
908 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
909 | endDraw (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
910 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
911 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
912 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
913 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
914 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
915 | m_drawedVerts << pos; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
916 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
917 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
918 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
919 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
920 | void GLRenderer::mouseReleaseEvent (QMouseEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
921 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
922 | const bool wasLeft = (m_lastButtons & Qt::LeftButton) && ! (ev->buttons() & Qt::LeftButton), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
923 | wasRight = (m_lastButtons & Qt::RightButton) && ! (ev->buttons() & Qt::RightButton), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
924 | wasMid = (m_lastButtons & Qt::MidButton) && ! (ev->buttons() & Qt::MidButton); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
925 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
926 | if (m_panning) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
927 | m_panning = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
928 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
929 | if (wasLeft) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
930 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
931 | // Check if we selected a camera icon | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
932 | if (!m_rangepick) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
933 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
934 | for (CameraIcon & info : m_cameraIcons) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
935 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
936 | if (info.destRect.contains (ev->pos())) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
937 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
938 | setCamera (info.cam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
939 | goto end; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
940 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
941 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
942 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
943 | |
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
944 | switch (editMode()) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
945 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
946 | case EDrawMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
947 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
948 | if (m_rectdraw) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
949 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
950 | if (m_drawedVerts.size() == 2) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
951 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
952 | endDraw (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
953 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
954 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
955 | } else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
956 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
957 | // If we have 4 verts, stop drawing. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
958 | if (m_drawedVerts.size() >= 4) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
959 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
960 | endDraw (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
961 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
962 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
963 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
964 | if (m_drawedVerts.isEmpty() && ev->modifiers() & Qt::ShiftModifier) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
965 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
966 | m_rectdraw = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
967 | updateRectVerts(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
968 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
969 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
970 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
971 | addDrawnVertex (m_hoverpos); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
972 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
973 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
974 | case ECircleMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
975 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
976 | if (m_drawedVerts.size() == 3) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
977 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
978 | endDraw (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
979 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
980 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
981 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
982 | addDrawnVertex (m_hoverpos); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
983 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
984 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
985 | case ESelectMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
986 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
987 | if (!isDrawOnly()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
988 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
989 | if (m_totalmove < 10) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
990 | m_rangepick = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
991 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
992 | if (!m_rangepick) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
993 | m_addpick = (m_keymods & Qt::ControlModifier); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
994 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
995 | if (m_totalmove < 10 || m_rangepick) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
996 | pick (ev->x(), ev->y()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
997 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
998 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
999 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1000 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1001 | m_rangepick = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1002 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1003 | |
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1004 | if (wasMid && editMode() != ESelectMode && m_drawedVerts.size() < 4 && m_totalmove < 10) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1005 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1006 | // Find the closest vertex to our cursor | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1007 | double mindist = 1024.0f; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1008 | Vertex closest; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1009 | bool valid = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1010 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1011 | QPoint curspos = coordconv3_2 (m_hoverpos); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1012 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1013 | for (const Vertex& pos3d: m_knownVerts) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1014 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1015 | QPoint pos2d = coordconv3_2 (pos3d); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1016 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1017 | // Measure squared distance | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1018 | const double dx = abs (pos2d.x() - curspos.x()), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1019 | dy = abs (pos2d.y() - curspos.y()), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1020 | distsq = (dx * dx) + (dy * dy); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1021 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1022 | if (distsq >= 1024.0f) // 32.0f ** 2 | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1023 | continue; // too far away | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1024 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1025 | if (distsq < mindist) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1026 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1027 | mindist = distsq; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1028 | closest = pos3d; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1029 | valid = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1030 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1031 | // If it's only 4 pixels away, I think we found our vertex now. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1032 | if (distsq <= 16.0f) // 4.0f ** 2 | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1033 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1034 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1035 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1036 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1037 | if (valid) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1038 | addDrawnVertex (closest); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1039 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1040 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1041 | if (wasRight && !m_drawedVerts.isEmpty()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1042 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1043 | // Remove the last vertex | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1044 | m_drawedVerts.removeLast(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1045 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1046 | if (m_drawedVerts.isEmpty()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1047 | m_rectdraw = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1048 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1049 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1050 | end: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1051 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1052 | m_totalmove = 0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1053 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1054 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1055 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1056 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1057 | void GLRenderer::mousePressEvent (QMouseEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1058 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1059 | m_totalmove = 0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1060 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1061 | if (ev->modifiers() & Qt::ControlModifier) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1062 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1063 | m_rangepick = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1064 | m_rangeStart.setX (ev->x()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1065 | m_rangeStart.setY (ev->y()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1066 | m_addpick = (m_keymods & Qt::AltModifier); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1067 | ev->accept(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1068 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1069 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1070 | m_lastButtons = ev->buttons(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1071 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1072 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1073 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1074 | // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1075 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1076 | void GLRenderer::mouseMoveEvent (QMouseEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1077 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1078 | int dx = ev->x() - m_pos.x(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1079 | int dy = ev->y() - m_pos.y(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1080 | m_totalmove += abs (dx) + abs (dy); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1081 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1082 | const bool left = ev->buttons() & Qt::LeftButton, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1083 | mid = ev->buttons() & Qt::MidButton, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1084 | shift = ev->modifiers() & Qt::ShiftModifier; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1085 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1086 | if (mid || (left && shift)) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1087 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1088 | pan (X) += 0.03f * dx * (zoom() / 7.5f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1089 | pan (Y) -= 0.03f * dy * (zoom() / 7.5f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1090 | m_panning = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1091 | } elif (left && !m_rangepick && camera() == EFreeCamera) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1092 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1093 | rot (X) = rot (X) + dy; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1094 | rot (Y) = rot (Y) + dx; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1095 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1096 | clampAngle (rot (X)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1097 | clampAngle (rot (Y)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1098 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1099 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1100 | // Start the tool tip timer | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1101 | if (!m_drawToolTip) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1102 | m_toolTipTimer->start (500); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1103 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1104 | // Update 2d position | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1105 | m_pos = ev->pos(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1106 | m_globalpos = ev->globalPos(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1107 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1108 | // Calculate 3d position of the cursor | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1109 | m_hoverpos = (camera() != EFreeCamera) ? coordconv2_3 (m_pos, true) : g_origin; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1110 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1111 | // Update rect vertices since m_hoverpos may have changed | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1112 | updateRectVerts(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1113 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1114 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1115 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1116 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1117 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1118 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1119 | void GLRenderer::keyPressEvent (QKeyEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1120 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1121 | m_keymods = ev->modifiers(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1122 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1123 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1124 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1125 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1126 | void GLRenderer::keyReleaseEvent (QKeyEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1127 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1128 | m_keymods = ev->modifiers(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1129 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1130 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1131 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1132 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1133 | void GLRenderer::wheelEvent (QWheelEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1134 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1135 | makeCurrent(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1136 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1137 | zoomNotch (ev->delta() > 0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1138 | zoom() = clamp (zoom(), 0.01, 10000.0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1139 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1140 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1141 | ev->accept(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1142 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1143 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1144 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1145 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1146 | void GLRenderer::leaveEvent (QEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1147 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1148 | (void) ev; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1149 | m_drawToolTip = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1150 | m_toolTipTimer->stop(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1151 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1152 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1153 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1154 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1155 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1156 | void GLRenderer::contextMenuEvent (QContextMenuEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1157 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1158 | g_win->spawnContextMenu (ev->globalPos()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1159 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1160 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1161 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1162 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1163 | void GLRenderer::setCamera (const GLRenderer::EFixedCamera cam) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1164 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1165 | m_camera = cam; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1166 | gl_camera = (int) cam; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1167 | g_win->updateEditModeActions(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1168 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1169 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1170 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1171 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1172 | void GLRenderer::pick (int mouseX, int mouseY) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1173 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1174 | makeCurrent(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1175 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1176 | // Use particularly thick lines while picking ease up selecting lines. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1177 | glLineWidth (max<double> (gl_linethickness, 6.5f)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1178 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1179 | // Clear the selection if we do not wish to add to it. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1180 | if (!m_addpick) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1181 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1182 | LDObjectList oldsel = selection(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1183 | getCurrentDocument()->clearSelection(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1184 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1185 | for (LDObject* obj : oldsel) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1186 | compileObject (obj); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1187 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1188 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1189 | setPicking (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1190 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1191 | // Paint the picking scene | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1192 | glDisable (GL_DITHER); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1193 | glClearColor (1.0f, 1.0f, 1.0f, 1.0f); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1194 | drawGLScene(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1195 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1196 | int x0 = mouseX, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1197 | y0 = mouseY; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1198 | int x1, y1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1199 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1200 | // Determine how big an area to read - with range picking, we pick by | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1201 | // the area given, with single pixel picking, we use an 1 x 1 area. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1202 | if (m_rangepick) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1203 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1204 | x1 = m_rangeStart.x(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1205 | y1 = m_rangeStart.y(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1206 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1207 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1208 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1209 | x1 = x0 + 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1210 | y1 = y0 + 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1211 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1212 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1213 | // x0 and y0 must be less than x1 and y1, respectively. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1214 | if (x0 > x1) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1215 | qSwap (x0, x1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1216 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1217 | if (y0 > y1) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1218 | qSwap (y0, y1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1219 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1220 | // Clamp the values to ensure they're within bounds | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1221 | x0 = max (0, x0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1222 | y0 = max (0, y0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1223 | x1 = min (x1, m_width); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1224 | y1 = min (y1, m_height); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1225 | const int areawidth = (x1 - x0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1226 | const int areaheight = (y1 - y0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1227 | const qint32 numpixels = areawidth * areaheight; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1228 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1229 | // Allocate space for the pixel data. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1230 | uchar* const pixeldata = new uchar[4 * numpixels]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1231 | uchar* pixelptr = &pixeldata[0]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1232 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1233 | // Read pixels from the color buffer. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1234 | glReadPixels (x0, m_height - y1, areawidth, areaheight, GL_RGBA, GL_UNSIGNED_BYTE, pixeldata); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1235 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1236 | LDObject* removedObj = null; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1237 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1238 | // Go through each pixel read and add them to the selection. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1239 | for (qint32 i = 0; i < numpixels; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1240 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1241 | qint32 idx = | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1242 | (*(pixelptr + 0) * 0x10000) + | 
| 
675
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
1243 | (*(pixelptr + 1) * 0x100) + | 
| 
 
450827da2376
Merge ../ldforge into gl
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
629 
diff
changeset
 | 
1244 | *(pixelptr + 2); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1245 | pixelptr += 4; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1246 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1247 | if (idx == 0xFFFFFF) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1248 | continue; // White is background; skip | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1249 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1250 | LDObject* obj = LDObject::fromID (idx); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1251 | assert (obj != null); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1252 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1253 | // If this is an additive single pick and the object is currently selected, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1254 | // we remove it from selection instead. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1255 | if (!m_rangepick && m_addpick) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1256 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1257 | if (obj->isSelected()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1258 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1259 | obj->unselect(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1260 | removedObj = obj; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1261 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1262 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1263 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1264 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1265 | obj->select(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1266 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1267 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1268 | delete[] pixeldata; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1269 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1270 | // Update everything now. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1271 | g_win->updateSelection(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1272 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1273 | // Recompile the objects now to update their color | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1274 | for (LDObject* obj : selection()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1275 | compileObject (obj); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1276 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1277 | if (removedObj) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1278 | compileObject (removedObj); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1279 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1280 | // Restore line thickness | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1281 | glLineWidth (gl_linethickness); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1282 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1283 | setPicking (false); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1284 | m_rangepick = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1285 | glEnable (GL_DITHER); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1286 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1287 | setBackground(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1288 | repaint(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1289 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1290 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1291 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1292 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1293 | void GLRenderer::setEditMode (EditMode const& a) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1294 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1295 | m_editMode = a; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1296 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1297 | switch (a) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1298 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1299 | case ESelectMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1300 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1301 | unsetCursor(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1302 | setContextMenuPolicy (Qt::DefaultContextMenu); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1303 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1304 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1305 | case EDrawMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1306 | case ECircleMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1307 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1308 | // Cannot draw into the free camera - use top instead. | 
| 689 | 1309 | if (camera() == EFreeCamera) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1310 | setCamera (ETopCamera); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1311 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1312 | // Disable the context menu - we need the right mouse button | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1313 | // for removing vertices. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1314 | setContextMenuPolicy (Qt::NoContextMenu); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1315 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1316 | // Use the crosshair cursor when drawing. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1317 | setCursor (Qt::CrossCursor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1318 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1319 | // Clear the selection when beginning to draw. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1320 | LDObjectList priorsel = selection(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1321 | getCurrentDocument()->clearSelection(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1322 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1323 | for (LDObject* obj : priorsel) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1324 | compileObject (obj); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1325 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1326 | g_win->updateSelection(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1327 | m_drawedVerts.clear(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1328 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1329 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1330 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1331 | g_win->updateEditModeActions(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1332 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1333 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1334 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1335 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1336 | // | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1337 | void GLRenderer::setDocument (LDDocument* const& a) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1338 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1339 | m_document = a; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1340 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1341 | if (a != null) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1342 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1343 | initOverlaysFromObjects(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1344 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1345 | if (currentDocumentData().init == false) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1346 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1347 | resetAllAngles(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1348 | currentDocumentData().init = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1349 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1350 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1351 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1352 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1353 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1354 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1355 | Matrix GLRenderer::getCircleDrawMatrix (double scale) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1356 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1357 | Matrix transform = g_circleDrawMatrixTemplates[camera() % 3]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1358 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1359 | for (int i = 0; i < 9; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1360 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1361 | if (transform[i] == 2) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1362 | transform[i] = scale; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1363 | elif (transform[i] == 1 && camera() >= 3) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1364 | transform[i] = -1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1365 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1366 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1367 | return transform; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1368 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1369 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1370 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1371 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1372 | void GLRenderer::endDraw (bool accept) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1373 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1374 | (void) accept; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1375 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1376 | // Clean the selection and create the object | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1377 | QList<Vertex>& verts = m_drawedVerts; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1378 | LDObjectList objs; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1379 | |
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1380 | switch (editMode()) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1381 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1382 | case EDrawMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1383 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1384 | if (m_rectdraw) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1385 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1386 | LDQuad* quad = new LDQuad; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1387 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1388 | // Copy the vertices from m_rectverts | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1389 | updateRectVerts(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1390 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1391 | for (int i = 0; i < quad->vertices(); ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1392 | quad->setVertex (i, m_rectverts[i]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1393 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1394 | quad->setColor (maincolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1395 | objs << quad; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1396 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1397 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1398 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1399 | switch (verts.size()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1400 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1401 | case 1: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1402 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1403 | // 1 vertex - add a vertex object | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1404 | LDVertex* obj = new LDVertex; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1405 | obj->pos = verts[0]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1406 | obj->setColor (maincolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1407 | objs << obj; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1408 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1409 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1410 | case 2: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1411 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1412 | // 2 verts - make a line | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1413 | LDLine* obj = new LDLine (verts[0], verts[1]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1414 | obj->setColor (edgecolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1415 | objs << obj; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1416 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1417 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1418 | case 3: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1419 | case 4: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1420 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1421 | LDObject* obj = (verts.size() == 3) ? | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1422 | static_cast<LDObject*> (new LDTriangle) : | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1423 | static_cast<LDObject*> (new LDQuad); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1424 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1425 | obj->setColor (maincolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1426 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1427 | for (int i = 0; i < obj->vertices(); ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1428 | obj->setVertex (i, verts[i]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1429 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1430 | objs << obj; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1431 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1432 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1433 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1434 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1435 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1436 | case ECircleMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1437 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1438 | const int segs = g_lores, divs = g_lores; // TODO: make customizable | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1439 | double dist0 = getCircleDrawDist (0), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1440 | dist1 = getCircleDrawDist (1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1441 | LDDocument* refFile = null; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1442 | Matrix transform; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1443 | bool circleOrDisc = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1444 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1445 | if (dist1 < dist0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1446 | std::swap<double> (dist0, dist1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1447 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1448 | if (dist0 == dist1) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1449 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1450 | // If the radii are the same, there's no ring space to fill. Use a circle. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1451 | refFile = ::getDocument ("4-4edge.dat"); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1452 | transform = getCircleDrawMatrix (dist0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1453 | circleOrDisc = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1454 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1455 | elif (dist0 == 0 || dist1 == 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1456 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1457 | // If either radii is 0, use a disc. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1458 | refFile = ::getDocument ("4-4disc.dat"); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1459 | transform = getCircleDrawMatrix ((dist0 != 0) ? dist0 : dist1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1460 | circleOrDisc = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1461 | } | 
| 
653
 
a9966d51ebf1
- fixed various compilation issues
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
644 
diff
changeset
 | 
1462 | elif (g_RingFinder.findRings (dist0, dist1)) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1463 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1464 | // The ring finder found a solution, use that. Add the component rings to the file. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1465 | for (const RingFinder::Component& cmp : g_RingFinder.bestSolution()->getComponents()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1466 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1467 | // Get a ref file for this primitive. If we cannot find it in the | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1468 | // LDraw library, generate it. | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1469 | if ((refFile = ::getDocument (radialFileName (::Ring, g_lores, g_lores, cmp.num))) == null) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1470 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1471 | refFile = generatePrimitive (::Ring, g_lores, g_lores, cmp.num); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1472 | refFile->setImplicit (false); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1473 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1474 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1475 | LDSubfile* ref = new LDSubfile; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1476 | ref->setFileInfo (refFile); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1477 | ref->setTransform (getCircleDrawMatrix (cmp.scale)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1478 | ref->setPosition (m_drawedVerts[0]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1479 | ref->setColor (maincolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1480 | objs << ref; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1481 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1482 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1483 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1484 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1485 | // Ring finder failed, last resort: draw the ring with quads | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1486 | QList<QLineF> c0, c1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1487 | Axis relX, relY, relZ; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1488 | getRelativeAxes (relX, relY); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1489 | relZ = (Axis) (3 - relX - relY); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1490 | double x0 = m_drawedVerts[0][relX], | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1491 | y0 = m_drawedVerts[0][relY]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1492 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1493 | Vertex templ; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1494 | templ[relX] = x0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1495 | templ[relY] = y0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1496 | templ[relZ] = getDepthValue(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1497 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1498 | // Calculate circle coords | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1499 | makeCircle (segs, divs, dist0, c0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1500 | makeCircle (segs, divs, dist1, c1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1501 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1502 | for (int i = 0; i < segs; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1503 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1504 | Vertex v0, v1, v2, v3; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1505 | v0 = v1 = v2 = v3 = templ; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1506 | v0[relX] += c0[i].x1(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1507 | v0[relY] += c0[i].y1(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1508 | v1[relX] += c0[i].x2(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1509 | v1[relY] += c0[i].y2(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1510 | v2[relX] += c1[i].x2(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1511 | v2[relY] += c1[i].y2(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1512 | v3[relX] += c1[i].x1(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1513 | v3[relY] += c1[i].y1(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1514 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1515 | LDQuad* q = new LDQuad (v0, v1, v2, v3); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1516 | q->setColor (maincolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1517 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1518 | // Ensure the quads always are BFC-front towards the camera | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1519 | if (camera() % 3 <= 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1520 | q->invert(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1521 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1522 | objs << q; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1523 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1524 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1525 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1526 | if (circleOrDisc) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1527 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1528 | LDSubfile* ref = new LDSubfile; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1529 | ref->setFileInfo (refFile); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1530 | ref->setTransform (transform); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1531 | ref->setPosition (m_drawedVerts[0]); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1532 | ref->setColor (maincolor); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1533 | objs << ref; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1534 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1535 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1536 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1537 | case ESelectMode: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1538 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1539 | // this shouldn't happen | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1540 | assert (false); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1541 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1542 | } break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1543 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1544 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1545 | if (objs.size() > 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1546 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1547 | for (LDObject* obj : objs) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1548 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1549 | document()->addObject (obj); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1550 | compileObject (obj); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1551 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1552 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1553 | g_win->refresh(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1554 | g_win->endAction(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1555 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1556 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1557 | m_drawedVerts.clear(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1558 | m_rectdraw = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1559 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1560 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1561 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1562 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1563 | double GLRenderer::getCircleDrawDist (int pos) const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1564 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1565 | assert (m_drawedVerts.size() >= pos + 1); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1566 | const Vertex& v1 = (m_drawedVerts.size() >= pos + 2) ? m_drawedVerts[pos + 1] : m_hoverpos; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1567 | Axis relX, relY; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1568 | getRelativeAxes (relX, relY); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1569 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1570 | const double dx = m_drawedVerts[0][relX] - v1[relX]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1571 | const double dy = m_drawedVerts[0][relY] - v1[relY]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1572 | return sqrt ((dx * dx) + (dy * dy)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1573 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1574 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1575 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1576 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1577 | void GLRenderer::getRelativeAxes (Axis& relX, Axis& relY) const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1578 | { | 
| 689 | 1579 | const LDFixedCameraInfo* cam = &g_FixedCameras[camera()]; | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1580 | relX = cam->axisX; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1581 | relY = cam->axisY; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1582 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1583 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1584 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1585 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1586 | static QList<Vertex> getVertices (LDObject* obj) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1587 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1588 | QList<Vertex> verts; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1589 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1590 | if (obj->vertices() >= 2) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1591 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1592 | for (int i = 0; i < obj->vertices(); ++i) | 
| 
638
 
382226e40865
- renamed several LDObject methods
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
633 
diff
changeset
 | 
1593 | verts << obj->vertex (i); | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1594 | } | 
| 690 | 1595 | elif (obj->type() == LDObject::ESubfile) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1596 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1597 | LDSubfile* ref = static_cast<LDSubfile*> (obj); | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1598 | LDObjectList objs = ref->inlineContents (true, false); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1599 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1600 | for (LDObject* obj : objs) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1601 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1602 | verts << getVertices (obj); | 
| 
640
 
d4dda62c6600
- renamed LDObject::deleteSelf to LDObject::destroy
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
638 
diff
changeset
 | 
1603 | obj->destroy(); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1604 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1605 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1606 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1607 | return verts; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1608 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1609 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1610 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1611 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1612 | void GLRenderer::compileObject (LDObject* obj) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1613 | { | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
1614 | compiler()->stageForCompilation (obj); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1615 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1616 | // Mark in known vertices of this object | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1617 | /* | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1618 | QList<Vertex> verts = getVertices (obj); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1619 | m_knownVerts << verts; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1620 | removeDuplicates (m_knownVerts); | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1621 | */ | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1622 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1623 | obj->setGLInit (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1624 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1625 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1626 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1627 | // | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1628 | void GLRenderer::forgetObject (LDObject* obj) | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1629 | { | 
| 
694
 
3868f52da6b9
- the GL compiler now supports multiple documents
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
691 
diff
changeset
 | 
1630 | compiler()->dropObject (obj); | 
| 
681
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1631 | } | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1632 | |
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1633 | // ============================================================================= | 
| 
 
c1cc036c6e1f
- work on improved rendering performance
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
679 
diff
changeset
 | 
1634 | // | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1635 | uchar* GLRenderer::getScreencap (int& w, int& h) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1636 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1637 | w = m_width; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1638 | h = m_height; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1639 | uchar* cap = new uchar[4 * w * h]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1640 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1641 | m_screencap = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1642 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1643 | m_screencap = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1644 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1645 | // Capture the pixels | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1646 | glReadPixels (0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, cap); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1647 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1648 | return cap; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1649 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1650 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1651 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1652 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1653 | void GLRenderer::slot_toolTipTimer() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1654 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1655 | // We come here if the cursor has stayed in one place for longer than a | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1656 | // a second. Check if we're holding it over a camera icon - if so, draw | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1657 | // a tooltip. | 
| 
676
 
f7f965742fd5
- converted to VBO
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
675 
diff
changeset
 | 
1658 | for (CameraIcon & icon : m_cameraIcons) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1659 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1660 | if (icon.destRect.contains (m_pos)) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1661 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1662 | m_toolTipCamera = icon.cam; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1663 | m_drawToolTip = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1664 | update(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1665 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1666 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1667 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1668 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1669 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1670 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1671 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1672 | Axis GLRenderer::getCameraAxis (bool y, GLRenderer::EFixedCamera camid) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1673 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1674 | if (camid == (GL::EFixedCamera) - 1) | 
| 689 | 1675 | camid = camera(); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1676 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1677 | const LDFixedCameraInfo* cam = &g_FixedCameras[camid]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1678 | return (y) ? cam->axisY : cam->axisX; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1679 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1680 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1681 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1682 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1683 | bool GLRenderer::setupOverlay (EFixedCamera cam, QString file, int x, int y, int w, int h) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1684 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1685 | QImage* img = new QImage (QImage (file).convertToFormat (QImage::Format_ARGB32)); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1686 | LDGLOverlay& info = getOverlay (cam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1687 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1688 | if (img->isNull()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1689 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1690 | critical (tr ("Failed to load overlay image!")); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1691 | delete img; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1692 | return false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1693 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1694 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1695 | delete info.img; // delete the old image | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1696 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1697 | info.fname = file; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1698 | info.lw = w; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1699 | info.lh = h; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1700 | info.ox = x; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1701 | info.oy = y; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1702 | info.img = img; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1703 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1704 | if (info.lw == 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1705 | info.lw = (info.lh * img->width()) / img->height(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1706 | elif (info.lh == 0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1707 | info.lh = (info.lw * img->height()) / img->width(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1708 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1709 | const Axis x2d = getCameraAxis (false, cam), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1710 | y2d = getCameraAxis (true, cam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1711 | const double negXFac = g_FixedCameras[cam].negX ? -1 : 1, | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1712 | negYFac = g_FixedCameras[cam].negY ? -1 : 1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1713 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1714 | info.v0 = info.v1 = g_origin; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1715 | info.v0[x2d] = - (info.ox * info.lw * negXFac) / img->width(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1716 | info.v0[y2d] = (info.oy * info.lh * negYFac) / img->height(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1717 | info.v1[x2d] = info.v0[x2d] + info.lw; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1718 | info.v1[y2d] = info.v0[y2d] + info.lh; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1719 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1720 | // Set alpha of all pixels to 0.5 | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1721 | for (long i = 0; i < img->width(); ++i) | 
| 
684
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
1722 | for (long j = 0; j < img->height(); ++j) | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
1723 | { | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
1724 | uint32 pixel = img->pixel (i, j); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
1725 | img->setPixel (i, j, 0x80000000 | (pixel & 0x00FFFFFF)); | 
| 
 
8a56b1d4d44d
- greatly improved the GL compiler, now deals colors and object removal properly
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
683 
diff
changeset
 | 
1726 | } | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1727 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1728 | updateOverlayObjects(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1729 | return true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1730 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1731 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1732 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1733 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1734 | void GLRenderer::clearOverlay() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1735 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1736 | if (camera() == EFreeCamera) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1737 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1738 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1739 | LDGLOverlay& info = currentDocumentData().overlays[camera()]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1740 | delete info.img; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1741 | info.img = null; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1742 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1743 | updateOverlayObjects(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1744 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1745 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1746 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1747 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1748 | void GLRenderer::setDepthValue (double depth) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1749 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1750 | assert (camera() < EFreeCamera); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1751 | currentDocumentData().depthValues[camera()] = depth; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1752 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1753 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1754 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1755 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1756 | double GLRenderer::getDepthValue() const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1757 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1758 | assert (camera() < EFreeCamera); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1759 | return currentDocumentData().depthValues[camera()]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1760 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1761 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1762 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1763 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1764 | const char* GLRenderer::getCameraName() const | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1765 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1766 | return g_CameraNames[camera()]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1767 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1768 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1769 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1770 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1771 | LDGLOverlay& GLRenderer::getOverlay (int newcam) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1772 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1773 | return currentDocumentData().overlays[newcam]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1774 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1775 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1776 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1777 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1778 | void GLRenderer::zoomNotch (bool inward) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1779 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1780 | if (zoom() > 15) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1781 | zoom() *= inward ? 0.833f : 1.2f; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1782 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1783 | zoom() += inward ? -1.2f : 1.2f; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1784 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1785 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1786 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1787 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1788 | void GLRenderer::zoomToFit() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1789 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1790 | if (document() == null || m_width == -1 || m_height == -1) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1791 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1792 | zoom() = 30.0f; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1793 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1794 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1795 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1796 | bool lastfilled = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1797 | bool firstrun = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1798 | const uint32 white = 0xFFFFFFFF; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1799 | bool inward = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1800 | const int w = m_width, h = m_height; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1801 | int runaway = 50; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1802 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1803 | glClearColor (1.0, 1.0, 1.0, 1.0); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1804 | glDisable (GL_DITHER); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1805 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1806 | // Use the pick list while drawing the scene, this way we can tell whether borders | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1807 | // are background or not. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1808 | setPicking (true); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1809 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1810 | while (--runaway) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1811 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1812 | if (zoom() > 10000.0 || zoom() < 0.0) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1813 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1814 | // Obviously, there's nothing to draw if we get here. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1815 | // Default to 30.0f and break out. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1816 | zoom() = 30.0; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1817 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1818 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1819 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1820 | zoomNotch (inward); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1821 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1822 | uchar* cap = new uchar[4 * w * h]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1823 | drawGLScene(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1824 | glReadPixels (0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, cap); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1825 | uint32* imgdata = reinterpret_cast<uint32*> (cap); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1826 | bool filled = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1827 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1828 | // Check the top and bottom rows | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1829 | for (int i = 0; i < w; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1830 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1831 | if (imgdata[i] != white || imgdata[((h - 1) * w) + i] != white) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1832 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1833 | filled = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1834 | goto endOfLoop; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1835 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1836 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1837 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1838 | // Left and right edges | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1839 | for (int i = 0; i < h; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1840 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1841 | if (imgdata[i * w] != white || imgdata[(i * w) + w - 1] != white) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1842 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1843 | filled = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1844 | goto endOfLoop; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1845 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1846 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1847 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1848 | endOfLoop: | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1849 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1850 | delete[] cap; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1851 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1852 | if (firstrun) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1853 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1854 | // If this is the first run, we don't know enough to determine | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1855 | // whether the zoom was to fit, so we mark in our knowledge so | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1856 | // far and start over. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1857 | inward = !filled; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1858 | firstrun = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1859 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1860 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1861 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1862 | // If this run filled the screen and the last one did not, the | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1863 | // last run had ideal zoom - zoom a bit back and we should reach it. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1864 | if (filled && !lastfilled) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1865 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1866 | zoomNotch (false); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1867 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1868 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1869 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1870 | // If this run did not fill the screen and the last one did, we've | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1871 | // now reached ideal zoom so we're done here. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1872 | if (!filled && lastfilled) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1873 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1874 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1875 | inward = !filled; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1876 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1877 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1878 | lastfilled = filled; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1879 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1880 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1881 | setBackground(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1882 | setPicking (false); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1883 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1884 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1885 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1886 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1887 | void GLRenderer::zoomAllToFit() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1888 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1889 | EFixedCamera oldcam = camera(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1890 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1891 | for (int i = 0; i < 7; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1892 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1893 | setCamera ((EFixedCamera) i); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1894 | zoomToFit(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1895 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1896 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1897 | setCamera (oldcam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1898 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1899 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1900 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1901 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1902 | void GLRenderer::updateRectVerts() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1903 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1904 | if (!m_rectdraw) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1905 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1906 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1907 | if (m_drawedVerts.isEmpty()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1908 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1909 | for (int i = 0; i < 4; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1910 | m_rectverts[i] = m_hoverpos; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1911 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1912 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1913 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1914 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1915 | Vertex v0 = m_drawedVerts[0], | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1916 | v1 = (m_drawedVerts.size() >= 2) ? m_drawedVerts[1] : m_hoverpos; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1917 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1918 | const Axis ax = getCameraAxis (false), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1919 | ay = getCameraAxis (true), | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1920 | az = (Axis) (3 - ax - ay); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1921 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1922 | for (int i = 0; i < 4; ++i) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1923 | m_rectverts[i][az] = getDepthValue(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1924 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1925 | m_rectverts[0][ax] = v0[ax]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1926 | m_rectverts[0][ay] = v0[ay]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1927 | m_rectverts[1][ax] = v1[ax]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1928 | m_rectverts[1][ay] = v0[ay]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1929 | m_rectverts[2][ax] = v1[ax]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1930 | m_rectverts[2][ay] = v1[ay]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1931 | m_rectverts[3][ax] = v0[ax]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1932 | m_rectverts[3][ay] = v1[ay]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1933 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1934 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1935 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1936 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1937 | void GLRenderer::mouseDoubleClickEvent (QMouseEvent* ev) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1938 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1939 | if (!(ev->buttons() & Qt::LeftButton) || editMode() != ESelectMode) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1940 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1941 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1942 | pick (ev->x(), ev->y()); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1943 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1944 | if (selection().isEmpty()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1945 | return; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1946 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1947 | LDObject* obj = selection().first(); | 
| 
638
 
382226e40865
- renamed several LDObject methods
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
633 
diff
changeset
 | 
1948 | AddObjectDialog::staticDialog (obj->type(), obj); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1949 | g_win->endAction(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1950 | ev->accept(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1951 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1952 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1953 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1954 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1955 | LDOverlay* GLRenderer::findOverlayObject (EFixedCamera cam) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1956 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1957 | LDOverlay* ovlobj = null; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1958 | |
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1959 | for (LDObject* obj : document()->objects()) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1960 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1961 | if (obj->type() == LDObject::EOverlay && static_cast<LDOverlay*> (obj)->camera() == cam) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1962 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1963 | ovlobj = static_cast<LDOverlay*> (obj); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1964 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1965 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1966 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1967 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1968 | return ovlobj; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1969 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1970 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1971 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1972 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1973 | // Read in overlays from the current file and update overlay info accordingly. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1974 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1975 | void GLRenderer::initOverlaysFromObjects() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1976 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1977 | for (EFixedCamera cam : g_Cameras) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1978 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1979 | if (cam == EFreeCamera) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1980 | continue; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1981 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1982 | LDGLOverlay& meta = currentDocumentData().overlays[cam]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1983 | LDOverlay* ovlobj = findOverlayObject (cam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1984 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1985 | if (!ovlobj && meta.img) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1986 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1987 | delete meta.img; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1988 | meta.img = null; | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1989 | } | 
| 
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1990 | elif (ovlobj && (!meta.img || meta.fname != ovlobj->fileName())) | 
| 
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1991 | setupOverlay (cam, ovlobj->fileName(), ovlobj->x(), | 
| 
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
1992 | ovlobj->y(), ovlobj->width(), ovlobj->height()); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1993 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1994 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1995 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1996 | // ============================================================================= | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1997 | // | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1998 | void GLRenderer::updateOverlayObjects() | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
1999 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2000 | for (EFixedCamera cam : g_Cameras) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2001 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2002 | if (cam == EFreeCamera) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2003 | continue; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2004 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2005 | LDGLOverlay& meta = currentDocumentData().overlays[cam]; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2006 | LDOverlay* ovlobj = findOverlayObject (cam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2007 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2008 | if (!meta.img && ovlobj) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2009 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2010 | // If this is the last overlay image, we need to remove the empty space after it as well. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2011 | LDObject* nextobj = ovlobj->next(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2012 | |
| 
638
 
382226e40865
- renamed several LDObject methods
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
633 
diff
changeset
 | 
2013 | if (nextobj && nextobj->type() == LDObject::EEmpty) | 
| 
640
 
d4dda62c6600
- renamed LDObject::deleteSelf to LDObject::destroy
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
638 
diff
changeset
 | 
2014 | nextobj->destroy(); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2015 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2016 | // If the overlay object was there and the overlay itself is | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2017 | // not, remove the object. | 
| 
640
 
d4dda62c6600
- renamed LDObject::deleteSelf to LDObject::destroy
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
638 
diff
changeset
 | 
2018 | ovlobj->destroy(); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2019 | } elif (meta.img && !ovlobj) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2020 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2021 | // Inverse case: image is there but the overlay object is | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2022 | // not, thus create the object. | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2023 | ovlobj = new LDOverlay; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2024 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2025 | // Find a suitable position to place this object. We want to place | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2026 | // this into the header, which is everything up to the first scemantic | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2027 | // object. If we find another overlay object, place this object after | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2028 | // the last one found. Otherwise, place it before the first schemantic | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2029 | // object and put an empty object after it (though don't do this if | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2030 | // there was no schemantic elements at all) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2031 | int i, lastOverlay = -1; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2032 | bool found = false; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2033 | |
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
2034 | for (i = 0; i < document()->getObjectCount(); ++i) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2035 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
2036 | LDObject* obj = document()->getObject (i); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2037 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2038 | if (obj->isScemantic()) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2039 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2040 | found = true; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2041 | break; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2042 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2043 | |
| 
638
 
382226e40865
- renamed several LDObject methods
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
633 
diff
changeset
 | 
2044 | if (obj->type() == LDObject::EOverlay) | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2045 | lastOverlay = i; | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2046 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2047 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2048 | if (lastOverlay != -1) | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
2049 | document()->insertObj (lastOverlay + 1, ovlobj); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2050 | else | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2051 | { | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
2052 | document()->insertObj (i, ovlobj); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2053 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2054 | if (found) | 
| 
642
 
751a8df42842
- migrated the codebase to use a simpler PROPERTY macro, arrrrrrrrrrrrrrrrrrrrrgh
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
640 
diff
changeset
 | 
2055 | document()->insertObj (i + 1, new LDEmpty); | 
| 
629
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2056 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2057 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2058 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2059 | if (meta.img && ovlobj) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2060 | { | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2061 | ovlobj->setCamera (cam); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2062 | ovlobj->setFileName (meta.fname); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2063 | ovlobj->setX (meta.ox); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2064 | ovlobj->setY (meta.oy); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2065 | ovlobj->setWidth (meta.lw); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2066 | ovlobj->setHeight (meta.lh); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2067 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2068 | } | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2069 | |
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2070 | if (g_win->R() == this) | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2071 | g_win->refresh(); | 
| 
 
b75c6cce02e2
- refactored filenames
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents:  
diff
changeset
 | 
2072 | } |