comparison: src/ldObject.cc
src/ldObject.cc
- changeset 795
- 195fa1fff9c3
- parent 789
- 4b7306f52bb5
- child 805
- d88c0354de97
equal
deleted
inserted
replaced
| 794:c254ddc6618b | 795:195fa1fff9c3 |
|---|---|
| 323 delete this; | 323 delete this; |
| 324 } | 324 } |
| 325 | 325 |
| 326 // ============================================================================= | 326 // ============================================================================= |
| 327 // | 327 // |
| 328 static void transformObject (LDObjectPtr obj, Matrix transform, Vertex pos, int parentcolor) | 328 static void transformObject (LDObjectPtr obj, Matrix transform, Vertex pos, LDColor parentcolor) |
| 329 { | 329 { |
| 330 switch (obj->type()) | 330 switch (obj->type()) |
| 331 { | 331 { |
| 332 case OBJ_Line: | 332 case OBJ_Line: |
| 333 case OBJ_CondLine: | 333 case OBJ_CondLine: |
| 356 | 356 |
| 357 default: | 357 default: |
| 358 break; | 358 break; |
| 359 } | 359 } |
| 360 | 360 |
| 361 if (obj->color() == maincolor) | 361 if (obj->color() == maincolor()) |
| 362 obj->setColor (parentcolor); | 362 obj->setColor (parentcolor); |
| 363 } | 363 } |
| 364 | 364 |
| 365 // ============================================================================= | 365 // ============================================================================= |
| 366 // ----------------------------------------------------------------------------- | 366 // ----------------------------------------------------------------------------- |
| 394 return null; | 394 return null; |
| 395 | 395 |
| 396 LDPolygon* data = new LDPolygon; | 396 LDPolygon* data = new LDPolygon; |
| 397 data->id = id(); | 397 data->id = id(); |
| 398 data->num = num; | 398 data->num = num; |
| 399 data->color = color(); | 399 data->color = color()->index(); |
| 400 | 400 |
| 401 for (int i = 0; i < data->numVertices(); ++i) | 401 for (int i = 0; i < data->numVertices(); ++i) |
| 402 data->vertices[i] = vertex (i); | 402 data->vertices[i] = vertex (i); |
| 403 | 403 |
| 404 return data; | 404 return data; |
| 807 *ptr = val; | 807 *ptr = val; |
| 808 } | 808 } |
| 809 | 809 |
| 810 // ============================================================================= | 810 // ============================================================================= |
| 811 // | 811 // |
| 812 void LDObject::setColor (const int& val) | 812 void LDObject::setColor (LDColor const& val) |
| 813 { | 813 { |
| 814 changeProperty (self(), &m_color, val); | 814 changeProperty (self(), &m_color, val); |
| 815 } | 815 } |
| 816 | 816 |
| 817 // ============================================================================= | 817 // ============================================================================= |
