mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:53:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics

Browse source
This commit is contained in:
scrawl 2013-01-14 00:10:57 +01:00
commit 6c6ce4a05c
13 changed files with 71 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -440,7 +440,7 @@ namespace MWGui
for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
{
spellList.push_back(*it);
spellList.push_back (it->first);
}
const MWWorld::ESMStore &esmStore =

4
apps/openmw/mwgui/spellbuyingwindow.cpp
View file

@ -102,7 +102,7 @@ namespace MWGui
for (MWMechanics::Spells::TIterator iter = merchantSpells.begin(); iter!=merchantSpells.end(); ++iter)
{
const ESM::Spell* spell =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
if (spell->mData.mType!=ESM::Spell::ST_Spell)
continue; // don't try to sell diseases, curses or powers
@ -110,7 +110,7 @@ namespace MWGui
if (std::find (playerSpells.begin(), playerSpells.end(), *iter)!=playerSpells.end())
continue; // we have that spell already
addSpell (*iter);
addSpell (iter->first);
}
updateLabels();

2
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -436,7 +436,7 @@ namespace MWGui
for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
{
const ESM::Spell* spell =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find(*it);
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (it->first);
// only normal spells count
if (spell->mData.mType != ESM::Spell::ST_Spell)

2
apps/openmw/mwgui/spellwindow.cpp
View file

@ -139,7 +139,7 @@ namespace MWGui
for (MWMechanics::Spells::TIterator it = spells.begin(); it != spells.end(); ++it)
{
spellList.push_back(*it);
spellList.push_back (it->first);
}
const MWWorld::ESMStore &esmStore =

10
apps/openmw/mwmechanics/magiceffects.cpp
View file

@ -68,7 +68,7 @@ namespace MWMechanics
}
}
void MagicEffects::add (const ESM::EffectList& list)
void MagicEffects::add (const ESM::EffectList& list, float magnitude)
{
for (std::vector<ESM::ENAMstruct>::const_iterator iter (list.mList.begin()); iter!=list.mList.end();
++iter)
@ -78,9 +78,13 @@ namespace MWMechanics
if (iter->mMagnMin>=iter->mMagnMax)
param.mMagnitude = iter->mMagnMin;
else
{
if (magnitude==-1)
magnitude = static_cast<float> (std::rand()) / RAND_MAX;
param.mMagnitude = static_cast<int> (
(iter->mMagnMax-iter->mMagnMin+1)*
(static_cast<float> (std::rand()) / RAND_MAX) + iter->mMagnMin);
(iter->mMagnMax-iter->mMagnMin+1)*magnitude + iter->mMagnMin);
}
add (*iter, param);
}

3
apps/openmw/mwmechanics/magiceffects.hpp
View file

@ -67,7 +67,8 @@ namespace MWMechanics
void add (const EffectKey& key, const EffectParam& param);
void add (const ESM::EffectList& list);
void add (const ESM::EffectList& list, float magnitude = -1);
///< \param magnitude normalised magnitude (-1: random)
MagicEffects& operator+= (const MagicEffects& effects);

23
apps/openmw/mwmechanics/spells.cpp
View file

