~george-edison55/stackfusion/trunk

« back to all changes in this revision

Viewing changes to plugins/stackfusion/src/stackfusion.cpp

  • Committer: Nathan Osman
  • Date: 2011-07-29 06:08:13 UTC
  • Revision ID: admin@quickmediasolutions.com-20110729060813-eu9zx9diul4yot20
Added latest changes - not much.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
 
38
38
void StackFusionScreen::ToggleDisplay()
39
39
{
40
 
    m_active = !m_active;
 
40
    //m_active = !m_active;
 
41
    m_active = true;
41
42
 
42
43
    m_c_screen->preparePaintSetEnabled(this, m_active);
43
44
    m_c_screen->donePaintSetEnabled(this, m_active);
52
53
                                       CompOutput                * output,
53
54
                                       unsigned int              mask)
54
55
{
55
 
    bool status = m_g_screen->glPaintOutput (sAttrib, transform, region, output, mask);
 
56
    bool status = m_g_screen->glPaintOutput(sAttrib, transform, region, output, mask);
56
57
 
57
58
    // Draw a rectangle
58
59
    GLMatrix sTransform = transform;
76
77
    glDisable(GL_BLEND);
77
78
    */
78
79
    
79
 
    glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT);
 
80
    //glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT);
 
81
    glPushAttrib(GL_CURRENT_BIT | GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TEXTURE_BIT | GL_LIGHTING_BIT);
80
82
    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
81
83
    m_bubble.Render(m_ms);
82
84
    glEnableClientState(GL_TEXTURE_COORD_ARRAY);