Re: [osg-users] Feedback/guidance sought on move of osgQt out into it's own project/repository

[Curtis Rubel]

Hi Mathieu,

One other thing that is also not any sort of priority or
any sort of bug report for you to concern yourself with, but
maybe you know something about it with your work on this
project.

The attached PIC to this reply is what I get when starting
the osgviewerQt example.  You will notice the left larger  window
only contains one model instead of the 4 models that it should
have.  Just was running the example after building it and
it reminded me of seeing this again.

The 4 models show up properly as soon as I touch the window
and resize it.  Minimizing it or covering it up and then uncovering
does not fix it, it needs a resize event to finally show the correct
output, doesn't matter if its sized larger or smaller.

This linux system has QT 5.4.2 installed on it right  now, I want to
say this behavior started with the first version of Qt5 we started
to use after our linux distro finally updated from 4.8.x.

Anyhow, just curious if you have seen this at all with your Qt work
and if this is actually a Qt bug that we have to live with until they fix 
it or its something in the osgQt implementation.

We get the same as I recall when we run this on our development
Mac as well, not sure about windows we don't have the examples built
on that platform right now for me to test it at the moment.

... 

Thank you!

Cheers,
Curtis

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=68985#68985



___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Feedback/guidance sought on move of osgQt out into it's own project/repository

[Curtis Rubel]

Hi Mathieu,

  I did a pull on osg and osgQt just to make sure I had the
latest of both.

  cmake on osgQt completed without error now with both
the default settings and with the examples selected to build.

Just an FYI, when I selected the documentation build in the
cmake-gui...  I got a cmake error...anyhow that is just
so you know about it, its not anything that we need, just
figured I would pass it along to you for your TODO list...

CMake Error: File 
/usr/local/3rdparty/osgQt-git/doc/Doxyfiles/openthreads.doxyfile.cmake does not 
exist.
CMake Error at CMakeLists.txt:888 (CONFIGURE_FILE):
  configure_file Problem configuring file

... 

Thank you for the quick fix(s)...

Cheers,
Curtis

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=68984#68984





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Pragmatic shader composition - bug

[Robert Osfield]

Hi Glenn,

>> Is actually wrong and should be:
>>
>> if (versionLine[versionLine.versionLine.size()-1]!='\n')
>> versionLine.push_back('\n');
>>

I have checked this change into OSG master and OpenSceneGraph-3.4 branch.

Could you let me know if that works fine.

Cheers,
Robert
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Feedback/guidance sought on move of osgQt out into it's own project/repository

[Mathieu MARACHE]

Hi Curtis,

I'll have to try and reproduce on a Linux box on my side. But could you try
to pull current master and check if you can get further ?

--
nǝıɥʇɐƜ

On 12 October 2016 at 17:57, Curtis Rubel  wrote:

