Merge pull request #13 from OSVR/osvrUnityUpdatev0.6.6

Updated to OSVR-Unity-v0.6.6-2-g2bef29c-with-core-v0.6-1169-ge9235a4-…
OSVR · Mar 25, 2016 · 8f1033d · 8f1033d
2 parents 37fd7a0 + d219079
commit 8f1033d
Show file tree

Hide file tree

Showing 137 changed files with 109 additions and 124 deletions.
diff --git a/Assets/OSVRUnity.meta b/Assets/OSVRUnity.meta
diff --git a/Assets/OSVRUnity/Prefabs.meta b/Assets/OSVRUnity/Prefabs.meta
diff --git a/Assets/OSVRUnity/Resources.meta b/Assets/OSVRUnity/Resources.meta
diff --git a/Assets/OSVRUnity/Sample.meta b/Assets/OSVRUnity/Sample.meta
diff --git a/Assets/OSVRUnity/Sample/Demo.meta b/Assets/OSVRUnity/Sample/Demo.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Materials.meta b/Assets/OSVRUnity/Sample/Demo/Materials.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Materials/Effects.meta b/Assets/OSVRUnity/Sample/Demo/Materials/Effects.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models.meta b/Assets/OSVRUnity/Sample/Demo/Models.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment/Geometry.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment/Geometry.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment/Materials.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment/Materials.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Environment/Textures.meta b/Assets/OSVRUnity/Sample/Demo/Models/Environment/Textures.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword/Geometry.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword/Geometry.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword/Materials.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword/Materials.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Models/Sword/Textures.meta b/Assets/OSVRUnity/Sample/Demo/Models/Sword/Textures.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Prefabs.meta b/Assets/OSVRUnity/Sample/Demo/Prefabs.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scenes.meta b/Assets/OSVRUnity/Sample/Demo/Scenes.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scripts.meta b/Assets/OSVRUnity/Sample/Demo/Scripts.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scripts/Managers.meta b/Assets/OSVRUnity/Sample/Demo/Scripts/Managers.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Scripts/Objects.meta b/Assets/OSVRUnity/Sample/Demo/Scripts/Objects.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Shaders.meta b/Assets/OSVRUnity/Sample/Demo/Shaders.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Textures.meta b/Assets/OSVRUnity/Sample/Demo/Textures.meta
diff --git a/Assets/OSVRUnity/Sample/Demo/Textures/Effects.meta b/Assets/OSVRUnity/Sample/Demo/Textures/Effects.meta
diff --git a/Assets/OSVRUnity/Sample/Materials.meta b/Assets/OSVRUnity/Sample/Materials.meta
diff --git a/Assets/OSVRUnity/Sample/Scripts.meta b/Assets/OSVRUnity/Sample/Scripts.meta
diff --git a/Assets/OSVRUnity/Shaders.meta b/Assets/OSVRUnity/Shaders.meta
diff --git a/Assets/OSVRUnity/src.meta b/Assets/OSVRUnity/src.meta
diff --git a/Assets/OSVRUnity/src/VREye.cs b/Assets/OSVRUnity/src/VREye.cs
@@ -220,6 +220,7 @@ 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;
                             surface.SetRenderTexture(renderTexture);
                         }
                     }
@@ -263,6 +264,7 @@ 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;
                         surface.SetRenderTexture(renderTexture);                       
                     }             
                 }

diff --git a/Assets/Plugins.meta b/Assets/Plugins.meta
diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta
diff --git a/Assets/Plugins/Android/libs.meta b/Assets/Plugins/Android/libs.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a.meta b/Assets/Plugins/Android/libs/armeabi-v7a.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libcrystax.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libcrystax.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libgnustl_shared.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libgnustl_shared.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libjsoncpp.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libjsoncpp.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClient.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClient.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClientKit.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrClientKit.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrCommon.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrCommon.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrConnection.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrConnection.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUtil.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libosvrUtil.so.meta
diff --git a/Assets/Plugins/Android/libs/armeabi-v7a/libusb1.0.so.meta b/Assets/Plugins/Android/libs/armeabi-v7a/libusb1.0.so.meta
diff --git a/Assets/Plugins/OSVR.ClientKit.dll b/Assets/Plugins/OSVR.ClientKit.dll
diff --git a/Assets/Plugins/OSVR.ClientKit.dll.mdb b/Assets/Plugins/OSVR.ClientKit.dll.mdb
diff --git a/Assets/Plugins/OSVR.ClientKit.dll.mdb.meta b/Assets/Plugins/OSVR.ClientKit.dll.mdb.meta
diff --git a/Assets/Plugins/OSVR.ClientKit.dll.meta b/Assets/Plugins/OSVR.ClientKit.dll.meta
diff --git a/Assets/Plugins/OSVR.ClientKit.pdb b/Assets/Plugins/OSVR.ClientKit.pdb