Browse Source

Added sun prefab into main scene

-Added rotate environment script
develop
Joshua Reason 4 years ago
parent
commit
9c5fb2a1f3
11 changed files with 103 additions and 18 deletions
  1. +29
    -9
      Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Textures/ControllerBoxTextures/ButtonGlow.jpg.meta
  2. BIN
      Assets/Scenes/Test Scenes/Static Ring.unity
  3. +19
    -0
      Assets/Scripts/LookAt.cs
  4. +11
    -0
      Assets/Scripts/LookAt.cs.meta
  5. +23
    -0
      Assets/Scripts/Static Physics/EnvironmentRotator.cs
  6. +11
    -0
      Assets/Scripts/Static Physics/EnvironmentRotator.cs.meta
  7. +2
    -1
      Assets/Scripts/Static Physics/RotationController.cs
  8. +1
    -1
      Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_1K_Resolution.mat
  9. +1
    -1
      Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_4K_Resolution.mat
  10. BIN
      ProjectSettings/EditorBuildSettings.asset
  11. BIN
      ProjectSettings/GraphicsSettings.asset

+ 29
- 9
Assets/Oculus/SampleFramework/Usage/HandsTrainExample/Textures/ControllerBoxTextures/ButtonGlow.jpg.meta View File

@ -1,13 +1,13 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2c635ba82479d7a4b975a0a8bdf0a2df guid: 2c635ba82479d7a4b975a0a8bdf0a2df
TextureImporter: TextureImporter:
fileIDToRecycleName: {}
internalIDToNameTable: []
externalObjects: {} externalObjects: {}
serializedVersion: 4
serializedVersion: 11
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0 linearTexture: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
@ -21,6 +21,8 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
@ -31,7 +33,7 @@ TextureImporter:
serializedVersion: 2 serializedVersion: 2
filterMode: 2 filterMode: 2
aniso: -1 aniso: -1
mipBias: -1
mipBias: -100
wrapU: -1 wrapU: -1
wrapV: -1 wrapV: -1
wrapW: -1 wrapW: -1
@ -47,15 +49,18 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 0
textureType: 1
textureShape: 1 textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0 maxTextureSizeSet: 0
compressionQualitySet: 0 compressionQualitySet: 0
textureFormatSet: 0 textureFormatSet: 0
applyGammaDecoding: 1
platformSettings: platformSettings:
- buildTarget: DefaultTexturePlatform
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 128 maxTextureSize: 128
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
@ -65,7 +70,9 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
- buildTarget: Standalone
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 128 maxTextureSize: 128
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
@ -75,7 +82,9 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
- buildTarget: Android
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 128 maxTextureSize: 128
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
@ -85,12 +94,23 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

BIN
Assets/Scenes/Test Scenes/Static Ring.unity (Stored with Git LFS) View File

size 21859941

+ 19
- 0
Assets/Scripts/LookAt.cs View File

@ -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);
}
}

+ 11
- 0
Assets/Scripts/LookAt.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1579210a9abb7174791ccb219bf2d682
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 23
- 0
Assets/Scripts/Static Physics/EnvironmentRotator.cs View File

@ -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<RotationController>();
}
}

+ 11
- 0
Assets/Scripts/Static Physics/EnvironmentRotator.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cc06d59ac57a1c64b83c1ec77bd70780
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 1
Assets/Scripts/Static Physics/RotationController.cs View File

@ -10,6 +10,7 @@ public class RotationController : MonoBehaviour
public Vector3 Position => transform.position; public Vector3 Position => transform.position;
public Vector3 RotationAxis => m_RotationAxis; public Vector3 RotationAxis => m_RotationAxis;
public float CorrelusStrength => m_correlusStrength; public float CorrelusStrength => m_correlusStrength;
public float EnvironmentRotationPeriod => m_RotationPeriod * m_SkyboxRotationMultiplier;
#endregion Read-Only Fields #endregion Read-Only Fields
[SerializeField] [SerializeField]
@ -59,7 +60,7 @@ public class RotationController : MonoBehaviour
if (m_Skybox != null) if (m_Skybox != null)
{ {
m_Skybox.SetVector("_RotationAxis", m_RotationAxis); 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);
} }
} }

+ 1
- 1
Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_1K_Resolution.mat View File

@ -92,7 +92,7 @@ Material:
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _Rotation: 278.74142
- _Rotation: 102.55174
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1

+ 1
- 1
Assets/ThirdParty/SpaceSkies Free/Skybox_3/Purple_4K_Resolution.mat View File

@ -92,7 +92,7 @@ Material:
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _Rotation: 66.08979
- _Rotation: 78.55545
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1

BIN
ProjectSettings/EditorBuildSettings.asset (Stored with Git LFS) View File

size 269

BIN
ProjectSettings/GraphicsSettings.asset (Stored with Git LFS) View File

size 2437

Loading…
Cancel
Save