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

make streaming to a type array in nif a direct copy from the file into the vector

Browse source
This commit is contained in:
2017-09-21 23:47:09 -05:00
parent 090a8408b8
commit 8834066dea
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
components/nif/nifstream.hpp
View file

@ -41,6 +41,25 @@ template <uint32_t numInstances, typename T> inline void readLittleEndianBufferO
#endif #endif
} }
template <typename T> inline void readLittleEndianDynamicBufferOfType(Files::IStreamPtr &pIStream, T* dest, uint32_t numInstances)
{
#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
pIStream->read((char*)dest, numInstances * sizeof(T));
#else
char buffer[numInstances * sizeof(T)];
pIStream->read((char*)buffer, numInstances * sizeof(T));
/*
Due to the loop iterations being known at compile time,
this nested loop will most likely be unrolled
*/
for (uint32_t i = 0; i < numInstances; i++)
{
dest[i] = 0;
for (uint32_t byte = 0; byte < sizeof(T); byte++)
dest[i] |= ((T)buffer[i * sizeof(T) + byte]) << (byte * 8);
}
#endif
}
template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream) template<typename type> type inline readLittleEndianType(Files::IStreamPtr &pIStream)
{ {
type val; type val;
@ -146,28 +165,23 @@ public:
void getUShorts(std::vector<unsigned short> &vec, size_t size) { void getUShorts(std::vector<unsigned short> &vec, size_t size) {
vec.resize(size); vec.resize(size);
for (size_t i = 0;i < vec.size();i++) readLittleEndianDynamicBufferOfType<unsigned short>(inp, &vec.front(), size);
vec[i] = getUShort();
} }
void getFloats(std::vector<float> &vec, size_t size) { void getFloats(std::vector<float> &vec, size_t size) {
vec.resize(size); vec.resize(size);
for (size_t i = 0;i < vec.size();i++) readLittleEndianDynamicBufferOfType<float>(inp, &vec.front(), size);
vec[i] = getFloat();
} }
void getVector2s(std::vector<osg::Vec2f> &vec, size_t size) { void getVector2s(std::vector<osg::Vec2f> &vec, size_t size) {
vec.resize(size); vec.resize(size);
for (size_t i = 0;i < vec.size();i++) readLittleEndianDynamicBufferOfType<osg::Vec2f>(inp, &vec.front(), size);
vec[i] = getVector2();
} }
void getVector3s(std::vector<osg::Vec3f> &vec, size_t size) { void getVector3s(std::vector<osg::Vec3f> &vec, size_t size) {
vec.resize(size); vec.resize(size);
for (size_t i = 0;i < vec.size();i++) readLittleEndianDynamicBufferOfType<osg::Vec3f>(inp, &vec.front(), size);
vec[i] = getVector3();
} }
void getVector4s(std::vector<osg::Vec4f> &vec, size_t size) { void getVector4s(std::vector<osg::Vec4f> &vec, size_t size) {
vec.resize(size); vec.resize(size);
for (size_t i = 0;i < vec.size();i++) readLittleEndianDynamicBufferOfType<osg::Vec4f>(inp, &vec.front(), size);
vec[i] = getVector4();
} }
void getQuaternions(std::vector<osg::Quat> &quat, size_t size) { void getQuaternions(std::vector<osg::Quat> &quat, size_t size) {
quat.resize(size); quat.resize(size);