FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced the use of osgUtil::TriStripVisitor with ogUtil::MeshOptimizer usage to improve performance.

Browse Source 
Fixed set setColorArray assignement to pass in the color binding
This commit is contained in:
Robert Osfield 2018-04-19 19:36:19 +01:00
parent c9b1c234a6
commit 71583b825f
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgPlugins/obj/ReaderWriterOBJ.cpp
View File

@ -43,6 +43,7 @@
#include <osgDB/FileNameUtils> #include <osgDB/FileNameUtils>
#include <osgUtil/TriStripVisitor> #include <osgUtil/TriStripVisitor>
#include <osgUtil/MeshOptimizers>
#include <osgUtil/SmoothingVisitor> #include <osgUtil/SmoothingVisitor>
#include <osgUtil/Tessellator> #include <osgUtil/Tessellator>
@ -533,8 +534,7 @@ osg::Geometry* ReaderWriterOBJ::convertElementListToGeometry(obj::Model& model,
if (colors) if (colors)
{ {
geometry->setColorArray(colors); geometry->setColorArray(colors, osg::Array::BIND_PER_VERTEX);
geometry->setColorBinding(osg::Geometry::BIND_PER_VERTEX);
} }
if (numPointElements>0) if (numPointElements>0)
@ -654,12 +654,6 @@ osg::Geometry* ReaderWriterOBJ::convertElementListToGeometry(obj::Model& model,
obj::Element& element = *(*itr); obj::Element& element = *(*itr);
if (element.dataType==obj::Element::POLYGON) if (element.dataType==obj::Element::POLYGON)
{ {
#ifdef USE_DRAWARRAYLENGTHS #ifdef USE_DRAWARRAYLENGTHS
drawArrayLengths->push_back(element.vertexIndices.size()); drawArrayLengths->push_back(element.vertexIndices.size());
#else #else
@ -804,8 +798,14 @@ osg::Node* ReaderWriterOBJ::convertModelToSceneGraph(obj::Model& model, ObjOptio
// tri strip polygons to improve graphics peformance // tri strip polygons to improve graphics peformance
if (!localOptions.noTriStripPolygons) if (!localOptions.noTriStripPolygons)
{ {
osgUtil::TriStripVisitor tsv; osgUtil::IndexMeshVisitor imv;
tsv.stripify(*geometry); imv.makeMesh(*geometry);
osgUtil::VertexCacheVisitor vcv;
vcv.optimizeVertices(*geometry);
osgUtil::VertexAccessOrderVisitor vaov;
vaov.optimizeOrder(*geometry);
} }
// if no normals present add them. // if no normals present add them.