Merge pull request #223 from Ventrella/master

cleaned up a bunch of spacings inside of parentheses
This commit is contained in:
ZappoMan 2013-05-07 17:51:43 -07:00
commit 005b2fce35
6 changed files with 172 additions and 180 deletions

View file

@ -322,7 +322,6 @@ bool Avatar::getIsNearInteractingOther() {
void Avatar::simulate(float deltaTime) {
// update balls
if (_balls) { _balls->simulate(deltaTime); }
@ -1450,9 +1449,7 @@ void Avatar::processTransmitterData(unsigned char* packetData, int numBytes) {
//printLog("Packet: [%s]\n", packetData);
//printLog("Version: %s\n", device);
_transmitterInitialReading = glm::vec3( rot3,
rot2,
rot1 );
_transmitterInitialReading = glm::vec3(rot3, rot2, rot1);
}
const int TRANSMITTER_COUNT = 100;
if (_transmitterPackets % TRANSMITTER_COUNT == 0) {

View file

@ -53,8 +53,6 @@ void Camera::update( float deltaTime ) {
generateOrientation();
}
// generate the ortho-normals for the orientation based on the three Euler angles
void Camera::generateOrientation() {
_orientation.setToIdentity();
@ -63,7 +61,6 @@ void Camera::generateOrientation() {
_orientation.roll (_roll );
}
// use iterative forces to keep the camera at the desired position and angle
void Camera::updateFollowMode(float deltaTime) {
// derive t from tightness
@ -114,8 +111,6 @@ void Camera::setFarClip (float f) {
_frustumNeedsReshape = true;
}
// call to find out if the view frustum needs to be reshaped
bool Camera::getFrustumNeedsReshape() {
return _frustumNeedsReshape;