Wed, 20 Mar 2013 13:41:08 +0200
Made the GL renderer actually use the main color configuration
| 
30
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
1 | /* | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
2 | * LDForge: LDraw parts authoring CAD | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
3 | * Copyright (C) 2013 Santeri `arezey` Piippo | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
4 | * | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
5 | * This program is free software: you can redistribute it and/or modify | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
6 | * it under the terms of the GNU General Public License as published by | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
7 | * the Free Software Foundation, either version 3 of the License, or | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
8 | * (at your option) any later version. | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
9 | * | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
10 | * This program is distributed in the hope that it will be useful, | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
13 | * GNU General Public License for more details. | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
14 | * | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
15 | * You should have received a copy of the GNU General Public License | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
17 | */ | 
| 
 
31ff9aabd506
Licensed LDForge GPL3, added some more icons
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
29 
diff
changeset
 | 
18 | |
| 0 | 19 | #include "common.h" | 
| 20 | #include "ldtypes.h" | |
| 
26
 
83184d9407c7
Renamed io.cpp to file.cpp, draw.cpp to gldraw.cpp
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
24 
diff
changeset
 | 
21 | #include "file.h" | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
22 | #include "misc.h" | 
| 0 | 23 | |
| 
29
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
24 | char const* g_saObjTypeNames[] = { | 
| 0 | 25 | "unidentified", | 
| 26 | "unknown", | |
| 27 | "empty", | |
| 28 | "comment", | |
| 29 | "subfile", | |
| 30 | "line", | |
| 31 | "triangle", | |
| 32 | "quadrilateral", | |
| 33 | "condline", | |
| 34 | "vertex", | |
| 35 | }; | |
| 36 | ||
| 
39
 
110669124caf
Begin work on dialogs for adding objects. Comments functional!
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
32 
diff
changeset
 | 
37 | char const* g_saObjTypeIcons[] = { | 
| 
41
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
38 | "error", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
39 | "error", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
40 | "empty", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
41 | "comment", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
42 | "subfile", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
43 | "line", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
44 | "triangle", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
45 | "quad", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
46 | "condline", | 
| 
 
4ca63da5546b
Added insert vertex function and added vertex icons.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
40 
diff
changeset
 | 
47 | "vertex" | 
| 
39
 
110669124caf
Begin work on dialogs for adding objects. Comments functional!
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
32 
diff
changeset
 | 
48 | }; | 
| 
 
110669124caf
Begin work on dialogs for adding objects. Comments functional!
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
32 
diff
changeset
 | 
49 | |
| 0 | 50 | // ============================================================================= | 
| 
32
 
5d22b7ecf110
Made the GL renderer background color configurable
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
30 
diff
changeset
 | 
51 | // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 
| 
 
5d22b7ecf110
Made the GL renderer background color configurable
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
30 
diff
changeset
 | 
52 | // ============================================================================= | 
| 0 | 53 | // LDObject constructors | 
| 54 | LDObject::LDObject () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
55 | commonInit (); | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
56 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
57 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
58 | void LDObject::commonInit () { | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
59 | qObjListEntry = nullptr; | 
| 0 | 60 | } | 
| 61 | ||
| 62 | LDGibberish::LDGibberish () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
63 | commonInit (); | 
| 0 | 64 | } | 
| 65 | ||
| 
11
 
323390a03294
Color gibberish red. Check for line code length for gibberish (must be 1 to be valid)
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
0 
diff
changeset
 | 
66 | LDGibberish::LDGibberish (str _zContent, str _zReason) { | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
67 | zContents = _zContent; | 
| 
11
 
323390a03294
Color gibberish red. Check for line code length for gibberish (must be 1 to be valid)
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
0 
diff
changeset
 | 
68 | zReason = _zReason; | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
69 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
70 | commonInit (); | 
| 
11
 
323390a03294
Color gibberish red. Check for line code length for gibberish (must be 1 to be valid)
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
0 
diff
changeset
 | 
71 | } | 
| 
 
323390a03294
Color gibberish red. Check for line code length for gibberish (must be 1 to be valid)
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
0 
diff
changeset
 | 
