AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-26 22:45:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
scrawl 2016-03-11 19:18:51 +01:00
parent 9f03982e0b
commit 1abb77f8a1
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/sceneutil/riggeometry.cpp
View File

@ -94,33 +94,16 @@ void RigGeometry::setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeometry)
if (from.getStateSet()) if (from.getStateSet())
setStateSet(from.getStateSet()); setStateSet(from.getStateSet());
// copy over primitive sets. // shallow copy primitive sets & vertex attributes that we will not modify
getPrimitiveSetList() = from.getPrimitiveSetList(); getPrimitiveSetList() = from.getPrimitiveSetList();
if (from.getColorArray())
setColorArray(from.getColorArray()); setColorArray(from.getColorArray());
if (from.getSecondaryColorArray())
setSecondaryColorArray(from.getSecondaryColorArray()); setSecondaryColorArray(from.getSecondaryColorArray());
if (from.getFogCoordArray())
setFogCoordArray(from.getFogCoordArray()); setFogCoordArray(from.getFogCoordArray());
setTexCoordArrayList(from.getTexCoordArrayList());
setVertexAttribArrayList(from.getVertexAttribArrayList());
for(unsigned int ti=0;ti<from.getNumTexCoordArrays();++ti) // vertices and normals are modified every frame, so we need to deep copy them.
{ // assign a dedicated VBO to make sure that modifications don't interfere with source geometry's VBO.
if (from.getTexCoordArray(ti))
setTexCoordArray(ti,from.getTexCoordArray(ti));
}
osg::Geometry::ArrayList& arrayList = from.getVertexAttribArrayList();
for(unsigned int vi=0;vi< arrayList.size();++vi)
{
osg::Array* array = arrayList[vi].get();
if (array)
setVertexAttribArray(vi,array);
}
osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject); osg::ref_ptr<osg::VertexBufferObject> vbo (new osg::VertexBufferObject);
vbo->setUsage(GL_DYNAMIC_DRAW_ARB); vbo->setUsage(GL_DYNAMIC_DRAW_ARB);

2
components/sceneutil/riggeometry.hpp
View File

@ -36,6 +36,8 @@ namespace SceneUtil
void setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap); void setInfluenceMap(osg::ref_ptr<InfluenceMap> influenceMap);
/// Initialize this geometry from the source geometry.
/// @note The source geometry will not be modified.
void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom); void setSourceGeometry(osg::ref_ptr<osg::Geometry> sourceGeom);
// Called automatically by our CullCallback // Called automatically by our CullCallback