UPBGE: Encapsulate light update in KX_LightObject.

UPBGE · Dec 17, 2017 · e8a9322 · lordloki · Dec 17, 2017 · e8a9322
1 parent 149f33e
commit e8a9322
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -846,7 +846,7 @@ void KX_KetsjiEngine::RenderShadowBuffers(KX_Scene *scene)
 
 	for (KX_LightObject *light : lightlist) {
 		RAS_ILightObject *raslight = light->GetLightData();
-		raslight->Update();
+		light->Update();
 	}
 
 	if (m_rasterizer->GetDrawingMode() == RAS_Rasterizer::RAS_TEXTURED) {

diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp
@@ -105,6 +105,11 @@ void KX_LightObject::SetShowShadowFrustum(bool show)
 	m_showShadowFrustum = show;
 }
 
+void KX_LightObject::Update()
+{
+	m_lightobj->Update(NodeGetWorldTransform(), !m_bVisible);
+}
+
 void KX_LightObject::UpdateScene(KX_Scene *kxscene)
 {
 	m_lightobj->m_scene = (void *)kxscene;

diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h
@@ -67,6 +67,9 @@ class KX_LightObject : public KX_GameObject
 	bool GetShowShadowFrustum() const;
 	void SetShowShadowFrustum(bool show);
 
+	// Update rasterizer light settings.
+	void Update();
+
 	void UpdateScene(KX_Scene *kxscene);
 	virtual void SetLayer(int layer);
 

diff --git a/source/gameengine/Rasterizer/RAS_ILightObject.h b/source/gameengine/Rasterizer/RAS_ILightObject.h
@@ -81,7 +81,7 @@ class RAS_ILightObject
 	bool m_staticShadow;
 	bool m_requestShadowUpdate;
 
-	virtual ~RAS_ILightObject() {}
+	virtual ~RAS_ILightObject() = default;
 	virtual RAS_ILightObject* Clone() = 0;
 
 	virtual bool HasShadowBuffer() = 0;
@@ -94,7 +94,7 @@ class RAS_ILightObject
 	virtual void BindShadowBuffer(RAS_ICanvas *canvas, KX_Camera *cam, mt::mat3x4& camtrans) = 0;
 	virtual void UnbindShadowBuffer() = 0;
 	virtual Image *GetTextureImage(short texslot) = 0;
-	virtual void Update() = 0;
+	virtual void Update(const mt::mat3x4& trans, bool hide) = 0;
 };
 
 #endif  /* __RAS_LIGHTOBJECT_H__ */
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.cpp
@@ -289,17 +289,14 @@ Image *RAS_OpenGLLight::GetTextureImage(short texslot)
 	return nullptr;
 }
 
-void RAS_OpenGLLight::Update()
+void RAS_OpenGLLight::Update(const mt::mat3x4& trans, bool hide)
 {
-	GPULamp *lamp;
-	KX_LightObject *kxlight = (KX_LightObject *)m_light;
+	GPULamp *lamp = GetGPULamp();
 
-	if ((lamp = GetGPULamp()) != nullptr && kxlight->GetSGNode()) {
+	if (lamp) {
 		float obmat[4][4];
-		const mt::mat3x4 trans = kxlight->NodeGetWorldTransform();
 		trans.PackFromAffineTransform(obmat);
 
-		int hide = kxlight->GetVisible() ? 0 : 1;
 		GPU_lamp_update(lamp, m_layer, hide, obmat);
 		GPU_lamp_update_colors(lamp, m_color[0], m_color[1],
 		                       m_color[2], m_energy);

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLLight.h
@@ -60,6 +60,6 @@ class RAS_OpenGLLight : public RAS_ILightObject
 	void BindShadowBuffer(RAS_ICanvas *canvas, KX_Camera *cam, mt::mat3x4& camtrans);
 	void UnbindShadowBuffer();
 	Image *GetTextureImage(short texslot);
-	void Update();
+	void Update(const mt::mat3x4& trans, bool hide);
 	void SetShadowUpdateState(short state);
 };