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

update serializer with new properties

Browse Source
This commit is contained in:
Julien Valentin
2017-09-01 19:13:01 +02:00
parent 9560548722
commit a73c20d7f5
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/osgAnimation/MorphTransformHardware
View File

@@ -22,6 +22,9 @@
#include <osg/Matrix>
#include <osg/Array>
///texture unit reserved for morphtarget TBO
#define MORPHTRANSHW_DEFAULTMORPHTEXTUREUNIT 7
namespace osgAnimation
{
class MorphGeometry;
@@ -39,12 +42,13 @@ namespace osgAnimation
virtual void operator()(MorphGeometry&);
inline void setShader(osg::Shader*s){_shader=s;}
inline osg::Shader * getShader()const{return _shader;}
inline void setShader( osg::Shader*s ) { _shader=s; }
inline const osg::Shader * getShader() const{ return _shader; }
inline osg::Shader * getShader() { return _shader; }
///texture unit reserved for morphtarget TBO default is 7
void setReservedTextureUnit(unsigned int t){_reservedTextureUnit=t;}
unsigned int getReservedTextureUnit() const {return _reservedTextureUnit;}
void setReservedTextureUnit(unsigned int t) { _reservedTextureUnit=t; }
unsigned int getReservedTextureUnit() const { return _reservedTextureUnit;}
protected:

5
include/osgAnimation/RigTransformHardware
View File

@@ -23,6 +23,8 @@
#include <osg/Matrix>
#include <osg/Array>
#define RIGTRANSHW_DEFAULT_FIRST_VERTATTRIB_TARGETTED 11
namespace osgAnimation
{
class RigGeometry;
@@ -48,7 +50,8 @@ namespace osgAnimation
unsigned int getFirstVertexAttributeTarget()const { return _minAttribIndex;}
void setShader(osg::Shader* shader) { _shader = shader; }
osg::Shader* getShader() const { return _shader; }
const osg::Shader* getShader() const { return _shader; }
osg::Shader* getShader() { return _shader; }
osg::Vec4Array* getVertexAttrib(unsigned int index);
unsigned int getNumVertexAttrib() const {return _boneWeightAttribArrays.size();}