72 | |
| 0 | 73 | LDEmpty::LDEmpty () { | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
74 | commonInit (); | 
| 0 | 75 | } | 
| 76 | ||
| 77 | LDComment::LDComment () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
78 | commonInit (); | 
| 0 | 79 | } | 
| 80 | ||
| 81 | LDSubfile::LDSubfile () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
82 | commonInit (); | 
| 0 | 83 | } | 
| 84 | ||
| 85 | LDLine::LDLine () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
86 | commonInit (); | 
| 0 | 87 | } | 
| 88 | ||
| 89 | LDTriangle::LDTriangle () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
90 | commonInit (); | 
| 0 | 91 | } | 
| 92 | ||
| 93 | LDQuad::LDQuad () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
94 | commonInit (); | 
| 0 | 95 | } | 
| 96 | ||
| 97 | LDCondLine::LDCondLine () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
98 | commonInit (); | 
| 0 | 99 | } | 
| 100 | ||
| 101 | LDVertex::LDVertex () { | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
102 | commonInit (); | 
| 
13
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
103 | } | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
104 | |
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
105 | ulong LDObject::getIndex () { | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
106 | if (!g_CurrentFile) | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
107 | return -1u; | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
108 | |
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
109 | // TODO: shouldn't rely on g_CurrentFile | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
110 | for (ulong i = 0; i < g_CurrentFile->objects.size(); ++i) { | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
111 | if (g_CurrentFile->objects[i] == this) | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
112 | return i; | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
113 | } | 
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
114 | |
| 
 
3955ff2a7d72
Added logf function to write to message log. Write warnings of unparsable files into the message log.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
11 
diff
changeset
 | 
115 | return -1u; | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
116 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
117 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
118 | // ============================================================================= | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
119 | str LDComment::getContents () { | 
| 
17
 
5606eebd0b90
Allow addition of dummy lines..
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
14 
diff
changeset
 | 
120 | return str::mkfmt ("0 %s", zText.chars ()); | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
121 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
122 | |
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
123 | str LDSubfile::getContents () { | 
| 
20
 
2ca638886082
Yay! This thing can save now.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
18 
diff
changeset
 | 
124 | str val = str::mkfmt ("1 %d %s ", dColor, vPosition.getStringRep (false).chars ()); | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
125 | |
| 
20
 
2ca638886082
Yay! This thing can save now.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
18 
diff
changeset
 | 
126 | for (short i = 0; i < 9; ++i) | 
| 
 
2ca638886082
Yay! This thing can save now.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
18 
diff
changeset
 | 
127 | val.appendformat ("%s ", ftoa (faMatrix[i]).chars()); | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
128 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
129 | val += zFileName; | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
130 | return val; | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
131 | } | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
132 | |
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
133 | str LDLine::getContents () { | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
134 | str val = str::mkfmt ("2 %d", dColor); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
135 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
136 | for (ushort i = 0; i < 2; ++i) | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
137 | val.appendformat (" %s", vaCoords[i].getStringRep (false).chars ()); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
138 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
139 | return val; | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
140 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
141 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
142 | str LDTriangle::getContents () { | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
143 | str val = str::mkfmt ("3 %d", dColor); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
144 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
145 | for (ushort i = 0; i < 3; ++i) | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
146 | val.appendformat (" %s", vaCoords[i].getStringRep (false).chars ()); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
147 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
148 | return val; | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
149 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
150 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
151 | str LDQuad::getContents () { | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
152 | str val = str::mkfmt ("4 %d", dColor); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
153 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
154 | for (ushort i = 0; i < 4; ++i) | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
155 | val.appendformat (" %s", vaCoords[i].getStringRep (false).chars ()); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
156 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
157 | return val; | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
158 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
159 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
160 | str LDCondLine::getContents () { | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
161 | str val = str::mkfmt ("5 %d", dColor); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
162 | |
| 
40
 
215b9f8f0cd7
Added triangle, quad and condline to the add object dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
39 
diff
changeset
 | 
163 | // Add the coordinates | 
| 
 
215b9f8f0cd7
Added triangle, quad and condline to the add object dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
39 
diff
changeset
 | 
164 | for (ushort i = 0; i < 4; ++i) | 
| 
18
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
165 | val.appendformat (" %s", vaCoords[i].getStringRep (false).chars ()); | 
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
166 | |
| 
 
a6732098fed8
Convert the static getCoordinateRep to a common ftoa, use this function to get proper coordinate representation when converting objects to LDraw code
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
17 
diff
changeset
 | 
167 | return val; | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
168 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
169 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
170 | str LDGibberish::getContents () { | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
171 | return zContents; | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
172 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
173 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
174 | str LDVertex::getContents () { | 
| 
29
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
175 | return str::mkfmt ("0 !LDFORGE VERTEX %d %s", dColor, vPosition.getStringRep (false).chars()); | 
| 
14
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
176 | } | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
177 | |
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
178 | str LDEmpty::getContents () { | 
| 
 
6d9d8efae2f8
this thing got its own reinterpret_cast now. :P Added SetContents action for altering an object by contents and reinterpreting it.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
13 
diff
changeset
 | 
179 | return str (); | 
| 
21
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
180 | } | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
181 | |
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
182 | void LDQuad::splitToTriangles () { | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
183 | // Find the index of this quad | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
184 | ulong ulIndex; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
185 | for (ulIndex = 0; ulIndex < g_CurrentFile->objects.size(); ++ulIndex) | 
| 
22
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
186 | if (g_CurrentFile->objects[ulIndex] == this) | 
| 
21
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
187 | break; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
188 | |
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
189 | if (ulIndex >= g_CurrentFile->objects.size()) { | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
190 | // couldn't find it? | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
191 | logf (LOG_Error, "LDQuad::splitToTriangles: Couldn't find quad %p in " | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
192 | "current object list!!\n", this); | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
193 | return; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
194 | } | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
195 | |
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
196 | // Create the two triangles based on this quadrilateral: | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
197 | // 0---3 0---3 3 | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
198 | // | | | / /| | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
199 | // | | = | / / | | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
200 | // | | |/ / | | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
201 | // 1---2 1 1---2 | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
202 | LDTriangle* tri1 = new LDTriangle; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
203 | tri1->vaCoords[0] = vaCoords[0]; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
204 | tri1->vaCoords[1] = vaCoords[1]; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
205 | tri1->vaCoords[2] = vaCoords[3]; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
206 | |
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
207 | LDTriangle* tri2 = new LDTriangle; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
208 | tri2->vaCoords[0] = vaCoords[1]; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
209 | tri2->vaCoords[1] = vaCoords[2]; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
210 | tri2->vaCoords[2] = vaCoords[3]; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
211 | |
| 
22
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
212 | printf ("triangles: %p %p\n", tri1, tri2); | 
| 
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
213 | |
| 
21
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
214 | // The triangles also inherit the quad's color | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
215 | tri1->dColor = tri2->dColor = dColor; | 
| 
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
216 | |
| 
22
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
217 | // Replace the quad with the first triangle and add the second triangle | 
| 
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
218 | // after the first one. | 
| 
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
219 | g_CurrentFile->objects[ulIndex] = tri1; | 
| 
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
220 | g_CurrentFile->objects.insert (g_CurrentFile->objects.begin() + ulIndex + 1, tri2); | 
| 
21
 
9aebaaafa5da
Added split-quads-to-triangles function
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
20 
diff
changeset
 | 
221 | |
| 
22
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
222 | // Delete this quad now, it has been split. | 
| 
 
335e430a6b4f
So much for that pointer class, caused more problems than it solved. For instance splitting a second quad after a first one had been split would trigger a peculiar crash...
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
21 
diff
changeset
 | 
223 | delete this; | 
| 
24
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
224 | } | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
225 | |
| 
29
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
226 | void LDObject::replace (LDObject* replacement) { | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
227 | // Replace all instances of the old object with the new object | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
228 | for (ulong i = 0; i < g_CurrentFile->objects.size(); ++i) { | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
229 | if (g_CurrentFile->objects[i] == this) | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
230 | g_CurrentFile->objects[i] = replacement; | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
231 | } | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
232 | |
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
233 | // Remove the old object | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
234 | delete this; | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
235 | } | 
| 
 
55406ce7446e
Added LDraw path setting dialog
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
26 
diff
changeset
 | 
236 | |
| 
24
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
237 | LDObject::~LDObject () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
238 | LDComment::~LDComment () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
239 | LDCondLine::~LDCondLine () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
240 | LDEmpty::~LDEmpty () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
241 | LDGibberish::~LDGibberish () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
242 | LDLine::~LDLine () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
243 | LDQuad::~LDQuad () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
244 | LDSubfile::~LDSubfile () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
245 | LDTriangle::~LDTriangle () {} | 
| 
 
d2d4d0154338
added dummy action for future inlining command. Also GCC says that deleting instances of classes with virtual members but no virtual destructors is bad.
 
Santeri Piippo <crimsondusk64@gmail.com> 
parents: 
22 
diff
changeset
 | 
246 | LDVertex::~LDVertex () {} |