Skip to content

Commit

Permalink
Merge pull request #14 from OSVR/osvrUnityUpdatev0.6.6.9
Browse files Browse the repository at this point in the history
Update to OSVR-Unityv0.6.6.9, adds d3dcompiler_47.dll dependency for …
  • Loading branch information
DuFF14 committed Mar 30, 2016
2 parents 8f1033d + a1e7543 commit 92cf1fa
Show file tree
Hide file tree
Showing 112 changed files with 162 additions and 140 deletions.
4 changes: 2 additions & 2 deletions Assets/OSVRUnity.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Prefabs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Resources.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Materials/Effects.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models/Environment.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models/Environment/Geometry.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models/Environment/Textures.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models/Sword.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models/Sword/Geometry.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models/Sword/Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Models/Sword/Textures.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Prefabs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Scenes.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Scripts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Scripts/Managers.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Scripts/Objects.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Shaders.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Textures.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Demo/Textures/Effects.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/Sample/Scripts.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/OSVRUnity/src.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Assets/OSVRUnity/src/DLLSearchPathFixer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,29 @@ public static void fix()
/// </summary>
private DLLSearchPathFixer()
{
#if !UNITY_WINRT
var currentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process);
//Debug.Log(String.Format("Old PATH: {0}", currentPath));
OrigDirs = new List<string>(currentPath.Split(Path.PathSeparator));
UnityDataDir = Application.dataPath;
UnityDataDirBackslashed = Application.dataPath.Replace("/", "\\");
#endif
}

/// <summary>
/// Update the process environment PATH variable to contain the full list (entries new and old) of directories.
/// </summary>
private void ApplyChanges()
{
#if !UNITY_WINRT
// Combine new and old dirs
var allDirs = new List<String>(NewDirs);
allDirs.AddRange(OrigDirs);

var newPathString = String.Join(Path.PathSeparator.ToString(), allDirs.ToArray());
//Debug.Log(String.Format("New PATH: {0}", newPathString));
Environment.SetEnvironmentVariable("PATH", newPathString, EnvironmentVariableTarget.Process);
#endif
}

/// <summary>
Expand Down
10 changes: 8 additions & 2 deletions Assets/OSVRUnity/src/VREye.cs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,10 @@ public void CreateSurfaces(uint surfaceCount)

//create a RenderTexture for this eye's camera to render into
RenderTexture renderTexture = new RenderTexture(surface.Viewport.Width, surface.Viewport.Height, 24, RenderTextureFormat.Default);
renderTexture.antiAliasing = QualitySettings.antiAliasing;
if (QualitySettings.antiAliasing > 0)
{
renderTexture.antiAliasing = QualitySettings.antiAliasing;
}
surface.SetRenderTexture(renderTexture);
}
}
Expand Down Expand Up @@ -264,7 +267,10 @@ public void CreateSurfaces(uint surfaceCount)

//create a RenderTexture for this eye's camera to render into
RenderTexture renderTexture = new RenderTexture(surface.Viewport.Width, surface.Viewport.Height, 24, RenderTextureFormat.Default);
renderTexture.antiAliasing = QualitySettings.antiAliasing;
if (QualitySettings.antiAliasing > 0)
{
renderTexture.antiAliasing = QualitySettings.antiAliasing;
}
surface.SetRenderTexture(renderTexture);
}
}
Expand Down
4 changes: 2 additions & 2 deletions Assets/Plugins.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Android.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Android/libs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Assets/Plugins/Android/libs/armeabi-v7a.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 92cf1fa

Please sign in to comment.