#149 Implement spotlight shader

skylicht-lab · Jun 1, 2022 · 4e30d7e · 4e30d7e
1 parent 58e8ea9
commit 4e30d7e
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 6 deletions.
diff --git a/Assets/BuiltIn/Shader/SpecularGlossiness/Lighting/GLSL/SGSpotLightFS.glsl b/Assets/BuiltIn/Shader/SpecularGlossiness/Lighting/GLSL/SGSpotLightFS.glsl
@@ -8,6 +8,7 @@ uniform sampler2D uTexData;
 
 uniform vec4 uCameraPosition;
 uniform vec4 uLightPosition;
+uniform vec4 uLightDirection;
 uniform vec4 uLightAttenuation;
 uniform vec4 uLightColor;
 
@@ -33,6 +34,18 @@ void main(void)
 	float attenuation = max(0.0, 1.0 - (distance * uLightAttenuation.z)) * uLightColor.a;
 
 	vec3 lightDir = normalize(direction);
+
+	float spotDot = dot(lightDir, uLightDirection.xyz);
+	if (spotDot < uLightAttenuation.x)
+	{
+		attenuation = 0.f;
+	}
+	else
+	{
+		float spotValue = smoothstep(uLightAttenuation.x, uLightAttenuation.y, spotDot);
+		attenuation = pow(spotValue, uLightAttenuation.w);
+	}
+
 	float NdotL = max(0.0, dot(lightDir, normal));
 
 	// Specular

diff --git a/Assets/BuiltIn/Shader/SpecularGlossiness/Lighting/HLSL/SGSpotLightFS.hlsl b/Assets/BuiltIn/Shader/SpecularGlossiness/Lighting/HLSL/SGSpotLightFS.hlsl
@@ -17,6 +17,7 @@ cbuffer cbPerFrame
 {
 	float4 uCameraPosition;
 	float4 uLightPosition;
+	float4 uLightDirection;
 	float4 uLightAttenuation;
 	float4 uLightColor;
 };
@@ -37,8 +38,20 @@ float4 main(PS_INPUT input) : SV_TARGET
 	float3 direction = uLightPosition.xyz - position;
 	float distance = length(direction);
 	float attenuation = max(0.0, 1.0 - (distance * uLightAttenuation.z)) * uLightColor.a;
-
+	
 	float3 lightDir = normalize(direction);
+
+	float spotDot = dot(lightDir, uLightDirection.xyz);
+	if (spotDot < uLightAttenuation.x)
+	{
+		attenuation = 0.f;
+	}
+	else
+	{
+		float spotValue = smoothstep(uLightAttenuation.x, uLightAttenuation.y, spotDot);
+		attenuation = pow(spotValue, uLightAttenuation.w);
+	}
+
 	float NdotL = max(0.0, dot(lightDir, normal));
 
 	// Specular

diff --git a/Assets/BuiltIn/Shader/SpecularGlossiness/Lighting/SGSpotLight.xml b/Assets/BuiltIn/Shader/SpecularGlossiness/Lighting/SGSpotLight.xml
@@ -10,6 +10,7 @@
 
 			<uniform name="uCameraPosition" type="WORLD_CAMERA_POSITION" value="0" float="4"/>
 			<uniform name="uLightPosition" type="SPOT_LIGHT_POSITION" value="0" float="4"/>
+			<uniform name="uLightDirection" type="SPOT_LIGHT_DIRECTION" value="0" float="4"/>
 			<uniform name="uLightAttenuation" type="SPOT_LIGHT_ATTENUATION" value="0" float="4"/>
 			<uniform name="uLightColor" type="SPOT_LIGHT_COLOR" value="1.0,1.0,1.0,1.0" float="4"/>
 		</fs>

diff --git a/Projects/Editor/Source/Selection/CSelection.cpp b/Projects/Editor/Source/Selection/CSelection.cpp
@@ -50,7 +50,8 @@ namespace Skylicht
 			m_selected.clear();
 
 			CSceneHistory* history = CSceneController::getInstance()->getHistory();
