X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=types.h;h=be7c1e43798c9d42c291d5e5c8a323964a042cae;hp=91813eedfc1a061a27607f34a35a2f5d319fc07b;hb=99056f711c30745dd12a2be3675580363df3f874;hpb=f1c86cda52b306cdfbe62e1776eb38cff811f47b;ds=sidebyside diff --git a/types.h b/types.h index 91813ee..be7c1e4 100644 --- a/types.h +++ b/types.h @@ -34,19 +34,16 @@ typedef struct { GLubyte *rgbData; // Array of bytes with the colour data for the texture } texture; - -typedef GLfloat vector[3]; // Vector datatype - typedef struct { - GLfloat parameter; // Transform amount - vector* vect; // Transform vector + GLfloat amount; // Transform amount + GLfloat vector[3]; // Transform vector } transform; typedef struct { int mesh; // Mesh index number int texture; // Texture index number float x,y,z; // Scene position - vector* scale; // Scale vector + GLfloat scale[3]; // Scale vector transform rotation; // Rotation transformation } SceneObject;