Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Some type modifications in DataViewPrototype

Browse source
This commit is contained in:
Atlante45 2014-07-08 16:59:27 -07:00
parent 7fe88a4426
commit 4b2e4b7b28
2 changed files with 46 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
libraries/script-engine/src/DataViewPrototype.cpp
View file

@ -38,23 +38,31 @@ bool DataViewPrototype::realOffset(quint32& offset, size_t size) const {
///////////////// GETTERS //////////////////////////// ///////////////// GETTERS ////////////////////////////
qint8 DataViewPrototype::getInt8(quint32 byteOffset) { qint32 DataViewPrototype::getInt8(quint32 byteOffset) {
if (realOffset(byteOffset, sizeof(qint8))) { if (realOffset(byteOffset, sizeof(qint8))) {
qDebug() << "Value: " << (qint8)thisArrayBuffer()->at(byteOffset); QDataStream stream(*thisArrayBuffer());
stream.skipRawData(byteOffset);
return (qint8)thisArrayBuffer()->at(byteOffset);
} qint8 result;
qDebug() << "42 powaaaa!!!"; stream >> result;
return 42; return result;
}
quint8 DataViewPrototype::getUint8(quint32 byteOffset) {
if (realOffset(byteOffset, sizeof(quint8))) { return thisArrayBuffer()->at(byteOffset);
} }
return 42; return 42;
} }
qint16 DataViewPrototype::getInt16(quint32 byteOffset, bool littleEndian) { quint32 DataViewPrototype::getUint8(quint32 byteOffset) {
if (realOffset(byteOffset, sizeof(quint8))) {
QDataStream stream(*thisArrayBuffer());
stream.skipRawData(byteOffset);
quint8 result;
stream >> result;
return result;
}
return 42;
}
qint32 DataViewPrototype::getInt16(quint32 byteOffset, bool littleEndian) {
if (realOffset(byteOffset, sizeof(qint16))) { if (realOffset(byteOffset, sizeof(qint16))) {
QDataStream stream(*thisArrayBuffer()); QDataStream stream(*thisArrayBuffer());
stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian); stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian);
@ -67,13 +75,13 @@ qint16 DataViewPrototype::getInt16(quint32 byteOffset, bool littleEndian) {
return 42; return 42;
} }
quint16 DataViewPrototype::getUint16(quint32 byteOffset, bool littleEndian) { quint32 DataViewPrototype::getUint16(quint32 byteOffset, bool littleEndian) {
if (realOffset(byteOffset, sizeof(quint16))) { if (realOffset(byteOffset, sizeof(quint16))) {
QDataStream stream(*thisArrayBuffer()); QDataStream stream(*thisArrayBuffer());
stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian); stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
qint16 result; quint16 result;
stream >> result; stream >> result;
return result; return result;
} }
@ -86,7 +94,7 @@ qint32 DataViewPrototype::getInt32(quint32 byteOffset, bool littleEndian) {
stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian); stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
qint16 result; qint32 result;
stream >> result; stream >> result;
return result; return result;
} }
@ -99,7 +107,7 @@ quint32 DataViewPrototype::getUint32(quint32 byteOffset, bool littleEndian) {
stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian); stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
qint16 result; quint32 result;
stream >> result; stream >> result;
return result; return result;
} }
@ -112,7 +120,7 @@ float DataViewPrototype::getFloat32(quint32 byteOffset, bool littleEndian) {
stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian); stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
qint16 result; float result;
stream >> result; stream >> result;
return result; return result;
} }
@ -125,7 +133,7 @@ double DataViewPrototype::getFloat64(quint32 byteOffset, bool littleEndian) {
stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian); stream.setByteOrder((littleEndian) ? QDataStream::LittleEndian : QDataStream::BigEndian);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
qint16 result; double result;
stream >> result; stream >> result;
return result; return result;
} }
@ -134,48 +142,48 @@ double DataViewPrototype::getFloat64(quint32 byteOffset, bool littleEndian) {
///////////////// SETTERS //////////////////////////// ///////////////// SETTERS ////////////////////////////
void DataViewPrototype::setInt8(quint32 byteOffset, qint8 value) { void DataViewPrototype::setInt8(quint32 byteOffset, qint32 value) {
if (realOffset(byteOffset, sizeof(qint8))) { if (realOffset(byteOffset, sizeof(qint8))) {
QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite); QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
stream << value; stream << (qint8)value;
} }
} }
void DataViewPrototype::setUint8(quint32 byteOffset, quint8 value) { void DataViewPrototype::setUint8(quint32 byteOffset, quint32 value) {
if (realOffset(byteOffset, sizeof(quint8))) { if (realOffset(byteOffset, sizeof(quint8))) {
QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite); QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
stream << value; stream << (quint8)value;
} }
} }
void DataViewPrototype::setInt16(quint32 byteOffset, qint16 value, bool littleEndian) { void DataViewPrototype::setInt16(quint32 byteOffset, qint32 value, bool littleEndian) {
if (realOffset(byteOffset, sizeof(qint16))) { if (realOffset(byteOffset, sizeof(qint16))) {
QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite); QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
stream << value; stream << (qint16)value;
} }
} }
void DataViewPrototype::setUint16(quint32 byteOffset, quint16 value, bool littleEndian) { void DataViewPrototype::setUint16(quint32 byteOffset, quint32 value, bool littleEndian) {
if (realOffset(byteOffset, sizeof(quint16))) { if (realOffset(byteOffset, sizeof(quint16))) {
QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite); QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
stream << value; stream << (quint16)value;
} }
} }
void DataViewPrototype::setInt32(quint32 byteOffset, quint32 value, bool littleEndian) { void DataViewPrototype::setInt32(quint32 byteOffset, qint32 value, bool littleEndian) {
if (realOffset(byteOffset, sizeof(qint32))) { if (realOffset(byteOffset, sizeof(qint32))) {
QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite); QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
stream << value; stream << (qint32)value;
} }
} }
@ -184,7 +192,7 @@ void DataViewPrototype::setUint32(quint32 byteOffset, quint32 value, bool little
QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite); QDataStream stream(thisArrayBuffer(), QIODevice::ReadWrite);
stream.skipRawData(byteOffset); stream.skipRawData(byteOffset);
stream << value; stream << (quint32)value;
} }
} }

