Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: core/cross/transform.cc

Issue 159168: This fixes a number of things that are warnings in the Mac compiler.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright 2009, Google Inc. 2 * Copyright 2009, Google Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 ShapeArray shapes; 313 ShapeArray shapes;
314 shapes.reserve(shape_array_.size()); 314 shapes.reserve(shape_array_.size());
315 std::copy(shape_array_.begin(), 315 std::copy(shape_array_.begin(),
316 shape_array_.end(), 316 shape_array_.end(),
317 std::back_inserter(shapes)); 317 std::back_inserter(shapes));
318 return shapes; 318 return shapes;
319 } 319 }
320 320
321 void Transform::SetShapes(const ShapeArray& shapes) { 321 void Transform::SetShapes(const ShapeArray& shapes) {
322 shape_array_.resize(shapes.size()); 322 shape_array_.resize(shapes.size());
323 for (int i = 0; i != shapes.size(); ++i) { 323 for (unsigned int i = 0; i != shapes.size(); ++i) {
324 shape_array_[i] = Shape::Ref(shapes[i]); 324 shape_array_[i] = Shape::Ref(shapes[i]);
325 } 325 }
326 } 326 }
327 327
328 void Transform::CreateDrawElements(Pack* pack, Material* material) { 328 void Transform::CreateDrawElements(Pack* pack, Material* material) {
329 for (unsigned cc = 0; cc < child_array_.size(); ++cc) { 329 for (unsigned cc = 0; cc < child_array_.size(); ++cc) {
330 child_array_[cc]->CreateDrawElements(pack, material); 330 child_array_[cc]->CreateDrawElements(pack, material);
331 } 331 }
332 for (unsigned ss = 0; ss < shape_array_.size(); ++ss) { 332 for (unsigned ss = 0; ss < shape_array_.size(); ++ss) {
333 shape_array_[ss]->CreateDrawElements(pack, material); 333 shape_array_[ss]->CreateDrawElements(pack, material);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 } 367 }
368 } 368 }
369 } 369 }
370 } 370 }
371 371
372 ObjectBase::Ref ParamTransform::Create(ServiceLocator* service_locator) { 372 ObjectBase::Ref ParamTransform::Create(ServiceLocator* service_locator) {
373 return ObjectBase::Ref(new ParamTransform(service_locator, false, false)); 373 return ObjectBase::Ref(new ParamTransform(service_locator, false, false));
374 } 374 }
375 375
376 } // namespace o3d 376 } // namespace o3d
OLDNEW
« core/cross/bitmap_dds.cc ('K') | « core/cross/texture.cc ('k') | import/cross/collada.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698