From 7fde576dd94aa73c446e75366e13163ee97523df Mon Sep 17 00:00:00 2001 From: Jason Hooks Date: Sat, 7 Jan 2012 23:21:19 -0500 Subject: [PATCH] actor physics again --- apps/openmw/mwclass/creature.cpp | 2 +- apps/openmw/mwclass/npc.cpp | 2 +- apps/openmw/mwrender/npcanimation.cpp | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp index 9b7ea192c..5aa203a49 100644 --- a/apps/openmw/mwclass/creature.cpp +++ b/apps/openmw/mwclass/creature.cpp @@ -47,7 +47,7 @@ namespace MWClass const std::string &model = ref->base->model; assert (ref->base != NULL); if(!model.empty()){ - physics.insertObjectPhysics(ptr, "meshes\\" + model); + physics.insertActorPhysics(ptr, "meshes\\" + model); } } diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp index 03c96a4ac..acb0a5a35 100644 --- a/apps/openmw/mwclass/npc.cpp +++ b/apps/openmw/mwclass/npc.cpp @@ -53,7 +53,7 @@ namespace MWClass std::string smodel = "meshes\\base_anim.nif"; if(beast) smodel = "meshes\\base_animkna.nif"; - physics.insertObjectPhysics(ptr, smodel); + physics.insertActorPhysics(ptr, smodel); } diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index c98ddc37d..f8755bc9f 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -224,6 +224,18 @@ void NpcAnimation::insertFreePart(const std::string &mesh, const std::string suf NIFLoader::load(meshNumbered); Ogre::Entity* ent = mRend.getScene()->createEntity(meshNumbered); + + /*MaterialPtr material = ent->getSubEntity(0)->getMaterial(); + material->removeAllTechniques(); + + Ogre::Technique* tech = material->createTechnique(); + + Pass* pass2 = tech->createPass(); + pass2->setVertexProgram("Ogre/HardwareSkinningTwoWeights"); + pass2->setColourWriteEnabled(false); + //tech->setSchemeName("blahblah");*/ + + insert->attachObject(ent); entityparts.push_back(ent); shapes = ((NIFLoader::getSingletonPtr())->getShapes(mesh + "0000" + suffix));