BGE Dome: removing of size option and adding tilt option.

- Size adjustments can be accomplished with warp mesh data now. So we get a free spot in the GUI for a tilt option.

- Tilt option to tilt the camera (for planetarium domes).
Angle is in degree from -180 to +180. It's needed for planetarium domes (as this one http://domejunky.blogspot.com/2009/05/dome-corrected-bge.html ).

- This is the last commit regarding dome code I expected to 2.49. I consider this feature full implemented now. (working on docs now)

4 files changed, 44 insertions, 44 deletions

diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp
index 25efe0a59c9..daa31379985 100644
--- a/source/gameengine/Ketsji/KX_Dome.cpp
+++ b/source/gameengine/Ketsji/KX_Dome.cpp
@@ -43,23 +43,23 @@ KX_Dome::KX_Dome (
     RAS_IRenderTools* rendertools,
     /// engine
     KX_KetsjiEngine* engine,
-	
-	float size,		//size for adjustments
+
 	short res,		//resolution of the mesh
 	short mode,		//mode - fisheye, truncated, warped, panoramic, ...
 	short angle,
 	float resbuf,	//size adjustment of the buffer
+	short tilt,
 	struct Text* warptext
 
 ):
 	dlistSupported(false),
 	canvaswidth(-1), canvasheight(-1),
 	m_drawingmode(engine->GetDrawType()),
-	m_size(size),
 	m_resolution(res),
 	m_mode(mode),
 	m_angle(angle),
 	m_resbuffer(resbuf),
+	m_tilt(tilt),
 	m_canvas(canvas),
 	m_rasterizer(rasterizer),
 	m_rendertools(rendertools),
@@ -124,7 +124,7 @@ KX_Dome::KX_Dome (
 			CreateMeshPanorama();
 			m_numfaces = 6;
 			break;
-		default: //DOME_TRUNCATED_DOWN and DOME_TRUNCATED_UP
+		default: //DOME_TRUNCATED_FRONT and DOME_TRUNCATED_REAR
 			if (m_angle <= 180){
 				cubetop.resize(1);
 				cubebottom.resize(1);
@@ -269,7 +269,7 @@ http://projects.blender.org/tracker/?func=detail&aid=18655&group_id=9&atid=125
 bool KX_Dome::CreateDL(){
 	dlistId = glGenLists((GLsizei) m_numimages);
 	if (dlistId != 0) {
-		if(m_mode == DOME_FISHEYE || m_mode == DOME_TRUNCATED_UP || m_mode == DOME_TRUNCATED_DOWN){
+		if(m_mode == DOME_FISHEYE || m_mode == DOME_TRUNCATED_FRONT || m_mode == DOME_TRUNCATED_REAR){
 			glNewList(dlistId, GL_COMPILE);
 				GLDrawTriangles(cubetop, nfacestop);
 			glEndList();
@@ -1485,13 +1485,14 @@ Uses 4 cameras for angles up to 180º
 Uses 5 cameras for angles up to 250º
 Uses 6 cameras for angles up to 360º
 */
+	int i;
 	float deg45 = MT_PI / 4;
 	MT_Scalar c = cos(deg45);
 	MT_Scalar s = sin(deg45);
 
 	if (m_angle <= 180 && (m_mode == DOME_FISHEYE 
-		|| m_mode == DOME_TRUNCATED_UP 
-		|| m_mode == DOME_TRUNCATED_DOWN)){
+		|| m_mode == DOME_TRUNCATED_FRONT
+		|| m_mode == DOME_TRUNCATED_REAR)){
 
 		m_locRot[0] = MT_Matrix3x3( // 90º - Top
 						c, -s, 0.0,
@@ -1514,8 +1515,8 @@ Uses 6 cameras for angles up to 360º
 						s, 0.0, c);
 
 	} else if (m_mode == DOME_ENVMAP || (m_angle > 180 && (m_mode == DOME_FISHEYE
-		|| m_mode == DOME_TRUNCATED_UP 
-		|| m_mode == DOME_TRUNCATED_DOWN))){
+		|| m_mode == DOME_TRUNCATED_FRONT 
+		|| m_mode == DOME_TRUNCATED_REAR))){
 
 		m_locRot[0] = MT_Matrix3x3( // 90º - Top
 						 1.0, 0.0, 0.0,
@@ -1579,6 +1580,23 @@ Uses 6 cameras for angles up to 360º
 						0.0, 1.0, 0.0,
 						s, 0.0, c);
 	}
+
+	// rotating the camera in horizontal axis
+	if (m_tilt)
+	{
+		float tiltdeg = ((m_tilt % 360) * 2 * MT_PI) / 360;
+		c = cos(tiltdeg);
+		s = sin(tiltdeg);
+
+		MT_Matrix3x3 tilt_mat = MT_Matrix3x3(
+		1.0, 0.0, 0.0,
+		0.0, c, -s,
+		0.0, s,  c
+		);
+
+		for (i =0;i<6;i++)
+			m_locRot[i] = tilt_mat * m_locRot[i];
+	}
 }
 
 void KX_Dome::RotateCamera(KX_Camera* cam, int i)
@@ -1621,10 +1639,10 @@ void KX_Dome::Draw(void)
 		case DOME_PANORAM_SPH:
 			DrawPanorama();
 			break;
-		case DOME_TRUNCATED_UP:
+		case DOME_TRUNCATED_FRONT:
 			DrawDomeFisheye();
 			break;
-		case DOME_TRUNCATED_DOWN:
+		case DOME_TRUNCATED_REAR:
 			DrawDomeFisheye();
 			break;
 	}
@@ -1670,9 +1688,6 @@ void KX_Dome::DrawEnvMap(void)
 			ortho_width = (float)can_width/can_height * ortho_height;
 		}
 		
