From 5016600397d70845eb509f5b90c6a7596eb22283 Mon Sep 17 00:00:00 2001 From: Brandon Mak Date: Tue, 25 Oct 2022 23:39:35 +0800 Subject: [PATCH] Lights WIP --- Assets/Editor/Layouts/UserLayout.ini | 12 ++++++------ .../Graphics/MiddleEnd/Interface/SHRenderable.cpp | 7 +++++++ .../src/Graphics/MiddleEnd/Interface/SHRenderable.h | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Assets/Editor/Layouts/UserLayout.ini b/Assets/Editor/Layouts/UserLayout.ini index 9add170c..4d608401 100644 --- a/Assets/Editor/Layouts/UserLayout.ini +++ b/Assets/Editor/Layouts/UserLayout.ini @@ -10,7 +10,7 @@ Collapsed=0 [Window][Hierarchy Panel] Pos=0,142 -Size=768,918 +Size=494,918 Collapsed=0 DockId=0x00000004,0 @@ -27,7 +27,7 @@ DockId=0x00000006,0 [Window][Profiler] Pos=0,48 -Size=768,92 +Size=494,92 Collapsed=0 DockId=0x00000003,0 @@ -38,17 +38,17 @@ Collapsed=0 DockId=0x00000002,0 [Window][ Viewport] -Pos=770,48 -Size=877,1012 +Pos=496,48 +Size=1151,1012 Collapsed=0 DockId=0x00000002,0 [Docking][Data] DockSpace ID=0xC5C9B8AB Window=0xBE4044E9 Pos=8,79 Size=1920,1012 Split=X DockNode ID=0x00000005 Parent=0xC5C9B8AB SizeRef=1992,1036 Split=X - DockNode ID=0x00000001 Parent=0x00000005 SizeRef=768,1036 Split=Y Selected=0x1E6EB881 + DockNode ID=0x00000001 Parent=0x00000005 SizeRef=494,1036 Split=Y Selected=0x1E6EB881 DockNode ID=0x00000003 Parent=0x00000001 SizeRef=225,94 Selected=0x1E6EB881 DockNode ID=0x00000004 Parent=0x00000001 SizeRef=225,940 Selected=0xE096E5AE - DockNode ID=0x00000002 Parent=0x00000005 SizeRef=877,1036 CentralNode=1 Selected=0xB41284E7 + DockNode ID=0x00000002 Parent=0x00000005 SizeRef=1151,1036 CentralNode=1 Selected=0xB41284E7 DockNode ID=0x00000006 Parent=0xC5C9B8AB SizeRef=271,1036 Selected=0xE7039252 diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp index 0b1c1b66..523722e4 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.cpp @@ -27,6 +27,8 @@ namespace SHADE sharedMaterial = {}; material = {}; oldMaterial = {}; + + lightLayer = 0; } void SHRenderable::OnDestroy() @@ -87,6 +89,11 @@ namespace SHADE return material; } + uint8_t SHRenderable::GetLightLayer(void) const noexcept + { + return lightLayer; + } + void SHRenderable::ResetChangedFlag() { materialChanged = false; diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.h b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.h index bc885ca2..95b53b9e 100644 --- a/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.h +++ b/SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderable.h @@ -56,6 +56,7 @@ namespace SHADE /*-------------------------------------------------------------------------------*/ bool WasMaterialChanged() const noexcept { return materialChanged; } Handle GetPrevMaterial() const noexcept { return oldMaterial; } + uint8_t GetLightLayer (void) const noexcept; /*-------------------------------------------------------------------------------*/ /* Batcher Dispatcher Functions */ @@ -75,6 +76,7 @@ namespace SHADE Handle material; bool materialChanged = true; Handle oldMaterial; + uint8_t lightLayer; }; }