Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix vec4 serialization

Browse source
This commit is contained in:
Dale Glass 2022-06-11 21:36:40 +02:00 committed by HifiExperiments
parent 23a5795ba9
commit 30ced59cec
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/shared/src/SerDes.h
View file

@ -235,7 +235,7 @@ class SerDes {
memcpy(&_store[_pos + sz*2], (char*)&val.z, sz);
memcpy(&_store[_pos + sz*3], (char*)&val.w, sz);
_pos += sz*3;
_pos += sz*4;
return *this;
}
@ -248,7 +248,7 @@ class SerDes {
memcpy((char*)&val.z, &_store[_pos + sz*2], sz);
memcpy((char*)&val.w, &_store[_pos + sz*3], sz);
_pos += sz*3;
_pos += sz*4;
} else {
_overflow = true;
qCritical() << "Deserializer trying to read past end of input, reading glm::vec3 from position " << _pos << ", length " << _length;

20
tests/shared/src/SerializerTests.cpp
View file

@ -60,13 +60,19 @@ void SerializerTests::testAdd() {
void SerializerTests::testAddAndRead() {
SerDes s;
glm::vec3 v{1.f, 3.1415f, 2.71828f};
glm::vec3 v2;
glm::vec3 v3_a{1.f, 3.1415f, 2.71828f};
glm::vec3 v3_b;
glm::vec4 v4_a{3.1415f, 2.71828f, 1.4142f, 1.6180f};
glm::vec4 v4_b;
glm::ivec2 iv2_a{10, 24};
glm::ivec2 iv2_b;
s << (qint8)1;
s << (qint16)0xaabb;
s << (qint32)0xccddeeff;
s << v;
s << v3_a;
s << v4_a;
s << iv2_a;
qint8 i8;
qint16 i16;
@ -77,14 +83,18 @@ void SerializerTests::testAddAndRead() {
s >> i8;
s >> i16;
s >> i32;
s >> v2;
s >> v3_b;
s >> v4_b;
s >> iv2_b;
qDebug() << s;
QCOMPARE(i8, (qint8)1);
QCOMPARE(i16, (qint16)0xaabb);
QCOMPARE(i32, (qint32)0xccddeeff);
QCOMPARE(v, v2);
QCOMPARE(v3_a, v3_b);
QCOMPARE(v4_a, v4_b);
QCOMPARE(iv2_a, iv2_b);
}
void SerializerTests::testReadPastEnd() {