Created LightState

Author: eduardodoria

engine/core/Scene.cpp

@@ -79,6 +79,7 @@ Scene::Scene(){
 	backgroundColor = Vector4(0.0, 0.0, 0.0, 1.0); //sRGB
 	shadowsPCF = true;
 
+	lightState = LightState::AUTO;
 	globalIllumColor = Vector3(1.0, 1.0, 1.0);
 	globalIllumIntensity = 0.1;
 
@@ -149,13 +150,27 @@ Vector4 Scene::getBackgroundColor() const{
 }
 
 void Scene::setShadowsPCF(bool shadowsPCF){
-	this->shadowsPCF = shadowsPCF;
+	if (this->shadowsPCF != shadowsPCF){
+		this->shadowsPCF = shadowsPCF;
+		getSystem<RenderSystem>()->needReloadMeshes();
+	}
 }
 
 bool Scene::isShadowsPCF() const{
 	return this->shadowsPCF;
 }
 
+void Scene::setLightState(LightState state){
+	if (this->lightState != state){
+		this->lightState = state;
+		getSystem<RenderSystem>()->needReloadMeshes();
+	}
+}
+
+LightState Scene::getLightState() const{
+	return this->lightState;
+}
+
 void Scene::setGlobalIllumination(float intensity, Vector3 color){
 	this->globalIllumIntensity = intensity;
 	this->globalIllumColor = Color::sRGBToLinear(color);

engine/core/Scene.h

@@ -62,6 +62,12 @@ namespace Supernova{
 
 	class Camera;
 
+	enum class LightState {
+		OFF,
+		ON,
+		AUTO
+	};
+
 	class SUPERNOVA_API Scene{
 	private:
 
@@ -71,6 +77,7 @@ namespace Supernova{
 		Vector4 backgroundColor;
 		bool shadowsPCF;
 
+		LightState lightState;
 		Vector3 globalIllumColor;
 		float globalIllumIntensity;
 
@@ -108,6 +115,9 @@ namespace Supernova{
 		void setShadowsPCF(bool shadowsPCF);
 		bool isShadowsPCF() const;
 
+		void setLightState(LightState state);
+		LightState getLightState() const;
+
 		void setGlobalIllumination(float intensity, Vector3 color);
 		void setGlobalIllumination(float intensity);
 		void setGlobalIllumination(Vector3 color);

engine/core/script/LuaBridgeAddon.h

@@ -53,6 +53,7 @@ namespace luabridge
     template<> struct Stack<AdMobRating> : EnumWrapper<AdMobRating>{};
     template<> struct Stack<CursorType> : EnumWrapper<CursorType>{};
     template<> struct Stack<ResourceLoadState> : EnumWrapper<ResourceLoadState>{};
+    template<> struct Stack<LightState> : EnumWrapper<LightState>{};
 
     template<> struct Stack<ResourceType> : EnumWrapper<ResourceType>{};
 

engine/core/script/binding/CoreClassesLua.cpp

@@ -152,6 +152,13 @@ void LuaBinding::registerCoreClasses(lua_State *L){
         .addVariable("Failed", ResourceLoadState::Failed)
         .endNamespace();
 
+    luabridge::getGlobalNamespace(L)
+        .beginNamespace("LightState")
+        .addVariable("OFF", LightState::OFF)
+        .addVariable("ON", LightState::ON)
+        .addVariable("AUTO", LightState::AUTO)
+        .endNamespace();
+
     luabridge::getGlobalNamespace(L)
         .beginClass<Engine>("Engine")
 
@@ -475,6 +482,7 @@ void LuaBinding::registerCoreClasses(lua_State *L){
             luabridge::overload<float, float, float>(&Scene::setBackgroundColor),
             luabridge::overload<float, float, float, float>(&Scene::setBackgroundColor))
         .addProperty("shadowsPCF", &Scene::isShadowsPCF, &Scene::setShadowsPCF)
+        .addProperty("lightState", &Scene::getLightState, &Scene::setLightState)
         .addProperty("globalIlluminationColor", &Scene::getGlobalIlluminationColor, (void (Scene::*)(Vector3))&Scene::setGlobalIllumination)
         .addProperty("globalIlluminationIntensity", &Scene::getGlobalIlluminationIntensity, (void (Scene::*)(float))&Scene::setGlobalIllumination)
         .addFunction("getGlobalIlluminationColorLinear", &Scene::getGlobalIlluminationColorLinear)

engine/core/subsystem/RenderSystem.cpp

@@ -175,8 +175,12 @@ int RenderSystem::checkLightsAndShadow(){
 	if (numLights > MAX_LIGHTS)
 		numLights = MAX_LIGHTS;
 
-	if (numLights > 0)
+	if (scene->getLightState() == LightState::AUTO){
+		if (numLights > 0)
+			hasLights = true;
+	}else if (scene->getLightState() == LightState::ON){
 		hasLights = true;
+	}
 
 	for (int i = 0; i < numLights; i++){
 		LightComponent& light = lights->getComponentFromIndex(i);
@@ -282,10 +286,11 @@ void RenderSystem::processLights(int numLights, Transform& cameraTransform){
 		fs_lighting.color_intensity[i] = Vector4(light.color.x, light.color.y, light.color.z, light.intensity);
 		fs_lighting.position_type[i] = Vector4(worldPosition.x, worldPosition.y, worldPosition.z, (float)type);
 		fs_lighting.inCon_ouCon_shadows_cascades[i] = Vector4(light.innerConeCos, light.outerConeCos, light.shadowMapIndex, light.numShadowCascades);
-		fs_lighting.eyePos = Vector4(cameraTransform.worldPosition.x, cameraTransform.worldPosition.y, cameraTransform.worldPosition.z, 0.0);
-		fs_lighting.globalIllum = Vector4(scene->getGlobalIlluminationColorLinear(), scene->getGlobalIlluminationIntensity());
 	}
 
+	fs_lighting.eyePos = Vector4(cameraTransform.worldPosition.x, cameraTransform.worldPosition.y, cameraTransform.worldPosition.z, 0.0);
+	fs_lighting.globalIllum = Vector4(scene->getGlobalIlluminationColorLinear(), scene->getGlobalIlluminationIntensity());
+
 	// Setting intensity of other lights to zero
 	for (int i = numLights; i < MAX_LIGHTS; i++){
 		fs_lighting.color_intensity[i].w = 0.0;