elliotwoods / ofxRulr

An application and high level framework for calibrating spaces with devices. Built on openFrameworks
134 stars 15 forks source link

Fixes for latest OF master and GL 3+ #112

Closed arturoc closed 8 years ago

arturoc commented 8 years ago

the soundStream api has changed, this fixes SoundEngine to work with the new ofSoundStreamSettings

in videooutput when drawing to a second context it would use glLoadMatrix glPushMatrix... which don't exist anymore in GL 3+

i think there were some changes in the break lines and the diff is not very clear in VideoOutput but the only thing that really changed was:

-               if (!this->mute) {
-                   //set the drawing matrices to normalised coordinates
-                   glMatrixMode(GL_PROJECTION);
-                   glPushMatrix();
-                   glLoadIdentity();
-                   glMatrixMode(GL_MODELVIEW);
-                   glPushMatrix();
-                   glLoadIdentity();
-
-                   this->fbo.draw(-1, +1, 2, -2);
-
-                   //reset all transforms
-                   glMatrixMode(GL_PROJECTION);
-                   glPopMatrix();
-                   glMatrixMode(GL_MODELVIEW);
-                   glPopMatrix();
-               }

to


                if (!this->mute) {
                    //set the drawing matrices to normalised coordinates
                    ofSetMatrixMode(OF_MATRIX_PROJECTION);
                    ofPushMatrix();
                    ofLoadMatrix(ofMatrix4x4());
                    ofSetMatrixMode(OF_MATRIX_MODELVIEW);
                    ofPushMatrix();
                    ofLoadMatrix(ofMatrix4x4());

                    this->fbo.draw(-1, +1, 2, -2);

                    //reset all transforms
                    ofSetMatrixMode(OF_MATRIX_PROJECTION);
                    ofPopMatrix();
                    ofSetMatrixMode(OF_MATRIX_MODELVIEW);
                    ofPopMatrix();
                }