krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Turning off hardware skinning2

Browse source
This commit is contained in:
Jason Hooks 2012-01-04 20:30:06 -05:00
parent 1d2e77d947
commit 45c57721ff
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwrender/animation.cpp
View file

@ -412,8 +412,8 @@ namespace MWRender{
bone->setOrientation(r); bone->setOrientation(r);
if(iter == transformations->begin()){ if(iter == transformations->begin()){
trans = bone->_getDerivedPosition(); trans = bone->getPosition();
rotate = bone->_getDerivedOrientation(); rotate = bone->getOrientation();
} }
skel->getManualBonesDirty(); skel->getManualBonesDirty();
skel->_updateTransforms(); skel->_updateTransforms();

2
apps/openmw/mwrender/npcanimation.cpp
View file

@ -266,7 +266,7 @@ void NpcAnimation::runAnimation(float timepassed){
Ogre::Quaternion boneQuat = rotate; Ogre::Quaternion boneQuat = rotate;
Ogre::Vector3 boneTrans = trans; Ogre::Vector3 boneTrans = trans;
mEnvironment.mWorld->setObjectPhysicsPosition(insert->getName(), boneTrans + insert->getPosition()); mEnvironment.mWorld->setObjectPhysicsPosition(insert->getName(), boneTrans + insert->getPosition());
mEnvironment.mWorld->setObjectPhysicsRotation(insert->getName(), boneQuat * insert->getOrientation()); //mEnvironment.mWorld->setObjectPhysicsRotation(insert->getName(), boneQuat * insert->getOrientation());
}*/ }*/
// handleAnimationTransforms(base); // handleAnimationTransforms(base);

3
components/nifogre/ogre_nif_loader.cpp
View file

@ -217,6 +217,7 @@ void NIFLoader::createMaterial(const String &name,
// will automatically be loaded when needed. If not (such as for // will automatically be loaded when needed. If not (such as for
// internal NIF textures that we might support later), we should // internal NIF textures that we might support later), we should
// already have inserted a manual loader for the texture. // already have inserted a manual loader for the texture.
/*
if(!mSkel.isNull()){ if(!mSkel.isNull()){
material->removeAllTechniques(); material->removeAllTechniques();
@ -224,7 +225,7 @@ void NIFLoader::createMaterial(const String &name,
//tech->setSchemeName("blahblah"); //tech->setSchemeName("blahblah");
Pass* pass = tech->createPass(); Pass* pass = tech->createPass();
pass->setVertexProgram("Ogre/HardwareSkinningFourWeights"); pass->setVertexProgram("Ogre/HardwareSkinningFourWeights");
} }*/
if (!texName.empty()) if (!texName.empty())
{ {
Pass *pass = material->getTechnique(0)->getPass(0); Pass *pass = material->getTechnique(0)->getPass(0);