浏览代码

Assorted changed

- Fixed NaNs on bush normal map
- Added cloud rotation to day/night cycle
/demo-work
André McGrail 5 年前
当前提交
dc80faee
共有 11 个文件被更改,包括 1020 次插入643 次删除
  1. 407
      Assets/Objects/Levels/Island/Environment Objects.prefab
  2. 5
      Assets/Objects/Levels/Island/Island Level.prefab
  3. 20
      Assets/Objects/Levels/Island/Lighting.prefab
  4. 5
      Assets/Objects/environment/Trees/Materials/Trees.mat
  5. 7
      Assets/Scripts/Environment/DayNightController.cs
  6. 999
      Assets/Textures/Island/BushTest_norm.png
  7. 56
      Assets/Textures/Island/BushTest_norm.png.meta
  8. 68
      Assets/Textures/Terrain/Bush.tif.meta
  9. 8
      Assets/Textures/Terrain/TerrainAutoUpgrade/Bush.terrainlayer
  10. 74
      Assets/scenes/Island.unity
  11. 14
      ProjectSettings/EditorSettings.asset

407
Assets/Objects/Levels/Island/Environment Objects.prefab
文件差异内容过多而无法显示
查看文件

5
Assets/Objects/Levels/Island/Island Level.prefab


propertyPath: m_Name
value: FX
objectReference: {fileID: 0}
- target: {fileID: 7473329029648627034, guid: 7eaaf74a3b1a44574b756860caf933d6,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7eaaf74a3b1a44574b756860caf933d6, type: 3}
--- !u!4 &6589000190473970530 stripped

20
Assets/Objects/Levels/Island/Lighting.prefab


m_TimeSlicingMode: 1
m_Resolution: 64
m_UpdateFrequency: 0
m_BoxSize: {x: 143.29808, y: 49.23163, z: 112.95329}
m_BoxOffset: {x: 24.039803, y: 15, z: -22.99675}
m_BoxSize: {x: 148.28072, y: 49.23163, z: 116.290085}
m_BoxOffset: {x: 21.548485, y: 15, z: -21.328354}
m_NearClip: 0.5
m_FarClip: 200
m_ShadowDistance: 0

m_TimeSlicingMode: 1
m_Resolution: 64
m_UpdateFrequency: 0
m_BoxSize: {x: 61.368267, y: 50, z: 48.24503}
m_BoxOffset: {x: -7.7802258, y: 0, z: -2.0956554}
m_BoxSize: {x: 66.135086, y: 50, z: 48.24503}
m_BoxOffset: {x: -10.163631, y: 0, z: -2.0956554}
m_NearClip: 0.5
m_FarClip: 200
m_ShadowDistance: 0

m_TimeSlicingMode: 1
m_Resolution: 64
m_UpdateFrequency: 0
m_BoxSize: {x: 76.496056, y: 25, z: 87.03796}
m_BoxOffset: {x: -2.4954758, y: 3.3000004, z: 3.0435143}
m_BoxSize: {x: 78.03863, y: 25, z: 87.03796}
m_BoxOffset: {x: -1.7241936, y: 3.3000002, z: 3.0435143}
m_NearClip: 0.5
m_FarClip: 200
m_ShadowDistance: 0

m_TimeSlicingMode: 1
m_Resolution: 64
m_UpdateFrequency: 0
m_BoxSize: {x: 51.787823, y: 50, z: 63.26336}
m_BoxOffset: {x: -1.96274, y: 0, z: 6.6316795}
m_BoxSize: {x: 59.04794, y: 50, z: 68.302986}
m_BoxOffset: {x: 0.18692589, y: 0, z: 9.151493}
m_NearClip: 0.5
m_FarClip: 200
m_ShadowDistance: 0

m_TimeSlicingMode: 1
m_Resolution: 64
m_UpdateFrequency: 0
m_BoxSize: {x: 105.5589, y: 49.23163, z: 86.46125}
m_BoxOffset: {x: -4.254387, y: 14.999999, z: -8.383949}
m_BoxSize: {x: 107.56966, y: 49.23163, z: 86.46125}
m_BoxOffset: {x: -3.2490082, y: 15, z: -8.383949}
m_NearClip: 0.5
m_FarClip: 200
m_ShadowDistance: 0

