Revision: 19445
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19445
Author: dfelinto
Date: 2009-03-29 10:39:26 +0200 (Sun, 29 Mar 2009)
Log Message:
-----------
final adjusts before first patch for reviewing.
Now the code is the same as the one found in:
[#18462] Fisheye (Dome) and Spherical Panoramic mode in BGE
file: 090329_review.R1.patch
Modified Paths:
--------------
branches/ge_dome/source/blender/blenkernel/intern/scene.c
branches/ge_dome/source/blender/blenloader/intern/readfile.c
branches/ge_dome/source/blender/src/buttons_scene.c
branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp
branches/ge_dome/source/gameengine/Ketsji/KX_Dome.h
branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.h
Modified: branches/ge_dome/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/ge_dome/source/blender/blenkernel/intern/scene.c 2009-03-29
08:31:04 UTC (rev 19444)
+++ branches/ge_dome/source/blender/blenkernel/intern/scene.c 2009-03-29
08:39:26 UTC (rev 19445)
@@ -230,10 +230,10 @@
sce->r.threads= 1;
sce->r.stereomode = 1; // no stereo
+ sce->r.domeangle = 180;
+ sce->r.domemode = 1;
sce->r.domesize = 1.0f;
sce->r.domeres = 4;
- sce->r.domemode = 1;
- sce->r.domeangle = 180;
sce->r.domeresbuf = 1.0f;
sce->r.simplify_subsurf= 6;
Modified: branches/ge_dome/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/ge_dome/source/blender/blenloader/intern/readfile.c
2009-03-29 08:31:04 UTC (rev 19444)
+++ branches/ge_dome/source/blender/blenloader/intern/readfile.c
2009-03-29 08:39:26 UTC (rev 19445)
@@ -8030,10 +8030,10 @@
/* Dome (Fisheye) default parameters */
for (sce= main->scene.first; sce; sce= sce->id.next) {
+ sce->r.domeangle = 180;
+ sce->r.domemode = 1;
sce->r.domesize = 1.0f;
sce->r.domeres = 4;
- sce->r.domemode = 1;
- sce->r.domeangle = 180;
sce->r.domeresbuf = 1.0f;
}
}
Modified: branches/ge_dome/source/blender/src/buttons_scene.c
===================================================================
--- branches/ge_dome/source/blender/src/buttons_scene.c 2009-03-29 08:31:04 UTC
(rev 19444)
+++ branches/ge_dome/source/blender/src/buttons_scene.c 2009-03-29 08:39:26 UTC
(rev 19445)
@@ -1827,12 +1827,12 @@
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
- uiDefButS(block, ROW, 0, "Dome", xco-=180, yco-=30, 88, 19,
&(G.scene->r.stereomode), 7.0, 8.0, 0, 0, "Enables Dome camera (fisheye)");
+ uiDefButS(block, ROW, 0, "Dome", xco-=180, yco-=30, 88, 19,
&(G.scene->r.stereomode), 7.0, 8.0, 0, 0, "Enables dome camera");
uiDefButS(block, NUM, 0, "Ang:", xco+=90, yco, 88, 19,
&G.scene->r.domeangle, 90.0, 250.0, 0, 0, "Angle (Aperture) of the Dome - it
only works in mode 1");
- uiDefButS(block, NUM, 0, "Mode:", xco+=90, yco, 88, 19,
&G.scene->r.domemode, 1.0, 3.0, 0, 0, "Dome mode - 1 fisheye, 2 truncated, 3
panoramic");//, 4 (tests), 5 offset, 6 warped");
+ uiDefButS(block, NUM, 0, "Mode:", xco+=90, yco, 88, 19,
&G.scene->r.domemode, 1.0, 3.0, 0, 0, "Dome mode - 1 fisheye, 2 truncated, 3
spherical panoramic");
- uiDefButF(block, NUM, 0, "Size:", xco-=180, yco-=21, 88,
19, &G.scene->r.domesize, 0.5, 3.5, 0, 0, "Size adjustemnts");
- uiDefButS(block, NUM, 0, "Def:", xco+=90, yco, 88, 19,
&G.scene->r.domeres, 1.0, 8.0, 0, 0, "Resolution of the dome - 1 to 8");
+ uiDefButF(block, NUM, 0, "Size:", xco-=180, yco-=21, 88,
19, &G.scene->r.domesize, 0.5, 3.5, 0, 0, "Size adjustments");
+ uiDefButS(block, NUM, 0, "Tes:", xco+=90, yco, 88, 19,
&G.scene->r.domeres, 1.0, 8.0, 0, 0, "Tesselation level - 1 to 8");
uiDefButF(block, NUM, 0, "Res:", xco+=90, yco, 88, 19,
&G.scene->r.domeresbuf, 0.1, 1.0, 0, 0, "Buffer Resolution - decrease it to
increase speed");
uiBlockEndAlign(block);
Modified: branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp
===================================================================
--- branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp 2009-03-29
08:31:04 UTC (rev 19444)
+++ branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp 2009-03-29
08:39:26 UTC (rev 19445)
@@ -1300,7 +1300,7 @@
void KX_Dome::RotateCamera(KX_Camera* cam, int i)
{
-// I'm not using it, I'm doing inline call for these commands
+// I'm not using it, I'm doing inline calls for these commands
// but it's nice to have it here in case I need it
MT_Matrix3x3 camori = cam->GetSGNode()->GetLocalOrientation();
Modified: branches/ge_dome/source/gameengine/Ketsji/KX_Dome.h
===================================================================
--- branches/ge_dome/source/gameengine/Ketsji/KX_Dome.h 2009-03-29 08:31:04 UTC
(rev 19444)
+++ branches/ge_dome/source/gameengine/Ketsji/KX_Dome.h 2009-03-29 08:39:26 UTC
(rev 19445)
@@ -108,7 +108,6 @@
//Draw functions
void GLDrawTriangles(vector <DomeFace>& face, int nfaces);
void Draw(void);
-
void DrawDomeFisheye(void);
void DrawPanorama(void);
Modified: branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
2009-03-29 08:31:04 UTC (rev 19444)
+++ branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
2009-03-29 08:39:26 UTC (rev 19445)
@@ -145,6 +145,8 @@
m_stereo(false),
m_curreye(0),
+ m_usedome(false),
+
m_logger(NULL),
// Set up timing info display variables
@@ -180,7 +182,7 @@
KX_KetsjiEngine::~KX_KetsjiEngine()
{
delete m_logger;
- if(usedome)
+ if(m_usedome)
delete m_dome;
}
@@ -262,7 +264,7 @@
void KX_KetsjiEngine::InitDome(float size, short res, short mode, short angle,
float resbuf)
{
m_dome = new KX_Dome(m_canvas, m_rasterizer, m_rendertools,this, size,
res, mode, angle, resbuf);
- usedome = true;
+ m_usedome = true;
}
void KX_KetsjiEngine::RenderDome()
@@ -739,7 +741,7 @@
void KX_KetsjiEngine::Render()
{
- if(usedome){
+ if(m_usedome){
RenderDome();
return;
}
Modified: branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.h
===================================================================
--- branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.h 2009-03-29
08:31:04 UTC (rev 19444)
+++ branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.h 2009-03-29
08:39:26 UTC (rev 19445)
@@ -37,7 +37,6 @@
#include "KX_Scene.h"
#include "KX_Python.h"
#include "KX_WorldInfo.h"
-#include "RAS_IRasterizer.h"
#include <vector>
#include <set>
@@ -214,7 +213,7 @@
void InitDome(float size, short res, short mode,
short angle, float resbuf);
void EndDome();
void RenderDome();
- bool usedome;
+ bool m_usedome;
///returns true if an update happened to indicate -> Render
bool NextFrame();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