-		ortho_width /= m_size;
-		ortho_height /= m_size;
-		
 		glOrtho((-ortho_width), ortho_width, (-ortho_height), ortho_height, -20.0, 10.0);
 	}
 
@@ -1803,20 +1818,17 @@ void KX_Dome::DrawDomeFisheye(void)
 				ortho_height = 1.0;
 			}
 			
-			ortho_width /= m_size;
-			ortho_height /= m_size;
-			
 			glOrtho((-ortho_width), ortho_width, (-ortho_height), ortho_height, -20.0, 10.0);
 		}
 	}
-	else if(m_mode == DOME_TRUNCATED_UP)
+	else if(m_mode == DOME_TRUNCATED_FRONT)
 	{
 		ortho_width = 1.0;
 		ortho_height = 2 * ((float)can_height/can_width) - 1.0 ;
 
 		glOrtho((-ortho_width), ortho_width, (-ortho_height), ortho_width, -20.0, 10.0);
 	}
-	else { //m_mode == DOME_TRUNCATED_DOWN
+	else { //m_mode == DOME_TRUNCATED_REAR
 		ortho_width = 1.0;
 		ortho_height = 2 * ((float)can_height/can_width) - 1.0 ;
 
@@ -1901,9 +1913,6 @@ void KX_Dome::DrawPanorama(void)
 			ortho_width = (float)can_width/can_height * 0.5;
 			ortho_height = 0.5;
 		}
-
-		ortho_width /= m_size;
-		ortho_height /= m_size;
 		
 		glOrtho((-ortho_width), ortho_width, (-ortho_height), ortho_height, -20.0, 10.0);
 	}
@@ -1972,7 +1981,6 @@ void KX_Dome::DrawDomeWarped(void)
 	int can_height = m_viewport.GetTop();
 
 	double screen_ratio = can_width/ (double) can_height;	
-	screen_ratio /= m_size;
 
     glOrtho(-screen_ratio,screen_ratio,-1.0,1.0,-20.0,10.0);
 
diff --git a/source/gameengine/Ketsji/KX_Dome.h b/source/gameengine/Ketsji/KX_Dome.h
index 30d02dce7a0..032098d38ad 100644
--- a/source/gameengine/Ketsji/KX_Dome.h
+++ b/source/gameengine/Ketsji/KX_Dome.h
@@ -40,12 +40,12 @@ Developed as part of a Research and Development project for SAT - La Société des
 #include "BKE_text.h"
 
 //Dome modes: limit hardcoded in buttons_scene.c