5
Assets/Objects/environment/Trees/Materials/Trees.mat


m_Name: Trees
m_Shader: {fileID: -6465566751694194690, guid: 4003ffa965d444d209561b52e55c61fc,
type: 3}
m_ShaderKeywords: BOOLEAN_D0D03BFD_ON VERTEX_ANIMATION_ON _CORRECTNORMALS _NORMALMAP
_VERTEXANIMATION
m_ShaderKeywords: BOOLEAN_5C6B42CA_ON BOOLEAN_D0D03BFD_ON VERTEX_ANIMATION_ON _CORRECTNORMALS
_NORMALMAP _VERTEXANIMATION
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1

m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- BOOLEAN_5C6B42CA: 1
- BOOLEAN_D0D03BFD: 1
- Boolean_F799EE7C: 1
- VERTEX_ANIMATION: 1

7
Assets/Scripts/Environment/DayNightController.cs


[Range(0, 360)]
public float _northHeading = 136; // north
public Transform clouds;
//Ambient light
[Header("Ambient Lighting")]
public Gradient _ambientColour; // ambient light colour (not used in LWRP correctly) over time

// update skybox
_skybox.SetFloat("_Rotation", 85 + ((_time - 0.5f) * 20f)); // rotate slightly for cheap moving cloud eefect
_skybox.SetColor("_Tint", _skyboxColour.Evaluate(_time));
}
if (clouds)
{
clouds.eulerAngles = new Vector3(0f, _time * 45f, 0f);
}
RenderSettings.fogColor = _fogColour.Evaluate(_time); // update fog colour
RenderSettings.ambientSkyColor = _ambientColour.Evaluate(_time); // update ambient light colour

999
Assets/Textures/Island/BushTest_norm.png
文件差异内容过多而无法显示
查看文件

56
Assets/Textures/Island/BushTest_norm.png.meta


mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0

maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
filterMode: 2
aniso: 5
mipBias: -100
wrapU: -1
wrapV: -1

alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureType: 1
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0

- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1

68
Assets/Textures/Terrain/Bush.tif.meta


fileFormatVersion: 2
guid: 3a9b50088d85baf4b9bdb204225d1867
TextureImporter:
fileIDToRecycleName: {}
internalIDToNameTable: []
serializedVersion: 5
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1

heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0

serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1

spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 100
alphaUsage: 1
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 2
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0

compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0

allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
spriteSheet:
serializedVersion: 2
sprites: []

spriteID:
internalID: 0
secondaryTextures: []
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Textures/Terrain/TerrainAutoUpgrade/Bush.terrainlayer


m_PrefabAsset: {fileID: 0}
m_Name: Bush
m_DiffuseTexture: {fileID: 2800000, guid: 3a9b50088d85baf4b9bdb204225d1867, type: 3}
m_NormalMapTexture: {fileID: 2800000, guid: d32e7607f71a3e6449c16ae86a4f459a, type: 3}
m_NormalMapTexture: {fileID: 2800000, guid: 749d98ca73398436c9d7d4552bfafc30, type: 3}
m_MaskMapTexture: {fileID: 0}
m_NormalScale: 1
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

74
Assets/scenes/Island.unity


propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7357475664972103680, guid: 860f73418635b430596220c04821a36c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7357475664972103680, guid: 860f73418635b430596220c04821a36c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.048675444
objectReference: {fileID: 0}
- target: {fileID: 7357475664972103680, guid: 860f73418635b430596220c04821a36c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7357475664972103680, guid: 860f73418635b430596220c04821a36c,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.99881464
objectReference: {fileID: 0}
- target: {fileID: 642770860795607900, guid: 860f73418635b430596220c04821a36c,
type: 3}
propertyPath: m_LocalScale.x

m_Script: {fileID: 11500000, guid: 30b50fc06dfa846f189e6a884ed7088f, type: 3}
m_Name:
m_EditorClassIdentifier:
_time: 0.107
_time: 0.124
_skybox: {fileID: 0}
_skyboxColour:
serializedVersion: 2

m_Mode: 0
m_NumColorKeys: 5
m_NumAlphaKeys: 2
_northHeading: 92
_northHeading: 79
clouds: {fileID: 1261708474}
_ambientColour:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}

