From: Johannes B. <jb...@us...> - 2011-10-12 08:57:26
|
Update of /cvsroot/opensg/OpenSG/Source/System/NodeCores/Drawables/Geometry In directory vz-cvs-4.sog:/tmp/cvs-serv9572 Modified Files: OSGGeoFunctions.cpp Log Message: changed resulting order for primitive types in createOptimizedPrimitives Index: OSGGeoFunctions.cpp =================================================================== RCS file: /cvsroot/opensg/OpenSG/Source/System/NodeCores/Drawables/Geometry/OSGGeoFunctions.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** OSGGeoFunctions.cpp 20 Jul 2011 14:16:13 -0000 1.74 --- OSGGeoFunctions.cpp 12 Oct 2011 08:57:24 -0000 1.75 *************** *** 2843,2847 **** std::vector<std::vector<UInt32> > primIndex(numPrimitives); ! const Int32 typeVec[] = { GL_TRIANGLES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN }; const Int32 typeN = sizeof(typeVec) / sizeof(Int32); --- 2843,2849 ---- std::vector<std::vector<UInt32> > primIndex(numPrimitives); ! ! //const Int32 typeVec[] = { GL_TRIANGLES, GL_TRIANGLE_STRIP, GL_TRIANGLE_FAN }; ! const Int32 typeVec[] = { GL_TRIANGLE_FAN, GL_TRIANGLE_STRIP, GL_TRIANGLES }; const Int32 typeN = sizeof(typeVec) / sizeof(Int32); |