[Pingus-CVS] r2537 - trunk/src/display

[grumbel at BerliOS]

Author: grumbel
Date: 2005-12-02 18:00:36 +0100 (Fri, 02 Dec 2005)
New Revision: 2537

Modified:
   trunk/src/display/scene_context.cxx
Log:
- disabled pbuffer support

Modified: trunk/src/display/scene_context.cxx
===================================================================
--- trunk/src/display/scene_context.cxx 2005-12-02 16:26:24 UTC (rev 2536)
+++ trunk/src/display/scene_context.cxx 2005-12-02 17:00:36 UTC (rev 2537)
@@ -33,16 +33,16 @@
   DrawingContext highlight; 
 
   CL_OpenGLSurface lightmap;
-  CL_Canvas        canvas;
+  //CL_Canvas        canvas;
 
   SceneContextImpl() 
     : lightmap(CL_PixelBuffer(static_cast<int>(800/SCALE_FACTOR), 
                               static_cast<int>(600/SCALE_FACTOR),
                               static_cast<int>(800/SCALE_FACTOR*4),
-                              CL_PixelFormat::rgba8888)),
-      canvas(lightmap)
+                              CL_PixelFormat::rgba8888))
+                  //canvas(lightmap)
   {
-    canvas.get_gc()->set_scale(1/SCALE_FACTOR, 1/SCALE_FACTOR);
+    //canvas.get_gc()->set_scale(1/SCALE_FACTOR, 1/SCALE_FACTOR);
   }
 };
 
@@ -133,15 +133,19 @@
   // FIXME: Render all to pbuffer for later combining of them
   impl->color.render(gc);
   
-  impl->light.render(impl->canvas.get_gc());
-  impl->canvas.sync_surface();
+#if 0
+    { // lightmap support
+      impl->light.render(impl->canvas.get_gc());
+      impl->canvas.sync_surface();
 
-  //impl->lightmap.set_blend_func(blend_src_alpha, blend_one);
-  impl->lightmap.set_blend_func(blend_dest_color, blend_zero);
-  //GL_DST_COLOR, GL_ZERO
-  impl->lightmap.set_scale(SCALE_FACTOR, SCALE_FACTOR);
-  impl->lightmap.draw();
-  impl->canvas.get_gc()->clear();
+      //impl->lightmap.set_blend_func(blend_src_alpha, blend_one);
+      impl->lightmap.set_blend_func(blend_dest_color, blend_zero);
+      //GL_DST_COLOR, GL_ZERO
+      impl->lightmap.set_scale(SCALE_FACTOR, SCALE_FACTOR);
+      impl->lightmap.draw();
+      impl->canvas.get_gc()->clear();
+    }
+#endif
 
   impl->highlight.render(gc);
 }