Configurable sensor size:

- Added support of variable size sensor width and height.
- Added presets for most common cameras, also new presets can be defined by user.
- Added option to control which dimension (vertical or horizontal) of sensor
  size defines FOV. Old behavior of automatic FOV calculation is also kept.
- Renderer, viewport, game engine and collada importer/exporter should
  deal fine with this changes. Other exporters would be updated soon.

8 files changed, 100 insertions, 18 deletions

diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 77bd6e0f374..ca37b06d12e 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1724,7 +1724,7 @@ static KX_LightObject *gamelight_from_blamp(Object *ob, Lamp *la, unsigned int l
 
 static KX_Camera *gamecamera_from_bcamera(Object *ob, KX_Scene *kxscene, KX_BlenderSceneConverter *converter) {
 	Camera* ca = static_cast<Camera*>(ob->data);
-	RAS_CameraData camdata(ca->lens, ca->ortho_scale, ca->clipsta, ca->clipend, ca->type == CAM_PERSP, ca->YF_dofdist);
+	RAS_CameraData camdata(ca->lens, ca->ortho_scale, ca->sensor_x, ca->sensor_y, ca->sensor_fit, ca->clipsta, ca->clipend, ca->type == CAM_PERSP, ca->YF_dofdist);
 	KX_Camera *gamecamera;
 	
 	gamecamera= new KX_Camera(kxscene, KX_Scene::m_callbacks, camdata);
diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp
index 77438b8f48a..14a307794db 100644
--- a/source/gameengine/Ketsji/KX_Camera.cpp
+++ b/source/gameengine/Ketsji/KX_Camera.cpp
@@ -200,7 +200,26 @@ float KX_Camera::GetScale() const
 	return m_camdata.m_scale;
 }
 
+/*
+* Gets the horizontal size of the sensor - for camera matching.
+*/
+float KX_Camera::GetSensorWidth() const
+{
+	return m_camdata.m_sensor_x;
+}
 
+/*
+* Gets the vertical size of the sensor - for camera matching.
+*/
+float KX_Camera::GetSensorHeight() const
+{
+	return m_camdata.m_sensor_y;
+}
+/** Gets the mode FOV is calculating from sensor dimensions */
+short KX_Camera::GetSensorFit() const
+{
+	return m_camdata.m_sensor_fit;
+}
 
 float KX_Camera::GetCameraNear() const
 {
diff --git a/source/gameengine/Ketsji/KX_Camera.h b/source/gameengine/Ketsji/KX_Camera.h
index 4c8cf21a7bf..236e914b9e5 100644
--- a/source/gameengine/Ketsji/KX_Camera.h
+++ b/source/gameengine/Ketsji/KX_Camera.h
@@ -199,6 +199,12 @@ public:
 	float				GetLens() const;
 	/** Gets the ortho scale. */
 	float				GetScale() const;
+	/** Gets the horizontal size of the sensor - for camera matching */
+	float				GetSensorWidth() const;
+	/** Gets the vertical size of the sensor - for camera matching */
+	float				GetSensorHeight() const;
+	/** Gets the mode FOV is calculating from sensor dimensions */
+	short				GetSensorFit() const;
 	/** Gets the near clip distance. */
 	float				GetCameraNear() const;
 	/** Gets the far clip distance. */
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 5de6adc5af4..a9be588e6b2 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -1251,6 +1251,7 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam)
 				cam->GetScale(),
 				nearfrust,
 				farfrust,
+				cam->GetSensorFit(),
 				frustum
 			);
 			if (!cam->GetViewport()) {
@@ -1268,6 +1269,9 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam)
 				area,
 				viewport,
 				cam->GetLens(),
+				cam->GetSensorWidth(),
+				cam->GetSensorHeight(),
+				cam->GetSensorFit(),
 				nearfrust,
 				farfrust,
 				frustum
