Hi Richard, Sorry for the slow review of these changes, jikes almost a year now... better later than never I hope :-)
I've merged your changes to the glsl plugin and the addition of the Registry/ShareStateManage::releaseGLObjects(). In both cases I had to amend the indentation style as it was out of step with the rest of the OSG. I haven't merged the cache plugin as I couldn't get my head around how you'd plan to use it, or how it worked. It's seem like a very niche feature too and easy to keep local to your own app without problem so shouldn't be an issue for you not having it merged. The changes for uniform names are required as we now have a lookup scheme integrated into osg::Uniform. This scheme is light weight and thread safe, two weakness that caused me to initially put this submission on hold back in January last year when I first reviewed it. I haven't merged the SharedStateManager::isSharedTexture(..) changes as svn/trunk now has a isShared(Texture*) method that doesn't quite overlap that of isSharedTexture(), but with the naming there is potential for confusion. isSharedTexture() also overlaps with isShared(StateSet*), so again I'm a bit confused when isShared(StateSet*) would be called vs isSharedTexture(). Given this confusion I didn't think it'd be appropriate to merge without further discussion. Thanks for your patience ;-) Robert. On Fri, Dec 18, 2009 at 10:33 AM, Schmidt, Richard <[email protected]> wrote: > Here are some of our changes which accumulated over the year. > > > > The following features were added: > > > > * the glsl plugin now supports processing #includes. The file extension sets > the shader type. > > * a cache plugin has been added which supports adding objects to the > registry cache. > > * the sharedstatemanager now supports sharing of textures as well. > > * the registry releases gl objects of the shared state manager > > * lookup for uniform names now takes constant time, which makes rendering of > scenes with large amounts of uniforms with the same name faster. > > > > I hope at least some of these features are worth being added to the trunk. J > > > > merry christmas, > > Richard > > > > Richard Schmidt > > System Designer > EADS, Defence & Security, System Design Center > > > > 88090 Friedrichshafen, Germany > + 49 (7545) 8-2553 > > > > EADS Deutschland GmbH > Registered Office: Ottobrunn, District Court of Munich HRB 107648 > Chairman of the Supervisory Board: Thomas Enders > Managing Directors: Dr. Stefan Zoller (Chairman), Dr. Christoph Hoppe > > > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
