Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-12 17:14:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into fixDPISetting

Browse source
This commit is contained in:
ZappoMan 2017-10-25 12:39:57 -07:00
commit dcb6530b8a
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/baking/src/JSBaker.cpp
View file

@ -72,7 +72,7 @@ void JSBaker::bake() {
bool JSBaker::bakeJS(const QByteArray& inputFile, QByteArray& outputFile) { bool JSBaker::bakeJS(const QByteArray& inputFile, QByteArray& outputFile) {
// Read from inputFile and write to outputFile per character // Read from inputFile and write to outputFile per character
QTextStream in(inputFile, QIODevice::ReadOnly); QTextStream in(inputFile, QIODevice::ReadOnly);
QTextStream out(outputFile, QIODevice::WriteOnly); QTextStream out(&outputFile, QIODevice::WriteOnly);
// Algorithm requires the knowledge of previous and next character for each character read // Algorithm requires the knowledge of previous and next character for each character read
QChar currentCharacter; QChar currentCharacter;

3
libraries/shared/src/ShapeInfo.cpp
View file

@ -67,7 +67,6 @@ void ShapeInfo::setParams(ShapeType type, const glm::vec3& halfExtents, QString
break; break;
case SHAPE_TYPE_BOX: case SHAPE_TYPE_BOX:
case SHAPE_TYPE_HULL: case SHAPE_TYPE_HULL:
case SHAPE_TYPE_SIMPLE_HULL:
break; break;
case SHAPE_TYPE_SPHERE: { case SHAPE_TYPE_SPHERE: {
float radius = glm::length(halfExtents) / SQUARE_ROOT_OF_3; float radius = glm::length(halfExtents) / SQUARE_ROOT_OF_3;
@ -361,7 +360,7 @@ const DoubleHashKey& ShapeInfo::getHash() const {
numHulls = 1; numHulls = 1;
} }
if (numHulls > 0) { if (numHulls > 0) {
hash = DoubleHashKey::hashFunction(numHulls, primeIndex++); uint32_t hash = DoubleHashKey::hashFunction(numHulls, primeIndex++);
_doubleHashKey.setHash(_doubleHashKey.getHash() ^ hash); _doubleHashKey.setHash(_doubleHashKey.getHash() ^ hash);
hash = DoubleHashKey::hashFunction2(numHulls); hash = DoubleHashKey::hashFunction2(numHulls);
_doubleHashKey.setHash2(_doubleHashKey.getHash2() ^ hash); _doubleHashKey.setHash2(_doubleHashKey.getHash2() ^ hash);