| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <deque> | 5 #include <deque> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/output/bsp_tree.h" | 9 #include "cc/output/bsp_tree.h" |
| 10 #include "cc/output/bsp_walk_action.h" | 10 #include "cc/output/bsp_walk_action.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 vertices_c.push_back(gfx::Point3F(10.0f, 10.0f, 5.0f)); | 107 vertices_c.push_back(gfx::Point3F(10.0f, 10.0f, 5.0f)); |
| 108 | 108 |
| 109 scoped_ptr<DrawPolygon> polygon_a( | 109 scoped_ptr<DrawPolygon> polygon_a( |
| 110 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); | 110 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); |
| 111 scoped_ptr<DrawPolygon> polygon_b( | 111 scoped_ptr<DrawPolygon> polygon_b( |
| 112 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 1)); | 112 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 1)); |
| 113 scoped_ptr<DrawPolygon> polygon_c( | 113 scoped_ptr<DrawPolygon> polygon_c( |
| 114 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 2)); | 114 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 2)); |
| 115 | 115 |
| 116 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 116 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 117 polygon_list.push_back(polygon_a.Pass()); | 117 polygon_list.push_back(std::move(polygon_a)); |
| 118 polygon_list.push_back(polygon_b.Pass()); | 118 polygon_list.push_back(std::move(polygon_b)); |
| 119 polygon_list.push_back(polygon_c.Pass()); | 119 polygon_list.push_back(std::move(polygon_c)); |
| 120 | 120 |
| 121 int compare_ids[] = {1, 0, 2}; | 121 int compare_ids[] = {1, 0, 2}; |
| 122 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 122 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 123 BspTreeTest::RunTest(&polygon_list, compare_list); | 123 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 124 } | 124 } |
| 125 | 125 |
| 126 // Basic two polygon split, can be viewed as a + from above. | 126 // Basic two polygon split, can be viewed as a + from above. |
| 127 TEST(BspTreeTest, BasicSplit) { | 127 TEST(BspTreeTest, BasicSplit) { |
| 128 std::vector<gfx::Point3F> vertices_a; | 128 std::vector<gfx::Point3F> vertices_a; |
| 129 vertices_a.push_back(gfx::Point3F(-5.0f, -5.0f, 0.0f)); | 129 vertices_a.push_back(gfx::Point3F(-5.0f, -5.0f, 0.0f)); |
| 130 vertices_a.push_back(gfx::Point3F(-5.0f, 5.0f, 0.0f)); | 130 vertices_a.push_back(gfx::Point3F(-5.0f, 5.0f, 0.0f)); |
| 131 vertices_a.push_back(gfx::Point3F(5.0f, 5.0f, 0.0f)); | 131 vertices_a.push_back(gfx::Point3F(5.0f, 5.0f, 0.0f)); |
| 132 vertices_a.push_back(gfx::Point3F(5.0f, -5.0f, 0.0f)); | 132 vertices_a.push_back(gfx::Point3F(5.0f, -5.0f, 0.0f)); |
| 133 std::vector<gfx::Point3F> vertices_b; | 133 std::vector<gfx::Point3F> vertices_b; |
| 134 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -5.0f)); | 134 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -5.0f)); |
| 135 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -5.0f)); | 135 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -5.0f)); |
| 136 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, 5.0f)); | 136 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, 5.0f)); |
| 137 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, 5.0f)); | 137 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, 5.0f)); |
| 138 | 138 |
| 139 scoped_ptr<DrawPolygon> polygon_a( | 139 scoped_ptr<DrawPolygon> polygon_a( |
| 140 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); | 140 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); |
| 141 scoped_ptr<DrawPolygon> polygon_b( | 141 scoped_ptr<DrawPolygon> polygon_b( |
| 142 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); | 142 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); |
| 143 | 143 |
| 144 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 144 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 145 polygon_list.push_back(polygon_a.Pass()); | 145 polygon_list.push_back(std::move(polygon_a)); |
| 146 polygon_list.push_back(polygon_b.Pass()); | 146 polygon_list.push_back(std::move(polygon_b)); |
| 147 | 147 |
| 148 int compare_ids[] = {1, 0, 1}; | 148 int compare_ids[] = {1, 0, 1}; |
| 149 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 149 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 150 BspTreeTest::RunTest(&polygon_list, compare_list); | 150 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 151 } | 151 } |
| 152 | 152 |
| 153 // Same as above with the second quad offset so it doesn't intersect. One quad | 153 // Same as above with the second quad offset so it doesn't intersect. One quad |
| 154 // should be very clearly on one side of the other, and no splitting should | 154 // should be very clearly on one side of the other, and no splitting should |
| 155 // occur. | 155 // occur. |
| 156 TEST(BspTreeTest, QuadOffset) { | 156 TEST(BspTreeTest, QuadOffset) { |
| 157 std::vector<gfx::Point3F> vertices_a; | 157 std::vector<gfx::Point3F> vertices_a; |
| 158 vertices_a.push_back(gfx::Point3F(-5.0f, -5.0f, 0.0f)); | 158 vertices_a.push_back(gfx::Point3F(-5.0f, -5.0f, 0.0f)); |
| 159 vertices_a.push_back(gfx::Point3F(-5.0f, 5.0f, 0.0f)); | 159 vertices_a.push_back(gfx::Point3F(-5.0f, 5.0f, 0.0f)); |
| 160 vertices_a.push_back(gfx::Point3F(5.0f, 5.0f, 0.0f)); | 160 vertices_a.push_back(gfx::Point3F(5.0f, 5.0f, 0.0f)); |
| 161 vertices_a.push_back(gfx::Point3F(5.0f, -5.0f, 0.0f)); | 161 vertices_a.push_back(gfx::Point3F(5.0f, -5.0f, 0.0f)); |
| 162 std::vector<gfx::Point3F> vertices_b; | 162 std::vector<gfx::Point3F> vertices_b; |
| 163 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -15.0f)); | 163 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -15.0f)); |
| 164 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -15.0f)); | 164 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -15.0f)); |
| 165 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -10.0f)); | 165 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -10.0f)); |
| 166 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -10.0f)); | 166 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -10.0f)); |
| 167 | 167 |
| 168 scoped_ptr<DrawPolygon> polygon_a( | 168 scoped_ptr<DrawPolygon> polygon_a( |
| 169 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); | 169 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); |
| 170 scoped_ptr<DrawPolygon> polygon_b( | 170 scoped_ptr<DrawPolygon> polygon_b( |
| 171 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); | 171 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); |
| 172 | 172 |
| 173 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 173 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 174 polygon_list.push_back(polygon_a.Pass()); | 174 polygon_list.push_back(std::move(polygon_a)); |
| 175 polygon_list.push_back(polygon_b.Pass()); | 175 polygon_list.push_back(std::move(polygon_b)); |
| 176 | 176 |
| 177 int compare_ids[] = {1, 0}; | 177 int compare_ids[] = {1, 0}; |
| 178 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 178 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 179 BspTreeTest::RunTest(&polygon_list, compare_list); | 179 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 180 } | 180 } |
| 181 | 181 |
| 182 // Same as above, but this time we change the order in which the quads are | 182 // Same as above, but this time we change the order in which the quads are |
| 183 // inserted into the tree, causing one to actually cross the plane of the other | 183 // inserted into the tree, causing one to actually cross the plane of the other |
| 184 // and cause a split. | 184 // and cause a split. |
| 185 TEST(BspTreeTest, QuadOffsetSplit) { | 185 TEST(BspTreeTest, QuadOffsetSplit) { |
| 186 std::vector<gfx::Point3F> vertices_a; | 186 std::vector<gfx::Point3F> vertices_a; |
| 187 vertices_a.push_back(gfx::Point3F(-5.0f, -5.0f, 0.0f)); | 187 vertices_a.push_back(gfx::Point3F(-5.0f, -5.0f, 0.0f)); |
| 188 vertices_a.push_back(gfx::Point3F(-5.0f, 5.0f, 0.0f)); | 188 vertices_a.push_back(gfx::Point3F(-5.0f, 5.0f, 0.0f)); |
| 189 vertices_a.push_back(gfx::Point3F(5.0f, 5.0f, 0.0f)); | 189 vertices_a.push_back(gfx::Point3F(5.0f, 5.0f, 0.0f)); |
| 190 vertices_a.push_back(gfx::Point3F(5.0f, -5.0f, 0.0f)); | 190 vertices_a.push_back(gfx::Point3F(5.0f, -5.0f, 0.0f)); |
| 191 std::vector<gfx::Point3F> vertices_b; | 191 std::vector<gfx::Point3F> vertices_b; |
| 192 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -15.0f)); | 192 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -15.0f)); |
| 193 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -15.0f)); | 193 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -15.0f)); |
| 194 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -10.0f)); | 194 vertices_b.push_back(gfx::Point3F(0.0f, 5.0f, -10.0f)); |
| 195 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -10.0f)); | 195 vertices_b.push_back(gfx::Point3F(0.0f, -5.0f, -10.0f)); |
| 196 | 196 |
| 197 scoped_ptr<DrawPolygon> polygon_a( | 197 scoped_ptr<DrawPolygon> polygon_a( |
| 198 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); | 198 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); |
| 199 scoped_ptr<DrawPolygon> polygon_b( | 199 scoped_ptr<DrawPolygon> polygon_b( |
| 200 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); | 200 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); |
| 201 | 201 |
| 202 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 202 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 203 polygon_list.push_back(polygon_b.Pass()); | 203 polygon_list.push_back(std::move(polygon_b)); |
| 204 polygon_list.push_back(polygon_a.Pass()); | 204 polygon_list.push_back(std::move(polygon_a)); |
| 205 | 205 |
| 206 int compare_ids[] = {0, 1, 0}; | 206 int compare_ids[] = {0, 1, 0}; |
| 207 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 207 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 208 BspTreeTest::RunTest(&polygon_list, compare_list); | 208 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 209 } | 209 } |
| 210 | 210 |
| 211 // In addition to what can be viewed as a + from above, another piece of | 211 // In addition to what can be viewed as a + from above, another piece of |
| 212 // geometry is inserted to cut these pieces right in the middle, viewed as | 212 // geometry is inserted to cut these pieces right in the middle, viewed as |
| 213 // a quad from overhead. | 213 // a quad from overhead. |
| 214 TEST(BspTreeTest, ThreeWaySplit) { | 214 TEST(BspTreeTest, ThreeWaySplit) { |
| (...skipping 14 matching lines...) Expand all Loading... |
| 229 vertices_c.push_back(gfx::Point3F(5.0f, 0.0f, -5.0f)); | 229 vertices_c.push_back(gfx::Point3F(5.0f, 0.0f, -5.0f)); |
| 230 | 230 |
| 231 scoped_ptr<DrawPolygon> polygon_a( | 231 scoped_ptr<DrawPolygon> polygon_a( |
| 232 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); | 232 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); |
| 233 scoped_ptr<DrawPolygon> polygon_b( | 233 scoped_ptr<DrawPolygon> polygon_b( |
| 234 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); | 234 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 1)); |
| 235 scoped_ptr<DrawPolygon> polygon_c( | 235 scoped_ptr<DrawPolygon> polygon_c( |
| 236 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 1.0f, 0.0f), 2)); | 236 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 1.0f, 0.0f), 2)); |
| 237 | 237 |
| 238 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 238 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 239 polygon_list.push_back(polygon_a.Pass()); | 239 polygon_list.push_back(std::move(polygon_a)); |
| 240 polygon_list.push_back(polygon_b.Pass()); | 240 polygon_list.push_back(std::move(polygon_b)); |
| 241 polygon_list.push_back(polygon_c.Pass()); | 241 polygon_list.push_back(std::move(polygon_c)); |
| 242 | 242 |
| 243 int compare_ids[] = {2, 1, 2, 0, 2, 1, 2}; | 243 int compare_ids[] = {2, 1, 2, 0, 2, 1, 2}; |
| 244 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 244 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 245 BspTreeTest::RunTest(&polygon_list, compare_list); | 245 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 246 } | 246 } |
| 247 | 247 |
| 248 // This test checks whether coplanar geometry, when inserted into the tree in | 248 // This test checks whether coplanar geometry, when inserted into the tree in |
| 249 // order, comes back in the same order as it should. | 249 // order, comes back in the same order as it should. |
| 250 TEST(BspTreeTest, Coplanar) { | 250 TEST(BspTreeTest, Coplanar) { |
| 251 std::vector<gfx::Point3F> vertices_a; | 251 std::vector<gfx::Point3F> vertices_a; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 270 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 1)); | 270 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 1)); |
| 271 scoped_ptr<DrawPolygon> polygon_c( | 271 scoped_ptr<DrawPolygon> polygon_c( |
| 272 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 2)); | 272 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 2)); |
| 273 | 273 |
| 274 scoped_ptr<DrawPolygon> polygon_d = polygon_a->CreateCopy(); | 274 scoped_ptr<DrawPolygon> polygon_d = polygon_a->CreateCopy(); |
| 275 scoped_ptr<DrawPolygon> polygon_e = polygon_b->CreateCopy(); | 275 scoped_ptr<DrawPolygon> polygon_e = polygon_b->CreateCopy(); |
| 276 scoped_ptr<DrawPolygon> polygon_f = polygon_c->CreateCopy(); | 276 scoped_ptr<DrawPolygon> polygon_f = polygon_c->CreateCopy(); |
| 277 | 277 |
| 278 { | 278 { |
| 279 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 279 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 280 polygon_list.push_back(polygon_a.Pass()); | 280 polygon_list.push_back(std::move(polygon_a)); |
| 281 polygon_list.push_back(polygon_b.Pass()); | 281 polygon_list.push_back(std::move(polygon_b)); |
| 282 polygon_list.push_back(polygon_c.Pass()); | 282 polygon_list.push_back(std::move(polygon_c)); |
| 283 | 283 |
| 284 int compare_ids[] = {0, 1, 2}; | 284 int compare_ids[] = {0, 1, 2}; |
| 285 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 285 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 286 BspTreeTest::RunTest(&polygon_list, compare_list); | 286 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 287 } | 287 } |
| 288 | 288 |
| 289 // Now check a different order and ensure we get that back as well | 289 // Now check a different order and ensure we get that back as well |
| 290 { | 290 { |
| 291 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 291 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 292 polygon_list.push_back(polygon_f.Pass()); | 292 polygon_list.push_back(std::move(polygon_f)); |
| 293 polygon_list.push_back(polygon_d.Pass()); | 293 polygon_list.push_back(std::move(polygon_d)); |
| 294 polygon_list.push_back(polygon_e.Pass()); | 294 polygon_list.push_back(std::move(polygon_e)); |
| 295 | 295 |
| 296 int compare_ids[] = {0, 1, 2}; | 296 int compare_ids[] = {0, 1, 2}; |
| 297 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 297 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 298 BspTreeTest::RunTest(&polygon_list, compare_list); | 298 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 299 } | 299 } |
| 300 } | 300 } |
| 301 | 301 |
| 302 // A bunch of coplanar geometry should end up sharing a single node, and | 302 // A bunch of coplanar geometry should end up sharing a single node, and |
| 303 // result in the final piece of geometry splitting into just two pieces on | 303 // result in the final piece of geometry splitting into just two pieces on |
| 304 // either side of the shared plane. | 304 // either side of the shared plane. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 327 scoped_ptr<DrawPolygon> polygon_a( | 327 scoped_ptr<DrawPolygon> polygon_a( |
| 328 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); | 328 CREATE_DRAW_POLYGON(vertices_a, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 0)); |
| 329 scoped_ptr<DrawPolygon> polygon_b( | 329 scoped_ptr<DrawPolygon> polygon_b( |
| 330 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 1)); | 330 CREATE_DRAW_POLYGON(vertices_b, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 1)); |
| 331 scoped_ptr<DrawPolygon> polygon_c( | 331 scoped_ptr<DrawPolygon> polygon_c( |
| 332 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 2)); | 332 CREATE_DRAW_POLYGON(vertices_c, gfx::Vector3dF(0.0f, 0.0f, 1.0f), 2)); |
| 333 scoped_ptr<DrawPolygon> polygon_d( | 333 scoped_ptr<DrawPolygon> polygon_d( |
| 334 CREATE_DRAW_POLYGON(vertices_d, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 3)); | 334 CREATE_DRAW_POLYGON(vertices_d, gfx::Vector3dF(-1.0f, 0.0f, 0.0f), 3)); |
| 335 | 335 |
| 336 std::deque<scoped_ptr<DrawPolygon>> polygon_list; | 336 std::deque<scoped_ptr<DrawPolygon>> polygon_list; |
| 337 polygon_list.push_back(polygon_a.Pass()); | 337 polygon_list.push_back(std::move(polygon_a)); |
| 338 polygon_list.push_back(polygon_b.Pass()); | 338 polygon_list.push_back(std::move(polygon_b)); |
| 339 polygon_list.push_back(polygon_c.Pass()); | 339 polygon_list.push_back(std::move(polygon_c)); |
| 340 polygon_list.push_back(polygon_d.Pass()); | 340 polygon_list.push_back(std::move(polygon_d)); |
| 341 | 341 |
| 342 int compare_ids[] = {3, 0, 1, 2, 3}; | 342 int compare_ids[] = {3, 0, 1, 2, 3}; |
| 343 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); | 343 std::vector<int> compare_list = INT_VECTOR_FROM_ARRAY(compare_ids); |
| 344 BspTreeTest::RunTest(&polygon_list, compare_list); | 344 BspTreeTest::RunTest(&polygon_list, compare_list); |
| 345 } | 345 } |
| 346 | 346 |
| 347 } // namespace | 347 } // namespace |
| 348 } // namespace cc | 348 } // namespace cc |
| OLD | NEW |