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

Group add function;Greaves

Browse source
This commit is contained in:
Jason Hooks 2012-04-14 18:58:52 -04:00
parent 5d4ad4cd81
commit e5becb1f50
2 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ NpcAnimation::~NpcAnimation(){
NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env,OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv): Animation(_env,_rend), mStateID(-1), inv(_inv), timeToChange(0), NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env,OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv): Animation(_env,_rend), mStateID(-1), inv(_inv), timeToChange(0),
robe(inv.getSlot(MWWorld::InventoryStore::Slot_Robe)), helmet(inv.getSlot(MWWorld::InventoryStore::Slot_Helmet)), shirt(inv.getSlot(MWWorld::InventoryStore::Slot_Shirt)), robe(inv.getSlot(MWWorld::InventoryStore::Slot_Robe)), helmet(inv.getSlot(MWWorld::InventoryStore::Slot_Helmet)), shirt(inv.getSlot(MWWorld::InventoryStore::Slot_Shirt)),
cuirass(inv.getSlot(MWWorld::InventoryStore::Slot_Cuirass)), cuirass(inv.getSlot(MWWorld::InventoryStore::Slot_Cuirass)), greaves(inv.getSlot(MWWorld::InventoryStore::Slot_Greaves)),
lclavicle(0), lclavicle(0),
rclavicle(0), rclavicle(0),
rupperArm(0), rupperArm(0),
@ -79,7 +79,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env,O
bodyRaceID = headID.substr(0, headID.find_last_of("head_") - 4); bodyRaceID = headID.substr(0, headID.find_last_of("head_") - 4);
char secondtolast = bodyRaceID.at(bodyRaceID.length() - 2); char secondtolast = bodyRaceID.at(bodyRaceID.length() - 2);
bool female = tolower(secondtolast) == 'f'; isFemale = tolower(secondtolast) == 'f';
std::transform(bodyRaceID.begin(), bodyRaceID.end(), bodyRaceID.begin(), ::tolower); std::transform(bodyRaceID.begin(), bodyRaceID.end(), bodyRaceID.begin(), ::tolower);
isBeast = bodyRaceID == "b_n_khajiit_m_" || bodyRaceID == "b_n_khajiit_f_" || bodyRaceID == "b_n_argonian_m_" || bodyRaceID == "b_n_argonian_f_"; isBeast = bodyRaceID == "b_n_khajiit_m_" || bodyRaceID == "b_n_khajiit_f_" || bodyRaceID == "b_n_argonian_m_" || bodyRaceID == "b_n_argonian_f_";
@ -145,7 +145,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env,O
insert->attachObject(base); insert->attachObject(base);
if(female) if(isFemale)
insert->scale(race->data.height.female, race->data.height.female, race->data.height.female); insert->scale(race->data.height.female, race->data.height.female, race->data.height.female);
else else
insert->scale(race->data.height.male, race->data.height.male, race->data.height.male); insert->scale(race->data.height.male, race->data.height.male, race->data.height.male);
@ -183,6 +183,12 @@ void NpcAnimation::updateParts(){
removePartGroup(MWWorld::InventoryStore::Slot_Cuirass); removePartGroup(MWWorld::InventoryStore::Slot_Cuirass);
apparelChanged = true; apparelChanged = true;
}
if(greaves != inv.getSlot(MWWorld::InventoryStore::Slot_Greaves)){
cuirass = inv.getSlot(MWWorld::InventoryStore::Slot_Greaves);
removePartGroup(MWWorld::InventoryStore::Slot_Greaves);
apparelChanged = true;
} }
if(shirt != inv.getSlot(MWWorld::InventoryStore::Slot_Shirt)){ if(shirt != inv.getSlot(MWWorld::InventoryStore::Slot_Shirt)){
shirt = inv.getSlot(MWWorld::InventoryStore::Slot_Shirt); shirt = inv.getSlot(MWWorld::InventoryStore::Slot_Shirt);
@ -198,56 +204,32 @@ void NpcAnimation::updateParts(){
const ESM::Clothing *clothes = (ptr.get<ESM::Clothing>())->base; const ESM::Clothing *clothes = (ptr.get<ESM::Clothing>())->base;
std::vector<ESM::PartReference> parts = clothes->parts.parts; std::vector<ESM::PartReference> parts = clothes->parts.parts;
for(int i = 0; i < parts.size(); i++) addPartGroup(MWWorld::InventoryStore::Slot_Robe, 5, parts);
{
ESM::PartReference part = parts[i];
const ESM::BodyPart *bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.male);
if(bodypart)
addOrReplaceIndividualPart(part.part, MWWorld::InventoryStore::Slot_Robe,5,"meshes\\" + bodypart->model);
}
} }
if(helmet != inv.end()){ if(helmet != inv.end()){
removeIndividualPart(ESM::PRT_Hair); removeIndividualPart(ESM::PRT_Hair);
const ESM::Armor *armor = (helmet->get<ESM::Armor>())->base; const ESM::Armor *armor = (helmet->get<ESM::Armor>())->base;
std::vector<ESM::PartReference> parts = armor->parts.parts; std::vector<ESM::PartReference> parts = armor->parts.parts;
for(int i = 0; i < parts.size(); i++) addPartGroup(MWWorld::InventoryStore::Slot_Helmet, 3, parts);
{
ESM::PartReference part = parts[i];
const ESM::BodyPart *bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.male);
if(bodypart)
addOrReplaceIndividualPart(part.part, MWWorld::InventoryStore::Slot_Helmet,3,"meshes\\" + bodypart->model);
}
} }
if(cuirass != inv.end()){ if(cuirass != inv.end()){
const ESM::Armor *armor = (cuirass->get<ESM::Armor>())->base; const ESM::Armor *armor = (cuirass->get<ESM::Armor>())->base;
std::vector<ESM::PartReference> parts = armor->parts.parts; std::vector<ESM::PartReference> parts = armor->parts.parts;
for(int i = 0; i < parts.size(); i++) addPartGroup(MWWorld::InventoryStore::Slot_Cuirass, 3, parts);
{
ESM::PartReference part = parts[i];
const ESM::BodyPart *bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.male);
if(bodypart)
addOrReplaceIndividualPart(part.part, MWWorld::InventoryStore::Slot_Cuirass,3,"meshes\\" + bodypart->model);
} }
if(greaves != inv.end()){
const ESM::Armor *armor = (greaves->get<ESM::Armor>())->base;
std::vector<ESM::PartReference> parts = armor->parts.parts;
addPartGroup(MWWorld::InventoryStore::Slot_Greaves, 3, parts);
} }
if(shirt != inv.end()){ if(shirt != inv.end()){
const ESM::Clothing *clothes = (shirt->get<ESM::Clothing>())->base; const ESM::Clothing *clothes = (shirt->get<ESM::Clothing>())->base;
std::vector<ESM::PartReference> parts = clothes->parts.parts; std::vector<ESM::PartReference> parts = clothes->parts.parts;
for(int i = 0; i < parts.size(); i++) addPartGroup(MWWorld::InventoryStore::Slot_Shirt, 2, parts);
{
ESM::PartReference part = parts[i];
const ESM::BodyPart *bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.male);
if(bodypart)
addOrReplaceIndividualPart(part.part, MWWorld::InventoryStore::Slot_Shirt,2,"meshes\\" + bodypart->model);
}
} }
} }
@ -299,6 +281,8 @@ std::pair<Ogre::Entity*, std::vector<Nif::NiTriShapeCopy>*> NpcAnimation::insert
} }
void NpcAnimation::runAnimation(float timepassed){ void NpcAnimation::runAnimation(float timepassed){
if(timeToChange > .2){ if(timeToChange > .2){
@ -585,6 +569,25 @@ void NpcAnimation::removeIndividualPart(int type){
} }
return false; return false;
} }
void NpcAnimation::addPartGroup(int group, int priority, std::vector<ESM::PartReference>& parts){
for(int i = 0; i < parts.size(); i++)
{
ESM::PartReference part = parts[i];
const ESM::BodyPart *bodypart = 0;
if(isFemale)
bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.female);
if(!bodypart)
bodypart = mEnvironment.mWorld->getStore().bodyParts.search (part.male);
if(bodypart)
addOrReplaceIndividualPart(part.part, group,priority,"meshes\\" + bodypart->model);
}
}
} }

