Browse Source

Parallax Stars, Skybox Fix

bolt_update
laurids 3 years ago
parent
commit
a2256de2e3
7 changed files with 181 additions and 45 deletions
  1. +2
    -2
      Assets/Exo planets/Prefabs/Planets/3D models/Materials/Sphere002Mat.mat
  2. BIN
      Assets/Exo planets/Textures/Skybox star/Stars_background 1.tga
  3. +9
    -11
      Assets/GWConquest/Materials/stars.mat
  4. +109
    -31
      Assets/GWConquest/Scenes/GalaxyMap.unity
  5. +49
    -0
      Assets/GWConquest/Scripts/Parallax.cs
  6. +11
    -0
      Assets/GWConquest/Scripts/Parallax.cs.meta
  7. +1
    -1
      ProjectSettings/TagManager.asset

+ 2
- 2
Assets/Exo planets/Prefabs/Planets/3D models/Materials/Sphere002Mat.mat View File

@ -9,8 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Sphere002Mat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1


BIN
Assets/Exo planets/Textures/Skybox star/Stars_background 1.tga View File


+ 9
- 11
Assets/GWConquest/Materials/stars.mat View File

@ -8,16 +8,14 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stars
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 0
m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses:
- ALWAYS
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -38,7 +36,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: f3c6207eed726f647a77351fd08df05e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
@ -64,7 +62,7 @@ Material:
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DistortionBlend: 0.5
@ -94,5 +92,5 @@ Material:
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: -1, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

+ 109
- 31
Assets/GWConquest/Scenes/GalaxyMap.unity View File

@ -13050,7 +13050,7 @@ Camera:
m_GameObject: {fileID: 197337106}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_ClearFlags: 3
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
@ -28878,7 +28878,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &431870514
GameObject:
@ -40417,6 +40417,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 197337107}
- {fileID: 978860180}
m_Father: {fileID: 690503116}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -52708,7 +52709,7 @@ Transform:
- {fileID: 877841778}
- {fileID: 1551981761}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &850500813
GameObject:
@ -59464,6 +59465,80 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 976457761}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &978860179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 978860180}
- component: {fileID: 978860181}
m_Layer: 0
m_Name: SkyboxCam
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &978860180
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 978860179}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 663080993}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &978860181
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 978860179}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 1
far clip plane: 10000000
field of view: 60
orthographic: 0
orthographic size: 774.82
m_Depth: -3
m_CullingMask:
serializedVersion: 2
m_Bits: 2048
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!1001 &984576231
PrefabInstance:
m_ObjectHideFlags: 0
@ -60059,7 +60134,7 @@ Transform:
- {fileID: 2007032522}
- {fileID: 1271054492}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &994186324
PrefabInstance:
@ -60537,27 +60612,14 @@ GameObject:
- component: {fileID: 998916851}
- component: {fileID: 998916850}
- component: {fileID: 998916849}
- component: {fileID: 998916848}
m_Layer: 0
m_Name: Sphere
- component: {fileID: 998916852}
m_Layer: 11
m_Name: ParallaxStars
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!135 &998916848
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998916847}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
m_IsActive: 1
--- !u!23 &998916849
MeshRenderer:
m_ObjectHideFlags: 0
@ -60604,7 +60666,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998916847}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh: {fileID: 4300000, guid: 1acc1f59481f4b7408cba47c01eada0f, type: 3}
--- !u!4 &998916851
Transform:
m_ObjectHideFlags: 0
@ -60612,13 +60674,29 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998916847}
m_LocalRotation: {x: 0.42439866, y: 0.80866784, z: -0.021312805, w: 0.40680194}
m_LocalPosition: {x: 400, y: 0, z: -962}
m_LocalScale: {x: 14126.617, y: 14126.617, z: 14126.617}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -494, y: 28.421814, z: -396}
m_LocalScale: {x: 1000, y: 1000, z: 1000}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 22.319, y: 136.238, z: 46.322002}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &998916852
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998916847}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 97cbd843f67980c4d882ae3d4ad0c956, type: 3}
m_Name:
m_EditorClassIdentifier:
CameraTransform: {fileID: 1992706994}
PositionFactor: 0.6
MinScale: 4000
MaxScale: 2000
--- !u!1001 &1000076786
PrefabInstance:
m_ObjectHideFlags: 0
@ -74372,7 +74450,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: ea716fd627e92314e9b5911e145db566,
type: 3}
propertyPath: m_RootOrder
value: 9
value: 10
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: ea716fd627e92314e9b5911e145db566,
type: 3}
@ -94108,7 +94186,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1529174990
GameObject:
@ -120146,7 +120224,7 @@ Transform:
m_LocalScale: {x: 624.14606, y: 624.14606, z: 624.14606}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 0}
--- !u!1 &1929296923
GameObject:
@ -124880,7 +124958,7 @@ Transform:
m_Children:
- {fileID: 690503116}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 54.33, y: 0, z: 0}
--- !u!1001 &1993069155
PrefabInstance:


+ 49
- 0
Assets/GWConquest/Scripts/Parallax.cs View File

@ -0,0 +1,49 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace GWConquest
{
public class Parallax : MonoBehaviour
{
public Transform CameraTransform;
public float PositionFactor;
//public float RotationFactor;
public float MinScale;
public float MaxScale;
private Vector3 CameraStartPosition;
//private Quaternion CameraStartRotation;
private GWCamera gwCamera;
private void Start() {
CameraStartPosition = CameraTransform.position;
//CameraStartRotation = CameraTransform.rotation;
gwCamera = CameraTransform.GetComponent<GWCamera>();
}
private void Update() {
var pos = CameraStartPosition;
pos += (CameraTransform.position - CameraStartPosition) * PositionFactor;
//var angle = Quaternion.Angle(CameraStartRotation, CameraTransform.rotation) * RotationFactor;
//transform.rotation = Quaternion.RotateTowards(CameraStartRotation, CameraTransform.rotation, angle);
var mainCam = gwCamera.mainCam;
if(mainCam.orthographic)
{
var zoomPrecent = Mathf.InverseLerp(gwCamera.minCameraZoom, gwCamera.maxCameraZoom, mainCam.orthographicSize);
var scale = Mathf.Lerp(MinScale, MaxScale, zoomPrecent);
transform.localScale = Vector3.one * scale;
}
transform.position = pos;
}
}
}

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

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

+ 1
- 1
ProjectSettings/TagManager.asset View File

@ -16,7 +16,7 @@ TagManager:
- PostProcessing
- Illuminated
- Connections
-
- Skybox
-
-
-


Loading…
Cancel
Save