Skip to content
This repository has been archived by the owner on Nov 8, 2019. It is now read-only.

Commit

Permalink
GoogleVR SDK for Unity v0.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
smdol committed Jun 15, 2016
1 parent b826947 commit 7ba8647
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 39 deletions.
5 changes: 0 additions & 5 deletions GoogleVR/Editor/GvrViewerEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ public class GvrViewerEditor : Editor {
"The screen resolution is multiplied by this value when creating the " +
"RenderTexture for the stereo screen.");

GUIContent autoDriftCorrectionLabel = new GUIContent("Auto Drift Correction",
"When enabled, drift in the gyro readings is estimated and removed.");

GUIContent neckModelScaleLabel = new GUIContent("Neck Model Scale",
"The scale factor of the builtin neck model [0..1]. To disable, set to 0.");

Expand Down Expand Up @@ -84,8 +81,6 @@ public override void OnInspectorGUI() {
}
gvrViewer.NeckModelScale =
EditorGUILayout.Slider(neckModelScaleLabel, gvrViewer.NeckModelScale, 0, 1);
gvrViewer.AutoDriftCorrection =
EditorGUILayout.Toggle(autoDriftCorrectionLabel, gvrViewer.AutoDriftCorrection);

EditorGUILayout.Separator();

Expand Down
1 change: 0 additions & 1 deletion GoogleVR/Prefabs/GvrMain.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,6 @@ MonoBehaviour:
enableSettingsButton: 1
backButtonMode: 1
neckModelScale: 1
autoDriftCorrection: 1
electronicDisplayStabilization: 0
autoUntiltHead: 1
UseUnityRemoteInput: 0
Expand Down
1 change: 0 additions & 1 deletion GoogleVR/Prefabs/GvrManager.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,6 @@ MonoBehaviour:
enableSettingsButton: 1
backButtonMode: 1
neckModelScale: 1
autoDriftCorrection: 1
electronicDisplayStabilization: 0
autoUntiltHead: 1
UseUnityRemoteInput: 0
Expand Down
16 changes: 0 additions & 16 deletions GoogleVR/Scripts/GvrViewer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,21 +218,6 @@ public float NeckModelScale {
[SerializeField]
private float neckModelScale = 0.0f;

/// When enabled, drift in the gyro readings is estimated and removed.
public bool AutoDriftCorrection {
get {
return autoDriftCorrection;
}
set {
if (value != autoDriftCorrection && device != null) {
device.SetAutoDriftCorrectionEnabled(value);
}
autoDriftCorrection = value;
}
}
[SerializeField]
private bool autoDriftCorrection = true;

/// @cond
public bool ElectronicDisplayStabilization {
get {
Expand Down Expand Up @@ -460,7 +445,6 @@ private void InitDevice() {
device.SetDistortionCorrectionEnabled(distortionCorrection == DistortionCorrectionMethod.Native
&& NativeDistortionCorrectionSupported);
device.SetNeckModelScale(neckModelScale);
device.SetAutoDriftCorrectionEnabled(autoDriftCorrection);
device.SetElectronicDisplayStabilizationEnabled(electronicDisplayStabilization);

device.SetVRModeEnabled(vrModeEnabled);
Expand Down
1 change: 0 additions & 1 deletion GoogleVR/Scripts/VRDevices/BaseVRDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ protected BaseVRDevice() {
public abstract void SetShowVrBackButtonOnlyInVR(bool only);

public abstract void SetNeckModelScale(float scale);
public abstract void SetAutoDriftCorrectionEnabled(bool enabled);
public abstract void SetElectronicDisplayStabilizationEnabled(bool enabled);

public virtual bool SupportsNativeDistortionCorrection(List<string> diagnostics) {
Expand Down
1 change: 0 additions & 1 deletion GoogleVR/Scripts/VRDevices/EditorDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public override void SetAlignmentMarkerEnabled(bool enabled) {}
public override void SetVRBackButtonEnabled(bool enabled) {}
public override void SetShowVrBackButtonOnlyInVR(bool only) {}
public override void SetNeckModelScale(float scale) {}
public override void SetAutoDriftCorrectionEnabled(bool enabled) {}
public override void SetElectronicDisplayStabilizationEnabled(bool enabled) {}

private Quaternion initialRotation = Quaternion.identity;
Expand Down
7 changes: 0 additions & 7 deletions GoogleVR/Scripts/VRDevices/GvrDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ public override void SetNeckModelScale(float scale) {
SetNeckModelFactor(scale);
}

public override void SetAutoDriftCorrectionEnabled(bool enabled) {
EnableAutoDriftCorrection(enabled);
}

public override void SetElectronicDisplayStabilizationEnabled(bool enabled) {
EnableElectronicDisplayStabilization(enabled);
}
Expand Down Expand Up @@ -209,9 +205,6 @@ protected virtual void ProcessEvents() {
[DllImport(dllName)]
private static extern void EnableDistortionCorrection(bool enable);

[DllImport(dllName)]
private static extern void EnableAutoDriftCorrection(bool enable);

[DllImport(dllName)]
private static extern void EnableElectronicDisplayStabilization(bool enable);

Expand Down
7 changes: 0 additions & 7 deletions GoogleVR/Scripts/VRDevices/iOSDevice.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,9 @@ public override void SetShowVrBackButtonOnlyInVR(bool only) {
setShowVrBackButtonOnlyInVR(only);
}

public override void SetAutoDriftCorrectionEnabled(bool enabled){
// For iOS don't use Drift Correction.
base.SetAutoDriftCorrectionEnabled(false);
}

public override void Init() {
isOpenGL = isOpenGLAPI();
base.Init();
// For iOS don't use Drift Correction.
SetAutoDriftCorrectionEnabled(false);
}

public override void ShowSettingsDialog() {
Expand Down
Binary file modified GoogleVRForUnity.unitypackage
Binary file not shown.

0 comments on commit 7ba8647

Please sign in to comment.