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

remove cruft, fix formatting and spelling

Browse source
This commit is contained in:
Andrew Meadows 2016-12-01 10:38:13 -08:00
parent 1625430e0e
commit 445c730ca3
5 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/avatar/MyAvatar.cpp
View file

@ -1444,9 +1444,6 @@ void MyAvatar::harvestResultsFromPhysicsSimulation(float deltaTime) {
}
nextAttitude(position, orientation);
// compute new _bodyToSensorMatrix
//_bodySensorMatrix = deriveBodyFromHMDSensor();
if (_characterController.isEnabledAndReady()) {
setVelocity(_characterController.getLinearVelocity());
}

6
interface/src/avatar/MyCharacterController.cpp
View file

@ -20,9 +20,7 @@
void MyCharacterController::RayShotgunResult::reset() {
//hitNormal = glm::vec3(0.0f);
hitFraction = 1.0f;
//numHits = 0;
walkable = true;
}
@ -441,7 +439,7 @@ void MyCharacterController::initRayShotgun(const btCollisionWorld* world) {
for (int32_t i = 0; i < NUM_ROWS; ++i) {
int32_t maxJ = NUM_COLUMNS;
btScalar offsetX = -(btScalar)((NUM_COLUMNS - 1) / 2) * stepX;
if (i%2 == 1) {
if (i % 2 == 1) {
// odd rows have one less point and start a halfStep closer
maxJ -= 1;
offsetX += 0.5f * stepX;
@ -473,7 +471,7 @@ void MyCharacterController::initRayShotgun(const btCollisionWorld* world) {
for (int32_t i = 0; i < NUM_ROWS; ++i) {
int32_t maxJ = NUM_COLUMNS;
btScalar offsetX = -(btScalar)((NUM_COLUMNS - 1) / 2) * stepX;
if (i%2 == 1) {
if (i % 2 == 1) {
// odd rows have one less point and start a halfStep closer
maxJ -= 1;
offsetX += 0.5f * stepX;

2
interface/src/avatar/MyCharacterController.h
View file

@ -34,9 +34,7 @@ public:
public:
void reset();
//glm::vec3 hitNormal { 0.0f, 0.0f, 0.0f };
float hitFraction { 1.0f };
//int32_t numHits { 0 };
bool walkable { true };
};

4
libraries/physics/src/CharacterGhostObject.cpp
View file

@ -1,6 +1,6 @@
//
// CharacterGhostObject.cpp
// libraries/physcis/src
// libraries/physics/src
//
// Created by Andrew Meadows 2016.08.26
// Copyright 2016 High Fidelity, Inc.
@ -289,7 +289,7 @@ void CharacterGhostObject::measurePenetration(btVector3& minBoxOut, btVector3& m
btScalar mostFloorPenetration = 0.0f;
collisionPair->m_algorithm->getAllContactManifolds(manifoldArray);
for (int j = 0;j < manifoldArray.size(); j++) {
for (int j = 0; j < manifoldArray.size(); j++) {
btPersistentManifold* manifold = manifoldArray[j];
btScalar directionSign = (manifold->getBody0() == this) ? btScalar(1.0) : btScalar(-1.0);
for (int p = 0; p < manifold->getNumContacts(); p++) {

2
libraries/physics/src/CharacterGhostObject.h
View file

@ -1,6 +1,6 @@
//
// CharacterGhostObject.h
// libraries/physcis/src
// libraries/physics/src
//
// Created by Andrew Meadows 2016.08.26
// Copyright 2016 High Fidelity, Inc.