/elec/propeller-clock

To get this branch, use:
bzr branch http://bzr.ed.am/elec/propeller-clock

« back to all changes in this revision

Viewing changes to src/text.cc

  • Committer: Tim Marston
  • Date: 2012-05-18 18:29:50 UTC
  • Revision ID: tim@ed.am-20120518182950-t85bn9a21n72uzm8
text messages are now individually enabled and draw()n automatically

Show diffs side-by-side

added added

removed removed

src/text.cc
40
40
static signed long _message_params[ NUM_MESSAGE_BUFFERS ];
41
41
 
42
42
// text scaling factors
43
 
static int _message_scale[ NUM_MESSAGE_BUFFERS ];
 
43
static char _message_scale[ NUM_MESSAGE_BUFFERS ];
44
44
 
45
45
// time last frame
46
46
static unsigned long _last_millis;
51
51
// recalculate message params, based on _duration
52
52
static bool _do_draw_reset;
53
53
 
54
 
// recalculate messages parameters (after message reset)
55
 
static unsigned char _message_recalc_flags;
56
54
 
 
55
#define MASK_MODE_SIZE 0x07
 
56
#define MASK_MODE_POS 0x40
57
57
 
58
58
void reset_message_param( int message_num )
59
59
{
60
60
        if( _message_modes[ message_num ] & Text::MODE_HSCROLL )
61
61
        {
62
 
                switch( _message_modes[ message_num ] & 0x1c )
 
62
                switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
63
63
                {
64
64
                case Text::MODE_ONEQUARTER:
65
65
                        _message_params[ message_num ] = -NUM_SEGMENTS / 4; break;
77
77
        }
78
78
        else
79
79
        {
80
 
                switch( _message_modes[ message_num ] & 0x1c )
 
80
                switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
81
81
                {
82
82
                case Text::MODE_ONEQUARTER:
83
83
                        _message_params[ message_num ] = NUM_SEGMENTS / 4; break;
99
99
}
100
100
 
101
101
 
102
 
void Text::set_message( int message_num, PString &pstring )
103
 
{
104
 
        // update message
105
 
        _message_lens[ message_num ] = pstring.length();
106
 
}
107
 
 
108
 
 
109
 
void Text::reset_message( int message_num, char mode, int scale )
110
 
{
111
 
        _message_modes[ message_num ] = mode;
112
 
        _message_recalc_flags |= 1 << message_num;
113
 
        _message_scale[ message_num ] = scale;
114
 
}
115
 
 
116
 
 
117
102
void Text::reset()
118
103
{
119
104
        // reset renderer
120
105
        _duration = 0;
121
106
        _last_millis = ::millis();
122
107
        _do_draw_reset = false;
123
 
        _message_recalc_flags = 0;
 
108
 
 
109
        // clear all message modes (disable messages)
 
110
        for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
 
111
                _message_modes[ a ] = 0;
124
112
 
125
113
        // reset the text renderer's output buffer
126
114
        TextRenderer::reset_buffer();
127
115
}
128
116
 
129
117
 
 
118
void Text::set_up_message( int message_num, char mode, char scale )
 
119
{
 
120
        _message_modes[ message_num ] = mode;
 
121
        _message_scale[ message_num ] = scale;
 
122
}
 
123
 
 
124
 
 
125
void Text::set_message_text( int message_num, PString &pstring )
 
126
{
 
127
        // update message
 
128
        _message_lens[ message_num ] = pstring.length();
 
129
}
 
130
 
 
131
 
130
132
void Text::draw_reset()
131
133
{
132
134
        // how many milliseconds have elapsed since last frame?
139
141
}
140
142
 
141
143
 
142
 
void Text::post_draw()
143
 
{
144
 
        _do_draw_reset = false;
145
 
}
146
 
 
147
 
 
148
 
void Text::draw( int message_num, int segment )
 
144
static void draw_message( int message_num, int segment )
149
145
{
150
146
        TextRenderer::buffer_in_use();
151
147
 
152
148
        // perform a mid-frame reset, as necessary
153
149
        if( _do_draw_reset ) // && segment > NUM_SEGMENTS / 2 )
154
150
        {
155
 
                // reset message param?
156
 
                if( _message_recalc_flags & ( 1 << message_num ) ) {
157
 
                        _message_recalc_flags &= ~( 1 << message_num );
158
 
                        reset_message_param( message_num );
159
 
                }
 
151
                // reset message param
 
152
                reset_message_param( message_num );
160
153
 
161
154
                // add to horizontal scroll position
162
 
                if( _message_modes[ message_num ] & MODE_HSCROLL ) {
 
155
                if( _message_modes[ message_num ] & Text::MODE_HSCROLL ) {
163
156
                        _message_params[ message_num ] +=
164
157
                                _duration * TEXT_SCROLL_SPEED / 1000;
165
158
                        long excess = _message_params[ message_num ] -
174
167
 
175
168
        // calculate the width
176
169
        int width;
177
 
        switch( _message_modes[ message_num ] & 0x1c )
 
170
        switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
178
171
        {
179
 
        case MODE_ONEQUARTER:
 
172
        case Text::MODE_ONEQUARTER:
180
173
                width = NUM_SEGMENTS / 4;
181
174
                break;
182
 
        case MODE_ONETHIRD:
 
175
        case Text::MODE_ONETHIRD:
183
176
                width = NUM_SEGMENTS / 3;
184
177
                break;
185
 
        case MODE_HALF:
 
178
        case Text::MODE_HALF:
186
179
                width = NUM_SEGMENTS / 2;
187
180
                break;
188
 
        case MODE_TWOTHIRDS:
 
181
        case Text::MODE_TWOTHIRDS:
189
182
                width = NUM_SEGMENTS * 2 / 3;
190
183
                break;
191
 
        case MODE_THREEQUARTERS:
 
184
        case Text::MODE_THREEQUARTERS:
192
185
                width = NUM_SEGMENTS * 3 / 4;
193
186
                break;
194
 
        case MODE_ALL:
 
187
        case Text::MODE_ALL:
195
188
                width = NUM_SEGMENTS;
196
189
                break;
197
190
        }
198
191
 
199
192
        // convert segment to display-space
200
 
        switch( _message_modes[ message_num ] & 0x03 )
 
193
        switch( _message_modes[ message_num ] & MASK_MODE_POS )
201
194
        {
202
 
        case MODE_TOP:
 
195
        case Text::MODE_TOP:
203
196
                if( segment < width / 2 )
204
197
                        segment += width / 2;
205
198
                else if( segment >= NUM_SEGMENTS - width / 2 )
207
200
                else
208
201
                        return;
209
202
                break;
210
 
        case MODE_BOTTOM:
 
203
        case Text::MODE_BOTTOM:
211
204
                if( segment > ( NUM_SEGMENTS - width ) / 2 &&
212
205
                        segment < ( NUM_SEGMENTS - width ) / 2 + width )
213
206
                {
220
213
 
221
214
        // render
222
215
        TextRenderer::render(
223
 
                _messages[ message_num ], _message_lens[ message_num ],
 
216
                Text::_messages[ message_num ], _message_lens[ message_num ],
224
217
                (long)segment + _message_params[ message_num ],
225
 
                ( _message_modes[ message_num ] & 1 ) == 0, 0,
226
 
                _message_scale[ message_num ] );
227
 
}
 
218
                ( _message_modes[ message_num ] & MASK_MODE_POS ) == Text::MODE_BOTTOM,
 
219
                0, _message_scale[ message_num ] );
 
220
}
 
221
 
 
222
 
 
223
void Text::draw( int segment )
 
224
{
 
225
        // draw any active messages
 
226
        for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
 
227
                if( _message_modes[ a ] & MASK_MODE_SIZE )
 
228
                        draw_message( a, segment );
 
229
 
 
230
        // turn off any requested draw reset after all messages are drawn
 
231
        _do_draw_reset = false;
 
232
}
 
233