m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 471032674}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -106.25, y: -0.25, z: 87.5}
m_LocalPosition: {x: -12.5, y: -0.25, z: 62.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}

height: 1
near clip plane: 0.2
far clip plane: 1600
field of view: 94
field of view: 70
orthographic: 0
orthographic size: 10
m_Depth: -5

m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 1
m_OcclusionCulling: 1
m_OcclusionCulling: 0
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1017609898

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1017609894}
m_LocalRotation: {x: -0.06584306, y: 0.8920085, z: 0.1347457, w: 0.42641437}
m_LocalPosition: {x: -114.6, y: 2, z: 97.6}
m_LocalRotation: {x: -0.009748473, y: 0.95066756, z: 0.029859738, w: 0.30861723}
m_LocalPosition: {x: -79.8, y: 9.9, z: 91.8}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}

m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2061336191}
m_LocalRotation: {x: -0.06584306, y: 0.8920085, z: 0.1347457, w: 0.42641437}
m_LocalPosition: {x: -114.6, y: 2, z: 97.6}
m_LocalRotation: {x: -0.009748473, y: 0.95066756, z: 0.029859738, w: 0.30861723}
m_LocalPosition: {x: -79.8, y: 9.9, z: 91.8}
m_LocalEulerAnglesHint: {x: -17.25, y: 128.92401, z: -0.15300001}
m_LocalEulerAnglesHint: {x: -3.6, y: 144.03, z: -0.006}
--- !u!114 &2061336193
MonoBehaviour:
m_ObjectHideFlags: 0

m_LookAt: {fileID: 0}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 94
FieldOfView: 70
OrthographicSize: 10
NearClipPlane: 0.2
FarClipPlane: 1600

- target: {fileID: 7312333174115242941, guid: 7ad8269e6bbda4db3a76a6e41c11a5db,
type: 3}
propertyPath: m_Enabled
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3829577903138488074, guid: 7ad8269e6bbda4db3a76a6e41c11a5db,
type: 3}

- target: {fileID: 7096263784801332180, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}
propertyPath: m_Color.g
value: 0.7897613
value: 0.7986312
value: 0.52409065
value: 0.54156923
value: 0.9918957
value: 0.99227154
objectReference: {fileID: 0}
- target: {fileID: 7096263784801332180, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}

type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6589000190826774739, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7792358350439295640, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}

- target: {fileID: 8115735017685696522, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.11620593
value: 0.14934751
value: -0.70920336
value: -0.6240504
value: 0.12033478
value: 0.12311261
value: 0.6848696
objectReference: {fileID: 0}
- target: {fileID: 6589000190473970533, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0.7570336
objectReference: {fileID: 0}
- target: {fileID: 6589000190219289651, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}

type: 3}
propertyPath: m_LocalPosition.x
value: 70.88732
objectReference: {fileID: 0}
- target: {fileID: 497707808075569993, guid: e70416e3bc35d4004a9981d0ac102ba5,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e70416e3bc35d4004a9981d0ac102ba5, type: 3}

14
ProjectSettings/EditorSettings.asset


--- !u!159 &1
EditorSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 9
m_PrefabRegularEnvironment: {fileID: 0}
m_PrefabUIEnvironment: {fileID: 0}
m_SpritePackerMode: 0
m_SpritePackerPaddingPower: 1
m_EtcTextureCompressorBehavior: 1

m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
m_UserGeneratedProjectSuffix:
m_EnableTextureStreamingInEditMode: 1
m_EnableTextureStreamingInPlayMode: 1
m_AsyncShaderCompilation: 1
m_EnterPlayModeOptionsEnabled: 0
m_EnterPlayModeOptions: 3
m_ShowLightmapResolutionOverlay: 1
m_UseLegacyProbeSampleCount: 1
正在加载...
取消
保存