From fd40c3c40de14e04ecc1713fa0df90acf4f20d8d Mon Sep 17 00:00:00 2001 From: Bernard Laptop Date: Fri, 1 Feb 2019 01:47:06 +1100 Subject: [PATCH] Added a rotating light and forced landscape orientation --- .../Examples/Official/CustomRTRain.meta | 8 -- .../Examples/Official/SimpleTerrain.meta | 8 -- .../Examples/Official/Substance.meta | 8 -- .../Examples/Official/Substance2018.meta | 8 -- .../EditorResources/Templates/SRP.meta | 8 -- Assets/Scenes/MainScene.unity | 129 ++++++++++++++---- Assets/Scipts/HomeScreenManager.cs | 2 +- Assets/Scipts/Timer.cs | 4 +- 8 files changed, 108 insertions(+), 67 deletions(-) delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta diff --git a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta deleted file mode 100644 index 2d0c900..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 917f314cd7500ab41a37e0c60edaf755 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta deleted file mode 100644 index d50bf8c..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e14f9199031928442a76fcb851644355 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance.meta deleted file mode 100644 index 68bce78..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3a1c9292d8fac714e9091922355abcd7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta deleted file mode 100644 index 2a2c78c..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 50c3f69bf74856340867f04dd9288b24 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta deleted file mode 100644 index 7e6002c..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cc9e432e1a0a4764f80870c080173cb7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 90a4381..9df8dda 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -37,7 +37,7 @@ RenderSettings: m_ReflectionBounces: 2 m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 170076734} + m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 @@ -561,29 +561,40 @@ Transform: m_Father: {fileID: 340012150} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &170076733 +--- !u!1 &221906467 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 170076735} - - component: {fileID: 170076734} - - component: {fileID: 170076736} + - component: {fileID: 221906470} + - component: {fileID: 221906469} + - component: {fileID: 221906468} m_Layer: 0 - m_Name: Directional Light + m_Name: OriginalLight (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &170076734 +--- !u!114 &221906468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 221906467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90a0ecd4363b0a547a4c174b9a95dd5d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!108 &221906469 Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 170076733} + m_GameObject: {fileID: 221906467} m_Enabled: 1 serializedVersion: 8 m_Type: 1 @@ -615,30 +626,19 @@ Light: m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 13 ---- !u!4 &170076735 +--- !u!4 &221906470 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 170076733} - m_LocalRotation: {x: -0.032943666, y: 0.5968051, z: -0.7768844, w: 0.19796236} + m_GameObject: {fileID: 221906467} + m_LocalRotation: {x: -0.3876005, y: 0.46317276, z: -0.49651274, w: 0.6234677} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 66.1, y: 45.2, z: -121.1} ---- !u!114 &170076736 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 170076733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 90a0ecd4363b0a547a4c174b9a95dd5d, type: 3} - m_Name: - m_EditorClassIdentifier: + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: -1.3390001, y: 74.303, z: -78.08} --- !u!1 &227900152 GameObject: m_ObjectHideFlags: 1 @@ -1320,6 +1320,7 @@ MonoBehaviour: sunB: 0 SunImage: {fileID: 2018855992} mode: {fileID: 340012153} + lightObj: {fileID: 221906467} --- !u!4 &340012150 Transform: m_ObjectHideFlags: 0 @@ -1679,6 +1680,84 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &460711545 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 460711548} + - component: {fileID: 460711547} + - component: {fileID: 460711546} + m_Layer: 0 + m_Name: OriginalLight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &460711546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 460711545} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90a0ecd4363b0a547a4c174b9a95dd5d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!108 &460711547 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 460711545} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 0.9150943, g: 0.705965, b: 0.47912958, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294959615 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 13 +--- !u!4 &460711548 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 460711545} + m_LocalRotation: {x: -0.032943666, y: 0.5968051, z: -0.7768844, w: 0.19796236} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 66.1, y: 45.2, z: -121.1} --- !u!1 &497923737 GameObject: m_ObjectHideFlags: 0 @@ -4223,7 +4302,7 @@ RectTransform: m_Children: - {fileID: 497923738} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/Scipts/HomeScreenManager.cs b/Assets/Scipts/HomeScreenManager.cs index 731b23c..0e7333f 100644 --- a/Assets/Scipts/HomeScreenManager.cs +++ b/Assets/Scipts/HomeScreenManager.cs @@ -16,7 +16,7 @@ public class HomeScreenManager : MonoBehaviour { public void Start() { - + Screen.orientation = ScreenOrientation.Landscape; int rand = Random.Range(0, DefaultNames.Length); IP.text = PlayerPrefs.GetString("IP", ""); diff --git a/Assets/Scipts/Timer.cs b/Assets/Scipts/Timer.cs index 4fc147a..45ad567 100644 --- a/Assets/Scipts/Timer.cs +++ b/Assets/Scipts/Timer.cs @@ -23,6 +23,8 @@ public class Timer : MonoBehaviour { public GameMode mode; + public GameObject lightObj; + void Start() { sunG = Dawn; @@ -50,7 +52,7 @@ public class Timer : MonoBehaviour { Debug.Log(col); SunImage.color = col; Sun.RotateAround(Pivot.transform.position, -1 * Sun.transform.forward, (180 / MaxTimer) * Time.deltaTime); - + lightObj.transform.RotateAround(lightObj.transform.position, -1 * Sun.transform.forward, (180 / MaxTimer) * Time.deltaTime); } }