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

Trying to get code to conform with older c++

Browse source
This commit is contained in:
Jason Hooks 2011-12-27 19:19:45 -05:00
parent d855bb4fc6
commit cef2f5e927
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/animation.hpp
View file

@ -31,7 +31,7 @@ class Animation{
//Only shapes with morphing data will need a shape number //Only shapes with morphing data will need a shape number
int shapeNumber; int shapeNumber;
std::vector<std::vector<int>> shapeIndexI; std::vector<std::vector<int> > shapeIndexI;
//Ogre::SkeletonInstance* skel; //Ogre::SkeletonInstance* skel;
std::vector<Nif::NiTriShapeCopy>* shapes; //All the NiTriShapeData for this creature std::vector<Nif::NiTriShapeCopy>* shapes; //All the NiTriShapeData for this creature

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

@ -18,7 +18,7 @@ class NpcAnimation: public Animation{
std::vector<Ogre::Entity*> entityparts; std::vector<Ogre::Entity*> entityparts;
Ogre::Entity* hand; Ogre::Entity* hand;
Ogre::SceneNode* insert; Ogre::SceneNode* insert;
std::vector<std::vector<Nif::NiTriShapeCopy>*> shapeparts; //All the NiTriShape data that we need for animating this particular npc std::vector<std::vector<Nif::NiTriShapeCopy>* > shapeparts; //All the NiTriShape data that we need for animating this particular npc
public: public:
NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend); NpcAnimation(const MWWorld::Ptr& ptr, MWWorld::Environment& _env, OEngine::Render::OgreRenderer& _rend);
~NpcAnimation(); ~NpcAnimation();

8
components/nif/data.hpp
View file

@ -429,9 +429,9 @@ class NiMorphData : public Record
float startTime; float startTime;
float stopTime; float stopTime;
std::vector<Ogre::Vector3> initialVertices; std::vector<Ogre::Vector3> initialVertices;
std::vector<std::vector<float>> relevantTimes; std::vector<std::vector<float> > relevantTimes;
std::vector<std::vector<Ogre::Vector3>> relevantData; std::vector<std::vector<Ogre::Vector3> > relevantData;
std::vector<std::vector<Ogre::Vector3>> additionalVertices; std::vector<std::vector<Ogre::Vector3> > additionalVertices;
public: public:
@ -457,7 +457,7 @@ public:
std::vector<std::vector<float>> getRelevantTimes(){ std::vector<std::vector<float>> getRelevantTimes(){
return relevantTimes; return relevantTimes;
} }
std::vector<std::vector<Ogre::Vector3>> getAdditionalVertices(){ std::vector<std::vector<Ogre::Vector3> > getAdditionalVertices(){
return additionalVertices; return additionalVertices;
} }

2
components/nifogre/ogre_nif_loader.cpp
View file

@ -1250,7 +1250,7 @@ void NIFLoader::loadResource(Resource *resource)
Nif::Node *o = dynamic_cast<Nif::Node*>(f->target.getPtr()); Nif::Node *o = dynamic_cast<Nif::Node*>(f->target.getPtr());
Nif::NiKeyframeDataPtr data = f->data; Nif::NiKeyframeDataPtr data = f->data;
if (f->timeStart == FLT_MAX) if (f->timeStart == 10000000000000000)
continue; continue;
data->setBonename(o->name.toString()); data->setBonename(o->name.toString());
data->setStartTime(f->timeStart); data->setStartTime(f->timeStart);

1
components/nifogre/ogre_nif_loader.hpp
View file

@ -31,6 +31,7 @@
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <Ogre.h> #include <Ogre.h>
#include <stdio.h> #include <stdio.h>
#include <iostream>
#include <libs/mangle/vfs/servers/ogre_vfs.hpp> #include <libs/mangle/vfs/servers/ogre_vfs.hpp>
#include "../nif/nif_file.hpp" #include "../nif/nif_file.hpp"