~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-28 06:01:05 UTC
  • Revision ID: admin@quickmediasolutions.com-20110728060105-o3j590hanrpqc24d
Added multitexture state change and reenabled the bubble code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
63
63
    glTranslatef(100.0f, 100.0f, 0.0f);
64
64
    glScalef(25.0f, 25.0f, 1.0f);
65
65
 
 
66
    /*
66
67
    glEnable(GL_BLEND);
67
68
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
68
69
    glColor4f(0.5, 0.5, 0.5, 0.2f);
73
74
    glVertex2f(-1.0f,-1.0f);
74
75
    glEnd();
75
76
    glDisable(GL_BLEND);
 
77
    */
76
78
    
77
 
    //m_bubble.Render(m_ms);
 
79
    glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 
80
    m_bubble.Render(m_ms);
 
81
    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
78
82
 
79
83
    glPopMatrix();
80
84