18
libraries/script-engine/src/DataViewPrototype.h
View file

@ -31,10 +31,10 @@ public slots:
// //
// These methods raise an exception if they would read // These methods raise an exception if they would read
// beyond the end of the view. // beyond the end of the view.
qint8 getInt8(quint32 byteOffset); qint32 getInt8(quint32 byteOffset);
quint8 getUint8(quint32 byteOffset); quint32 getUint8(quint32 byteOffset);
qint16 getInt16(quint32 byteOffset, bool littleEndian = false); qint32 getInt16(quint32 byteOffset, bool littleEndian = false);
quint16 getUint16(quint32 byteOffset, bool littleEndian = false); quint32 getUint16(quint32 byteOffset, bool littleEndian = false);
qint32 getInt32(quint32 byteOffset, bool littleEndian = false); qint32 getInt32(quint32 byteOffset, bool littleEndian = false);
quint32 getUint32(quint32 byteOffset, bool littleEndian = false); quint32 getUint32(quint32 byteOffset, bool littleEndian = false);
float getFloat32(quint32 byteOffset, bool littleEndian = false); float getFloat32(quint32 byteOffset, bool littleEndian = false);
@ -51,11 +51,11 @@ public slots:
// //
// These methods raise an exception if they would write // These methods raise an exception if they would write
// beyond the end of the view. // beyond the end of the view.
void setInt8(quint32 byteOffset, qint8 value); void setInt8(quint32 byteOffset, qint32 value);
void setUint8(quint32 byteOffset, quint8 value); void setUint8(quint32 byteOffset, quint32 value);
void setInt16(quint32 byteOffset, qint16 value, bool littleEndian = false); void setInt16(quint32 byteOffset, qint32 value, bool littleEndian = false);
void setUint16(quint32 byteOffset, quint16 value, bool littleEndian = false); void setUint16(quint32 byteOffset, quint32 value, bool littleEndian = false);
void setInt32(quint32 byteOffset, quint32 value, bool littleEndian = false); void setInt32(quint32 byteOffset, qint32 value, bool littleEndian = false);
void setUint32(quint32 byteOffset, quint32 value, bool littleEndian = false); void setUint32(quint32 byteOffset, quint32 value, bool littleEndian = false);
void setFloat32(quint32 byteOffset, float value, bool littleEndian = false); void setFloat32(quint32 byteOffset, float value, bool littleEndian = false);
void setFloat64(quint32 byteOffset, double value, bool littleEndian = false); void setFloat64(quint32 byteOffset, double value, bool littleEndian = false);