search

openFrameworks-RaspberryPi / openFrameworks

This repo has migrated into the openFramworks core! Please go to http://github.com/openFrameworks/openFrameworks for the latest!
http://github.com/openFrameworks/openFrameworks
Other
104 stars 11 forks source link

merge Develop #73

Closed bakercp closed 11 years ago

danzeeeman commented 11 years ago

checking it out now.

On Fri, Dec 7, 2012 at 8:43 PM, Christopher Baker notifications@github.comwrote:

git pull https://github.com/openframeworks/openFrameworks develop

"I believe in science. Unlike mathematical theorems, scientific results can't be proved. They can only be tested again and again, until only a fool would not believe them.

I cannot prove that electrons exist, but I believe fervently in their existence. And if you don't believe in them, I have a high voltage cattle prod I'm willing to apply as an argument on their behalf. Electrons speak for themselves."

-- Seth Lloyd: Quantum Mechanical Engineer, MIT

/.

bakercp commented 11 years ago

there is a conflict in ofCamera -- looking into it.

danzeeeman commented 11 years ago

same.

   ofSetMatrixMode(OF_MATRIX_PROJECTION);
    ofLoadIdentityMatrix();

    if(isOrtho) {
            ofMatrix4x4 ortho;
            ortho.makeOrthoMatrix(0, viewport.width, 0,

viewport.height, nearClip, farClip); ofLoadMatrix( ortho ); } else { <<<<<<< HEAD ofMatrix4x4 persp; persp.makePerspectiveMatrix( fov, viewport.width/viewport.height, nearClip, farClip );

ofLoadMatrix( persp );

            ofLoadMatrix( this->getProjectionMatrix() );

786a8d381aece3e638ebcd2ee08a784071d5cd40 }

On Fri, Dec 7, 2012 at 8:54 PM, Christopher Baker notifications@github.comwrote:

there is a conflict in ofCamera -- looking into it.

— Reply to this email directly or view it on GitHubhttps://github.com/openFrameworks-RaspberryPi/openFrameworks/pull/73#issuecomment-11153536.

"I believe in science. Unlike mathematical theorems, scientific results can't be proved. They can only be tested again and again, until only a fool would not believe them.

I cannot prove that electrons exist, but I believe fervently in their existence. And if you don't believe in them, I have a high voltage cattle prod I'm willing to apply as an argument on their behalf. Electrons speak for themselves."

-- Seth Lloyd: Quantum Mechanical Engineer, MIT

/.

bakercp commented 11 years ago

Develop is actually behind us on this one :)

bakercp commented 11 years ago

I'll fix it and merge it in a few minutes.

danzeeeman commented 11 years ago

word I'm hanging out in freenode

On Fri, Dec 7, 2012 at 9:03 PM, Christopher Baker notifications@github.comwrote:

I'll fix it and merge it in a few minutes.

— Reply to this email directly or view it on GitHubhttps://github.com/openFrameworks-RaspberryPi/openFrameworks/pull/73#issuecomment-11153628.

"I believe in science. Unlike mathematical theorems, scientific results can't be proved. They can only be tested again and again, until only a fool would not believe them.

I cannot prove that electrons exist, but I believe fervently in their existence. And if you don't believe in them, I have a high voltage cattle prod I'm willing to apply as an argument on their behalf. Electrons speak for themselves."

-- Seth Lloyd: Quantum Mechanical Engineer, MIT

/.