> Hi Mathieu,
>
>
> Basically that is exactly what I did and am getting an error.
>
> CMake Error: File /usr/local/3rdparty/osgQt-git/packaging/ld.so.conf.d/
> openscenegraph.conf.in does not exist.
> CMake Error at CMakeLists.txt:971 (CONFIGURE_FILE):
>   configure_file Problem configuring file
>
> The ld.so.conf.d directory does not exist within the packaging
> directory on my system, its actually at: /etc/ld.so.conf.d
>
> Currently ONLY the master branch 3.5.6 of osg is installed
> on my system in its default location of /usr/local/lib64.
>
> Here is my output of the entire process:
>
> amx@ios:/usr/local/3rdparty> cd osgQt-git/
> amx@ios:/usr/local/3rdparty/osgQt-git> mkdir BUILD
> amx@ios:/usr/local/3rdparty/osgQt-git> cd BUILD/
> amx@ios:/usr/local/3rdparty/osgQt-git/BUILD> cmake ..
> -- The C compiler identification is GNU 4.8.3
> -- The CXX compiler identification is GNU 4.8.3
> -- Check for working C compiler: /usr/bin/cc
> -- Check for working C compiler: /usr/bin/cc -- works
> -- Detecting C compiler ABI info
> -- Detecting C compiler ABI info - done
> -- Check for working CXX compiler: /usr/bin/c++
> -- Check for working CXX compiler: /usr/bin/c++ -- works
> -- Detecting CXX compiler ABI info
> -- Detecting CXX compiler ABI info - done
> -- Found osgDB: /usr/local/lib64/libosgDB.so
> -- Found osgGA: /usr/local/lib64/libosgGA.so
> -- Found osgUtil: /usr/local/lib64/libosgUtil.so
> -- Found osgText: /usr/local/lib64/libosgText.so
> -- Found osgViewer: /usr/local/lib64/libosgViewer.so
> -- Found osgWidget: /usr/local/lib64/libosgWidget.so
> -- Found osg: /usr/local/lib64/libosg.so
> -- Found OpenThreads: /usr/local/lib64/libOpenThreads.so
> -- Found OpenSceneGraph: /usr/local/lib64/libosgDB.so;/
> usr/local/lib64/libosgGA.so;/usr/local/lib64/libosgUtil.so;
> /usr/local/lib64/libosgText.so;/usr/local/lib64/
> libosgViewer.so;/usr/local/lib64/libosgWidget.so;/usr/
> local/lib64/libosg.so;/usr/local/lib64/libOpenThreads.so (found suitable
> version "3.5.6", minimum required is "3.5.5")
> -- Looking for include file pthread.h
> -- Looking for include file pthread.h - found
> -- Looking for pthread_create
> -- Looking for pthread_create - not found
> -- Looking for pthread_create in pthreads
> -- Looking for pthread_create in pthreads - not found
> -- Looking for pthread_create in pthread
> -- Looking for pthread_create in pthread - found
> -- Found Threads: TRUE
> -- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so
> -- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so
> - found
> -- Looking for gethostbyname
> -- Looking for gethostbyname - found
> -- Looking for connect
> -- Looking for connect - found
> -- Looking for remove
> -- Looking for remove - found
> -- Looking for shmat
> -- Looking for shmat - found
> -- Looking for IceConnectionNumber in ICE
> -- Looking for IceConnectionNumber in ICE - found
> -- Found X11: /usr/lib64/libX11.so
> -- Found OpenGL: /usr/lib64/libGL.so
>
> The build system is configured to install libraries to /usr/local/lib64
> Your applications may not be able to find your installed libraries unless
> you:
> set your LD_LIBRARY_PATH (user specific) or
> update your ld.so configuration (system wide)
> You have an ld.so.conf.d directory on your system, so if you wish to
> ensure that
> applications find the installed osg libraries, system wide, you could
> install an
> OpenSceneGraph specific ld.so configuration with:
> sudo make install_ld_conf
>
> CMake Error: File /usr/local/3rdparty/osgQt-git/packaging/ld.so.conf.d/
> openscenegraph.conf.in does not exist.
> CMake Error at CMakeLists.txt:971 (CONFIGURE_FILE):
>   configure_file Problem configuring file
>
>
> -- Configuring incomplete, errors occurred!
> See also "/usr/local/3rdparty/osgQt-git/BUILD/CMakeFiles/CMakeOutput.log".
> See also "/usr/local/3rdparty/osgQt-git/BUILD/CMakeFiles/CMakeError.log".
>
>
> I was able to get past this error by running cmake-gui and
> manually setting the build path, then clicked configure again
> and then finally was able to generate the makefile.  After that
> the osgQt project  built and installed ok on my system.
>
> I currently have cmake 3.0.2 installed on my 64bit OpenSuSE
> 13.2 Linux system that I am using  for this initial test in case
> that affects any of this.
>
> Thank you for your quick response..
>
> Cheers,
> Curtis
>
> --
> Read this topic online here:
> http://forum.openscenegraph.org/viewtopic.php?p=68981#68981
>
>
>
>
>
> ___
> osg-users mailing list
> osg-users@lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
>
___
osg-users mailing 

Re: [osg-users] Feedback/guidance sought on move of osgQt out into it's own project/repository

[Curtis Rubel]

Hi Mathieu,


Basically that is exactly what I did and am getting an error.

CMake Error: File 
/usr/local/3rdparty/osgQt-git/packaging/ld.so.conf.d/openscenegraph.conf.in 
does not exist.
CMake Error at CMakeLists.txt:971 (CONFIGURE_FILE):
  configure_file Problem configuring file