-#define DOME_FISHEYE		1
-#define DOME_ENVMAP			2
-#define DOME_PANORAM_SPH	3
-#define DOME_TRUNCATED_UP	4
-#define DOME_TRUNCATED_DOWN	5
-#define DOME_NUM_MODES		6
+#define DOME_FISHEYE			1
+#define DOME_TRUNCATED_FRONT	2
+#define DOME_TRUNCATED_REAR		3
+#define DOME_ENVMAP				4
+#define DOME_PANORAM_SPH		5
+#define DOME_NUM_MODES			6
 
 
 /// class for render 3d scene
@@ -61,12 +61,12 @@ public:
     RAS_IRenderTools* m_rendertools,
     /// engine
     KX_KetsjiEngine* m_engine,
-	
-	float size,
+
 	short res,
 	short mode,
 	short angle,
 	float resbuf,
+	short tilt,
 	struct Text* warptext
 	);
 
@@ -159,13 +159,13 @@ protected:
 	int m_buffersize;	// canvas small dimension
 	int m_numfaces;		// 4 to 6 depending on the kind of dome image
 	int m_numimages;	//numfaces +1 if we have warp mesh
-	
-	float m_size;		// size to adjust
+
 	short m_resolution;	//resolution to tesselate the mesh
 	short m_mode;		// the mode (truncated, warped, panoramic,...)
 	short m_angle;		//the angle of the fisheye
 	float m_radangle;	//the angle of the fisheye in radians
 	float m_resbuffer;	//the resolution of the buffer
+	short m_tilt;		//the dome tilt (camera rotation on horizontal axis)
 	
 	RAS_Rect m_viewport;
 
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index e773a9571f1..4107ed7d82e 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -262,9 +262,9 @@ void KX_KetsjiEngine::SetSceneConverter(KX_ISceneConverter* sceneconverter)
 	m_sceneconverter = sceneconverter;
 }
 
-void KX_KetsjiEngine::InitDome(float size, short res, short mode, short angle, float resbuf, struct Text* text)
+void KX_KetsjiEngine::InitDome(short res, short mode, short angle, float resbuf, short tilt, struct Text* text)
 {
-	m_dome = new KX_Dome(m_canvas, m_rasterizer, m_rendertools,this, size, res, mode, angle, resbuf, text);
+	m_dome = new KX_Dome(m_canvas, m_rasterizer, m_rendertools,this, res, mode, angle, resbuf, tilt, text);
 	m_usedome = true;
 }
 
@@ -272,7 +272,6 @@ void KX_KetsjiEngine::RenderDome()
 {
 	GLuint	viewport[4]={0};
 	glGetIntegerv(GL_VIEWPORT,(GLint *)viewport);
-//	unsigned int m_viewport[4] = {viewport[0], viewport[1], viewport[2], viewport[3]};
 	
 	m_dome->SetViewPort(viewport);
 
@@ -297,13 +296,6 @@ void KX_KetsjiEngine::RenderDome()
 
 	KX_SceneList::iterator sceneit;
 
-	// This is now done incrementally in KX_Scene::CalculateVisibleMeshes()
-	//for (sceneit = m_scenes.begin();sceneit != m_scenes.end(); sceneit++)
-	//{
-	//	// do this only once per scene
-	//	(*sceneit)->UpdateMeshTransformations();
-	//}
-
 	int n_renders=m_dome->GetNumberRenders();// usually 4 or 6
 	for (int i=0;i<n_renders;i++){
 		m_canvas->ClearBuffer(RAS_ICanvas::COLOR_BUFFER|RAS_ICanvas::DEPTH_BUFFER);
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.h b/source/gameengine/Ketsji/KX_KetsjiEngine.h
index 528465b6c2c..cc9b9198db7 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.h
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.h
@@ -211,7 +211,7 @@ public:
 	RAS_IRenderTools*	    GetRenderTools(){return m_rendertools;};
 
 	/// Dome functions
-	void			InitDome(float size, short res, short mode, short angle, float resbuf, struct Text* text); 
+	void			InitDome(short res, short mode, short angle, float resbuf, short tilt, struct Text* text); 
 	void			EndDome();
 	void			RenderDome();
 	bool			m_usedome;