Skip to content

Commit

Permalink
Lighting bake and texture updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Marebears committed Oct 1, 2024
1 parent 4a49bd7 commit a0c89c5
Show file tree
Hide file tree
Showing 32 changed files with 1,172 additions and 78 deletions.
306 changes: 242 additions & 64 deletions Assets/Scenes/ExteriorScene.unity

Large diffs are not rendered by default.

Binary file modified Assets/Scenes/ExteriorScene/LightingData.asset
Binary file not shown.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-0_comp_dir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-0_comp_light.exr
Binary file not shown.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-0_comp_shadowmask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-1_comp_dir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-1_comp_light.exr
Binary file not shown.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-2_comp_dir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-2_comp_light.exr
Binary file not shown.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-2_comp_shadowmask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-3_comp_dir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-3_comp_light.exr
Binary file not shown.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-3_comp_shadowmask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-4_comp_dir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-4_comp_light.exr
Binary file not shown.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-4_comp_shadowmask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-5_comp_dir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Scenes/ExteriorScene/Lightmap-5_comp_light.exr
Binary file not shown.
13 changes: 6 additions & 7 deletions Assets/_Assets/Materials/Base_Tent.mat
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Material:
m_InvalidKeywords:
- _HAFTONESHAPES_DOT
- _SPECULARHIGHTLIGHTS
- _STEPVIARAMPTEXTURE_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -138,7 +137,7 @@ Material:
- _AlphaClip: 0
- _Blend: 0
- _BrushLowerCut: 0
- _BrushSize: 0.308
- _BrushSize: 0.87
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
Expand Down Expand Up @@ -175,10 +174,10 @@ Material:
- _HalftoneFadeDistance: 582
- _HalftoneFadeToColor: 0
- _HalftoneLightSizeFactor: 0
- _HalftoneNoiseClip: 3.34
- _HalftoneNoiseClip: 2
- _HalftoneScale: 0
- _HalftoneSize: 0.3
- _HalftoneTilling: 10.32
- _HalftoneTilling: 98.03
- _HalftoneUseScreenSpaceUV: 0
- _HatchingDensity: 0
- _HatchingDiffuseOffset: -0.07
Expand Down Expand Up @@ -207,7 +206,7 @@ Material:
- _SPECULARHIGHTLIGHTS: 0
- _ShadowPatternSize: 0.68
- _Shininess: 0
- _SizeFalloff: 0
- _SizeFalloff: 0.309
- _Smoothness: 0
- _SmoothnessSource: 0
- _SmoothnessTextureChannel: 0
Expand All @@ -225,7 +224,7 @@ Material:
- _SrcBlend: 1
- _StencilComp: 0
- _StencilRef: 0
- _StepViaRampTexture: 1
- _StepViaRampTexture: 0
- _Surface: 0
- _USERAMPCOLOR: 0
- _UseClipPattern: 0
Expand All @@ -240,7 +239,7 @@ Material:
- _FaceFrontDirection: {r: 0, g: 0, b: 1, a: 0}
- _FaceRightDirection: {r: 1, g: 0, b: 0, a: 0}
- _HairSpecColor: {r: 0, g: 0, b: 0, a: 1}
- _HalfToneColor: {r: 0.4528302, g: 0.3311922, b: 0.24563903, a: 0.471}
- _HalfToneColor: {r: 0, g: 0, b: 0, a: 0.244}
- _HalftoneColor: {r: 1, g: 1, b: 1, a: 1}
- _HatchingColor: {r: 0.05660379, g: 0.05660379, b: 0.05660379, a: 0}
- _HatchingScale: {r: 25.58, g: 1, b: 0, a: 0}
Expand Down
134 changes: 134 additions & 0 deletions Assets/_Assets/Materials/EmmisiveLight.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: EmmisiveLight
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 0.78662425, b: 0.5613208, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &8814369313126016462
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
8 changes: 8 additions & 0 deletions Assets/_Assets/Materials/EmmisiveLight.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a0c89c5

Please sign in to comment.