Merge remote-tracking branch 'origin/master' into decklink

2 files changed, 51 insertions, 22 deletions

diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index 9feb6141cc4..2f85122cae8 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -75,8 +75,8 @@ ImageRender::ImageRender (KX_Scene *scene, KX_Camera * camera) :
     m_mirrorHalfWidth(0.f),
     m_mirrorHalfHeight(0.f)
 {
-	// initialize background color
-	setBackground(0, 0, 255, 255);
+	// initialize background color to scene background color as default
+	setBackgroundFromScene(m_scene);
 	// retrieve rendering objects
 	m_engine = KX_GetActiveEngine();
 	m_rasterizer = m_engine->GetRasterizer();
@@ -90,14 +90,33 @@ ImageRender::~ImageRender (void)
 		m_camera->Release();
 }
 
+// get background color
+float ImageRender::getBackground (int idx)
+{
+	return (idx < 0 || idx > 3) ? 0.0f : m_background[idx] * 255.0f;
+}
 
 // set background color
-void ImageRender::setBackground (int red, int green, int blue, int alpha)
+void ImageRender::setBackground (float red, float green, float blue, float alpha)
 {
-	m_background[0] = (red < 0) ? 0.f : (red > 255) ? 1.f : float(red)/255.f;
-	m_background[1] = (green < 0) ? 0.f : (green > 255) ? 1.f : float(green)/255.f;
-	m_background[2] = (blue < 0) ? 0.f : (blue > 255) ? 1.f : float(blue)/255.f;
-	m_background[3] = (alpha < 0) ? 0.f : (alpha > 255) ? 1.f : float(alpha)/255.f;
+	m_background[0] = (red < 0.0f) ? 0.0f : (red > 255.0f) ? 1.0f : red / 255.0f;
+	m_background[1] = (green < 0.0f) ? 0.0f : (green > 255.0f) ? 1.0f : green / 255.0f;
+	m_background[2] = (blue < 0.0f) ? 0.0f : (blue > 255.0f) ? 1.0f : blue / 255.0f;
+	m_background[3] = (alpha < 0.0f) ? 0.0f : (alpha > 255.0f) ? 1.0f : alpha / 255.0f;
+}
+
+// set background color from scene
+void ImageRender::setBackgroundFromScene (KX_Scene *scene)
+{
+	if (scene) {
+		const float *background_color = scene->GetWorldInfo()->getBackColor();
+		copy_v3_v3(m_background, background_color);
+		m_background[3] = 1.0f;
+	}
+	else {
+		const float blue_color[] = {0.0f, 0.0f, 1.0f, 1.0f};
+		copy_v4_v4(m_background, blue_color);
+	}
 }
 
 
@@ -272,8 +291,17 @@ void ImageRender::Render()
 	// restore the stereo mode now that the matrix is computed
 	m_rasterizer->SetStereoMode(stereomode);
 
+    if (stereomode == RAS_IRasterizer::RAS_STEREO_QUADBUFFERED) {
+        // In QUAD buffer stereo mode, the GE render pass ends with the right eye on the right buffer
+        // but we need to draw on the left buffer to capture the render
+        // TODO: implement an explicit function in rasterizer to restore the left buffer.
+        m_rasterizer->SetEye(RAS_IRasterizer::RAS_STEREO_LEFTEYE);
+    }
+
 	m_scene->CalculateVisibleMeshes(m_rasterizer,m_camera);
 
+	m_engine->UpdateAnimations(m_scene);
+
 	m_scene->RenderBuckets(camtrans, m_rasterizer);
 
 	m_scene->RenderFonts();
