Skip to content

Commit 7c096ed

Browse files
authored
Merge pull request #23 from Dschadu/beta-0.3.5
- Changed logging level - Fixed version string - Added a missing return statement to a not-used function
2 parents dfec330 + e884ccb commit 7c096ed

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

client_overlay/src/overlaycontroller.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace motioncompensation
2929
public:
3030
static constexpr const char* applicationKey = "ovrmc.VRMotionCompensation";
3131
static constexpr const char* applicationName = "OpenVR Motion Compensation";
32-
static constexpr const char* applicationVersionString = "v0.3.2";
32+
static constexpr const char* applicationVersionString = "v0.3.5";
3333

3434
private:
3535
vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;

driver_vrmotioncompensation/src/devicemanipulation/MotionCompensationManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ namespace vrmotioncompensation
597597
// point is the user-input offset to the controller
598598
// VecRotation and VecPosition is the current reference-pose (Controller or input from Mover)
599599
vr::HmdQuaternion_t quat = vrmath::quaternionFromYawPitchRoll(VecRotation.v[0], VecRotation.v[1], VecRotation.v[2]);
600-
transform(quat, VecPosition, point);
600+
return transform(quat, VecPosition, point);
601601
}
602602

603603
// Calculates the new coordinates of 'point', moved and rotated by VecRotation and VecPosition

driver_vrmotioncompensation/src/dllmain.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#define ELPP_THREAD_SAFE
2+
13
#include "logging.h"
24

35
const char* logConfigFileName = "logging.conf";
@@ -11,15 +13,16 @@ const char* logConfigDefault =
1113
" TO_STANDARD_OUTPUT = true\n"
1214
" MAX_LOG_FILE_SIZE = 2097152 ## 2MB\n"
1315
"* TRACE:\n"
14-
" ENABLED = true\n"
16+
" ENABLED = false\n"
1517
"* DEBUG:\n"
16-
" ENABLED = true\n";
18+
" ENABLED = false\n";
1719

1820
INITIALIZE_EASYLOGGINGPP
1921

2022
void init_logging()
2123
{
2224
el::Loggers::addFlag(el::LoggingFlag::DisableApplicationAbortOnFatalLog);
25+
el::Loggers::addFlag(el::LoggingFlag::StrictLogFileSizeCheck);
2326
el::Configurations conf(logConfigFileName);
2427
conf.parseFromText(logConfigDefault);
2528
//conf.parseFromFile(logConfigFileName);

0 commit comments

Comments
 (0)