summaryrefslogtreecommitdiff
path: root/rubik-internal.h
diff options
context:
space:
mode:
Diffstat (limited to 'rubik-internal.h')
-rw-r--r--rubik-internal.h21
1 files changed, 7 insertions, 14 deletions
diff --git a/rubik-internal.h b/rubik-internal.h
index 8005657..6758d36 100644
--- a/rubik-internal.h
+++ b/rubik-internal.h
@@ -138,14 +138,16 @@ typedef struct _RubikScreen
faceRec *faces;
- int numDesktopWindows;
+ int hsize;
+ float distance; //perpendicular distance to wall from centre
+ float radius; //radius on which the hSize points lie
+
+ float speedFactor; // multiply rotation speed by this value
+
}
RubikScreen;
typedef struct _RubikWindow{
- float x, y, z;
- Bool rotated;
-
DrawWindowGeometryProc drawWindowGeometry;
}
RubikWindow;
@@ -153,7 +155,7 @@ RubikWindow;
void rubikGetRotation( CompScreen *s, float *x, float *v );
-void initializeWorldVariables(int, float);
+void initializeWorldVariables(CompScreen *s);
void initFaces( CompScreen *s);
void updateSpeedFactor(float);
@@ -163,26 +165,17 @@ void updateSpeedFactor(float);
float randf(float); //random float
float minimum(float,float); //my compiler at home didn't have min or fminf!
float maximum(float,float); //nor did it have max or fmaxf!
-float symmDistr(void); //symmetric distribution
void setColor(float *, float, float, float, float, float, float);
void setSpecifiedColor (float *, int);
void rotateClockwise (squareRec * square);
void rotateAnticlockwise (squareRec * square);
-//maybe define a struct for these values
-float speedFactor; // global variable (fish/crab speeds multiplied by this value)
-float radius;//radius on which the hSize points lie
-float distance;//perpendicular distance to wall from centre
-
//All calculations that matter with angles are done clockwise from top.
//I think of it as x=radius, y=0 being the top (towards 1st desktop from above view)
//and the z coordinate as height.
-int hSize; // horizontal desktop size
-float q; // equal to float version of hSize (replace with hSizef some time)
-
int vStrips;
int currentVStrip;