Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:49:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feedback re magic numbers and variable name.

Browse source
This commit is contained in:
howard-stearns 2016-06-22 16:40:10 -07:00
parent 67f76db7e4
commit 581d87d653
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
View file

@ -420,8 +420,9 @@ bool HmdDisplayPlugin::setHandLaser(uint32_t hands, HandLaserMode mode, const ve
} }
void HmdDisplayPlugin::compositeExtra() { void HmdDisplayPlugin::compositeExtra() {
std::array<HandLaserInfo, 2> handLasers; const int NUMBER_OF_HANDS = 2;
std::array<mat4, 2> renderHandPoses; std::array<HandLaserInfo, NUMBER_OF_HANDS> handLasers;
std::array<mat4, NUMBER_OF_HANDS> renderHandPoses;
Transform uiModelTransform; Transform uiModelTransform;
withPresentThreadLock([&] { withPresentThreadLock([&] {
handLasers = _handLasers; handLasers = _handLasers;
@ -443,9 +444,9 @@ void HmdDisplayPlugin::compositeExtra() {
using namespace oglplus; using namespace oglplus;
useProgram(_laserProgram); useProgram(_laserProgram);
_laserGeometry->Use(); _laserGeometry->Use();
std::array<mat4, 2> handLaserModelMatrices; std::array<mat4, NUMBER_OF_HANDS> handLaserModelMatrices;
for (int i = 0; i < 2; ++i) { for (int i = 0; i < NUMBER_OF_HANDS; ++i) {
if (renderHandPoses[i] == identity) { if (renderHandPoses[i] == identity) {
continue; continue;
} }
@ -485,7 +486,7 @@ void HmdDisplayPlugin::compositeExtra() {
auto eyePose = _currentPresentFrameInfo.presentPose * getEyeToHeadTransform(eye); auto eyePose = _currentPresentFrameInfo.presentPose * getEyeToHeadTransform(eye);
auto view = glm::inverse(eyePose); auto view = glm::inverse(eyePose);
const auto& projection = _eyeProjections[eye]; const auto& projection = _eyeProjections[eye];
for (int i = 0; i < 2; ++i) { for (int i = 0; i < NUMBER_OF_HANDS; ++i) {
if (handLaserModelMatrices[i] == identity) { if (handLaserModelMatrices[i] == identity) {
continue; continue;
} }

3
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -194,7 +194,8 @@ void enableOpenVrKeyboard(PluginContainer* container) {
_overlayMenuConnection = QObject::connect(action, &QAction::triggered, [action] { _overlayMenuConnection = QObject::connect(action, &QAction::triggered, [action] {
if (action->isChecked()) { if (action->isChecked()) {
_overlayRevealed = true; _overlayRevealed = true;
QTimer::singleShot(100, [&] { _overlayRevealed = false; }); const int KEYBOARD_DELAY_MS = 100;
QTimer::singleShot(KEYBOARD_DELAY_MS, [&] { _overlayRevealed = false; });
} }
}); });

4
scripts/system/controllers/handControllerGrab.js
View file

@ -877,8 +877,8 @@ function MyController(hand) {
// find entities near the avatar that might be equipable. // find entities near the avatar that might be equipable.
var entities = Entities.findEntities(MyAvatar.position, HOTSPOT_DRAW_DISTANCE); var entities = Entities.findEntities(MyAvatar.position, HOTSPOT_DRAW_DISTANCE);
var i, l = entities.length; var i, length = entities.length;
for (i = 0; i < l; i++) { for (i = 0; i < length; i++) {
var grabProps = Entities.getEntityProperties(entities[i], GRABBABLE_PROPERTIES); var grabProps = Entities.getEntityProperties(entities[i], GRABBABLE_PROPERTIES);
// does this entity have an attach point? // does this entity have an attach point?
var wearableData = getEntityCustomData("wearable", entities[i], undefined); var wearableData = getEntityCustomData("wearable", entities[i], undefined);