@ -1,22 +1,19 @@
#include "spells.hpp"
#include "../mwworld/esmstore.hpp"
#include <cstdlib>
#include <components/esm/loadspel.hpp>
#include "../mwbase/environment.hpp"
#include "../mwbase/world.hpp"
#include "../mwworld/esmstore.hpp"
#include "magiceffects.hpp"
namespace MWMechanics
{
void Spells::addSpell (const ESM::Spell *spell, MagicEffects& effects) const
{
effects.add (spell->mEffects);
}
Spells::TIterator Spells::begin() const
{
return mSpells.begin();
@ -29,13 +26,13 @@ namespace MWMechanics
void Spells::add (const std::string& spellId)
{
if (std::find (mSpells.begin(), mSpells.end(), spellId)==mSpells.end())
mSpells.push_back (spellId);
if (mSpells.find (spellId)==mSpells.end())
mSpells.insert (std::make_pair (spellId, static_cast<float> (std::rand()) / RAND_MAX));
}
void Spells::remove (const std::string& spellId)
{
TContainer::iterator iter = std::find (mSpells.begin(), mSpells.end(), spellId);
TContainer::iterator iter = mSpells.find (spellId);
if (iter!=mSpells.end())
mSpells.erase (iter);
@ -51,11 +48,11 @@ namespace MWMechanics
for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
{
const ESM::Spell *spell =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
if (spell->mData.mType==ESM::Spell::ST_Ability || spell->mData.mType==ESM::Spell::ST_Blight ||
spell->mData.mType==ESM::Spell::ST_Disease || spell->mData.mType==ESM::Spell::ST_Curse)
addSpell (spell, effects);
effects.add (spell->mEffects, iter->second);
}
return effects;
@ -81,7 +78,7 @@ namespace MWMechanics
for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
{
const ESM::Spell *spell =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
if (spell->mData.mFlags & ESM::Spell::ST_Disease)
return true;
@ -95,7 +92,7 @@ namespace MWMechanics
for (TIterator iter = mSpells.begin(); iter!=mSpells.end(); ++iter)
{
const ESM::Spell *spell =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (*iter);
MWBase::Environment::get().getWorld()->getStore().get<ESM::Spell>().find (iter->first);
if (spell->mData.mFlags & ESM::Spell::ST_Blight)
return true;

8
apps/openmw/mwmechanics/spells.hpp
View file

@ -1,7 +1,7 @@
#ifndef GAME_MWMECHANICS_SPELLS_H
#define GAME_MWMECHANICS_SPELLS_H
#include <vector>
#include <map>
#include <string>
namespace ESM
@ -21,16 +21,14 @@ namespace MWMechanics
{
public:
typedef std::vector<std::string> TContainer;
typedef std::map<std::string, float> TContainer; // ID, normalised magnitude
typedef TContainer::const_iterator TIterator;
private:
std::vector<std::string> mSpells;
TContainer mSpells;
std::string mSelectedSpell;
void addSpell (const ESM::Spell *, MagicEffects& effects) const;
public:
TIterator begin() const;

2
apps/openmw/mwscript/statsextensions.cpp
View file

@ -485,7 +485,7 @@ namespace MWScript
for (MWMechanics::Spells::TIterator iter (
MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().begin());
iter!=MWWorld::Class::get (ptr).getCreatureStats (ptr).getSpells().end(); ++iter)
if (*iter==id)
if (iter->first==id)
{
value = 1;
break;

17
components/nif/nif_file.cpp
View file

@ -39,9 +39,8 @@
//#include <boost/mutex.hpp>
//#include <boost/thread/locks.hpp>
using namespace std;
using namespace Nif;
using namespace Misc;
namespace Nif
{
class NIFFile::LoadedCache
{
@ -207,7 +206,7 @@ void NIFFile::parse()
fail("Unsupported NIF version");
// Number of records
int recNum = getInt();
size_t recNum = getInt();
records.resize(recNum);
/* The format for 10.0.1.0 seems to be a bit different. After the
@ -219,7 +218,7 @@ void NIFFile::parse()
we do not support or plan to support other versions yet.
*/
for(int i=0;i<recNum;i++)
for(size_t i = 0;i < recNum;i++)
{
std::string rec = getString();
//cout << i << ": " << rec.toString() << endl;
@ -311,6 +310,7 @@ void NIFFile::parse()
assert(r != NULL);
assert(r->recType != RC_MISSING);
r->recName = rec;
r->recIndex = i;
records[i] = r;
r->read(this);
@ -329,11 +329,8 @@ void NIFFile::parse()
tree, but for the moment we ignore it.
*/
// TODO: Set up kf file here first, if applicable. It needs its own
// code to link it up with the main NIF structure.
// Once parsing is done, do post-processing.
for(int i=0; i<recNum; i++)
for(size_t i=0; i<recNum; i++)
records[i]->post(this);
}
@ -375,3 +372,5 @@ Ogre::Matrix4 Node::getWorldTransform() const
return parent->getWorldTransform() * getLocalTransform();
return getLocalTransform();
}
}

2
components/nif/nif_file.hpp
View file

@ -146,7 +146,7 @@ public:
}
/// Number of records
int numRecords() { return records.size(); }
size_t numRecords() { return records.size(); }
/*************************************************
Parser functions

3
components/nif/record.hpp
View file

@ -91,8 +91,9 @@ struct Record
// Record type and type name
int recType;
std::string recName;
size_t recIndex;
Record() : recType(RC_MISSING) {}
Record() : recType(RC_MISSING), recIndex(~(size_t)0) {}
/// Parses the record from file
virtual void read(NIFFile *nif) = 0;

30
components/nifogre/ogre_nif_loader.cpp
View file

@ -697,9 +697,10 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
{
std::string mName;
std::string mGroup;
std::string mShapeName;
std::string mMaterialName;
size_t mShapeIndex;
std::string mSkelName;
std::string mMaterialName;
std::string mShapeName;
void warn(const std::string &msg)
{
@ -807,7 +808,8 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
Ogre::VertexDeclaration *decl;
int nextBuf = 0;
Ogre::SubMesh *sub = mesh->createSubMesh(shape->name);
Ogre::SubMesh *sub = ((mShapeName.length() > 0) ? mesh->createSubMesh(mShapeName) :
mesh->createSubMesh());
// Add vertices
sub->useSharedVertices = false;
@ -914,13 +916,13 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
bool findTriShape(Ogre::Mesh *mesh, Nif::Node const *node)
{
if(node->recType == Nif::RC_NiTriShape && mShapeName == node->name)
if(node->recType == Nif::RC_NiTriShape && mShapeIndex == node->recIndex)
{
handleNiTriShape(mesh, dynamic_cast<Nif::NiTriShape const *>(node));
handleNiTriShape(mesh, dynamic_cast<const Nif::NiTriShape*>(node));
return true;
}
Nif::NiNode const *ninode = dynamic_cast<Nif::NiNode const *>(node);
const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
if(ninode)
{
Nif::NodeList const &children = ninode->children;
@ -944,7 +946,7 @@ public:
NIFMeshLoader()
{ }
NIFMeshLoader(const std::string &name, const std::string &group, const std::string skelName)
: mName(name), mGroup(group), mSkelName(skelName)
: mName(name), mGroup(group), mShapeIndex(~(size_t)0), mSkelName(skelName)
{ }
virtual void loadResource(Ogre::Resource *resource)
@ -952,15 +954,14 @@ public:
Ogre::Mesh *mesh = dynamic_cast<Ogre::Mesh*>(resource);
assert(mesh && "Attempting to load a mesh into a non-mesh resource!");
if(!mShapeName.length())
Nif::NIFFile::ptr nif = Nif::NIFFile::create(mName);
if(mShapeIndex >= nif->numRecords())
{
if(mSkelName.length() > 0)
mesh->setSkeletonName(mSkelName);
return;
}
Nif::NIFFile::ptr nif = Nif::NIFFile::create (mName);
Nif::Node const *node = dynamic_cast<Nif::Node const *>(nif->getRecord(0));
Nif::Node const *node = dynamic_cast<const Nif::Node*>(nif->getRecord(mShapeIndex));
findTriShape(mesh, node);
}
@ -1001,9 +1002,12 @@ public:
if(node->recType == Nif::RC_NiTriShape)
{
const Nif::NiTriShape *shape = dynamic_cast<const Nif::NiTriShape*>(node);
mShapeName = shape->name;
Ogre::MeshManager &meshMgr = Ogre::MeshManager::getSingleton();
std::string fullname = mName+"@shape="+shape->name;
std::string fullname = mName+"@index="+Ogre::StringConverter::toString(shape->recIndex);
if(mShapeName.length() > 0)
fullname += "@shape="+mShapeName;
if(mSkelName.length() > 0 && mName != mSkelName)
fullname += "@skel="+mSkelName;
@ -1015,7 +1019,7 @@ public:
*loader = *this;
if(!(flags&0x01)) // Not hidden
{
loader->mShapeName = shape->name;
loader->mShapeIndex = shape->recIndex;
loader->mMaterialName = NIFMaterialLoader::getMaterial(shape, fullname, mGroup);
}