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

fixed some warnings

Browse source
This commit is contained in:
ZappoMan 2014-07-15 10:41:29 -07:00
parent 61d998d2ad
commit 000785a531
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/devices/MIDIManager.cpp
View file

@ -44,7 +44,9 @@ MIDIManager::~MIDIManager() {
#endif #endif
} }
#ifdef HAVE_RTMIDI
const int DEFAULT_MIDI_PORT = 0; const int DEFAULT_MIDI_PORT = 0;
#endif
void MIDIManager::openDefaultPort() { void MIDIManager::openDefaultPort() {
#ifdef HAVE_RTMIDI #ifdef HAVE_RTMIDI

40
libraries/particles/src/Particle.cpp
View file

@ -368,7 +368,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
uint32_t editID; uint32_t editID;
// check to make sure we have enough content to keep reading... // check to make sure we have enough content to keep reading...
if (length - processedBytes - sizeof(editID) < 0) { if (length - (processedBytes + (int)sizeof(editID)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -387,7 +387,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
uint32_t creatorTokenID; uint32_t creatorTokenID;
// check to make sure we have enough content to keep reading... // check to make sure we have enough content to keep reading...
if (length - processedBytes - sizeof(creatorTokenID) < 0) { if (length - (processedBytes + (int)sizeof(creatorTokenID)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -426,7 +426,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// lastEdited // lastEdited
// check to make sure we have enough content to keep reading... // check to make sure we have enough content to keep reading...
if (length - processedBytes - sizeof(newParticle._lastEdited) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._lastEdited)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -439,7 +439,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// properties included bits // properties included bits
uint16_t packetContainsBits = 0; uint16_t packetContainsBits = 0;
if (!isNewParticle) { if (!isNewParticle) {
if (length - processedBytes - sizeof(packetContainsBits) < 0) { if (length - (processedBytes + (int)sizeof(packetContainsBits)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -452,7 +452,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// radius // radius
if (isNewParticle || ((packetContainsBits & CONTAINS_RADIUS) == CONTAINS_RADIUS)) { if (isNewParticle || ((packetContainsBits & CONTAINS_RADIUS) == CONTAINS_RADIUS)) {
if (length - processedBytes - sizeof(newParticle._radius) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._radius)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -464,7 +464,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// position // position
if (isNewParticle || ((packetContainsBits & CONTAINS_POSITION) == CONTAINS_POSITION)) { if (isNewParticle || ((packetContainsBits & CONTAINS_POSITION) == CONTAINS_POSITION)) {
if (length - processedBytes - sizeof(newParticle._position) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._position)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -476,7 +476,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// color // color
if (isNewParticle || ((packetContainsBits & CONTAINS_COLOR) == CONTAINS_COLOR)) { if (isNewParticle || ((packetContainsBits & CONTAINS_COLOR) == CONTAINS_COLOR)) {
if (length - processedBytes - sizeof(newParticle._color) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._color)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -488,7 +488,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// velocity // velocity
if (isNewParticle || ((packetContainsBits & CONTAINS_VELOCITY) == CONTAINS_VELOCITY)) { if (isNewParticle || ((packetContainsBits & CONTAINS_VELOCITY) == CONTAINS_VELOCITY)) {
if (length - processedBytes - sizeof(newParticle._velocity) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._velocity)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -500,7 +500,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// gravity // gravity
if (isNewParticle || ((packetContainsBits & CONTAINS_GRAVITY) == CONTAINS_GRAVITY)) { if (isNewParticle || ((packetContainsBits & CONTAINS_GRAVITY) == CONTAINS_GRAVITY)) {
if (length - processedBytes - sizeof(newParticle._gravity) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._gravity)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -512,7 +512,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// damping // damping
if (isNewParticle || ((packetContainsBits & CONTAINS_DAMPING) == CONTAINS_DAMPING)) { if (isNewParticle || ((packetContainsBits & CONTAINS_DAMPING) == CONTAINS_DAMPING)) {
if (length - processedBytes - sizeof(newParticle._damping) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._damping)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -524,7 +524,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// lifetime // lifetime
if (isNewParticle || ((packetContainsBits & CONTAINS_LIFETIME) == CONTAINS_LIFETIME)) { if (isNewParticle || ((packetContainsBits & CONTAINS_LIFETIME) == CONTAINS_LIFETIME)) {
if (length - processedBytes - sizeof(newParticle._lifetime) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._lifetime)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -537,7 +537,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// TODO: make inHand and shouldDie into single bits // TODO: make inHand and shouldDie into single bits
// inHand // inHand
if (isNewParticle || ((packetContainsBits & CONTAINS_INHAND) == CONTAINS_INHAND)) { if (isNewParticle || ((packetContainsBits & CONTAINS_INHAND) == CONTAINS_INHAND)) {
if (length - processedBytes - sizeof(newParticle._inHand) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._inHand)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -549,7 +549,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// shouldDie // shouldDie
if (isNewParticle || ((packetContainsBits & CONTAINS_SHOULDDIE) == CONTAINS_SHOULDDIE)) { if (isNewParticle || ((packetContainsBits & CONTAINS_SHOULDDIE) == CONTAINS_SHOULDDIE)) {
if (length - processedBytes - sizeof(newParticle._shouldDie) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._shouldDie)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -562,7 +562,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// script // script
if (isNewParticle || ((packetContainsBits & CONTAINS_SCRIPT) == CONTAINS_SCRIPT)) { if (isNewParticle || ((packetContainsBits & CONTAINS_SCRIPT) == CONTAINS_SCRIPT)) {
uint16_t scriptLength; uint16_t scriptLength;
if (length - processedBytes - sizeof(scriptLength) < 0) { if (length - (processedBytes + (int)sizeof(scriptLength)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -571,7 +571,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
dataAt += sizeof(scriptLength); dataAt += sizeof(scriptLength);
processedBytes += sizeof(scriptLength); processedBytes += sizeof(scriptLength);
if (length - processedBytes - scriptLength < 0) { if (length - (processedBytes + (int)scriptLength) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -585,7 +585,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// modelURL // modelURL
if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_URL) == CONTAINS_MODEL_URL)) { if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_URL) == CONTAINS_MODEL_URL)) {
uint16_t modelURLLength; uint16_t modelURLLength;
if (length - processedBytes - sizeof(modelURLLength) < 0) { if (length - (processedBytes + (int)sizeof(modelURLLength)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -594,7 +594,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
dataAt += sizeof(modelURLLength); dataAt += sizeof(modelURLLength);
processedBytes += sizeof(modelURLLength); processedBytes += sizeof(modelURLLength);
if (length - processedBytes - modelURLLength < 0) { if (length - (processedBytes + (int)modelURLLength) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -607,7 +607,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// modelScale // modelScale
if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_SCALE) == CONTAINS_MODEL_SCALE)) { if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_SCALE) == CONTAINS_MODEL_SCALE)) {
if (length - processedBytes - sizeof(newParticle._modelScale) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._modelScale)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -619,7 +619,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// modelTranslation // modelTranslation
if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_TRANSLATION) == CONTAINS_MODEL_TRANSLATION)) { if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_TRANSLATION) == CONTAINS_MODEL_TRANSLATION)) {
if (length - processedBytes - sizeof(newParticle._modelTranslation) < 0) { if (length - (processedBytes + (int)sizeof(newParticle._modelTranslation)) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer
@ -632,7 +632,7 @@ Particle Particle::fromEditPacket(const unsigned char* data, int length, int& pr
// modelRotation // modelRotation
if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_ROTATION) == CONTAINS_MODEL_ROTATION)) { if (isNewParticle || ((packetContainsBits & CONTAINS_MODEL_ROTATION) == CONTAINS_MODEL_ROTATION)) {
const int expectedBytesForPackedQuat = sizeof(uint16_t) * 4; // this is how we pack the quats const int expectedBytesForPackedQuat = sizeof(uint16_t) * 4; // this is how we pack the quats
if (length - processedBytes - expectedBytesForPackedQuat < 0) { if (length - (processedBytes + expectedBytesForPackedQuat) < 0) {
valid = false; valid = false;
processedBytes = length; processedBytes = length;
return newParticle; // fail as if we read the entire buffer return newParticle; // fail as if we read the entire buffer

3
libraries/particles/src/ParticleCollisionSystem.cpp
View file

@ -181,9 +181,6 @@ void ParticleCollisionSystem::updateCollisionWithParticles(Particle* particleA)
} }
} }
// MIN_VALID_SPEED is obtained by computing speed gained at one gravity after the shortest expected frame
const float MIN_EXPECTED_FRAME_PERIOD = 0.0167f; // 1/60th of a second
void ParticleCollisionSystem::updateCollisionWithAvatars(Particle* particle) { void ParticleCollisionSystem::updateCollisionWithAvatars(Particle* particle) {
// particles that are in hand, don't collide with avatars // particles that are in hand, don't collide with avatars
if (!_avatars || particle->getInHand()) { if (!_avatars || particle->getInHand()) {