6
apps/openmw/mwrender/npcanimation.hpp
View file

@ -62,6 +62,7 @@ private:
Ogre::SceneNode* insert; Ogre::SceneNode* insert;
bool isBeast; bool isBeast;
bool isFemale;
std::string headID; std::string headID;
std::string hairID; std::string hairID;
std::string npcName; std::string npcName;
@ -71,6 +72,7 @@ private:
MWWorld::ContainerStoreIterator helmet; MWWorld::ContainerStoreIterator helmet;
MWWorld::ContainerStoreIterator shirt; MWWorld::ContainerStoreIterator shirt;
MWWorld::ContainerStoreIterator cuirass; MWWorld::ContainerStoreIterator cuirass;
MWWorld::ContainerStoreIterator greaves;
public: public:
NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv); NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend, MWWorld::InventoryStore& _inv);
@ -80,8 +82,10 @@ private:
virtual void runAnimation(float timepassed); virtual void runAnimation(float timepassed);
void updateParts(); void updateParts();
void removeIndividualPart(int type); void removeIndividualPart(int type);
void removePartGroup(int group);
bool addOrReplaceIndividualPart(int type, int group, int priority, const std::string &mesh); bool addOrReplaceIndividualPart(int type, int group, int priority, const std::string &mesh);
void removePartGroup(int group);
void addPartGroup(int group, int priority, std::vector<ESM::PartReference>& parts);
}; };
} }