-			history->endSaveHistory();
+			if (history)
+				history->endSaveHistory();
 		}
 
 		std::vector<CSelectObject*> CSelection::getSelectedByType(CSelectObject::ESelectType type)

diff --git a/Projects/Skylicht/Engine/Source/Lighting/CLight.cpp b/Projects/Skylicht/Engine/Source/Lighting/CLight.cpp
@@ -32,6 +32,7 @@ namespace Skylicht
 		m_color(1.0f, 1.0f, 1.0f, 1.0f),
 		m_spotCutoff(180.0f / 4.0f),
 		m_spotInnerCutoff(180.0f / 5.0f),
+		m_spotExponent(10.0f),
 		m_intensity(1.0f),
 		m_bakeBounce(1)
 	{

diff --git a/Projects/Skylicht/Engine/Source/Lighting/CLight.h b/Projects/Skylicht/Engine/Source/Lighting/CLight.h
@@ -45,6 +45,7 @@ namespace Skylicht
 		//! The angle of the spot's outer cone. Ignored for other lights.
 		float m_spotCutoff;
 		float m_spotInnerCutoff;
+		float m_spotExponent;
 
 		//! Direction of the light.
 		/** If Type is ELT_POINT, it is ignored. Changed via light scene node's rotation. */
@@ -125,6 +126,16 @@ namespace Skylicht
 			return m_spotInnerCutoff;
 		}
 
+		inline void setSpotExponent(float e)
+		{
+			m_spotExponent = e;
+		}
+
+		inline float getSpotExponent()
+		{
+			return m_spotExponent;
+		}
+
 		inline core::vector3df& getDirection()
 		{
 			return m_direction;

diff --git a/Projects/Skylicht/Engine/Source/Lighting/CSpotLight.cpp b/Projects/Skylicht/Engine/Source/Lighting/CSpotLight.cpp
@@ -83,6 +83,7 @@ namespace Skylicht
 		object->autoRelease(new CFloatProperty(object, "radius", m_radius, 0.0f));
 		object->autoRelease(new CFloatProperty(object, "outer cutoff", m_spotCutoff, 0.0f, 180.0f));
 		object->autoRelease(new CFloatProperty(object, "inner cutoff", m_spotInnerCutoff, 0.0f, 180.0f));
+		object->autoRelease(new CFloatProperty(object, "spot exponent", m_spotExponent, 0.0f, 128.0f));
 
 		return object;
 	}
@@ -95,10 +96,9 @@ namespace Skylicht
 		float radius = object->get<float>("radius", 3.0f);
 		m_spotCutoff = object->get<float>("outer cutoff", 180.0f / 4.0f);
 		m_spotInnerCutoff = object->get<float>("inner cutoff", 180.0f / 5.0f);
+		m_spotExponent = object->get<float>("spot exponent", 10.0f);
 
 		setRadius(radius);
-		setSpotAngle(m_spotCutoff);
-		setSpotInnerAngle(m_spotInnerCutoff);
 	}
 
 	core::vector3df CSpotLight::getPosition()

diff --git a/Projects/Skylicht/Engine/Source/Material/Shader/ShaderCallback/CShaderLighting.cpp b/Projects/Skylicht/Engine/Source/Material/Shader/ShaderCallback/CShaderLighting.cpp
@@ -200,9 +200,10 @@ namespace Skylicht
 				float attenuation[4] = { 0 };
 
 				// set attenuation			
-				attenuation[0] = s_spotLight->getSplotCutoff();
-				attenuation[1] = s_spotLight->getSpotInnerCutof();
+				attenuation[0] = cosf(s_spotLight->getSplotCutoff() * core::DEGTORAD * 0.5f);
+				attenuation[1] = cosf(s_spotLight->getSpotInnerCutof() * core::DEGTORAD * 0.5f);
 				attenuation[2] = s_spotLight->getAttenuation();
+				attenuation[3] = s_spotLight->getSpotExponent();
 
 				// shader variable
 				if (vertexShader == true)