Updated index.html with dependacy info about the new osgText library.
Modified osg/Drawable::draw(..) so that it uses display list COMPILE rather than COMPILE_AND_EXECUTE to solve performance problems under NVidia drivers. The old behavior is still available by comments out a #define. Fixed the default compilation list src/osgPlugins/Makefile so that it compiles by defalt png and gif.
This commit is contained in:
@@ -22,7 +22,13 @@ class Vec2;
|
||||
class Vec3;
|
||||
class Vec4;
|
||||
|
||||
// this is define to alter the way display lists are compiled inside the
|
||||
// the draw method, it has been found that the NVidia drivers fail completely
|
||||
// to optimize COMPILE_AND_EXECUTE in fact make it go slower than for no display
|
||||
// lists, but optimize a seperate COMPILE very well?! Define it as default
|
||||
// the use of a sperate COMPILE, then glCallList rather than use COMPILE_AND_EXECUTE.
|
||||
|
||||
#define USE_SEPERATE_COMPILE_AND_EXECUTE
|
||||
|
||||
/** Pure virtual base class for drawable Geometry. Contains no drawing primitives
|
||||
directly, these are provided by subclasses such as GeoSet. State attributes
|
||||
@@ -232,10 +238,19 @@ inline void Drawable::draw(State& state)
|
||||
}
|
||||
else if (_useDisplayList)
|
||||
{
|
||||
#ifdef USE_SEPERATE_COMPILE_AND_EXECUTE
|
||||
globj = glGenLists( 1 );
|
||||
glNewList( globj, GL_COMPILE );
|
||||
drawImmediateMode(state);
|
||||
glEndList();
|
||||
|
||||
glCallList( globj);
|
||||
#else
|
||||
globj = glGenLists( 1 );
|
||||
glNewList( globj, GL_COMPILE_AND_EXECUTE );
|
||||
drawImmediateMode(state);
|
||||
glEndList();
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
29
index.html
29
index.html
@@ -226,6 +226,35 @@ CodeWarroir's</tt> Make/Workspace files for Mac.
|
||||
<br>
|
||||
<hr WIDTH="100%">
|
||||
<h3>
|
||||
<a NAME="Scene graph dependencies"></a><u>Scene graph dependencies</u></h3>
|
||||
Currently the only dependancy of the core scene graph libraries (osg,osgUtil
|
||||
and osgDB) is Standard C++ and OpenGL. The osgText library, osgGLUT and osgWX
|
||||
have the following dependancies, these arn't core libraries so arn't needed
|
||||
to be compiled unless you need that feature. The demos do however require
|
||||
osgGLUT so its likely that you will typically need it when trying out the osg.
|
||||
The osgtext and wxsgv demos add osgText and osgWX dependancies as well, you
|
||||
only need to compile them if you need to a demo of those features.
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
src/osgText</li>
|
||||
|
||||
<br>The osgText library supports true type fonts via the freetype library :
|
||||
<ul><i><a href="http://www.freetype.org/">http://www.freetype.org/</a></i>
|
||||
</ul>
|
||||
|
||||
<li>
|
||||
src/osgGLUT</li>
|
||||
|
||||
<br>The osgGLUT library depends upon, you guessed it, glut :
|
||||
<ul><i><a href="http://www.opengl.org/developers/documentation/glut/index.html">http://www.opengl.org/developers/documentation/glut/index.html</a></i>
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
<br>
|
||||
<br>
|
||||
<hr WIDTH="100%">
|
||||
<h3>
|
||||
<a NAME="Plug-in dependencies"></a><u>Plug-in dependencies</u></h3>
|
||||
Follows is the list of depedencies which some of the osgPlugins require,
|
||||
note the core osg and viewer do not need the following dependencies, you
|
||||
|
||||
@@ -2,8 +2,7 @@
|
||||
SHELL=/bin/sh
|
||||
|
||||
#DIRS = osg rgb lib3ds flt pfb obj lwo dw bmp pic png jpeg tga tiff gif osgtgz tgz zip
|
||||
DIRS = osg rgb lib3ds flt obj lwo dw bmp pic jpeg tga tiff osgtgz tgz zip
|
||||
|
||||
DIRS = osg rgb lib3ds flt obj lwo dw bmp pic png jpeg tga tiff gif osgtgz tgz zip
|
||||
all :
|
||||
for f in $(DIRS) ; do cd $$f; $(MAKE) || exit 1; cd ..; done
|
||||
|
||||
|
||||
Reference in New Issue
Block a user