The ld.so.conf.d directory does not exist within the packaging
directory on my system, its actually at: /etc/ld.so.conf.d

Currently ONLY the master branch 3.5.6 of osg is installed
on my system in its default location of /usr/local/lib64.

Here is my output of the entire process:

amx@ios:/usr/local/3rdparty> cd osgQt-git/
amx@ios:/usr/local/3rdparty/osgQt-git> mkdir BUILD
amx@ios:/usr/local/3rdparty/osgQt-git> cd BUILD/
amx@ios:/usr/local/3rdparty/osgQt-git/BUILD> cmake ..
-- The C compiler identification is GNU 4.8.3
-- The CXX compiler identification is GNU 4.8.3
-- Check for working C compiler: /usr/bin/cc
-- Check for working C compiler: /usr/bin/cc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++
-- Check for working CXX compiler: /usr/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Found osgDB: /usr/local/lib64/libosgDB.so  
-- Found osgGA: /usr/local/lib64/libosgGA.so  
-- Found osgUtil: /usr/local/lib64/libosgUtil.so  
-- Found osgText: /usr/local/lib64/libosgText.so  
-- Found osgViewer: /usr/local/lib64/libosgViewer.so  
-- Found osgWidget: /usr/local/lib64/libosgWidget.so  
-- Found osg: /usr/local/lib64/libosg.so  
-- Found OpenThreads: /usr/local/lib64/libOpenThreads.so  
-- Found OpenSceneGraph: 
/usr/local/lib64/libosgDB.so;/usr/local/lib64/libosgGA.so;/usr/local/lib64/libosgUtil.so;/usr/local/lib64/libosgText.so;/usr/local/lib64/libosgViewer.so;/usr/local/lib64/libosgWidget.so;/usr/local/lib64/libosg.so;/usr/local/lib64/libOpenThreads.so
 (found suitable version "3.5.6", minimum required is "3.5.5") 
-- Looking for include file pthread.h
-- Looking for include file pthread.h - found
-- Looking for pthread_create
-- Looking for pthread_create - not found
-- Looking for pthread_create in pthreads
-- Looking for pthread_create in pthreads - not found
-- Looking for pthread_create in pthread
-- Looking for pthread_create in pthread - found
-- Found Threads: TRUE  
-- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so
-- Looking for XOpenDisplay in /usr/lib64/libX11.so;/usr/lib64/libXext.so - 
found
-- Looking for gethostbyname
-- Looking for gethostbyname - found
-- Looking for connect
-- Looking for connect - found
-- Looking for remove
-- Looking for remove - found
-- Looking for shmat
-- Looking for shmat - found
-- Looking for IceConnectionNumber in ICE
-- Looking for IceConnectionNumber in ICE - found
-- Found X11: /usr/lib64/libX11.so
-- Found OpenGL: /usr/lib64/libGL.so  

The build system is configured to install libraries to /usr/local/lib64
Your applications may not be able to find your installed libraries unless you:
set your LD_LIBRARY_PATH (user specific) or
update your ld.so configuration (system wide)
You have an ld.so.conf.d directory on your system, so if you wish to ensure that
applications find the installed osg libraries, system wide, you could install an
OpenSceneGraph specific ld.so configuration with:
sudo make install_ld_conf

CMake Error: File 
/usr/local/3rdparty/osgQt-git/packaging/ld.so.conf.d/openscenegraph.conf.in 
does not exist.
CMake Error at CMakeLists.txt:971 (CONFIGURE_FILE):
  configure_file Problem configuring file


-- Configuring incomplete, errors occurred!
See also "/usr/local/3rdparty/osgQt-git/BUILD/CMakeFiles/CMakeOutput.log".
See also "/usr/local/3rdparty/osgQt-git/BUILD/CMakeFiles/CMakeError.log".


I was able to get past this error by running cmake-gui and
manually setting the build path, then clicked configure again 
and then finally was able to generate the makefile.  After that 
the osgQt project  built and installed ok on my system.
   
I currently have cmake 3.0.2 installed on my 64bit OpenSuSE 
13.2 Linux system that I am using  for this initial test in case
that affects any of this.

Thank you for your quick response..

