Skip to content

Commit

Permalink
comments
Browse files Browse the repository at this point in the history
  • Loading branch information
mai authored and mai committed Jul 23, 2019
1 parent f5fb8dc commit df44b9a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
4 changes: 4 additions & 0 deletions alvr_server/Listener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ void Listener::SendHapticsFeedback(uint64_t startTime, float amplitude, float du
mSocket->Send((char *)&packetBuffer, sizeof(HapticsFeedback));
}


//process messages from HMD
void Listener::ProcessRecv(char *buf, int len, sockaddr_in *addr) {
if (len < 4) {
return;
Expand Down Expand Up @@ -417,6 +419,7 @@ void Listener::ProcessRecv(char *buf, int len, sockaddr_in *addr) {
}
}

//Process messages from UI
void Listener::ProcessCommand(const std::string &commandName, const std::string args) {
if (commandName == "SetDebugFlags") {
mSettings.debugFlags = strtol(args.c_str(), NULL, 10);
Expand Down Expand Up @@ -527,6 +530,7 @@ void Listener::ProcessCommand(const std::string &commandName, const std::string
}
}
else {
//send command to OpenVRHmd
mCallback->OnCommand(commandName, args);
}
}
Expand Down
14 changes: 13 additions & 1 deletion alvr_server/OpenVRHmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,25 @@ std::string OpenVRHmd::GetSerialNumber() const
return Settings::Instance().mSerialNumber;
}

//starts virtual hmd
void OpenVRHmd::Enable()
{
//add only once
if (mAdded) {
return;
}
mAdded = true;


bool ret;
ret = vr::VRServerDriverHost()->TrackedDeviceAdded(
GetSerialNumber().c_str(),
vr::TrackedDeviceClass_HMD,
this);
Log(L"TrackedDeviceAdded(HMD) Ret=%d SerialNumber=%hs", ret, GetSerialNumber().c_str());


//fake base station setting, unused for quest?
if (Settings::Instance().mUseTrackingReference) {
mTrackingReference = std::make_shared<OpenVRFakeTrackingReference>();
ret = vr::VRServerDriverHost()->TrackedDeviceAdded(
Expand All @@ -87,6 +94,8 @@ void OpenVRHmd::Enable()

}


//called from steamVR?? Init HMD
vr::EVRInitError OpenVRHmd::Activate(vr::TrackedDeviceIndex_t unObjectId)
{
Log(L"OpenVRHmd Activate %d", unObjectId);
Expand Down Expand Up @@ -160,6 +169,7 @@ vr::EVRInitError OpenVRHmd::Activate(vr::TrackedDeviceIndex_t unObjectId)
}
}

//thread triggers vsync events in OpenVR
mVSyncThread = std::make_shared<VSyncThread>(Settings::Instance().mRefreshRate);
mVSyncThread->Start();

Expand All @@ -184,6 +194,7 @@ void OpenVRHmd::EnterStandby()
{
}

//method to get component for SteamVR??
void * OpenVRHmd::GetComponent(const char * pchComponentNameAndVersion)
{
Log(L"GetComponent %hs", pchComponentNameAndVersion);
Expand All @@ -208,6 +219,7 @@ void OpenVRHmd::DebugRequest(const char * pchRequest, char * pchResponseBuffer,
pchResponseBuffer[0] = 0;
}

//return current pose to OpenVR, uses RecenterManger to adjust poses
vr::DriverPose_t OpenVRHmd::GetPose()
{
vr::DriverPose_t pose = { 0 };
Expand Down Expand Up @@ -421,7 +433,7 @@ void OpenVRHmd::OnPoseUpdated() {
//update OpenVR HMD Pose
vr::VRServerDriverHost()->TrackedDevicePoseUpdated(mObjectId, GetPose(), sizeof(vr::DriverPose_t));

//tracking reference??
//fake tracking reference update, unused for quest
if (mTrackingReference) {
mTrackingReference->OnPoseUpdated();
}
Expand Down

0 comments on commit df44b9a

Please sign in to comment.