mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects 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){
if(animverbose)
if(animverbose){
NifOgre::NIFLoader::getSingletonPtr()->setOutputAnimFiles(true);
NifOgre::NIFLoader::getSingletonPtr()->setVerbosePath(mCfgMgr.getLogPath().string());
}
}
bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
@ -338,6 +340,7 @@ void OMW::Engine::go()
// Set up the GUI system
mGuiManager = new OEngine::GUI::MyGUIManager(mOgre->getWindow(), mOgre->getScene(), false,
mCfgMgr.getLogPath().string() + std::string("/"));
// Create window manager - this manages all the MW-specific GUI windows
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<Ogre::Entity*>::iterator entitypartsiter = entityparts.begin();
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){
mOutputAnimFiles = output;
}
void NIFLoader::setVerbosePath(std::string path){
verbosePath = path;
}
void NIFLoader::createMaterial(const String &name,
const Vector &ambient,
const Vector &diffuse,
@ -1016,7 +1019,7 @@ void NIFLoader::handleNode(Nif::Node *node, int flags,
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++)

2
components/nifogre/ogre_nif_loader.hpp
View File

@ -118,6 +118,7 @@ class NIFLoader : Ogre::ManualResourceLoader
Ogre::Quaternion convertRotation(const Nif::Matrix& rot);
void setOutputAnimFiles(bool output);
void setVerbosePath(std::string path);
private:
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.
Mangle::VFS::OgreVFS *vfs;
std::string verbosePath;
std::string resourceName;
std::string resourceGroup;
Ogre::Matrix4 mTransform;