mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-22 20:40:18 +00:00
Code Issues Releases Wiki Activity

Animation files in the correct directory

Browse source
This commit is contained in:
Jason Hooks 2012-01-12 20:09:55 -05:00
parent 0712bba49b
commit d1793bc4bd
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/engine.cpp
View file

@ -102,8 +102,10 @@ void OMW::Engine::updateFocusReport (float duration)
} }
void OMW::Engine::setAnimationVerbose(bool animverbose){ void OMW::Engine::setAnimationVerbose(bool animverbose){
if(animverbose) if(animverbose){
NifOgre::NIFLoader::getSingletonPtr()->setOutputAnimFiles(true); NifOgre::NIFLoader::getSingletonPtr()->setOutputAnimFiles(true);
NifOgre::NIFLoader::getSingletonPtr()->setVerbosePath(mCfgMgr.getLogPath().string());
}
} }
bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt) bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
@ -338,6 +340,7 @@ void OMW::Engine::go()
// Set up the GUI system // Set up the GUI system
mGuiManager = new OEngine::GUI::MyGUIManager(mOgre->getWindow(), mOgre->getScene(), false, mGuiManager = new OEngine::GUI::MyGUIManager(mOgre->getWindow(), mOgre->getScene(), false,
mCfgMgr.getLogPath().string() + std::string("/")); mCfgMgr.getLogPath().string() + std::string("/"));
// Create window manager - this manages all the MW-specific GUI windows // Create window manager - this manages all the MW-specific GUI windows
MWScript::registerExtensions (mExtensions); MWScript::registerExtensions (mExtensions);

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

@ -284,6 +284,7 @@ void NpcAnimation::runAnimation(float timepassed){
}*/ }*/
std::vector<std::vector<Nif::NiTriShapeCopy>*>::iterator shapepartsiter = shapeparts.begin(); std::vector<std::vector<Nif::NiTriShapeCopy>*>::iterator shapepartsiter = shapeparts.begin();
std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin(); std::vector<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin();
while(shapepartsiter != shapeparts.end()) while(shapepartsiter != shapeparts.end())

5
components/nifogre/ogre_nif_loader.cpp
View file

@ -204,6 +204,9 @@ static CompareFunction getTestMode(int mode)
void NIFLoader::setOutputAnimFiles(bool output){ void NIFLoader::setOutputAnimFiles(bool output){
mOutputAnimFiles = output; mOutputAnimFiles = output;
} }
void NIFLoader::setVerbosePath(std::string path){
verbosePath = path;
}
void NIFLoader::createMaterial(const String &name, void NIFLoader::createMaterial(const String &name,
const Vector &ambient, const Vector &ambient,
const Vector &diffuse, const Vector &diffuse,
@ -1016,7 +1019,7 @@ void NIFLoader::handleNode(Nif::Node *node, int flags,
std::cout << "Outputting " << cut << "\n"; std::cout << "Outputting " << cut << "\n";
file.open(("Indices" + cut + ".txt").c_str()); file.open((verbosePath + "/Indices" + cut + ".txt").c_str());
} }
for(std::vector<Nif::NiTextKeyExtraData::TextKey>::iterator textiter = extra->list.begin(); textiter != extra->list.end(); textiter++) for(std::vector<Nif::NiTextKeyExtraData::TextKey>::iterator textiter = extra->list.begin(); textiter != extra->list.end(); textiter++)

2
components/nifogre/ogre_nif_loader.hpp
View file

@ -118,6 +118,7 @@ class NIFLoader : Ogre::ManualResourceLoader
Ogre::Quaternion convertRotation(const Nif::Matrix& rot); Ogre::Quaternion convertRotation(const Nif::Matrix& rot);
void setOutputAnimFiles(bool output); void setOutputAnimFiles(bool output);
void setVerbosePath(std::string path);
private: private:
NIFLoader() : mNormaliseNormals(false), resourceGroup("General"), resourceName(""), flip(false), NIFLoader() : mNormaliseNormals(false), resourceGroup("General"), resourceName(""), flip(false),
@ -163,6 +164,7 @@ class NIFLoader : Ogre::ManualResourceLoader
// extension from .tga to .dds if the texture is missing. // extension from .tga to .dds if the texture is missing.
Mangle::VFS::OgreVFS *vfs; Mangle::VFS::OgreVFS *vfs;
std::string verbosePath;
std::string resourceName; std::string resourceName;
std::string resourceGroup; std::string resourceGroup;
Ogre::Matrix4 mTransform; Ogre::Matrix4 mTransform;