@@ -342,7 +370,7 @@ static int ImageRender_init(PyObject *pySelf, PyObject *args, PyObject *kwds)
 // get background color
 static PyObject *getBackground (PyImage *self, void *closure)
 {
-	return Py_BuildValue("[BBBB]",
+	return Py_BuildValue("[ffff]",
 	                     getImageRender(self)->getBackground(0),
 	                     getImageRender(self)->getBackground(1),
 	                     getImageRender(self)->getBackground(2),
@@ -354,20 +382,20 @@ static int setBackground(PyImage *self, PyObject *value, void *closure)
 {
 	// check validity of parameter
 	if (value == NULL || !PySequence_Check(value) || PySequence_Size(value) != 4
-		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0))
-		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1))
-		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 2))
-		|| !PyLong_Check(PySequence_Fast_GET_ITEM(value, 3)))
-	{
-		PyErr_SetString(PyExc_TypeError, "The value must be a sequence of 4 integer between 0 and 255");
+		|| (!PyFloat_Check(PySequence_Fast_GET_ITEM(value, 0)) && !PyLong_Check(PySequence_Fast_GET_ITEM(value, 0)))
+		|| (!PyFloat_Check(PySequence_Fast_GET_ITEM(value, 1)) && !PyLong_Check(PySequence_Fast_GET_ITEM(value, 1)))
+		|| (!PyFloat_Check(PySequence_Fast_GET_ITEM(value, 2)) && !PyLong_Check(PySequence_Fast_GET_ITEM(value, 2)))
+		|| (!PyFloat_Check(PySequence_Fast_GET_ITEM(value, 3)) && !PyLong_Check(PySequence_Fast_GET_ITEM(value, 3)))) {
+
+		PyErr_SetString(PyExc_TypeError, "The value must be a sequence of 4 floats or ints between 0.0 and 255.0");
 		return -1;
 	}
 	// set background color
 	getImageRender(self)->setBackground(
-	        (unsigned char)(PyLong_AsLong(PySequence_Fast_GET_ITEM(value, 0))),
-	        (unsigned char)(PyLong_AsLong(PySequence_Fast_GET_ITEM(value, 1))),
-	        (unsigned char)(PyLong_AsLong(PySequence_Fast_GET_ITEM(value, 2))),
-	        (unsigned char)(PyLong_AsLong(PySequence_Fast_GET_ITEM(value, 3))));
+	        PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, 0)),
+	        PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, 1)),
+	        PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, 2)),
+	        PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, 3)));
 	// success
 	return 0;
 }
@@ -727,7 +755,8 @@ ImageRender::ImageRender (KX_Scene *scene, KX_GameObject *observer, KX_GameObjec
 	m_mirrorX = m_mirrorY.cross(m_mirrorZ);
 	m_render = true;
 
-	setBackground(0, 0, 255, 255);
+	// set mirror background color to scene background color as default
+	setBackgroundFromScene(m_scene);
 }
 
 
diff --git a/source/gameengine/VideoTexture/ImageRender.h b/source/gameengine/VideoTexture/ImageRender.h
index 98dceeaafe1..ef55e4dea84 100644
--- a/source/gameengine/VideoTexture/ImageRender.h
+++ b/source/gameengine/VideoTexture/ImageRender.h
@@ -55,9 +55,9 @@ public:
 	virtual ~ImageRender (void);
 
 	/// get background color
-	int getBackground (int idx) { return (idx < 0 || idx > 3) ? 0 : int(m_background[idx]*255.f); }
+	float getBackground (int idx);
 	/// set background color
-	void setBackground (int red, int green, int blue, int alpha);
+	void setBackground (float red, float green, float blue, float alpha);
 
 	/// clipping distance
 	float getClip (void) { return m_clip; }
@@ -100,7 +100,7 @@ protected:
 	void Render();
 	void SetupRenderFrame(KX_Scene *scene, KX_Camera* cam);
 	void RenderFrame(KX_Scene* scene, KX_Camera* cam);
-	void SetBackGround(KX_WorldInfo* wi);
+	void setBackgroundFromScene(KX_Scene *scene);
 	void SetWorldSettings(KX_WorldInfo* wi);
 };