| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef APP_MULTI_ANIMATION_H_ | 5 #ifndef APP_MULTI_ANIMATION_H_ |
| 6 #define APP_MULTI_ANIMATION_H_ | 6 #define APP_MULTI_ANIMATION_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 int time_ms; | 39 int time_ms; |
| 40 int start_time_ms; | 40 int start_time_ms; |
| 41 int end_time_ms; | 41 int end_time_ms; |
| 42 Tween::Type type; | 42 Tween::Type type; |
| 43 }; | 43 }; |
| 44 | 44 |
| 45 typedef std::vector<Part> Parts; | 45 typedef std::vector<Part> Parts; |
| 46 | 46 |
| 47 explicit MultiAnimation(const Parts& parts); | 47 explicit MultiAnimation(const Parts& parts); |
| 48 virtual ~MultiAnimation(); |
| 48 | 49 |
| 49 // Returns the current value. The current value for a MultiAnimation is | 50 // Returns the current value. The current value for a MultiAnimation is |
| 50 // determined from the tween type of the current part. | 51 // determined from the tween type of the current part. |
| 51 virtual double GetCurrentValue() const { return current_value_; } | 52 virtual double GetCurrentValue() const { return current_value_; } |
| 52 | 53 |
| 53 // Returns the index of the current part. | 54 // Returns the index of the current part. |
| 54 size_t current_part_index() const { return current_part_index_; } | 55 size_t current_part_index() const { return current_part_index_; } |
| 55 | 56 |
| 56 protected: | 57 protected: |
| 57 // Animation overrides. | 58 // Animation overrides. |
| (...skipping 14 matching lines...) Expand all Loading... |
| 72 // Current value for the animation. | 73 // Current value for the animation. |
| 73 double current_value_; | 74 double current_value_; |
| 74 | 75 |
| 75 // Index of the current part. | 76 // Index of the current part. |
| 76 size_t current_part_index_; | 77 size_t current_part_index_; |
| 77 | 78 |
| 78 DISALLOW_COPY_AND_ASSIGN(MultiAnimation); | 79 DISALLOW_COPY_AND_ASSIGN(MultiAnimation); |
| 79 }; | 80 }; |
| 80 | 81 |
| 81 #endif // APP_MULTI_ANIMATION_H_ | 82 #endif // APP_MULTI_ANIMATION_H_ |
| OLD | NEW |