/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

Lines of Context:
src/text.cc
37
37
static char _message_modes[ NUM_MESSAGE_BUFFERS ];
38
38
 
39
39
// mode-specific message parameters
40
 
static signed long _message_pos[ NUM_MESSAGE_BUFFERS ];
 
40
static signed long _message_params[ NUM_MESSAGE_BUFFERS ];
41
41
 
42
42
// text scaling factors
43
43
static char _message_scale[ NUM_MESSAGE_BUFFERS ];
55
55
#define MASK_MODE_SIZE 0x07
56
56
#define MASK_MODE_POS 0x40
57
57
 
58
 
void reset_message_pos( int message_num )
 
58
void reset_message_param( int message_num )
59
59
{
60
60
        if( _message_modes[ message_num ] & Text::MODE_HSCROLL )
61
61
        {
62
62
                switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
63
63
                {
64
64
                case Text::MODE_ONEQUARTER:
65
 
                        _message_pos[ message_num ] = -NUM_SEGMENTS / 4; break;
 
65
                        _message_params[ message_num ] = -NUM_SEGMENTS / 4; break;
66
66
                case Text::MODE_ONETHIRD:
67
 
                        _message_pos[ message_num ] = -NUM_SEGMENTS / 3; break;
 
67
                        _message_params[ message_num ] = -NUM_SEGMENTS / 3; break;
68
68
                case Text::MODE_HALF:
69
 
                        _message_pos[ message_num ] = -NUM_SEGMENTS / 2; break;
 
69
                        _message_params[ message_num ] = -NUM_SEGMENTS / 2; break;
70
70
                case Text::MODE_TWOTHIRDS:
71
 
                        _message_pos[ message_num ] = -NUM_SEGMENTS * 2 / 3; break;
 
71
                        _message_params[ message_num ] = -NUM_SEGMENTS * 2 / 3; break;
72
72
                case Text::MODE_THREEQUARTERS:
73
 
                        _message_pos[ message_num ] = -NUM_SEGMENTS * 3 / 4; break;
 
73
                        _message_params[ message_num ] = -NUM_SEGMENTS * 3 / 4; break;
74
74
                case Text::MODE_ALL:
75
 
                        _message_pos[ message_num ] = -NUM_SEGMENTS; break;
 
75
                        _message_params[ message_num ] = -NUM_SEGMENTS; break;
76
76
                }
77
77
        }
78
78
        else
80
80
                switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
81
81
                {
82
82
                case Text::MODE_ONEQUARTER:
83
 
                        _message_pos[ message_num ] = NUM_SEGMENTS / 4; break;
 
83
                        _message_params[ message_num ] = NUM_SEGMENTS / 4; break;
84
84
                case Text::MODE_ONETHIRD:
85
 
                        _message_pos[ message_num ] = NUM_SEGMENTS / 3; break;
 
85
                        _message_params[ message_num ] = NUM_SEGMENTS / 3; break;
86
86
                case Text::MODE_HALF:
87
 
                        _message_pos[ message_num ] = NUM_SEGMENTS / 2; break;
 
87
                        _message_params[ message_num ] = NUM_SEGMENTS / 2; break;
88
88
                case Text::MODE_TWOTHIRDS:
89
 
                        _message_pos[ message_num ] = NUM_SEGMENTS * 2 / 3; break;
 
89
                        _message_params[ message_num ] = NUM_SEGMENTS * 2 / 3; break;
90
90
                case Text::MODE_THREEQUARTERS:
91
 
                        _message_pos[ message_num ] = NUM_SEGMENTS * 3 / 4; break;
 
91
                        _message_params[ message_num ] = NUM_SEGMENTS * 3 / 4; break;
92
92
                case Text::MODE_ALL:
93
 
                        _message_pos[ message_num ] = NUM_SEGMENTS; break;
 
93
                        _message_params[ message_num ] = NUM_SEGMENTS; break;
94
94
                }
95
 
                _message_pos[ message_num ] = -( _message_pos[ message_num ] -
 
95
                _message_params[ message_num ] = -( _message_params[ message_num ] -
96
96
                        TextRenderer::get_width( _message_lens[ message_num ],
97
97
                                        _message_scale[ message_num ] ) ) / 2;
98
98
        }
104
104
        // reset renderer
105
105
        _duration = 0;
106
106
        _last_millis = ::millis();
 
107
        _do_draw_reset = false;
107
108
 
108
109
        // clear all message modes (disable messages)
109
110
        for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
118
119
{
119
120
        _message_modes[ message_num ] = mode;
120
121
        _message_scale[ message_num ] = scale;
121
 
 
122
 
        // horizontal scrolling messages need their position reset at start of mode
123
 
        if( _message_modes[ message_num ] & MODE_HSCROLL )
124
 
                reset_message_pos( message_num );
125
122
}
126
123
 
127
124
 
129
126
{
130
127
        // update message
131
128
        _message_lens[ message_num ] = pstring.length();
132
 
 
133
 
        // non-horizontal scrolling modes need their position reset whenever the
134
 
        // text changes
135
 
        if( !( _message_modes[ message_num ] & MODE_HSCROLL ) )
136
 
                reset_message_pos( message_num );
137
129
}
138
130
 
139
131
 
145
137
                _duration = millis - _last_millis;
146
138
        _last_millis = millis;
147
139
 
148
 
        // we'll need to recalculate params for the frame, but we want to do it when
149
 
        // we're not in the middle of a text display (to avoid tearing).
150
140
        _do_draw_reset = true;
151
141
}
152
142
 
