comparison: ldtypes.cpp
ldtypes.cpp
- changeset 162
- b7d65e89861a
- parent 161
- c9fba92c4e35
- child 164
- 8c93d8e38494
equal
deleted
inserted
replaced
| 161:c9fba92c4e35 | 162:b7d65e89861a |
|---|---|
| 265 LDRadial::~LDRadial () {} | 265 LDRadial::~LDRadial () {} |
| 266 | 266 |
| 267 // ============================================================================= | 267 // ============================================================================= |
| 268 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * | 268 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * |
| 269 // ============================================================================= | 269 // ============================================================================= |
| 270 static void transformObject (LDObject* obj, matrix transform, vertex pos, short parentcolor) { | 270 static void transformObject (LDObject* obj, matrix<3> transform, vertex pos, short parentcolor) { |
| 271 switch (obj->getType()) { | 271 switch (obj->getType()) { |
| 272 case OBJ_Line: | 272 case OBJ_Line: |
| 273 case OBJ_CondLine: | 273 case OBJ_CondLine: |
| 274 case OBJ_Triangle: | 274 case OBJ_Triangle: |
| 275 case OBJ_Quad: | 275 case OBJ_Quad: |
| 279 | 279 |
| 280 case OBJ_Subfile: | 280 case OBJ_Subfile: |
| 281 { | 281 { |
| 282 LDSubfile* ref = static_cast<LDSubfile*> (obj); | 282 LDSubfile* ref = static_cast<LDSubfile*> (obj); |
| 283 | 283 |
| 284 matrix mNewMatrix = transform * ref->mMatrix; | 284 matrix<3> newMatrix = transform * ref->mMatrix; |
| 285 ref->vPosition.transform (transform, pos); | 285 ref->vPosition.transform (transform, pos); |
| 286 ref->mMatrix = mNewMatrix; | 286 ref->mMatrix = newMatrix; |
| 287 } | 287 } |
| 288 break; | 288 break; |
| 289 | 289 |
| 290 default: | 290 default: |
| 291 break; | 291 break; |