Cheers,
Curtis

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=68981#68981





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Pragmatic shader composition - bug

[Glenn Waldron]

Robert,
Yes, I think you are correct.

Glenn Waldron

On Wed, Oct 12, 2016 at 10:46 AM, Robert Osfield 
wrote:

> HI Glen,
>
> Could it be the line:
>
> if (source[source.size()-1]!='\n') source.push_back('\n');
>
> Is actually wrong and should be:
>
> if (versionLine[versionLine.versionLine.size()-1]!='\n')
> versionLine.push_back('\n');
>
> So rather than adding this, it should replace the original line
> appending the \n to the source line.
>
> Robert.
>
> On 12 October 2016 at 14:57, Glenn Waldron  wrote:
> > Robert,
> > I was trying to use the pragmatic shader comp in OSG 3.4 and ran into the
> > following bug.
> >
> > osg::Shader attempts to extract the "#version" string and insert the new
> > #define statements between the #version line and the rest of the source.
> > However, if the #version line ends in a CRLF combination (\r\n), the LF
> is
> > stripped and never replaced -- this causes the NVIDIA driver to report an
> > illegal version string.
> >
> > I was able to fix it by checking for a LF and appending it if it's
> missing.
> >
> > In Shader::PerContextShader::compileShader, I inserted this line:
> >
> > if ((end_of_line-start_of_line)>=8 && source.compare(start_of_line, 8,
> > "#version")==0)
> > {
> > versionLine = source.substr(start_of_line,
> end_of_line-start_of_line+1);
> > if (versionLine.back() != '\n') versionLine.push_back('\n');//
> FIX
> > BY INSERTING THIS LINE
> > if (source[source.size()-1]!='\n') source.push_back('\n');
> > 
> >
> > Let me know if you think this fix makes sense to put in the master.
> Thanks.
> >
> > Glenn Waldron
> >
> > ___
> > osg-users mailing list
> > osg-users@lists.openscenegraph.org
> > http://lists.openscenegraph.org/listinfo.cgi/osg-users-
> openscenegraph.org
> >
> ___
> osg-users mailing list
> osg-users@lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
>
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Feedback/guidance sought on move of osgQt out into it's own project/repository

[Mathieu MARACHE]

Hi Curtis,

The repository now lies next to osg's :
https://github.com/openscenegraph/osgQt
To be able to compile osgQt you need to have an existing osg installation
beforehand.
I'll try to make change the Readme to explain in better detail.
What I did (macOS with Qt5) :
git clone ...
cd osgQt
mkdir build
cd build
cmake ..
make
:-)


--
nǝıɥʇɐƜ

On 12 October 2016 at 16:25, Curtis Rubel  wrote:

> Hi,
>
>   Just curious how things are proceeding with this process.
>
> I saw Roberts request to test the latest 3.5.6 Master branch with the
> new vertex buffer changes  and would like to try and do that
> but our entire baseline relies heavily on osgQt being present
> to build against.
>
> We are mainly a Linux house, but also have some Windows
> and MacOSX requirements from time to time.
>
> My first attempt to clone out the latest osgQt kit from GitHub
> does not allow me to run cmake on it successfully as
> a standalone project/directory on my system.   I looked around
> a bit and I do not see how to actually get cmake to properly
> setup the project to build with OSG now that its been
> separated.
>
> Can someone point me in the direction to find a set of
> instructions to follow or possibly give me some hints on
> how to get osgQt built against the current 3.5.6 master branch
> of OSG.  I have a little bit of time right now so, any info would
> be greatly appreciated so that we can start to provide back some feedback
> on the latest master branch of OSG as well as this
> new osgQt project.
>
> ...
>
> Thank you!
>
> Cheers,
> Curtis
>
> --
> Read this topic online here:
> http://forum.openscenegraph.org/viewtopic.php?p=68976#68976
>
>
>
>
>
> ___
> osg-users mailing list
> osg-users@lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
>
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Pragmatic shader composition - bug

[Robert Osfield]

HI Glen,

Could it be the line:

if (source[source.size()-1]!='\n') source.push_back('\n');

Is actually wrong and should be:

if (versionLine[versionLine.versionLine.size()-1]!='\n')
versionLine.push_back('\n');

