Compile error retry

actorid
Jason Hooks 13 years ago
parent 9848b67174
commit 39ff8d6a01

@ -331,7 +331,7 @@ namespace MWRender{
} }
} }
bool Animation::timeIndex( float time, std::vector<float> & times, int & i, int & j, float & x ){ bool Animation::timeIndex( float time, const std::vector<float> & times, int & i, int & j, float & x ){
int count; int count;
if ( (count = times.size()) > 0 ) if ( (count = times.size()) > 0 )
{ {
@ -427,19 +427,19 @@ namespace MWRender{
float x; float x;
float x2; float x2;
std::vector<Ogre::Quaternion> & quats = iter->getQuat(); const std::vector<Ogre::Quaternion> & quats = iter->getQuat();
std::vector<float> & ttime = iter->gettTime(); const std::vector<float> & ttime = iter->gettTime();
std::vector<float> & rtime = iter->getrTime(); const std::vector<float> & rtime = iter->getrTime();
int rindexJ = rindexI[slot]; int rindexJ = rindexI[slot];
timeIndex(time, rtime, rindexI[slot], rindexJ, x2); timeIndex(time, rtime, rindexI[slot], rindexJ, x2);
int tindexJ = tindexI[slot]; int tindexJ = tindexI[slot];
std::vector<Ogre::Vector3> & translist1 = iter->getTranslist1(); const std::vector<Ogre::Vector3> & translist1 = iter->getTranslist1();
timeIndex(time, ttime, tindexI[slot], tindexJ, x); timeIndex(time, ttime, tindexI[slot], tindexJ, x);

@ -56,7 +56,7 @@ class Animation{
Ogre::Entity* base; Ogre::Entity* base;
void handleShapes(std::vector<Nif::NiTriShapeCopy>* allshapes, Ogre::Entity* creaturemodel, Ogre::SkeletonInstance *skel); void handleShapes(std::vector<Nif::NiTriShapeCopy>* allshapes, Ogre::Entity* creaturemodel, Ogre::SkeletonInstance *skel);
void handleAnimationTransforms(); void handleAnimationTransforms();
bool timeIndex( float time, std::vector<float> & times, int & i, int & j, float & x ); bool timeIndex( float time, const std::vector<float> & times, int & i, int & j, float & x );
std::string getUniqueID(std::string mesh); std::string getUniqueID(std::string mesh);
public: public:

Loading…
Cancel
Save