| OLD | NEW |
| 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2016 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 "chrome/browser/android/vr_shell/ui_scene.h" | 5 #include "chrome/browser/android/vr_shell/ui_scene.h" |
| 6 | 6 |
| 7 #define _USE_MATH_DEFINES // For M_PI in MSVC. | 7 #define _USE_MATH_DEFINES // For M_PI in MSVC. |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 EXPECT_EQ(scene.GetUiElementById(0), nullptr); | 61 EXPECT_EQ(scene.GetUiElementById(0), nullptr); |
| 62 scene.RemoveUiElement(99); | 62 scene.RemoveUiElement(99); |
| 63 EXPECT_EQ(scene.GetUiElements().size(), 0u); | 63 EXPECT_EQ(scene.GetUiElements().size(), 0u); |
| 64 EXPECT_EQ(scene.GetUiElementById(99), nullptr); | 64 EXPECT_EQ(scene.GetUiElementById(99), nullptr); |
| 65 | 65 |
| 66 scene.RemoveUiElement(0); | 66 scene.RemoveUiElement(0); |
| 67 scene.RemoveUiElement(99); | 67 scene.RemoveUiElement(99); |
| 68 EXPECT_EQ(scene.GetUiElements().size(), 0u); | 68 EXPECT_EQ(scene.GetUiElements().size(), 0u); |
| 69 } | 69 } |
| 70 | 70 |
| 71 TEST(UiScene, AddRemoveContentQuad) { |
| 72 UiScene scene; |
| 73 |
| 74 EXPECT_EQ(scene.GetContentQuad(), nullptr); |
| 75 |
| 76 base::DictionaryValue dict; |
| 77 dict.SetInteger("id", 0); |
| 78 dict.SetBoolean("contentQuad", true); |
| 79 scene.AddUiElementFromDict(dict); |
| 80 EXPECT_NE(scene.GetContentQuad(), nullptr); |
| 81 |
| 82 dict.SetBoolean("contentQuad", false); |
| 83 scene.UpdateUiElementFromDict(dict); |
| 84 EXPECT_EQ(scene.GetContentQuad(), nullptr); |
| 85 |
| 86 dict.SetBoolean("contentQuad", true); |
| 87 scene.UpdateUiElementFromDict(dict); |
| 88 EXPECT_NE(scene.GetContentQuad(), nullptr); |
| 89 |
| 90 scene.RemoveUiElement(0); |
| 91 EXPECT_EQ(scene.GetContentQuad(), nullptr); |
| 92 } |
| 93 |
| 71 TEST(UiScene, AddRemoveAnimations) { | 94 TEST(UiScene, AddRemoveAnimations) { |
| 72 UiScene scene; | 95 UiScene scene; |
| 73 addElement(&scene, 0); | 96 addElement(&scene, 0); |
| 74 auto *element = scene.GetUiElementById(0); | 97 auto *element = scene.GetUiElementById(0); |
| 75 | 98 |
| 76 EXPECT_EQ(element->animations.size(), 0u); | 99 EXPECT_EQ(element->animations.size(), 0u); |
| 77 addAnimation(&scene, 0, 0, Animation::Property::SIZE); | 100 addAnimation(&scene, 0, 0, Animation::Property::SIZE); |
| 78 EXPECT_EQ(element->animations.size(), 1u); | 101 EXPECT_EQ(element->animations.size(), 1u); |
| 79 EXPECT_EQ(element->animations[0]->property, Animation::Property::SIZE); | 102 EXPECT_EQ(element->animations[0]->property, Animation::Property::SIZE); |
| 80 addAnimation(&scene, 0, 1, Animation::Property::SCALE); | 103 addAnimation(&scene, 0, 1, Animation::Property::SCALE); |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 UiScene scene; | 209 UiScene scene; |
| 187 addElement(&scene, 11); | 210 addElement(&scene, 11); |
| 188 | 211 |
| 189 base::DictionaryValue dict; | 212 base::DictionaryValue dict; |
| 190 | 213 |
| 191 dict.SetInteger("id", 10); | 214 dict.SetInteger("id", 10); |
| 192 dict.SetInteger("parentId", 11); | 215 dict.SetInteger("parentId", 11); |
| 193 dict.SetBoolean("visible", false); | 216 dict.SetBoolean("visible", false); |
| 194 dict.SetBoolean("hitTestable", false); | 217 dict.SetBoolean("hitTestable", false); |
| 195 dict.SetBoolean("lockToFov", true); | 218 dict.SetBoolean("lockToFov", true); |
| 219 dict.SetBoolean("contentQuad", true); |
| 196 | 220 |
| 197 std::unique_ptr<base::DictionaryValue> copy_rect(new base::DictionaryValue); | 221 std::unique_ptr<base::DictionaryValue> copy_rect(new base::DictionaryValue); |
| 198 copy_rect->SetInteger("x", 100); | 222 copy_rect->SetInteger("x", 100); |
| 199 copy_rect->SetInteger("y", 101); | 223 copy_rect->SetInteger("y", 101); |
| 200 copy_rect->SetInteger("width", 102); | 224 copy_rect->SetInteger("width", 102); |
| 201 copy_rect->SetInteger("height", 103); | 225 copy_rect->SetInteger("height", 103); |
| 202 dict.Set("copyRect", std::move(copy_rect)); | 226 dict.Set("copyRect", std::move(copy_rect)); |
| 203 | 227 |
| 204 std::unique_ptr<base::DictionaryValue> size(new base::DictionaryValue); | 228 std::unique_ptr<base::DictionaryValue> size(new base::DictionaryValue); |
| 205 size->SetDouble("x", 200); | 229 size->SetDouble("x", 200); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 230 | 254 |
| 231 scene.AddUiElementFromDict(dict); | 255 scene.AddUiElementFromDict(dict); |
| 232 const auto *element = scene.GetUiElementById(10); | 256 const auto *element = scene.GetUiElementById(10); |
| 233 EXPECT_NE(element, nullptr); | 257 EXPECT_NE(element, nullptr); |
| 234 | 258 |
| 235 EXPECT_EQ(element->id, 10); | 259 EXPECT_EQ(element->id, 10); |
| 236 EXPECT_EQ(element->parent_id, 11); | 260 EXPECT_EQ(element->parent_id, 11); |
| 237 EXPECT_EQ(element->visible, false); | 261 EXPECT_EQ(element->visible, false); |
| 238 EXPECT_EQ(element->hit_testable, false); | 262 EXPECT_EQ(element->hit_testable, false); |
| 239 EXPECT_EQ(element->lock_to_fov, true); | 263 EXPECT_EQ(element->lock_to_fov, true); |
| 264 EXPECT_EQ(element->content_quad, true); |
| 240 | 265 |
| 241 EXPECT_EQ(element->copy_rect.x, 100); | 266 EXPECT_EQ(element->copy_rect.x, 100); |
| 242 EXPECT_EQ(element->copy_rect.y, 101); | 267 EXPECT_EQ(element->copy_rect.y, 101); |
| 243 EXPECT_EQ(element->copy_rect.width, 102); | 268 EXPECT_EQ(element->copy_rect.width, 102); |
| 244 EXPECT_EQ(element->copy_rect.height, 103); | 269 EXPECT_EQ(element->copy_rect.height, 103); |
| 245 | 270 |
| 246 EXPECT_FLOAT_EQ(element->size.x, 200); | 271 EXPECT_FLOAT_EQ(element->size.x, 200); |
| 247 EXPECT_FLOAT_EQ(element->size.y, 201); | 272 EXPECT_FLOAT_EQ(element->size.y, 201); |
| 248 EXPECT_FLOAT_EQ(element->size.z, 1); | 273 EXPECT_FLOAT_EQ(element->size.z, 1); |
| 249 | 274 |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 EXPECT_FLOAT_EQ(animation->from[0], 300); | 338 EXPECT_FLOAT_EQ(animation->from[0], 300); |
| 314 EXPECT_FLOAT_EQ(animation->from[1], 301); | 339 EXPECT_FLOAT_EQ(animation->from[1], 301); |
| 315 EXPECT_FLOAT_EQ(animation->from[2], 302); | 340 EXPECT_FLOAT_EQ(animation->from[2], 302); |
| 316 EXPECT_FLOAT_EQ(animation->from[3], 303); | 341 EXPECT_FLOAT_EQ(animation->from[3], 303); |
| 317 | 342 |
| 318 EXPECT_EQ(animation->start, 22345000); | 343 EXPECT_EQ(animation->start, 22345000); |
| 319 EXPECT_EQ(animation->duration, 54321000); | 344 EXPECT_EQ(animation->duration, 54321000); |
| 320 } | 345 } |
| 321 | 346 |
| 322 } // namespace vr_shell | 347 } // namespace vr_shell |
| OLD | NEW |