db4d58b01d
Bone now inherit from MatrixTransform. It simplify a lot the update of Bone matrix. It helps to have the bone system more generic. eg it's now possible to have animation data with precomputed bind matrix. The other benefit, is now the collada plugin will be able to use osgAnimation to display skinned mesh. Michael Plating did a great work to improve this aspect, he is working on the collada plugin and should be able to submit a new version soon. The RigGeometry has been refactored so now it works when you save and reload RigGeometry because the source is not touched anymore. The benefit with this update is that it should be now possible to use a MorphGeometry as source for a RigGeometry. The bad news is that the format has changed, so i have rebuild osg-data related to osgAnimation data, updated the blender exporter to export to the new format. The fbx plugin could be touched about this commit, i dont compile it so i can't give more information about it. The bvh plugin has been updated by Wang rui so this one is fixed with the new code of osgAnimation. The examples has been updated to work with the new code too... The example osg-data/example.osg should be remove, it's an old example that does not work. For people using blender the blender exporter up to date is here: http://hg.plopbyte.net/osgexport2/ it will be merge to http://hg.plopbyte.net/osgexport/ as soon as the modification will be push in the trunk. "
57 lines
2.1 KiB
C++
57 lines
2.1 KiB
C++
/* -*-c++-*-
|
|
* Copyright (C) 2009 Cedric Pinson <cedric.pinson@plopbyte.net>
|
|
*
|
|
* This library is open source and may be redistributed and/or modified under
|
|
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
|
|
* (at your option) any later version. The full license is in LICENSE file
|
|
* included with this distribution, and on the openscenegraph.org website.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* OpenSceneGraph Public License for more details.
|
|
*/
|
|
|
|
#include <osgAnimation/StackedScaleElement>
|
|
|
|
using namespace osgAnimation;
|
|
|
|
StackedScaleElement::StackedScaleElement(const std::string& name, const osg::Vec3& scale) : _scale(scale) { setName(name); }
|
|
StackedScaleElement::StackedScaleElement(const osg::Vec3& scale) : _scale(scale) { setName("scale"); }
|
|
|
|
StackedScaleElement::StackedScaleElement(const StackedScaleElement& rhs, const osg::CopyOp&) : StackedTransformElement(rhs), _scale(rhs._scale)
|
|
{
|
|
if (rhs._target.valid())
|
|
_target = new Vec3Target(*rhs._target);
|
|
}
|
|
|
|
const osg::Vec3& StackedScaleElement::getScale() const { return _scale; }
|
|
void StackedScaleElement::setScale(const osg::Vec3& scale) { _scale = scale; }
|
|
|
|
Target* StackedScaleElement::getTarget() {return _target.get();}
|
|
const Target* StackedScaleElement::getTarget() const {return _target.get();}
|
|
|
|
bool StackedScaleElement::isIdentity() const { return (_scale.x() == 1 && _scale.y() == 1 && _scale.z() == 1); }
|
|
|
|
osg::Matrix StackedScaleElement::getAsMatrix() const { return osg::Matrix::scale(_scale); }
|
|
|
|
void StackedScaleElement::applyToMatrix(osg::Matrix& matrix) const { matrix.preMultScale(_scale); }
|
|
|
|
StackedScaleElement::StackedScaleElement()
|
|
{
|
|
_scale = osg::Vec3(1,1,1);
|
|
}
|
|
|
|
void StackedScaleElement::update()
|
|
{
|
|
if (_target.valid())
|
|
_scale = _target->getValue();
|
|
}
|
|
|
|
Target* StackedScaleElement::getOrCreateTarget()
|
|
{
|
|
if (!_target.valid())
|
|
_target = new Vec3Target(_scale);
|
|
return _target.get();
|
|
}
|