mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 16:49:54 +00:00
Code Issues Releases Wiki Activity

Change triangle indices to unsigned

Browse source
This commit is contained in:
scrawl 2015-04-21 20:56:16 +02:00
parent 102eadf91c
commit 28643660d3
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/nif/data.cpp
View file

@ -71,7 +71,7 @@ void NiTriShapeData::read(NIFStream *nif)
// We have three times as many vertices as triangles, so this // We have three times as many vertices as triangles, so this
// is always equal to tris*3. // is always equal to tris*3.
int cnt = nif->getInt(); int cnt = nif->getInt();
nif->getShorts(triangles, cnt); nif->getUShorts(triangles, cnt);
// Read the match list, which lists the vertices that are equal to // Read the match list, which lists the vertices that are equal to
// vertices. We don't actually need need this for anything, so // vertices. We don't actually need need this for anything, so

4
components/nif/data.hpp
View file

@ -48,7 +48,7 @@ class NiTriShapeData : public ShapeData
{ {
public: public:
// Triangles, three vertex indices per triangle // Triangles, three vertex indices per triangle
std::vector<short> triangles; std::vector<unsigned short> triangles;
void read(NIFStream *nif); void read(NIFStream *nif);
}; };
@ -144,7 +144,7 @@ class NiSkinData : public Record
public: public:
struct VertWeight struct VertWeight
{ {
short vertex; unsigned short vertex;
float weight; float weight;
}; };

4
components/nif/nifstream.cpp
View file

@ -103,11 +103,11 @@ std::string NIFStream::getVersionString()
return result; return result;
} }
void NIFStream::getShorts(std::vector<short> &vec, size_t size) void NIFStream::getUShorts(std::vector<unsigned short> &vec, size_t size)
{ {
vec.resize(size); vec.resize(size);
for(size_t i = 0;i < vec.size();i++) for(size_t i = 0;i < vec.size();i++)
vec[i] = getShort(); vec[i] = getUShort();
} }
void NIFStream::getFloats(std::vector<float> &vec, size_t size) void NIFStream::getFloats(std::vector<float> &vec, size_t size)
{ {

2
components/nif/nifstream.hpp
View file

@ -59,7 +59,7 @@ public:
///This is special since the version string doesn't start with a number, and ends with "\n" ///This is special since the version string doesn't start with a number, and ends with "\n"
std::string getVersionString(); std::string getVersionString();
void getShorts(std::vector<short> &vec, size_t size); void getUShorts(std::vector<unsigned short> &vec, size_t size);
void getFloats(std::vector<float> &vec, size_t size); void getFloats(std::vector<float> &vec, size_t size);
void getVector2s(std::vector<osg::Vec2f> &vec, size_t size); void getVector2s(std::vector<osg::Vec2f> &vec, size_t size);
void getVector3s(std::vector<osg::Vec3f> &vec, size_t size); void getVector3s(std::vector<osg::Vec3f> &vec, size_t size);

2
components/nifosg/nifloader.cpp
View file

@ -1146,7 +1146,7 @@ namespace NifOsg
//influence.mWeights.reserve(weights.size()); //influence.mWeights.reserve(weights.size());
for(size_t j = 0;j < weights.size();j++) for(size_t j = 0;j < weights.size();j++)
{ {
std::pair<short, float> indexWeight = std::make_pair(weights[j].vertex, weights[j].weight); std::pair<unsigned short, float> indexWeight = std::make_pair(weights[j].vertex, weights[j].weight);
influence.mWeights.insert(indexWeight); influence.mWeights.insert(indexWeight);
} }
influence.mInvBindMatrix = toMatrix(data->bones[i].trafo); influence.mInvBindMatrix = toMatrix(data->bones[i].trafo);

4
components/sceneutil/riggeometry.cpp
View file

@ -172,9 +172,9 @@ void RigGeometry::update(osg::NodeVisitor* nv)
osg::Matrixf finalMatrix = bi.mInvBindMatrix * bone->mMatrixInSkeletonSpace * geomToSkel; osg::Matrixf finalMatrix = bi.mInvBindMatrix * bone->mMatrixInSkeletonSpace * geomToSkel;
for (std::map<short, float>::const_iterator weightIt = bi.mWeights.begin(); weightIt != bi.mWeights.end(); ++weightIt) for (std::map<unsigned short, float>::const_iterator weightIt = bi.mWeights.begin(); weightIt != bi.mWeights.end(); ++weightIt)
{ {
short vertex = weightIt->first; unsigned short vertex = weightIt->first;
float weight = weightIt->second; float weight = weightIt->second;
osg::Vec3f a = (*positionSrc)[vertex]; osg::Vec3f a = (*positionSrc)[vertex];

2
components/sceneutil/riggeometry.hpp
View file

@ -25,7 +25,7 @@ namespace SceneUtil
{ {
osg::Matrixf mInvBindMatrix; osg::Matrixf mInvBindMatrix;
// <vertex index, weight> // <vertex index, weight>
std::map<short, float> mWeights; std::map<unsigned short, float> mWeights;
}; };
struct InfluenceMap : public osg::Referenced struct InfluenceMap : public osg::Referenced