canurabus / openscenegraph-gles2

OpenSceneGraph fork with some small changes to make it more OpenGLES2 / Playbook friendly
Other
7 stars 5 forks source link

Just a comment.. #1

Open wrabbit-revisited opened 11 years ago

wrabbit-revisited commented 11 years ago

Did a diff against rev 13084 (I'm not absolutely certain this is the correct rev.. but it seems close) and found the following diffs:

include/osg/State(1574)

                #ifndef OSG_GLES2_AVAILABLE
                // playbook
                // with opengl es 2, GL_TEXTURE_2D is always enabled
                // so trying to enable it explicitly causes errors
                if (enabled) glEnable(mode);
                else glDisable(mode);
                #endif

src/osg/State.cpp (903)

    // playbook
     #ifdef OSG_GLES2_AVAILABLE
        _glMaxTextureCoords = 1;
     #else
        glGetIntegerv(GL_MAX_TEXTURE_COORDS,&_glMaxTextureCoords);
     #endif

     OSG_NOTICE << "Info: GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS: " << _glMaxTextureUnits << ", GL_MAX_TEXTURE_COORDS: " << _glMaxTextureCoords << std::endl;

There are a few other diffs, mainly in src/osgPlugins.

canurabus commented 11 years ago

Hey. It's a bit unclear to me what this comment is regarding... could you clarify? The OSG_NOTICE in State.cpp is just some debug stuff that can be discarded.

wrabbit-revisited commented 11 years ago

hi.. I was curious what changes you made to adapt the code and thought someone else could benefit from the brief foray since they might want to move your changes to a later version of the trunk. Perhaps you cover it.. a brief mention of the source revision you modified in the readme might help.


From: Preet Desai notifications@github.com To: canurabus/openscenegraph-gles2 openscenegraph-gles2@noreply.github.com Cc: wrabbit-revisited david_aiken@yahoo.com Sent: Wednesday, November 7, 2012 5:04:45 PM Subject: Re: [openscenegraph-gles2] Just a comment.. (#1)

Hey. It's a bit unclear to me what this comment is regarding... could you clarify? The OSG_NOTICE in State.cpp is just some debug stuff that can be discarded. — Reply to this email directly or view it on GitHub.

canurabus commented 11 years ago

I'm not really sure why I scrubbed the old git history and pushed my fork as a brand new project (really stupid of me), but I don't have the last commit anymore. The last official push is probably one of the June commits here: https://github.com/openscenegraph/osg/commits/master?page=3

I don't think I did too much outside of the major change you noted... other changes were all platform-specific. I changed CMakeLists/CMakeModules to force using mutexes and instal pthreads. There's a trivial change in osgViewer/GraphicsWindow to fix a compile error I had (see line 242 in include/osgViewer/GraphicsWindow).

Any other changes were also likely done to support the specific compiler I was using. I'll try and re apply my changes to the latest openscenegraph sometime in the near future and update this repo accordingly (and preserve the history!) but I can't give you an exact date.

wrabbit-revisited commented 11 years ago

It's not a problem for me, Preet.. just thought it might help someone coming along later. Thanks for your help!


From: Preet Desai notifications@github.com To: canurabus/openscenegraph-gles2 openscenegraph-gles2@noreply.github.com Cc: wrabbit-revisited david_aiken@yahoo.com Sent: Wednesday, November 7, 2012 7:29:30 PM Subject: Re: [openscenegraph-gles2] Just a comment.. (#1)

I'm not really sure why I scrubbed the old git history and pushed my fork as a brand new project (really stupid of me), but I don't have the last commit anymore. The last official push is probably one of the June commits here: https://github.com/openscenegraph/osg/commits/master?page=3 I don't think I did too much outside of the major change you noted... other changes were all platform-specific. I changed CMakeLists/CMakeModules to force using mutexes and instal pthreads. There's a trivial change in osgViewer/GraphicsWindow to fix a compile error I had (see line 242 in include/osgViewer/GraphicsWindow). Any other changes were also likely done to support the specific compiler I was using. I'll try and re apply my changes to the latest openscenegraph sometime in the near future and update this repo accordingly (and preserve the history!) but I can't give you an exact date. — Reply to this email directly or view it on GitHub.