So rather than adding this, it should replace the original line
appending the \n to the source line.

Robert.

On 12 October 2016 at 14:57, Glenn Waldron  wrote:
> Robert,
> I was trying to use the pragmatic shader comp in OSG 3.4 and ran into the
> following bug.
>
> osg::Shader attempts to extract the "#version" string and insert the new
> #define statements between the #version line and the rest of the source.
> However, if the #version line ends in a CRLF combination (\r\n), the LF is
> stripped and never replaced -- this causes the NVIDIA driver to report an
> illegal version string.
>
> I was able to fix it by checking for a LF and appending it if it's missing.
>
> In Shader::PerContextShader::compileShader, I inserted this line:
>
> if ((end_of_line-start_of_line)>=8 && source.compare(start_of_line, 8,
> "#version")==0)
> {
> versionLine = source.substr(start_of_line, end_of_line-start_of_line+1);
> if (versionLine.back() != '\n') versionLine.push_back('\n');// FIX
> BY INSERTING THIS LINE
> if (source[source.size()-1]!='\n') source.push_back('\n');
> 
>
> Let me know if you think this fix makes sense to put in the master. Thanks.
>
> Glenn Waldron
>
> ___
> osg-users mailing list
> osg-users@lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org
>
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] Feedback/guidance sought on move of osgQt out into it's own project/repository

[Curtis Rubel]

Hi,

  Just curious how things are proceeding with this process.

I saw Roberts request to test the latest 3.5.6 Master branch with the
new vertex buffer changes  and would like to try and do that
but our entire baseline relies heavily on osgQt being present
to build against.

We are mainly a Linux house, but also have some Windows
and MacOSX requirements from time to time.

My first attempt to clone out the latest osgQt kit from GitHub
does not allow me to run cmake on it successfully as
a standalone project/directory on my system.   I looked around
a bit and I do not see how to actually get cmake to properly
setup the project to build with OSG now that its been
separated.

Can someone point me in the direction to find a set of
instructions to follow or possibly give me some hints on
how to get osgQt built against the current 3.5.6 master branch
of OSG.  I have a little bit of time right now so, any info would 
be greatly appreciated so that we can start to provide back some feedback on 
the latest master branch of OSG as well as this 
new osgQt project.

... 

Thank you!

Cheers,
Curtis

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=68976#68976





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

[osg-users] Pragmatic shader composition - bug

[Glenn Waldron]

Robert,
I was trying to use the pragmatic shader comp in OSG 3.4 and ran into the
following bug.

osg::Shader attempts to extract the "#version" string and insert the new
#define statements between the #version line and the rest of the source.
However, if the #version line ends in a CRLF combination (\r\n), the LF is
stripped and never replaced -- this causes the NVIDIA driver to report an
illegal version string.

I was able to fix it by checking for a LF and appending it if it's missing.

In Shader::PerContextShader::compileShader, I inserted this line:

if ((end_of_line-start_of_line)>=8 && source.compare(start_of_line, 8,
"#version")==0)
{
versionLine = source.substr(start_of_line, end_of_line-start_of_line+1);
if (versionLine.back() != '\n') versionLine.push_back('\n');// FIX
BY INSERTING THIS LINE
if (source[source.size()-1]!='\n') source.push_back('\n');


Let me know if you think this fix makes sense to put in the master. Thanks.

Glenn Waldron
___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

Re: [osg-users] blending with shader

[Gianni Ambrosio]

Thanks for the explanations.

d_a_heitbrink wrote:
> 
> As per the inout, this states the parameter into the function is both an 
> input and an output. I set the version for my shader to something like 4.5 in 
> compatibility mode. The function was called last in my shader.
> 

I was just asking how do you get the value of color parameter passed to the 
function not the meaning of "inout" (I already read that from documentation ;))

Regards,
Gianni

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=68969#68969





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

[osg-users] Crash using current OSG master with collada dom 2.4.0

[Torben Dannhauer]

Hi,

I compiled current master OSG with collada dom 2.4.0.
It compiled and linked fine.

However, as soon as I try to load a collada file (diningroom.dae), it crashes 
with a NULL Ptr Access in >   
osg145-osgDBd.dll!osgDB::Registry::ReadNodeFunctor::doRead(osgDB::ReaderWriter 
& rw={...}) line 954 

