X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=share%2Fsolid.h;h=6038b8365c5730d93986e007e7281270e32222f6;hb=1745b6a90dfd9e626e5c40d20c6aa595ec41d888;hp=3f3172fde3389dab9ef723466d6cf8a8f23f698f;hpb=c02ae9f8fce350c74e6ac7d281f03857c44964a7;p=neverball

diff --git a/share/solid.h b/share/solid.h
index 3f3172f..6038b83 100644
--- a/share/solid.h
+++ b/share/solid.h
@@ -86,13 +86,14 @@
 #define M_ADDITIVE    16
 #define M_CLAMPED     32
 #define M_DECAL       64
-#define M_SHADOWED (M_OPAQUE | M_REFLECTIVE)
+#define M_TWO_SIDED  128
 
 /* Billboard types. */
 
 #define B_EDGE     1
 #define B_FLAT     2
 #define B_ADDITIVE 4
+#define B_NOFACE   8
 
 /* Lump flags. */
 
@@ -109,8 +110,8 @@
 
 struct s_mtrl
 {
-    float a[4];                                /* ambient color              */
     float d[4];                                /* diffuse color              */
+    float a[4];                                /* ambient color              */
     float s[4];                                /* specular color             */
     float e[4];                                /* emission color             */
     float h[1];                                /* specular exponent          */
@@ -237,6 +238,8 @@ struct s_bill
     float rx[3];                               /* X rotation coefficients    */
     float ry[3];                               /* Y rotation coefficients    */
     float rz[3];                               /* Z rotation coefficients    */
+
+    float p[3];
 };
 
 struct s_jump
@@ -252,6 +255,8 @@ struct s_ball
     float p[3];                                /* position vector            */
     float v[3];                                /* velocity vector            */
     float w[3];                                /* angular velocity vector    */
+    float E[3][3];                             /* basis of pendulum          */
+    float W[3];                                /* angular pendulum velocity  */
     float r;                                   /* radius                     */
 };