diff --git a/source/gameengine/Rasterizer/RAS_CameraData.h b/source/gameengine/Rasterizer/RAS_CameraData.h
index 2056068a2ad..2120a18f139 100644
--- a/source/gameengine/Rasterizer/RAS_CameraData.h
+++ b/source/gameengine/Rasterizer/RAS_CameraData.h
@@ -36,6 +36,9 @@ struct RAS_CameraData
 {
 	float m_lens;
 	float m_scale;
+	float m_sensor_x;
+	float m_sensor_y;
+	short m_sensor_fit;
 	float m_clipstart;
 	float m_clipend;
 	bool m_perspective;
@@ -46,11 +49,15 @@ struct RAS_CameraData
 	int m_viewporttop;
 	float m_focallength;
 
-	RAS_CameraData(float lens = 35.0, float scale = 6.0, float clipstart = 0.1, float clipend = 5000.0, bool perspective = true,
+	RAS_CameraData(float lens = 35.0, float scale = 6.0, float sensor_x = 32.0, float sensor_y = 18.0, short sensor_fit = 0,
+	               float clipstart = 0.1, float clipend = 5000.0, bool perspective = true,
 	               float focallength = 3.0, bool viewport = false, int viewportleft = 0, int viewportbottom = 0,
 	               int viewportright = 0, int viewporttop = 0) :
 	    m_lens(lens),
 	    m_scale(scale),
+	    m_sensor_x(sensor_x),
+	    m_sensor_y(sensor_y),
+		m_sensor_fit(sensor_fit),
 	    m_clipstart(clipstart),
 	    m_clipend(clipend),
 	    m_perspective(perspective),
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.cpp b/source/gameengine/Rasterizer/RAS_FramingManager.cpp
index da6c230ffc1..8a5c10b3a3b 100644
--- a/source/gameengine/Rasterizer/RAS_FramingManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_FramingManager.cpp
@@ -39,25 +39,35 @@ ComputeDefaultFrustum(
 	const float camnear,
 	const float camfar,
 	const float lens,
+	const float sensor_x, const float sensor_y,
+	const short sensor_fit,
 	const float design_aspect_ratio,
 	RAS_FrameFrustum & frustum
-){
-		
-	/*
-	 * Magic Blender calculation.
-	 * Blender does not give a Field of View as lens but a size
-	 * at 16 units away from the lens.
-	 */
-	float halfSize = 16.f * camnear / lens;
+){		
+	float halfSize;
 	float sizeX;
 	float sizeY;
 
-	if (design_aspect_ratio > 1.f) {
-		// halfsize defines the width
+	if(sensor_fit==RAS_SENSORFIT_AUTO) {
+		halfSize = (sensor_x / 2.f) * camnear / lens;
+
+		if (design_aspect_ratio > 1.f) {
+			// halfsize defines the width
+			sizeX = halfSize;
+			sizeY = halfSize/design_aspect_ratio;
+		} else {
+			// halfsize defines the height
+			sizeX = halfSize * design_aspect_ratio;
+			sizeY = halfSize;
+		}
+	}
+	else if(sensor_fit==RAS_SENSORFIT_HOR) {
+		halfSize = (sensor_x / 2.f) * camnear / lens;
 		sizeX = halfSize;
 		sizeY = halfSize/design_aspect_ratio;
-	} else {
-		// halfsize defines the height
+	}
+	else {
+		halfSize = (sensor_y / 2.f) * camnear / lens;
 		sizeX = halfSize * design_aspect_ratio;
 		sizeY = halfSize;
 	}
@@ -77,6 +87,7 @@ ComputeDefaultOrtho(
 	const float camfar,
 	const float scale,
 	const float design_aspect_ratio,
+	const short sensor_fit,
 	RAS_FrameFrustum & frustum
 )
 {
@@ -84,12 +95,22 @@ ComputeDefaultOrtho(
 	float sizeX;
 	float sizeY;
 
-	if (design_aspect_ratio > 1.f) {
-		// halfsize defines the width
+	if(sensor_fit==RAS_SENSORFIT_AUTO) {
+		if (design_aspect_ratio > 1.f) {
+			// halfsize defines the width
+			sizeX = halfSize;
+			sizeY = halfSize/design_aspect_ratio;
+		} else {
+			// halfsize defines the height
+			sizeX = halfSize * design_aspect_ratio;
+			sizeY = halfSize;
+		}
+	}
+	else if(sensor_fit==RAS_SENSORFIT_HOR) {
 		sizeX = halfSize;
 		sizeY = halfSize/design_aspect_ratio;
-	} else {
-		// halfsize defines the height
+	}
+	else {
 		sizeX = halfSize * design_aspect_ratio;
 		sizeY = halfSize;
 	}
@@ -199,6 +220,7 @@ ComputeFrustum(
 	const RAS_Rect &availableViewport,
 	const RAS_Rect &viewport,
 	const float lens,
+	const float sensor_x, const float sensor_y, const short sensor_fit,
 	const float camnear,
 	const float camfar,
 	RAS_FrameFrustum &frustum
@@ -224,6 +246,9 @@ ComputeFrustum(
 		camnear,
 		camfar,
 		lens,
+		sensor_x,
+		sensor_y,
+		sensor_fit,
 		design_aspect_ratio,
 		frustum
 	);
@@ -269,6 +294,7 @@ RAS_FramingManager::
 		const float scale,
 		const float camnear,
 		const float camfar,
+		const short sensor_fit,
 		RAS_FrameFrustum &frustum
 	)
 {
@@ -293,6 +319,7 @@ RAS_FramingManager::
 		camfar,
 		scale,
 		design_aspect_ratio,
+		sensor_fit,
 		frustum
 	);
 
diff --git a/source/gameengine/Rasterizer/RAS_FramingManager.h b/source/gameengine/Rasterizer/RAS_FramingManager.h
index 38ea8f4e07a..612142234e3 100644
--- a/source/gameengine/Rasterizer/RAS_FramingManager.h
+++ b/source/gameengine/Rasterizer/RAS_FramingManager.h
@@ -184,6 +184,14 @@ enum RAS_CullingMode
 	RAS_CULLING_NONE
 };
 
+/* Should match CAMERA_SENSOR_FIT... from DNA_camera_types.h */
+enum RAS_SensorFit
+{
+	RAS_SENSORFIT_AUTO = 0,
+	RAS_SENSORFIT_HOR,
+	RAS_SENSORFIT_VERT
+};
+
 /**
  * @section RAS_FramingManager
  * This class helps to compute a view frustum
@@ -229,6 +237,7 @@ public :
 		const float scale,
 		const float camnear,
 		const float camfar,
+		const short sensor_fit,
 		RAS_FrameFrustum &frustum
 	);
 
@@ -239,6 +248,7 @@ public :
 		const RAS_Rect &availableViewport,
 		const RAS_Rect &viewport,
 		const float lens,
+		const float sensor_x, const float sensor_y, const short sensor_fit,
 		const float camnear,
 		const float camfar,
 		RAS_FrameFrustum &frustum
@@ -250,6 +260,8 @@ public :
 		const float camnear,
 		const float camfar,
 		const float lens,
+		const float sensor_x, const float sensor_y,
+		const short sensor_fit,
 		const float design_aspect_ratio,
 		RAS_FrameFrustum & frustum
 	);	
@@ -261,6 +273,7 @@ public :
 		const float camfar,
 		const float scale,
 		const float design_aspect_ratio,
+		const short sensor_fit,
 		RAS_FrameFrustum & frustum
 	);
 
diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index 912d5864560..a349b45e403 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -214,6 +214,8 @@ void ImageRender::Render()
 	} else
 	{
 		float lens = m_camera->GetLens();
+		float sensor_x = m_camera->GetSensorWidth();
+		float sensor_y = m_camera->GetSensorHeight();
 		bool orthographic = !m_camera->GetCameraData()->m_perspective;
 		float nearfrust = m_camera->GetCameraNear();
 		float farfrust = m_camera->GetCameraFar();
@@ -233,6 +235,7 @@ void ImageRender::Render()
 			            farfrust,
 			            m_camera->GetScale(),
 			            aspect_ratio,
+						m_camera->GetSensorFit(),
 			            frustrum
 			            );
 
@@ -244,6 +247,9 @@ void ImageRender::Render()
 			            nearfrust,
 			            farfrust,
 			            lens,
+			            sensor_x,
+			            sensor_y,
+			            RAS_SENSORFIT_AUTO,
 			            aspect_ratio,
 			            frustrum);