155
145
{
156
146
        TextRenderer::buffer_in_use();
157
147
 
 
148
        // perform a mid-frame reset, as necessary
 
149
        if( _do_draw_reset ) // && segment > NUM_SEGMENTS / 2 )
 
150
        {
 
151
                // reset message param
 
152
                reset_message_param( message_num );
 
153
 
 
154
                // add to horizontal scroll position
 
155
                if( _message_modes[ message_num ] & Text::MODE_HSCROLL ) {
 
156
                        _message_params[ message_num ] +=
 
157
                                _duration * TEXT_SCROLL_SPEED / 1000;
 
158
                        long excess = _message_params[ message_num ] -
 
159
                                TextRenderer::get_width( _message_lens[ message_num ],
 
160
                                                _message_scale[ message_num ] );
 
161
                        if( excess >= 0 ) {
 
162
                                reset_message_param( message_num );
 
163
                                _message_params[ message_num ] += excess;
 
164
                        }
 
165
                }
 
166
        }
 
167
 
158
168
        // calculate the width
159
169
        int width;
160
170
        switch( _message_modes[ message_num ] & MASK_MODE_SIZE )
204
214
        // render
205
215
        TextRenderer::render(
206
216
                Text::_messages[ message_num ], _message_lens[ message_num ],
207
 
                (long)segment + _message_pos[ message_num ],
 
217
                (long)segment + _message_params[ message_num ],
208
218
                ( _message_modes[ message_num ] & MASK_MODE_POS ) == Text::MODE_BOTTOM,
209
219
                0, _message_scale[ message_num ] );
210
220
}
212
222
 
213
223
void Text::draw( int segment )
214
224
{
215
 
        // perform a mid-frame reset, as necessary
216
 
        if( _do_draw_reset && segment == NUM_SEGMENTS / 2 ) {
217
 
                _do_draw_reset = false;
218
 
 
219
 
                // go through the messages looking for an active one
220
 
                for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
221
 
                        if( _message_modes[ a ] & MASK_MODE_SIZE )
222
 
                        {
223
 
                                // add to horizontal scroll position
224
 
                                if( _message_modes[ a ] & Text::MODE_HSCROLL ) {
225
 
                                        _message_pos[ a ] +=
226
 
                                                        _duration * TEXT_SCROLL_SPEED / 1000;
227
 
                                        long excess = _message_pos[ a ] -
228
 
                                                        TextRenderer::get_width( _message_lens[ a ],
229
 
                                                                        _message_scale[ a ] );
230
 
                                        if( excess >= 0 ) {
231
 
                                                reset_message_pos( a );
232
 
                                                _message_pos[ a ] += excess;
233
 
                                        }
234
 
                                }
235
 
                        }
236
 
        }
237
 
 
238
225
        // draw any active messages
239
226
        for( int a = 0; a < NUM_MESSAGE_BUFFERS; a++ )
240
227
                if( _message_modes[ a ] & MASK_MODE_SIZE )
241
228
                        draw_message( a, segment );
 
229
 
 
230
        // turn off any requested draw reset after all messages are drawn
 
231
        _do_draw_reset = false;
242
232
}
243
233