|
Line
Link Here
|
| 0 |
-- toycars_vehicle_editor/src/VehicleEditorUI.cxx |
0 |
++ toycars_vehicle_editor/src/VehicleEditorUI.cxx |
|
Lines 228-234
Link Here
|
| 228 |
sprintf(str, "%d", n); |
228 |
sprintf(str, "%d", n); |
| 229 |
convexChoice->add(str); |
229 |
convexChoice->add(str); |
| 230 |
convexChoice->value(n); |
230 |
convexChoice->value(n); |
| 231 |
vehicleObj.getGeometry()->push_back(std::list<Vec2D>::list()); |
231 |
vehicleObj.getGeometry()->push_back(std::list<Vec2D>()); |
| 232 |
spriteView->setConvexChoice(n); |
232 |
spriteView->setConvexChoice(n); |
| 233 |
spriteView->redraw(); |
233 |
spriteView->redraw(); |
| 234 |
} |
234 |
} |
| 235 |
-- toycars_vehicle_editor/src/VehicleObject.cpp |
235 |
++ toycars_vehicle_editor/src/VehicleObject.cpp |
|
Lines 152-158
Link Here
|
| 152 |
short count; |
152 |
short count; |
| 153 |
geometry.clear(); |
153 |
geometry.clear(); |
| 154 |
for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) { |
154 |
for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) { |
| 155 |
geometry.push_back(std::list<Vec2D>::list()); |
155 |
geometry.push_back(std::list<Vec2D>()); |
| 156 |
std::list<Vec2D> &convex = geometry.back(); |
156 |
std::list<Vec2D> &convex = geometry.back(); |
| 157 |
readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count); |
157 |
readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count); |
| 158 |
} |
158 |
} |
|
Lines 411-417
Link Here
|
| 411 |
short count; |
411 |
short count; |
| 412 |
geometry.clear(); |
412 |
geometry.clear(); |
| 413 |
for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) { |
413 |
for (xConvex = xGeometry->FirstChild(); xConvex != NULL; xConvex = xConvex->NextSibling("convex")) { |
| 414 |
geometry.push_back(std::list<Vec2D>::list()); |
414 |
geometry.push_back(std::list<Vec2D>()); |
| 415 |
std::list<Vec2D> &convex = geometry.back(); |
415 |
std::list<Vec2D> &convex = geometry.back(); |
| 416 |
readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count); |
416 |
readPointsFromString(xConvex->FirstChild()->ToText()->Value(), convex, count); |
| 417 |
} |
417 |
} |
