mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 05:37:11 +00:00
1367963d3d
- Bug 1198124 - Enable -Wshadow in directories that have no -Wshadow warnings. r=glandium (d03cfc1bb6) - Bug 1204403 - Fix -Wshadow warnings in xpcom. r=mccr8 (3247b5b146) - Bug 1140120 - Remove a couple of unused test functions on ServiceWorkerContainer; r=baku (efe1119749) - Bug 1180148 - Clear service workers registered for a site when clearing the cookies and stored data is not working in b2g. r=baku (7fb1d522ff) - Bug 1162333 - Add stronger assertions to PromiseWorkerProxy in debug builds. r=catalinb (0005a76252) - Bug 1190672 - Fix use of AutoReleasePromiseWorkerProxy in PushManager. r=catalinb (18f7358163) - Bug 1191495 - Relax PushManager callback assertions. r=kitcambridge (8a3822969f) - Bug 1189543 - pushManager.getSubscription() should return null for nonexistent push subscriptions in workers. r=nsm (b990083262) - spacing (44b87017a7) - Bug 1180295 - Rip out the Fennec code to set the screen render offset. r=rbarker (67183ae8bf) - Bug 1187804 - Un-adjust fixed layers by the async transform of the scroll frame that they're fixed with respect to, not of the nearest ancestor scroll frame. r=kats (7c5e7ac29c) - Bug 1131359 - Fix an include-what-you-use error in AsyncCompositionManager.cpp. r=kats (fe04815939) - Bug 1187804 - When a layer is scrolled by multiple scroll frames, do an AlignFixedAndStickyLayers pass on its subtree for each of the scroll frames. r=kats (031a5686f1) - Bug 1180295 - Stop clipping the content while the toolbar is in the process of sliding off. r=rbarker (9d806870e4) - Bug 1186968 - Fix Compositor::SetScreenRotation() call r=nical (e554c4b4a2) - Bug 1180295 - Implement seamless snapping to the stable state. r=rbarker (d1e7978eb7) - Bug 1131470 - Part 1: Rename existing use of ScreenOrientation to ScreenOrientationInternal. r=baku (63f0cb994b) - Bug 1131470 - Part 2: Update screen configuration HAL to report orientation angle. r=snorp,mwu (39b537f008) - Bug 1167597 - Mark PromiseReportRejectFeature::mPromise as MOZ_NON_OWNING_REF. r=ehsan (3ad520790a) - Bug 1086627 - Rename Promise constructs to more closely match the specification. r=nsm,jst (cea1d71cb1) - Bug 1086627 - Rename ThenableResolverTask to PromiseResolveThenableJob to more closely match Promise spec. r=nsm (e7102fe506) - Bug 1164725 - Convert flags in nsIDocument into bit fields. r=smaug (9f5d5f352d) - Bug 1192467 - Formalize precondition that SetDisplayDocument must not be called with null. - r=peterv (1aa8e91d14) - Bug 1153841 - Remove the 'it must be 2D' restriction for transforms on fixed-pos layers. r=BenWa,mattwoodrow (5bab86ec6a) - Bug 1173521 - Properly handle unapplying 3D projective transforms to rectangles in APZ code. r=botond (45c9850d5c) - Bug 1166301 - When applying an async adjustment to a fixed layer, only adjust its mask layer under the same circumstances as its clip rect. r=mattwoodrow (2801c48fe9) - Bug 1166301 - Update an old comment in AsyncCompositionManager::AlignFixedAndStickyLayers. r=kats (7e1d5c97d0) - Bug 1166301 - Allow async scrolling to move the clip rects of fixed background layers. r=mattwoodrow (edd889ec2b) - Bug 1200399 - Only send the RCD's metrics to Java-land for fennec-apz. r=rbarker (3b36a52f3a) - Bug 1201625 - Special-case B2GDroid since it doesn't have a root content document. r=rbarker (4fcdda1b0a) - Bug 1201529 - Fall back to rootmost metrics if there is no root content document metrics. r=botond (615c2ee727) - Bug 1201581 - Extract a helper method. r=rbarker (f2cccb8666) - Bug 1201581 - Hook up the syncFrameMetrics call to sync metrics info from the compositor to Java-land on each composite. r=rbarker (48e15bbde8) - Bug 1203760 P1 Allow pipe to wake up multiple streams at the same time. r=froydnj (5baed00637) - Bug 1203760 P2 Add gtests for nsPipeInputStream AsyncRead(). r=froydnj (52e5129dc8) - Bug 1201889 - When adjusting fixed and sticky layers in AsyncCompsitionManager, unapply all async transforms on the path from the fixed layer to the layer it's fixed with respect to. r=kats (dbb203178e) - Bug 1165536. Don't include resolution compensation when adjusting the cliprect of ancestors of scrollbars. r=botond (3bef5f2c18) - Fix async transforms on scrollbars not including any existing shadow transform. (bug 1128740 part 2, r=botond) (af12d76775) - missing of Bug 943728 - Replace double quotes with single quotes in Makefiles (e11470540f) - Bug 1188766 - Avoid exporting UPLOAD_EXTRA_FILES from mozconfig. r=mshal (4241b9e80b) - Fixup for bug 1188766 for valgrind bustage on a CLOSED TREE. r=me (4401dedf06) - Bug 1077622 - Fixes cp missing operand message if no .mozconfig found r=glandium (6eca1e5214) - Bug 1200523 - Remove leftover debugging code from js/src/Makefile.in; r=ted (414b72c74e) - spacing (99cda3f8a7)
363 lines
11 KiB
C++
363 lines
11 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include <math.h>
|
|
|
|
#include "prlink.h"
|
|
#include "prmem.h"
|
|
#include "prenv.h"
|
|
#include "gfxPrefs.h"
|
|
#include "nsString.h"
|
|
#include "mozilla/dom/ScreenOrientation.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "mozilla/Hal.h"
|
|
|
|
#include "gfxVRCardboard.h"
|
|
|
|
#include "nsServiceManagerUtils.h"
|
|
#include "nsIScreenManager.h"
|
|
|
|
#ifdef ANDROID
|
|
#include <android/log.h>
|
|
#define LOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoVR" , ## args)
|
|
#else
|
|
#define LOG(...) do { } while(0)
|
|
#endif
|
|
|
|
// 1/sqrt(2) (aka sqrt(2)/2)
|
|
#ifndef M_SQRT1_2
|
|
# define M_SQRT1_2 0.70710678118654752440
|
|
#endif
|
|
|
|
using namespace mozilla::dom;
|
|
using namespace mozilla::gfx;
|
|
using namespace mozilla::gfx::impl;
|
|
|
|
namespace {
|
|
// some utility functions
|
|
|
|
// This remaps axes in the given matrix to a new configuration based on the
|
|
// screen orientation. Similar to what Android SensorManager.remapCoordinateSystem
|
|
// does, except only for a fixed number of transforms that we need.
|
|
Matrix4x4
|
|
RemapMatrixForOrientation(ScreenOrientationInternal screenConfig, const Matrix4x4& aMatrix)
|
|
{
|
|
Matrix4x4 out;
|
|
const float *in = &aMatrix._11;
|
|
float *o = &out._11;
|
|
|
|
if (screenConfig == eScreenOrientation_LandscapePrimary) {
|
|
// remap X,Y -> Y,-X
|
|
o[0] = -in[1]; o[1] = in[0]; o[2] = in[2];
|
|
o[4] = -in[5]; o[5] = in[4]; o[6] = in[6];
|
|
o[8] = -in[9]; o[9] = in[8]; o[10] = in[10];
|
|
} else if (screenConfig == eScreenOrientation_LandscapeSecondary) {
|
|
// remap X,Y -> -Y,X
|
|
o[0] = in[1]; o[1] = -in[0]; o[2] = in[2];
|
|
o[4] = in[5]; o[5] = -in[4]; o[6] = in[6];
|
|
o[8] = in[9]; o[9] = -in[8]; o[10] = in[10];
|
|
} else if (screenConfig == eScreenOrientation_PortraitPrimary ||
|
|
screenConfig == eScreenOrientation_PortraitSecondary)
|
|
{
|
|
// remap X,Y -> X,-Z
|
|
o[0] = in[0]; o[1] = in[2]; o[2] = -in[1];
|
|
o[4] = in[4]; o[5] = in[6]; o[6] = -in[5];
|
|
o[8] = in[8]; o[9] = in[10]; o[10] = -in[9];
|
|
} else {
|
|
MOZ_ASSERT(0, "gfxVRCardboard::RemapMatrixForOrientation invalid screenConfig");
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
}
|
|
|
|
HMDInfoCardboard::HMDInfoCardboard()
|
|
: VRHMDInfo(VRHMDType::Cardboard)
|
|
, mStartCount(0)
|
|
, mOrient(eScreenOrientation_PortraitPrimary)
|
|
{
|
|
MOZ_ASSERT(sizeof(HMDInfoCardboard::DistortionVertex) == sizeof(VRDistortionVertex),
|
|
"HMDInfoCardboard::DistortionVertex must match the size of VRDistortionVertex");
|
|
|
|
MOZ_COUNT_CTOR_INHERITED(HMDInfoCardboard, VRHMDInfo);
|
|
|
|
mDeviceName.AssignLiteral("Phone Sensor (Cardboard) HMD");
|
|
|
|
mSupportedSensorBits = State_Orientation;
|
|
|
|
mRecommendedEyeFOV[Eye_Left] = VRFieldOfView(45.0, 45.0, 45.0, 45.0);
|
|
mRecommendedEyeFOV[Eye_Right] = VRFieldOfView(45.0, 45.0, 45.0, 45.0);
|
|
|
|
mMaximumEyeFOV[Eye_Left] = VRFieldOfView(45.0, 45.0, 45.0, 45.0);
|
|
mMaximumEyeFOV[Eye_Right] = VRFieldOfView(45.0, 45.0, 45.0, 45.0);
|
|
|
|
SetFOV(mRecommendedEyeFOV[Eye_Left], mRecommendedEyeFOV[Eye_Right], 0.01, 10000.0);
|
|
|
|
#if 1
|
|
int32_t xcoord = 0;
|
|
if (getenv("FAKE_CARDBOARD_SCREEN")) {
|
|
const char *env = getenv("FAKE_CARDBOARD_SCREEN");
|
|
nsresult err;
|
|
xcoord = nsCString(env).ToInteger(&err);
|
|
if (err != NS_OK) xcoord = 0;
|
|
}
|
|
mScreen = VRHMDManager::MakeFakeScreen(xcoord, 0, 1920, 1080);
|
|
#endif
|
|
|
|
}
|
|
|
|
bool
|
|
HMDInfoCardboard::StartSensorTracking()
|
|
{
|
|
LOG("HMDInfoCardboard::StartSensorTracking %d\n", mStartCount);
|
|
if (mStartCount == 0) {
|
|
// it's never been started before; initialize observers and
|
|
// initial state.
|
|
|
|
mozilla::hal::ScreenConfiguration sconfig;
|
|
mozilla::hal::GetCurrentScreenConfiguration(&sconfig);
|
|
this->Notify(sconfig);
|
|
|
|
mozilla::hal::RegisterSensorObserver(mozilla::hal::SENSOR_GAME_ROTATION_VECTOR, this);
|
|
mozilla::hal::RegisterScreenConfigurationObserver(this);
|
|
|
|
mLastSensorState.Clear();
|
|
}
|
|
|
|
mStartCount++;
|
|
return true;
|
|
}
|
|
|
|
void
|
|
HMDInfoCardboard::Notify(const mozilla::hal::ScreenConfiguration& config)
|
|
{
|
|
mOrient = config.orientation();
|
|
|
|
if (mOrient == eScreenOrientation_LandscapePrimary) {
|
|
mScreenTransform = Quaternion(0.f, 0.f, (float) M_SQRT1_2, (float) M_SQRT1_2);
|
|
} else if (mOrient == eScreenOrientation_LandscapeSecondary) {
|
|
mScreenTransform = Quaternion(0.f, 0.f, (float) -M_SQRT1_2, (float) M_SQRT1_2);
|
|
} else if (mOrient == eScreenOrientation_PortraitPrimary) {
|
|
mScreenTransform = Quaternion();
|
|
} else if (mOrient == eScreenOrientation_PortraitSecondary) {
|
|
mScreenTransform = Quaternion(0.f, 0.f, 1.f, 0.f);
|
|
}
|
|
}
|
|
|
|
void
|
|
HMDInfoCardboard::Notify(const mozilla::hal::SensorData& data)
|
|
{
|
|
if (data.sensor() != mozilla::hal::SENSOR_GAME_ROTATION_VECTOR)
|
|
return;
|
|
|
|
const nsTArray<float>& sensorValues = data.values();
|
|
|
|
// This is super chatty
|
|
//LOG("HMDInfoCardboard::Notify %f %f %f %f\n", sensorValues[0], sensorValues[1], sensorValues[2], sensorValues[3]);
|
|
|
|
mSavedLastSensor.Set(sensorValues[0], sensorValues[1], sensorValues[2], sensorValues[3]);
|
|
mSavedLastSensorTime = data.timestamp();
|
|
mNeedsSensorCompute = true;
|
|
}
|
|
|
|
void
|
|
HMDInfoCardboard::ComputeStateFromLastSensor()
|
|
{
|
|
if (!mNeedsSensorCompute)
|
|
return;
|
|
|
|
// apply the zero orientation
|
|
Quaternion q = mSensorZeroInverse * mSavedLastSensor;
|
|
|
|
// make a matrix from the quat
|
|
Matrix4x4 qm;
|
|
qm.SetRotationFromQuaternion(q);
|
|
|
|
// remap the coordinate space, based on the orientation
|
|
Matrix4x4 qmRemapped = RemapMatrixForOrientation(mOrient, qm);
|
|
|
|
// turn it back into a quat
|
|
q.SetFromRotationMatrix(qmRemapped);
|
|
|
|
// apply adjustment based on what's been done to the screen and the original zero
|
|
// position of the base coordinate space
|
|
q = mScreenTransform * q;
|
|
|
|
VRHMDSensorState& state = mLastSensorState;
|
|
|
|
state.flags |= State_Orientation;
|
|
state.orientation[0] = q.x;
|
|
state.orientation[1] = q.y;
|
|
state.orientation[2] = q.z;
|
|
state.orientation[3] = q.w;
|
|
|
|
state.timestamp = mSavedLastSensorTime / 1000000.0;
|
|
|
|
mNeedsSensorCompute = false;
|
|
}
|
|
|
|
VRHMDSensorState
|
|
HMDInfoCardboard::GetSensorState(double timeOffset)
|
|
{
|
|
ComputeStateFromLastSensor();
|
|
return mLastSensorState;
|
|
}
|
|
|
|
void
|
|
HMDInfoCardboard::StopSensorTracking()
|
|
{
|
|
LOG("HMDInfoCardboard::StopSensorTracking, count %d\n", mStartCount);
|
|
if (--mStartCount == 0) {
|
|
mozilla::hal::UnregisterScreenConfigurationObserver(this);
|
|
mozilla::hal::UnregisterSensorObserver(mozilla::hal::SENSOR_GAME_ROTATION_VECTOR, this);
|
|
}
|
|
}
|
|
|
|
void
|
|
HMDInfoCardboard::ZeroSensor()
|
|
{
|
|
mSensorZeroInverse = mSavedLastSensor;
|
|
mSensorZeroInverse.Invert();
|
|
}
|
|
|
|
bool
|
|
HMDInfoCardboard::SetFOV(const VRFieldOfView& aFOVLeft,
|
|
const VRFieldOfView& aFOVRight,
|
|
double zNear, double zFar)
|
|
{
|
|
const float standardIPD = 0.064f;
|
|
|
|
for (uint32_t eye = 0; eye < NumEyes; eye++) {
|
|
mEyeFOV[eye] = eye == Eye_Left ? aFOVLeft : aFOVRight;
|
|
mEyeTranslation[eye] = Point3D(standardIPD * (eye == Eye_Left ? -1.0 : 1.0), 0.0, 0.0);
|
|
mEyeProjectionMatrix[eye] = mEyeFOV[eye].ConstructProjectionMatrix(zNear, zFar, true);
|
|
|
|
mDistortionMesh[eye].mVertices.SetLength(4);
|
|
mDistortionMesh[eye].mIndices.SetLength(6);
|
|
|
|
HMDInfoCardboard::DistortionVertex *destv = reinterpret_cast<HMDInfoCardboard::DistortionVertex*>(mDistortionMesh[eye].mVertices.Elements());
|
|
float xoffs = eye == Eye_Left ? 0.0f : 1.0f;
|
|
float txoffs = eye == Eye_Left ? 0.0f : 0.5f;
|
|
destv[0].pos[0] = -1.0 + xoffs;
|
|
destv[0].pos[1] = -1.0;
|
|
destv[0].texR[0] = destv[0].texG[0] = destv[0].texB[0] = 0.0 + txoffs;
|
|
destv[0].texR[1] = destv[0].texG[1] = destv[0].texB[1] = 1.0;
|
|
destv[0].padding[0] = 1.0; // vignette factor
|
|
|
|
destv[1].pos[0] = 0.0 + xoffs;
|
|
destv[1].pos[1] = -1.0;
|
|
destv[1].texR[0] = destv[1].texG[0] = destv[1].texB[0] = 0.5 + txoffs;
|
|
destv[1].texR[1] = destv[1].texG[1] = destv[1].texB[1] = 1.0;
|
|
destv[1].padding[0] = 1.0; // vignette factor
|
|
|
|
destv[2].pos[0] = 0.0 + xoffs;
|
|
destv[2].pos[1] = 1.0;
|
|
destv[2].texR[0] = destv[2].texG[0] = destv[2].texB[0] = 0.5 + txoffs;
|
|
destv[2].texR[1] = destv[2].texG[1] = destv[2].texB[1] = 0.0;
|
|
destv[2].padding[0] = 1.0; // vignette factor
|
|
|
|
destv[3].pos[0] = -1.0 + xoffs;
|
|
destv[3].pos[1] = 1.0;
|
|
destv[3].texR[0] = destv[3].texG[0] = destv[3].texB[0] = 0.0 + txoffs;
|
|
destv[3].texR[1] = destv[3].texG[1] = destv[3].texB[1] = 0.0;
|
|
destv[3].padding[0] = 1.0; // vignette factor
|
|
|
|
uint16_t *iv = mDistortionMesh[eye].mIndices.Elements();
|
|
iv[0] = 0; iv[1] = 1; iv[2] = 2;
|
|
iv[3] = 2; iv[4] = 3; iv[5] = 0;
|
|
}
|
|
|
|
// XXX find out the default screen size and use that
|
|
mEyeResolution.width = 1920 / 2;
|
|
mEyeResolution.height = 1080;
|
|
|
|
mConfiguration.hmdType = mType;
|
|
mConfiguration.value = 0;
|
|
mConfiguration.fov[0] = aFOVLeft;
|
|
mConfiguration.fov[1] = aFOVRight;
|
|
|
|
return true;
|
|
}
|
|
|
|
void
|
|
HMDInfoCardboard::FillDistortionConstants(uint32_t whichEye,
|
|
const IntSize& textureSize, const IntRect& eyeViewport,
|
|
const Size& destViewport, const Rect& destRect,
|
|
VRDistortionConstants& values)
|
|
{
|
|
// these modify the texture coordinates; texcoord * zw + xy
|
|
values.eyeToSourceScaleAndOffset[0] = 0.0;
|
|
values.eyeToSourceScaleAndOffset[1] = 0.0;
|
|
values.eyeToSourceScaleAndOffset[2] = 1.0;
|
|
values.eyeToSourceScaleAndOffset[3] = 1.0;
|
|
|
|
// Our mesh positions are in the [-1..1] clip space; we give appropriate offset
|
|
// and scaling for the right viewport. (In the 0..2 space for sanity)
|
|
|
|
// this is the destRect in clip space
|
|
float x0 = destRect.x / destViewport.width * 2.0 - 1.0;
|
|
float x1 = (destRect.x + destRect.width) / destViewport.width * 2.0 - 1.0;
|
|
|
|
float y0 = destRect.y / destViewport.height * 2.0 - 1.0;
|
|
float y1 = (destRect.y + destRect.height) / destViewport.height * 2.0 - 1.0;
|
|
|
|
// offset
|
|
values.destinationScaleAndOffset[0] = (x0+x1) / 2.0;
|
|
values.destinationScaleAndOffset[1] = (y0+y1) / 2.0;
|
|
// scale
|
|
values.destinationScaleAndOffset[2] = destRect.width / destViewport.width;
|
|
values.destinationScaleAndOffset[3] = destRect.height / destViewport.height;
|
|
}
|
|
|
|
void
|
|
HMDInfoCardboard::Destroy()
|
|
{
|
|
}
|
|
|
|
|
|
|
|
bool
|
|
VRHMDManagerCardboard::PlatformInit()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
VRHMDManagerCardboard::Init()
|
|
{
|
|
if (mCardboardInitialized)
|
|
return true;
|
|
|
|
nsRefPtr<HMDInfoCardboard> hmd = new HMDInfoCardboard();
|
|
mCardboardHMDs.AppendElement(hmd);
|
|
|
|
mCardboardInitialized = true;
|
|
return true;
|
|
}
|
|
|
|
void
|
|
VRHMDManagerCardboard::Destroy()
|
|
{
|
|
if (!mCardboardInitialized)
|
|
return;
|
|
|
|
for (size_t i = 0; i < mCardboardHMDs.Length(); ++i) {
|
|
mCardboardHMDs[i]->Destroy();
|
|
}
|
|
|
|
mCardboardHMDs.Clear();
|
|
mCardboardInitialized = false;
|
|
}
|
|
|
|
void
|
|
VRHMDManagerCardboard::GetHMDs(nsTArray<nsRefPtr<VRHMDInfo>>& aHMDResult)
|
|
{
|
|
Init();
|
|
for (size_t i = 0; i < mCardboardHMDs.Length(); ++i) {
|
|
aHMDResult.AppendElement(mCardboardHMDs[i]);
|
|
}
|
|
}
|