add bevels to planar surfaces

diff --git a/render2/planar.c b/render2/planar.c
index d1c8b9108ba52c3a350d9f7a90759b0513cd5dfb..55e18bdbdb8051677e25a16bf3957a5606a1b26a 100644 (file)
--- a/render2/planar.c
+++ b/render2/planar.c
@@ -10,10 +10,12 @@
 
 void RrPlanarSet(struct RrSurface *sur,
                  enum RrSurfaceColorType type,
+                 enum RrBevelType bevel,
                  struct RrColor *primary,
                  struct RrColor *secondary)
 {
     sur->data.planar.colortype = type;
+    sur->data.planar.bevel = bevel;
     sur->data.planar.primary = *primary;
     sur->data.planar.secondary = *secondary;
 }
@@ -293,6 +295,8 @@ void RrPlanarPaint(struct RrSurface *sur, int absx, int absy)
         struct RrTextureText *t;
         glEnable(GL_TEXTURE_2D);
         switch (sur->texture[i].type) {
+        case RR_TEXTURE_NONE:
+            break;
         case RR_TEXTURE_TEXT:
             t = &sur->texture[i].data.text;
             printf("text %s\n", t->string);
@@ -303,8 +307,7 @@ void RrPlanarPaint(struct RrSurface *sur, int absx, int absy)
             }
             GlftRenderString(t->font->font, t->string, 
                              strlen(t->string), 0, 0);
-
-        break;
+            break;
         }
     }
     glDisable(GL_TEXTURE_2D);

diff --git a/render2/planar.h b/render2/planar.h
index c394c98e915be339e150133ba1916594ad7c51ad..1877b5cad58f38824d3a2bc9c397f91dcb2ff8a7 100644 (file)
--- a/render2/planar.h
+++ b/render2/planar.h
@@ -5,6 +5,7 @@
 
 struct RrPlanarSurface {
     enum RrSurfaceColorType colortype;
+    enum RrBevelType bevel;
 
     struct RrColor primary;
     struct RrColor secondary;

diff --git a/render2/render.h b/render2/render.h
index 30215e509dea9309d750cafe9ef4ef762a20feec..6bff9a1c6e3573721d47d6a83cbc510e5dacc8f5 100644 (file)
--- a/render2/render.h
+++ b/render2/render.h
@@ -172,8 +172,17 @@ enum RrSurfaceColorType {
     RR_PLANAR_PYRAMID
 };
 
+enum RrBevelType {
+    RR_SUNKEN_OUTER = -2,
+    RR_SUNKEN_INNER = -1,
+    RR_BEVEL_NONE   =  0,
+    RR_RAISED_INNER =  1,
+    RR_RAISED_OUTER =  2
+};
+
 void RrPlanarSet(struct RrSurface *sur,
                  enum RrSurfaceColorType type,
+                 enum RrBevelType bevel,
                  struct RrColor *primary,
                  struct RrColor *secondary);
 

diff --git a/render2/test.c b/render2/test.c
index 27934d09d52ee9da1cc709bcd5127b5466a28b5c..261fdbad84e76003d6171b564bf1e5c9a3587dbe 100644 (file)
--- a/render2/test.c
+++ b/render2/test.c
@@ -67,7 +67,7 @@ int main()
     RrSurfaceSetArea(sur, X, Y, W, H);
     RrColorSet(&pri, 0, 0, 0, 0);
     RrColorSet(&sec, 1, 1, 1, 0);
-    RrPlanarSet(sur, RR_PLANAR_PIPECROSS, &pri, &sec);
+    RrPlanarSet(sur, RR_PLANAR_PIPECROSS, RR_RAISED_INNER, &pri, &sec);
 
     quit = 0;
     while (!quit) {