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

Side by Side Diff: import/cross/collada.h

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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 FCDSceneNode *node_; 125 FCDSceneNode *node_;
126 Transform *transform_; 126 Transform *transform_;
127 std::vector<NodeInstance *> children_; 127 std::vector<NodeInstance *> children_;
128 }; 128 };
129 129
130 class Collada { 130 class Collada {
131 public: 131 public:
132 struct Options { 132 struct Options {
133 Options() 133 Options()
134 : generate_mipmaps(true), 134 : generate_mipmaps(true),
135 keep_original_data(false),
135 condition_document(false), 136 condition_document(false),
136 keep_original_data(false),
137 up_axis(0.0f, 0.0f, 0.0f), 137 up_axis(0.0f, 0.0f, 0.0f),
138 base_path(FilePath::kCurrentDirectory) {} 138 base_path(FilePath::kCurrentDirectory) {}
139 // Whether or not to generate mip-maps on the textures we load. 139 // Whether or not to generate mip-maps on the textures we load.
140 bool generate_mipmaps; 140 bool generate_mipmaps;
141 141
142 // Whether or not to retain the original form for textures for later 142 // Whether or not to retain the original form for textures for later
143 // access by filename. 143 // access by filename.
144 bool keep_original_data; 144 bool keep_original_data;
145 145
146 // Whether or not to condition documents for o3d as part of 146 // Whether or not to condition documents for o3d as part of
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 bool cull_enabled_; 458 bool cull_enabled_;
459 bool cull_front_; 459 bool cull_front_;
460 bool front_cw_; 460 bool front_cw_;
461 461
462 int unique_filename_counter_; 462 int unique_filename_counter_;
463 463
464 DISALLOW_COPY_AND_ASSIGN(Collada); 464 DISALLOW_COPY_AND_ASSIGN(Collada);
465 }; 465 };
466 } 466 }
467 #endif // O3D_IMPORT_CROSS_COLLADA_H_ 467 #endif // O3D_IMPORT_CROSS_COLLADA_H_
OLDNEW
« core/cross/bitmap_dds.cc ('K') | « core/cross/transform.cc ('k') | import/cross/collada.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698