Revision: 19424
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19424
Author:   dfelinto
Date:     2009-03-27 07:42:36 +0100 (Fri, 27 Mar 2009)

Log Message:
-----------
A small fix (specular problem strikes again)
and now WireFrame mode shows the background mesh in wireframe as well. It's 
useful for calibration I think.

Modified Paths:
--------------
    branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp
    branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Modified: branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp
===================================================================
--- branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp       2009-03-27 
06:06:11 UTC (rev 19423)
+++ branches/ge_dome/source/gameengine/Ketsji/KX_Dome.cpp       2009-03-27 
06:42:36 UTC (rev 19424)
@@ -1478,11 +1478,6 @@
 
 void KX_Dome::Draw(void)
 {
-//     printf("Drawing Mode: %d\n", m_drawingmode);
-//     if(m_drawingmode == RAS_IRasterizer::KX_WIREFRAME)
-//             printf("WIREFRAME !!!!!\n");
-//     else
-//             printf("Boring MODE !!!\n");
        switch(m_mode){
                case DOME_FISHEYE:
                        DrawDomeFisheye();
@@ -1552,8 +1547,10 @@
 
 //     glDisable(GL_DEPTH_TEST);
        glEnable(GL_DEPTH_TEST);
-       glPolygonMode(GL_FRONT, GL_FILL);
-       glPolygonMode(GL_BACK, GL_LINE);        
+       if(m_drawingmode == RAS_IRasterizer::KX_WIREFRAME)
+               glPolygonMode(GL_FRONT, GL_LINE);
+       else
+               glPolygonMode(GL_FRONT, GL_FILL);
        glShadeModel(GL_SMOOTH);
        glDisable(GL_LIGHTING);
 
@@ -1633,9 +1630,10 @@
 
        glDisable(GL_DEPTH_TEST);
 
-//     glPolygonMode(GL_BACK, GL_LINE);
-//     glPolygonMode(GL_FRONT, GL_LINE);
-       glPolygonMode(GL_FRONT, GL_FILL);
+       if(m_drawingmode == RAS_IRasterizer::KX_WIREFRAME)
+               glPolygonMode(GL_FRONT, GL_LINE);
+       else
+               glPolygonMode(GL_FRONT, GL_FILL);
        glShadeModel(GL_SMOOTH);
        glDisable(GL_LIGHTING);
 

Modified: branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
--- branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp       
2009-03-27 06:06:11 UTC (rev 19423)
+++ branches/ge_dome/source/gameengine/Ketsji/KX_KetsjiEngine.cpp       
2009-03-27 06:42:36 UTC (rev 19424)
@@ -288,7 +288,6 @@
        // only once per frame
 
        m_canvas->BeginDraw();
-//     m_rasterizer->SetEye(RAS_IRasterizer::RAS_STEREO_LEFTEYE);//XXX to be 
removed
 
        // BeginFrame() sets the actual drawing area. You can use a part of the 
window
        if (!BeginFrame())
@@ -304,6 +303,7 @@
                        KX_Scene* scene = *sceneit;
                        KX_Camera* cam = scene->GetActiveCamera();
 
+                       m_rendertools->BeginFrame(m_rasterizer);
                        // pass the scene's worldsettings to the rasterizer
                        SetWorldSettings(scene->GetWorldInfo());
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to