Changeset 3916Tweet

Timestamp:

Nov 17, 2009, 5:09:21 PM (13 years ago)

Author:

Sam Hocevar

Message:

Temporary check for triangle texturing (SVN libcaca). If not available,
cube transitions will not work.

Location:

neercs/trunk

Files:

• configure.ac (modified) (1 diff)
• src/wm.c (modified) (4 diffs)

neercs/trunk/configure.ac

@@ -46 +46 @@
  [AC_DEFINE(HAVE_CACA_DIRTY_RECTANGLES, 1, [libcaca has dirty rectangles])])
 
+AC_CHECK_LIB(caca, caca_fill_triangle_textured,
+ [AC_DEFINE(HAVE_CACA_TRIANGLE_TEXTURING, 1, [libcaca has trifiller])])
+
 AC_CHECK_LIB(util, forkpty, UTIL_LIBS="${UTIL_LIBS} -lutil")
 AC_SUBST(UTIL_LIBS)

neercs/trunk/src/wm.c

@@ -470 +470 @@
 }
 
-float get_direction(float p1x, float p1y, float p2x, float p2y, float p3x, float p3y) {
+#if defined HAVE_CACA_TRIANGLE_TEXTURING
+static float get_direction(float p1x, float p1y, float p2x, float p2y, float p3x, float p3y)
+{
     float d1x, d1y, d2x, d2y;
     
@@ -479 +481 @@
     return (d1x * d2y) - (d1y * d2x);
 }
+#endif
 
 /* 3D Cube. Yeah I know, it's a mess. Just look anywhere else. */
@@ -582 +585 @@
             caca_clear_canvas(screen_list->cv);
             
+#if defined HAVE_CACA_TRIANGLE_TEXTURING
             caca_canvas_t *first =  screen_list->screen[screen_list->prevpty]->cv;
             caca_canvas_t *second = screen_list->screen[screen_list->pty]->cv;
-            
+
             if(get_direction(cube_projected[0][0], cube_projected[0][1], 
                              cube_projected[1][0], cube_projected[1][1], 
@@ -697 +701 @@
                 }
             }
+#endif
             
             screen_list->changed =1 ;