1 files changed, 60 insertions, 24 deletions

diff --git a/source/gameengine/Ketsji/KX_WorldInfo.h b/source/gameengine/Ketsji/KX_WorldInfo.h
index 90b16fe1242..22851d3e269 100644
--- a/source/gameengine/Ketsji/KX_WorldInfo.h
+++ b/source/gameengine/Ketsji/KX_WorldInfo.h
@@ -33,41 +33,77 @@
 #define __KX_WORLDINFO_H__
 
 #include "MT_Scalar.h"
+#include "KX_KetsjiEngine.h"
+#include "PyObjectPlus.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
 #endif
 
-class MT_CmMatrix4x4;
+#ifdef USE_MATHUTILS
+void KX_WorldInfo_Mathutils_Callback_Init(void);
+#endif
+
+struct Scene;
+struct World;
 
-class KX_WorldInfo
+class KX_WorldInfo : public PyObjectPlus
 {
-public:
-	KX_WorldInfo() {}
-	virtual ~KX_WorldInfo();
+	Py_Header
 
-	virtual bool hasWorld() = 0;
-	virtual bool hasMist() = 0;
-	virtual float getBackColorRed() = 0;
-	virtual float getBackColorGreen() = 0;
-	virtual float getBackColorBlue() = 0;
-	virtual float getMistStart() = 0;
-	virtual float getMistDistance() = 0;
-	virtual float getMistColorRed() = 0;
-	virtual float getMistColorGreen() = 0;
-	virtual float getMistColorBlue() = 0;
+	STR_String m_name;
+	bool m_do_color_management;
+	bool m_hasworld;
+	bool m_hasmist;
+	short m_misttype;
+	float m_miststart;
+	float m_mistdistance;
+	float m_mistintensity;
+	float m_mistcolor[3];
+	float m_backgroundcolor[3];
+	float m_ambientcolor[3];
+	float m_con_mistcolor[3];
+	float m_con_backgroundcolor[3];
+	float m_con_ambientcolor[3];
 
-	virtual float getAmbientColorRed() = 0;
-	virtual float getAmbientColorGreen() = 0;
-	virtual float getAmbientColorBlue() = 0;
+public:
+	/**
+	 * Mist options
+	 */
+	enum MistType {
+		KX_MIST_QUADRATIC,
+		KX_MIST_LINEAR,
+		KX_MIST_INV_QUADRATIC,
+	};
+
+	KX_WorldInfo(Scene *blenderscene, World *blenderworld);
+	~KX_WorldInfo();
 
-	virtual void setBackColor(float, float, float) = 0;
-	virtual void setMistStart(float) = 0;
-	virtual void setMistDistance(float) = 0;
-	virtual void setMistColorRed(float) = 0;
-	virtual void setMistColorGreen(float) = 0;
-	virtual void setMistColorBlue(float) = 0;
+	const STR_String &GetName();
+	bool hasWorld();
+	void setUseMist(bool enable);
+	void setMistType(short type);
+	void setMistStart(float d);
+	void setMistDistance(float d);
+	void setMistIntensity(float intensity);
+	void setMistColor(float r, float g, float b);
+	void setBackColor(float r, float g, float b);
+	const float *getBackColorConverted() const;
+	void setAmbientColor(float r, float g, float b);
+	void UpdateBackGround();
+	void UpdateWorldSettings();
 
+#ifdef WITH_PYTHON
+	/* attributes */
+	static PyObject *pyattr_get_mist_typeconst(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	static PyObject *pyattr_get_mist_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	static int pyattr_set_mist_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+	static PyObject *pyattr_get_back_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	static int pyattr_set_back_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+	static PyObject *pyattr_get_ambient_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
+	static int pyattr_set_ambient_color(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
+	virtual PyObject *py_repr(void);
+#endif
 
 #ifdef WITH_CXX_GUARDEDALLOC
 	MEM_CXX_CLASS_ALLOC_FUNCS("GE:KX_WorldInfo")