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

printing bytes out correctly

Browse source
This commit is contained in:
Eric Levin 2015-05-29 19:42:07 -07:00
parent 7d5dd278a1
commit cb72b620cf
2 changed files with 45 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
libraries/octree/src/OctreePacketData.cpp
View file

@ -382,21 +382,47 @@ bool OctreePacketData::appendValue(const glm::vec3& value) {
}
bool OctreePacketData::appendValue(const QVector<glm::vec3>& value){
const unsigned char* data = (const unsigned char*)value.data();
uint16_t qVecSize = (uint16_t)value.size();
int length = qVecSize * sizeof(glm::vec3);
const unsigned char* sizePointer = (const unsigned char*)&qVecSize;
bool success = append(sizePointer, sizeof(uint16_t));
if(success){
_bytesOfValues += qVecSize;
_totalBytesOfValues += qVecSize;
success = append(data, length);
if (success){
_bytesOfValues += length;
_totalBytesOfValues += length;
}
// const unsigned char* data = (const unsigned char*)value.data();
// uint16_t qVecSize = (uint16_t)value.size();
//
// int length = qVecSize * sizeof(glm::vec3);
// const unsigned char* sizePointer = (const unsigned char*)&qVecSize;
// bool success = append(sizePointer, sizeof(uint16_t));
// if(success){
// _bytesOfValues += qVecSize;
// _totalBytesOfValues += qVecSize;
// success = append(data, length);
// if (success){
// _bytesOfValues += length;
// _totalBytesOfValues += length;
// }
// }
// return success;
// const unsigned char* data = (const unsigned char*)value.data();
// int qVecSize = value.size();
//
// int length = qVecSize * sizeof(glm::vec3);
//
// bool success = append(data, length);
// if (success){
// _bytesOfValues += length;
// _totalBytesOfValues += length;
// }
// return success;
qDebug("YAAAR");
int qVecSize = value.size() * sizeof(glm::vec3);
QByteArray myArray('', qVecSize );
const char* data = (const char*)value.data();
for(int i = 0; i < qVecSize; i+=sizeof(float)){
float num;
memcpy(&num, data, sizeof(float));
qDebug()<<"NUM***"<<num;
data+=sizeof(float);
}
return success;
return true;
}
bool OctreePacketData::appendValue(const glm::quat& value) {
@ -598,11 +624,9 @@ int OctreePacketData::uppackDataFromBytes(const unsigned char* dataBytes, xColor
}
int OctreePacketData::uppackDataFromBytes(const unsigned char *dataBytes, QVector<glm::vec3>& result){
uint16_t length;
memcpy(&length, dataBytes, sizeof(length));
dataBytes+= sizeof(length);
qDebug()<<"size of LENGTH: "<<length;
QByteArray ba((const char*)dataBytes, length);
qDebug()<<"size of BYTE ARRAY: " << ba.size();
glm::vec3 p1;
memcpy(&p1, dataBytes, sizeof(p1));
qDebug()<<"point 1***"<<p1;
return 36;
}

1
libraries/shared/src/RegisteredMetaTypes.cpp
View file

@ -27,6 +27,7 @@ static int pickRayMetaTypeId = qRegisterMetaType<PickRay>();
static int collisionMetaTypeId = qRegisterMetaType<Collision>();
void registerMetaTypes(QScriptEngine* engine) {
qScriptRegisterMetaType(engine, vec4toScriptValue, vec4FromScriptValue);
qScriptRegisterMetaType(engine, vec3toScriptValue, vec3FromScriptValue);