int ir_condenser(void);\r
/* Set data mem */\r
enum dtype { FSDAT, MSDAT, ADAT, LDAT, FBDAT };\r
+struct ir_facinglist_t;\r
+struct ir_facinglist_t\r
+{ struct ir_facinglist_t* nextsib;\r
+ apc_facing facing;\r
+};\r
struct ir_namelist_t;\r
struct ir_namelist_t\r
{ struct ir_namelist_t* nextsib;\r
};\r
struct ir_framedata_t\r
{ struct ir_setdata_header_t header;\r
- struct ir_frameinfo_t frameinfo;\r
+ apc_facing facing;\r
+ int w, h;\r
+ struct ir_facinglist_t* mirrorlist,* nextmirror;\r
};\r
struct ir_framebox_t\r
{ struct ir_setdata_header_t header;\r
static inline\r
struct ir_framebox_t* ir_set_add_framebox(struct ir_set_t*,uint8_t*);\r
static inline\r
-union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,apc_facing,int,int);\r
+union ir_setdata_t* ir_framedata (enum dtype,const uint8_t*,facinglist,int,int);\r
static inline\r
void ir_linkdata_resolve_set(union ir_setdata_t*);\r
static inline\r
switch (setdata->header.type)\r
{ case FSDAT:\r
framebox = ir_set_add_framebox(set, setdata->header.data_name);\r
- if (framebox->framesheets[setdata->framesheet.frameinfo.facing].header.data_name != NULL)\r
+ if (framebox->framesheets[setdata->framesheet.facing].header.data_name != NULL)\r
wprintf("Duplicate framesheet [%i] %s\n",\r
- setdata->framesheet.frameinfo.facing, setdata->header.data_name);\r
- framebox->framesheets[setdata->framesheet.frameinfo.facing] = setdata->framesheet;\r
+ setdata->framesheet.facing, setdata->header.data_name);\r
+ framebox->framesheets[setdata->framesheet.facing] = setdata->framesheet;\r
break;\r
case MSDAT:\r
framebox = ir_set_add_framebox(set, setdata->header.data_name);\r
- if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing].header.data_name != NULL)\r
+ if (framebox->mapsheets[setdata->mapsheet.facing].header.data_name != NULL)\r
wprintf("Duplicate mapsheet [%i] %s\n",\r
- setdata->mapsheet.frameinfo.facing, setdata->header.data_name);\r
- framebox->mapsheets[setdata->mapsheet.frameinfo.facing] = setdata->mapsheet;\r
+ setdata->mapsheet.facing, setdata->header.data_name);\r
+ framebox->mapsheets[setdata->mapsheet.facing] = setdata->mapsheet;\r
break;\r
case ADAT:\r
if (set->audio == NULL)\r
}\r
\r
union ir_setdata_t* ir_framesheet\r
-( const uint8_t* name,\r
- apc_facing d,\r
- int width,\r
- int height\r
+( const uint8_t* name,\r
+ struct ir_facinglist_t* facinglist,\r
+ int width,\r
+ int height\r
)\r
-{ return ir_framedata(FSDAT, name, d, width, height); }\r
+{ return ir_framedata(FSDAT, name, facinglist, width, height); }\r
\r
union ir_setdata_t* ir_mapsheet\r
-( const uint8_t* name,\r
- apc_facing d,\r
- int width,\r
- int height\r
+( const uint8_t* name,\r
+ struct ir_facinglist_t* facinglist,\r
+ int width,\r
+ int height\r
)\r
-{ return ir_framedata(MSDAT, name, d, width, height); }\r
+{ return ir_framedata(MSDAT, name, facinglist, width, height); }\r
\r
static inline\r
union ir_setdata_t* ir_framedata\r
-( enum dtype type,\r
- const uint8_t* name,\r
- apc_facing d,\r
- int width,\r
- int height\r
+( enum dtype type,\r
+ const uint8_t* name,\r
+ struct ir_facinglist_t* facinglist,\r
+ int width,\r
+ int height\r
)\r
{ struct ir_framedata_t* framedata = struct_alloc(ir_framedata_t);\r
struct_clear(framedata);\r
eprintf("Null name in set allocation\n");\r
framedata->header.type = type;\r
framedata->header.data_name = name_alloc(name);\r
- framedata->frameinfo.facing = d;\r
- framedata->frameinfo.w = width;\r
- framedata->frameinfo.h = height;\r
+ if (facinglist != NULL)\r
+ { framedata->facing = facinglist->facing;\r
+ framedata->mirrorlist = facinglist->nextsib;\r
+ }\r
+ else\r
+ { framedata->facing = SFACE;\r
+ framedata->mirrorlist = NULL;\r
+ }\r
+ framedata->nextmirror = framedata->mirrorlist;\r
+ framedata->w = width;\r
+ framedata->h = height;\r
return (union ir_setdata_t*) framedata;\r
}\r
\r
( union ir_setdata_t* setdata, uint8_t* name )\r
{ setdata->header.data_name = name;}\r
\r
+/* Create a new facinglist from an apc_facing */\r
+struct ir_facinglist_t* ir_facinglist\r
+( apc_facing facing )\r
+{ struct ir_facinglist_t* list = struct_alloc(ir_facinglist_t);\r
+ list->facing = facing;\r
+ return list;\r
+}\r
+\r
+/* Add a child to the facing list */\r
+struct ir_facinglist_t* ir_facinglist_push\r
+( struct ir_facinglist_t* list,\r
+ apc_facing facing\r
+)\r
+{ struct ir_facinglist_t* iter = list;\r
+ if (iter != NULL)\r
+ { while (iter->nextsib != NULL)\r
+ iter = iter->nextsib;\r
+ iter->nextsib = struct_alloc(ir_facinglist_t);\r
+ iter->nextsib->facing = facing;\r
+ }\r
+ return list;\r
+}\r
+\r
+#define assert_framebox(fbox) if (DEBUG) { \\r
+ if (fbox->header.type != FBDAT) \\r
+ eprintf("Data %s is not a framebox\n", fbox->header.data_name); \\r
+ }\r
+\r
/* Return a framebox's specified framesheet */\r
union ir_setdata_t* ir_framebox_framesheet\r
( union ir_setdata_t* fbox,\r
apc_facing facing\r
)\r
-{ if (fbox->header.type != FBDAT)\r
- eprintf("Data %s is not a framebox\n", fbox->header.data_name);\r
+{ assert_framebox(fbox);\r
return (union ir_setdata_t*) &fbox->framebox.framesheets[facing];\r
}\r
\r
( union ir_setdata_t* fbox,\r
apc_facing facing\r
)\r
-{ if (fbox->header.type != FBDAT)\r
- eprintf("Data %s is not a framebox\n", fbox->header.data_name);\r
+{ assert_framebox(fbox);\r
return (union ir_setdata_t*) &fbox->framebox.mapsheets[facing];\r
}\r
\r
+#define assert_framedata(fdat) if (DEBUG) { \\r
+ if (fdat->header.type != MSDAT && fdat->header.type != FSDAT) \\r
+ eprintf("Data %s is not a framedata\n", fdat->header.data_name); \\r
+ }\r
+\r
+/* Return a framedata's frame info */\r
+int ir_framedata_width\r
+( union ir_setdata_t* framedata )\r
+{ assert_framedata(framedata);\r
+ return framedata->mapsheet.w;\r
+}\r
+\r
/* Return a framedata's frame info */\r
-struct ir_frameinfo_t* ir_framedata_frameinfo\r
+int ir_framedata_height\r
( union ir_setdata_t* framedata )\r
-{ if (framedata->header.type != MSDAT && framedata->header.type != FSDAT)\r
- eprintf("Data %s is not a framedata\n", framedata->header.data_name);\r
- return &framedata->mapsheet.frameinfo;\r
+{ assert_framedata(framedata);\r
+ return framedata->mapsheet.h;\r
}\r
\r
+/* Return the next facing in the framedata's facing list, and reset the\r
+ 'nextmirror' head to mirrorlist, so that 'ir_framedata_nextmirror' will now\r
+ refer to the second facing in the framedata */\r
+apc_facing ir_framedata_firstfacing\r
+( union ir_setdata_t* framedata )\r
+{ assert_framedata(framedata);\r
+ framedata->mapsheet.nextmirror = framedata->mapsheet.mirrorlist;\r
+ return framedata->mapsheet.facing;\r
+}\r
+\r
+/* Return the next facing for this framedata, incrementing the 'nextmirror'\r
+ head. Returns FACING_MAX when there are no more facings to return. */\r
+apc_facing ir_framedata_nextfacing\r
+( union ir_setdata_t* framedata )\r
+{ apc_facing facing;\r
+ assert_framedata(framedata);\r
+ if (framedata->mapsheet.nextmirror == NULL)\r
+ return FACING_MAX;\r
+ facing = framedata->mapsheet.nextmirror->facing;\r
+ framedata->mapsheet.nextmirror = framedata->mapsheet.nextmirror->nextsib;\r
+ return facing;\r
+}\r
\r
/** Allocators **/\r
static\r
projects / henge / apc.git / blobdiff