comparison: src/ldtypes.cpp
src/ldtypes.cpp
- changeset 251
- c4b96bc41298
- parent 250
- 6e80f038e8df
- child 252
- 3f9067022d74
equal
deleted
inserted
replaced
| 250:6e80f038e8df | 251:c4b96bc41298 |
|---|---|
| 214 | 214 |
| 215 LDObject::~LDObject () { | 215 LDObject::~LDObject () { |
| 216 // Remove this object from the selection array if it is there. | 216 // Remove this object from the selection array if it is there. |
| 217 for (ulong i = 0; i < g_win->sel ().size(); ++i) | 217 for (ulong i = 0; i < g_win->sel ().size(); ++i) |
| 218 if (g_win->sel ()[i] == this) | 218 if (g_win->sel ()[i] == this) |
| 219 g_win->sel ().erase (g_win->sel ().begin() + i); | 219 g_win->sel ().erase (i); |
| 220 | 220 |
| 221 // Delete the GL lists | 221 // Delete the GL lists |
| 222 GL::deleteLists (this); | 222 GL::deleteLists (this); |
| 223 } | 223 } |
| 224 | 224 |
| 337 } | 337 } |
| 338 | 338 |
| 339 // ============================================================================= | 339 // ============================================================================= |
| 340 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 340 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
| 341 // ============================================================================= | 341 // ============================================================================= |
| 342 void LDObject::moveObjects (std::vector<LDObject*> objs, const bool bUp) { | 342 void LDObject::moveObjects (vector<LDObject*> objs, const bool bUp) { |
| 343 // If we move down, we need to iterate the array in reverse order. | 343 // If we move down, we need to iterate the array in reverse order. |
| 344 const long start = bUp ? 0 : (objs.size() - 1); | 344 const long start = bUp ? 0 : (objs.size() - 1); |
| 345 const long end = bUp ? objs.size() : -1; | 345 const long end = bUp ? objs.size() : -1; |
| 346 const long incr = bUp ? 1 : -1; | 346 const long incr = bUp ? 1 : -1; |
| 347 | 347 |
| 376 } | 376 } |
| 377 | 377 |
| 378 // ============================================================================= | 378 // ============================================================================= |
| 379 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 379 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
| 380 // ============================================================================= | 380 // ============================================================================= |
| 381 str LDObject::objectListContents (const std::vector<LDObject*>& objs) { | 381 str LDObject::objectListContents (const vector<LDObject*>& objs) { |
| 382 bool firstDetails = true; | 382 bool firstDetails = true; |
| 383 str text = ""; | 383 str text = ""; |
| 384 | 384 |
| 385 if (objs.size() == 0) | 385 if (objs.size() == 0) |
| 386 return "nothing"; // :) | 386 return "nothing"; // :) |
| 510 } | 510 } |
| 511 | 511 |
| 512 // ============================================================================= | 512 // ============================================================================= |
| 513 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 513 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
| 514 // ============================================================================= | 514 // ============================================================================= |
| 515 std::vector<LDObject*> LDRadial::decompose (bool applyTransform) { | 515 vector<LDObject*> LDRadial::decompose (bool applyTransform) { |
| 516 std::vector<LDObject*> paObjects; | 516 vector<LDObject*> paObjects; |
| 517 | 517 |
| 518 for (short i = 0; i < segs; ++i) { | 518 for (short i = 0; i < segs; ++i) { |
| 519 double x0 = cos ((i * 2 * pi) / divs), | 519 double x0 = cos ((i * 2 * pi) / divs), |
| 520 x1 = cos (((i + 1) * 2 * pi) / divs), | 520 x1 = cos (((i + 1) * 2 * pi) / divs), |
| 521 z0 = sin ((i * 2 * pi) / divs), | 521 z0 = sin ((i * 2 * pi) / divs), |
