Merge branch 'Feature/TrimSheet' into 'main'

ALPHA LEVEL See merge request kernel-panic/revival!24
2021-03-02 21:07:43 +00:00 · 2021-03-02 21:07:43 +00:00 · 84c67b7f11
parent 76c07b7fa1 88fd38453b
commit 84c67b7f11
94 changed files with 33954 additions and 2323 deletions
--- a/game/Assets/ASSETS.meta
+++ b/game/Assets/ASSETS.meta
--- a/game/Assets/ASSETS/TRAPS.meta
+++ b/game/Assets/ASSETS/TRAPS.meta
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/PIT/lambert1_Base_Color.jpg.meta
+++ b/PIT/lambert1_Base_Color.jpg.meta
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/PIT/lambert1_Metallic.jpg.meta
+++ b/PIT/lambert1_Metallic.jpg.meta
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/PIT/lambert1_Mixed_AO.jpg.meta
+++ b/PIT/lambert1_Mixed_AO.jpg.meta
--- a/PIT/lambert1_Normal_DirectX.jpg
+++ b/PIT/lambert1_Normal_DirectX.jpg
--- a/PIT/lambert1_Normal_DirectX.jpg.meta
+++ b/PIT/lambert1_Normal_DirectX.jpg.meta
--- a/game/Assets/ASSETS/TRAPS/SPIKE
+++ b/game/Assets/ASSETS/TRAPS/SPIKE
--- a/PIT/lambert1_Roughness.jpg.meta
+++ b/PIT/lambert1_Roughness.jpg.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/M_TrimSheet1.mat.meta
+++ b/1/M_TrimSheet1.mat.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Doorway_A.fbx.meta
+++ b/1/Meshes/Doorway_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Floor_A.fbx.meta
+++ b/1/Meshes/Floor_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Floor_B.fbx.meta
+++ b/1/Meshes/Floor_B.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Floor_C.fbx.meta
+++ b/1/Meshes/Floor_C.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Floor_D.fbx.meta
+++ b/1/Meshes/Floor_D.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Floor_E.fbx.meta
+++ b/1/Meshes/Floor_E.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Floor_F.fbx.meta
+++ b/1/Meshes/Floor_F.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Floor_G.fbx.meta
+++ b/1/Meshes/Floor_G.fbx.meta
--- a/1/Meshes/Floor_Spline.fbx
+++ b/1/Meshes/Floor_Spline.fbx
--- a/1/Meshes/Floor_Spline.fbx.meta
+++ b/1/Meshes/Floor_Spline.fbx.meta
--- a/1/Meshes/Fountain_A.fbx
+++ b/1/Meshes/Fountain_A.fbx
--- a/1/Meshes/Fountain_A.fbx.meta
+++ b/1/Meshes/Fountain_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Pillar_A.fbx.meta
+++ b/1/Meshes/Pillar_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Pillar_B.fbx.meta
+++ b/1/Meshes/Pillar_B.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Pillar_C.fbx.meta
+++ b/1/Meshes/Pillar_C.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Pillar_D.fbx.meta
+++ b/1/Meshes/Pillar_D.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Railing_A.fbx.meta
+++ b/1/Meshes/Railing_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Roof_A.fbx.meta
+++ b/1/Meshes/Roof_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Stairs_A.fbx.meta
+++ b/1/Meshes/Stairs_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Stairs_B.fbx.meta
+++ b/1/Meshes/Stairs_B.fbx.meta
--- a/1/Meshes/SunLightSettings.lighting
+++ b/1/Meshes/SunLightSettings.lighting
--- a/1/Meshes/SunLightSettings.lighting.meta
+++ b/1/Meshes/SunLightSettings.lighting.meta
--- a/1/Meshes/Walkway_Spline.fbx
+++ b/1/Meshes/Walkway_Spline.fbx
--- a/1/Meshes/Walkway_Spline.fbx.meta
+++ b/1/Meshes/Walkway_Spline.fbx.meta
--- a/1/Meshes/WallPiece_A.fbx
+++ b/1/Meshes/WallPiece_A.fbx
--- a/1/Meshes/WallPiece_A.fbx.meta
+++ b/1/Meshes/WallPiece_A.fbx.meta
--- a/1/Meshes/WallPiece_B.fbx
+++ b/1/Meshes/WallPiece_B.fbx
--- a/1/Meshes/WallPiece_B.fbx.meta
+++ b/1/Meshes/WallPiece_B.fbx.meta
--- a/1/Meshes/WallPiece_C.fbx
+++ b/1/Meshes/WallPiece_C.fbx
--- a/1/Meshes/WallPiece_C.fbx.meta
+++ b/1/Meshes/WallPiece_C.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Wall_A.fbx.meta
+++ b/1/Meshes/Wall_A.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Wall_B.fbx.meta
+++ b/1/Meshes/Wall_B.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Meshes/Wall_C.fbx.meta
+++ b/1/Meshes/Wall_C.fbx.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/1/Textures/blinn1_Base_Color.tga
+++ b/1/Textures/blinn1_Base_Color.tga
--- a/1/Textures/blinn1_Base_Color.tga.meta
+++ b/1/Textures/blinn1_Base_Color.tga.meta
--- a/1/Textures/blinn1_Height.tga
+++ b/1/Textures/blinn1_Height.tga
--- a/1/Textures/blinn1_Height.tga.meta
+++ b/1/Textures/blinn1_Height.tga.meta
--- a/1/Textures/blinn1_Metallic.tga
+++ b/1/Textures/blinn1_Metallic.tga
--- a/1/Textures/blinn1_Metallic.tga.meta
+++ b/1/Textures/blinn1_Metallic.tga.meta
--- a/1/Textures/blinn1_Mixed_AO.tga
+++ b/1/Textures/blinn1_Mixed_AO.tga
--- a/1/Textures/blinn1_Mixed_AO.tga.meta
+++ b/1/Textures/blinn1_Mixed_AO.tga.meta
--- a/1/Textures/blinn1_Normal_DirectX.tga
+++ b/1/Textures/blinn1_Normal_DirectX.tga
--- a/1/Textures/blinn1_Normal_DirectX.tga.meta
+++ b/1/Textures/blinn1_Normal_DirectX.tga.meta
--- a/1/Textures/blinn1_Roughness.tga
+++ b/1/Textures/blinn1_Roughness.tga
--- a/1/Textures/blinn1_Roughness.tga.meta
+++ b/1/Textures/blinn1_Roughness.tga.meta
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/game/Assets/ASSETS/TRIM
+++ b/game/Assets/ASSETS/TRIM
--- a/game/Assets/Scenes/DevLevel.unity
+++ b/game/Assets/Scenes/DevLevel.unity
--- a/game/Assets/Scenes/DevLevel/Global
+++ b/game/Assets/Scenes/DevLevel/Global
@ -93,10 +93,10 @@ MonoBehaviour:
    m_Value: {x: 0.7020849, y: 0.73619574, z: 1, w: 0.04683842}
  midtones:
    m_OverrideState: 1
-    m_Value: {x: 0.9806411, y: 1, z: 0.9229189, w: -0.07025762}
+    m_Value: {x: 0.9806411, y: 1, z: 0.9229189, w: -0.17749621}
  highlights:
    m_OverrideState: 1
-    m_Value: {x: 1, y: 0.99147195, z: 0.9255205, w: -0.11709601}
+    m_Value: {x: 1, y: 0.98038995, z: 0.8660951, w: -0.090286344}
  shadowsStart:
    m_OverrideState: 0
    m_Value: 0