Are there any known bugs in this area atm?

Thank you!

Cheers,
Torben

--
Read this topic online here:
http://forum.openscenegraph.org/viewtopic.php?p=68968#68968





___
osg-users mailing list
osg-users@lists.openscenegraph.org
http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org

[osg-users] vertex_array_object branch merged with master

[Robert Osfield]

Hi All,

This morning I have merged the vertex_array_branch with master, this
adds support for OpenGL vertex array objects to the OSG.  Pushing out
this functionality to the whole OSG has been quite a bit of work, with
quite a few parts of the OSG having to be rewritten.  The merge below
illustrates the file changes, added and removed.

This is the large major feature to be completed for the next stable
release OSG-3.6, but being a big one will need widespread testing out
in the community.  First pass will be does everything compile and run
with defaults (without VAO enabled).  The next pass will be to enable
VAO by setting the env var OSG_VERTEX_BUFFER_HINT to
VERTEX_ARRAY_OBJECT (or VAO)

I'll provide more details as this thread evolves.

Robert.

$ git merge vertex_array_object
Updating d51036f..0314fd5
Fast-forward
 CMakeLists.txt|3 +
 examples/CMakeLists.txt   |1 +
 examples/osggpucull/ShapeToGeometry.cpp   | 1131
+-
 examples/osggpucull/ShapeToGeometry.h |   70 --
 examples/osggpucull/osggpucull.cpp|2 +-
 examples/osgimpostor/CMakeLists.txt   |8 +
 examples/osgimpostor/TestManipulator.cpp  |  292
+++
 examples/osgimpostor/TestManipulator.h|  103 
 examples/osgimpostor/osgimpostor.cpp  |  171
+
 examples/osgparticle/osgparticle.cpp  |   63 +++--
 examples/osgparticleshader/osgparticleshader.cpp  |   75 +++---
 examples/osgsharedarray/osgsharedarray.cpp|4 +
 examples/osgspheresegment/osgspheresegment.cpp|   50 
 examples/osgtext/osgtext.cpp  |   14 +-
 include/osg/Array |5 +-
 include/osg/{ArrayDispatchers => AttributeDispatchers}|   58 ++---
 include/osg/DisplaySettings   |   13 +
 include/osg/Drawable  |  121 ++
 include/osg/GLBeginEndAdapter |  174
--
 include/osg/GLDefines |8 +-
 include/osg/GLExtensions  |   70 +-
 include/osg/Geometry  |9 +-
 include/osg/Shape |  189
+--
 include/osg/ShapeDrawable |  139
+--
 include/osg/State |  926
++
 include/osg/Texture   |4 +-
 include/osg/Vec4ub|   20 +-
 include/osg/VertexArrayState  |  265

 include/osgParticle/ConstantRateCounter   |9 +
 include/osgParticle/Counter   |4 +
 include/osgParticle/Emitter   |8 +
 include/osgParticle/Particle  |   72 +-
 include/osgParticle/ParticleProcessor |7 +-
 include/osgParticle/ParticleSystem|   82 ---
 include/osgParticle/VariableRateCounter   |2 +
 include/osgSim/ImpostorSprite |   48 +---
 include/osgSim/SphereSegment  |  111 +++--
 include/osgTerrain/GeometryPool   |3 +
 include/osgText/Text  |1 +
 include/osgText/TextBase  |5 +
 include/osgUtil/IncrementalCompileOperation   |2 +-
 src/osg/{ArrayDispatchers.cpp => AttributeDispatchers.cpp}|   94 +---
 src/osg/BufferObject.cpp  |   18 +-
 src/osg/CMakeLists.txt|8 +-
 src/osg/DisplaySettings.cpp   |   30 +++
 src/osg/Drawable.cpp  |  206

 src/osg/GLBeginEndAdapter.cpp |  306

 src/osg/GLExtensions.cpp  |   85 ++-
 src/osg/Geometry.cpp  |  182
+-
 src/osg/PrimitiveSet.cpp  |   18 +-
 src/osg/Shape.cpp | 1055
+++-
 src/osg/ShapeDrawable.cpp