OLD | NEW |
1 | 1 |
2 /* | 2 /* |
3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
4 * | 4 * |
5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
7 */ | 7 */ |
8 | 8 |
9 | 9 |
10 #include "SkAnimateSet.h" | 10 #include "SkAnimateSet.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 DEFINE_GET_MEMBER(SkSet); | 32 DEFINE_GET_MEMBER(SkSet); |
33 | 33 |
34 SkSet::SkSet() { | 34 SkSet::SkSet() { |
35 dur = 1; | 35 dur = 1; |
36 } | 36 } |
37 | 37 |
38 #ifdef SK_DUMP_ENABLED | 38 #ifdef SK_DUMP_ENABLED |
39 void SkSet::dump(SkAnimateMaker* maker) { | 39 void SkSet::dump(SkAnimateMaker* maker) { |
40 INHERITED::dump(maker); | 40 INHERITED::dump(maker); |
41 if (dur != 1) { | 41 if (dur != 1) { |
42 SkDebugf("dur=\"%g\" ", SkScalarToFloat(SkScalarDiv(dur,1000))); | 42 SkDebugf("dur=\"%g\" ", dur * 0.001); |
43 } | 43 } |
44 //don't want double />\n's | 44 //don't want double />\n's |
45 SkDebugf("/>\n"); | 45 SkDebugf("/>\n"); |
46 | 46 |
47 } | 47 } |
48 #endif | 48 #endif |
49 | 49 |
50 void SkSet::refresh(SkAnimateMaker& maker) { | 50 void SkSet::refresh(SkAnimateMaker& maker) { |
51 fFieldInfo->setValue(maker, &fValues, 0, fFieldInfo->fCount, NULL, | 51 fFieldInfo->setValue(maker, &fValues, 0, fFieldInfo->fCount, NULL, |
52 fFieldInfo->getType(), to); | 52 fFieldInfo->getType(), to); |
(...skipping 25 matching lines...) Expand all Loading... |
78 SkASSERT(fValues.count() == comps); | 78 SkASSERT(fValues.count() == comps); |
79 } | 79 } |
80 } | 80 } |
81 if (formula.size() > 0) { | 81 if (formula.size() > 0) { |
82 comps = 1; | 82 comps = 1; |
83 outType = SkType_MSec; | 83 outType = SkType_MSec; |
84 } | 84 } |
85 fFieldInfo->setValue(maker, &fValues, fFieldOffset, comps, this, outType, fo
rmula.size() > 0 ? formula : to); | 85 fFieldInfo->setValue(maker, &fValues, fFieldOffset, comps, this, outType, fo
rmula.size() > 0 ? formula : to); |
86 fComponents = fValues.count(); | 86 fComponents = fValues.count(); |
87 } | 87 } |
OLD | NEW |