diff --git a/Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Textures/ControllerBoxTextures/ButtonGlow.jpg.meta b/Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Textures/ControllerBoxTextures/ButtonGlow.jpg.meta index 997f148..d35c570 100644 --- a/Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Textures/ControllerBoxTextures/ButtonGlow.jpg.meta +++ b/Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Textures/ControllerBoxTextures/ButtonGlow.jpg.meta @@ -1,13 +1,13 @@ fileFormatVersion: 2 guid: 2c635ba82479d7a4b975a0a8bdf0a2df TextureImporter: - fileIDToRecycleName: {} + internalIDToNameTable: [] externalObjects: {} - serializedVersion: 4 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 1 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 @@ -21,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -31,7 +33,7 @@ TextureImporter: serializedVersion: 2 filterMode: 2 aniso: -1 - mipBias: -1 + mipBias: -100 wrapU: -1 wrapV: -1 wrapW: -1 @@ -47,15 +49,18 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 0 + textureType: 1 textureShape: 1 + singleChannelComponent: 0 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + applyGammaDecoding: 1 platformSettings: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 @@ -65,7 +70,9 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Standalone + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Standalone maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 @@ -75,7 +82,9 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - buildTarget: Android + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Android maxTextureSize: 128 resizeAlgorithm: 0 textureFormat: -1 @@ -85,12 +94,23 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/Test Scenes/Static Ring.unity b/Assets/Scenes/Test Scenes/Static Ring.unity index ce286da..bdd974c 100644 --- a/Assets/Scenes/Test Scenes/Static Ring.unity +++ b/Assets/Scenes/Test Scenes/Static Ring.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b5b64cd0d3aa22950b5083dc6fb6884b68a8fe072d045c2d8f904d95d901e84 -size 21853065 +oid sha256:27c7e58bdeea7e6776bb5fbb5763674ff0265ba2834da59602e4ccf244ca4e3f +size 21859941 diff --git a/Assets/Scripts/LookAt.cs b/Assets/Scripts/LookAt.cs new file mode 100644 index 0000000..01dc376 --- /dev/null +++ b/Assets/Scripts/LookAt.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LookAt : MonoBehaviour +{ + + + [SerializeField] + private Transform m_target; + + + // Update is called once per frame + void Update() + { + if (m_target != null) + transform.LookAt(m_target); + } +} diff --git a/Assets/Scripts/LookAt.cs.meta b/Assets/Scripts/LookAt.cs.meta new file mode 100644 index 0000000..43bb922 --- /dev/null +++ b/Assets/Scripts/LookAt.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1579210a9abb7174791ccb219bf2d682 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Static Physics/EnvironmentRotator.cs b/Assets/Scripts/Static Physics/EnvironmentRotator.cs new file mode 100644 index 0000000..d176092 --- /dev/null +++ b/Assets/Scripts/Static Physics/EnvironmentRotator.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnvironmentRotator : MonoBehaviour +{ + [SerializeField] + private RotationController m_ship; + + + // Update is called once per frame + void Update() + { + if (m_ship != null) + transform.RotateAround(m_ship.Position, m_ship.RotationAxis, m_ship.EnvironmentRotationPeriod * Time.deltaTime); + } + + private void Reset() + { + m_ship = FindObjectOfType(); + } + +} diff --git a/Assets/Scripts/Static Physics/EnvironmentRotator.cs.meta b/Assets/Scripts/Static Physics/EnvironmentRotator.cs.meta new file mode 100644 index 0000000..309ddfd --- /dev/null +++ b/Assets/Scripts/Static Physics/EnvironmentRotator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc06d59ac57a1c64b83c1ec77bd70780 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Static Physics/RotationController.cs b/Assets/Scripts/Static Physics/RotationController.cs index 52a640c..6be7799 100644 --- a/Assets/Scripts/Static Physics/RotationController.cs +++ b/Assets/Scripts/Static Physics/RotationController.cs @@ -10,6 +10,7 @@ public class RotationController : MonoBehaviour public Vector3 Position => transform.position; public Vector3 RotationAxis => m_RotationAxis; public float CorrelusStrength => m_correlusStrength; + public float EnvironmentRotationPeriod => m_RotationPeriod * m_SkyboxRotationMultiplier; #endregion Read-Only Fields [SerializeField] @@ -59,7 +60,7 @@ public class RotationController : MonoBehaviour if (m_Skybox != null) { m_Skybox.SetVector("_RotationAxis", m_RotationAxis); - m_Skybox.SetFloat("_Rotation", (Time.time * m_SkyboxRotationMultiplier * m_RotationPeriod) % 360); + m_Skybox.SetFloat("_Rotation", (Time.time * EnvironmentRotationPeriod) % 360); } } diff --git a/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_1K_Resolution.mat b/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_1K_Resolution.mat index 0ebd920..d46cd8c 100644 --- a/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_1K_Resolution.mat +++ b/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_1K_Resolution.mat @@ -92,7 +92,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 278.74142 + - _Rotation: 102.55174 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_4K_Resolution.mat b/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_4K_Resolution.mat index aea8314..56c6aee 100644 --- a/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_4K_Resolution.mat +++ b/Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_4K_Resolution.mat @@ -92,7 +92,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 66.08979 + - _Rotation: 78.55545 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 19f97fc..dbd6c6d 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1942c088ddfeeef348fdf12390e2a2d6da51056e197458d67969d44e7b2cbbd3 -size 160 +oid sha256:cce1038f53a4f727995f0516b6cbc0d22a7705b79f94dea58808385ce6d4ad64 +size 269 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 2ab22a5..657f5c5 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:442894020eebc9cfeddc7b95f3e637fdcf033513a507e0fbe231a8e0e4f7d60b -size 2230 +oid sha256:f8119ffd07e67f41783a0211864be87a452d6849605a9296df8a3523ca1e73d7 +size 2437