← Back to branch summary

~azzar1/unity/fix-1028810

« back to all changes in this revision

Viewing changes to unity-shared/BGHash.h

  • Committer: Andrea Azzarone
  • Date: 2012-08-22 13:14:18 UTC
  • mfrom: (2516.1.92 unity)
  • Revision ID: azzaronea@gmail.com-20120822131418-mrfwx82k39xnvl9e
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
unity-shared/BGHash.h
19
19
#ifndef BGHASH_H
20
20
#define BGHASH_H
21
21
 
 
22
#include <NuxCore/Animation.h>
22
23
#include <Nux/Nux.h>
23
 
#include "Animator.h"
24
24
#include "UBusWrapper.h"
25
25
 
26
26
namespace unity {
41
41
    void OverrideColor(nux::Color const& color);
42
42
 
43
43
  private:
44
 
    void OnTransitionUpdated(double progress);
 
44
    void OnTransitionUpdated(nux::Color const& new_color);
45
45
    void DoUbusColorEmit();
46
46
    void TransitionToNewColor(nux::Color const& new_color);
47
 
    nux::Color InterpolateColor(nux::Color const& colora, nux::Color const& colorb, float value) const;
48
47
    nux::Color MatchColor(nux::Color const& base_color) const;
49
48
 
50
49
  private:
51
 
    Animator transition_animator_;
 
50
    nux::animation::AnimateValue<nux::Color> transition_animator_;
52
51
 
53
52
    nux::Color current_color_; // the current colour, including steps in transitions
54
 
    nux::Color new_color_;     // in transitions, the next colour, otherwise the current colour
55
 
    nux::Color old_color_;     // the last colour chosen, used for transitions
56
53
    nux::Color override_color_;
57
54
 
58
55
    UBusManager ubus_manager_;