home *** CD-ROM | disk | FTP | other *** search
/ ARM Club 3 / TheARMClub_PDCD3.iso / programs / games / diyupdate3 / Unix / Diffs / i_video_c < prev   
Encoding:
Text File  |  1998-07-29  |  7.4 KB  |  280 lines
  1. 49c49
  2. < #include <errnos.h>
  3. ---
  4. > #include <errno.h>
  5. 53a54
  6. > #include "i_video.h"
  7. 59a61,63
  8. > #include "r_main.h"
  9. > 
  10. > 
  11. 63a68
  12. > #if (LD_PIXEL_DEPTH == 3)
  13. 64a70,82
  14. > #define USE_PIXEL_DEPTH        8
  15. > #else
  16. > #if (LD_PIXEL_DEPTH == 4)
  17. > #define USE_PIXEL_DEPTH        16
  18. > #elif (LD_PIXEL_DEPTH == 5)
  19. > #define USE_PIXEL_DEPTH        24
  20. > #else
  21. > #error "Unsupported pixel depth!"
  22. > #endif
  23. > boolean        PaletteChanged=false;
  24. > lighttable_t    translated_colourmaps[256*(NUMCOLORMAPS+1)];
  25. > unsigned long    light_multipliers[NUMCOLORMAPS];
  26. > #endif
  27. 93a112,113
  28. > 
  29. > 
  30. 151a172,182
  31. >       case XK_0:
  32. >       case XK_KP_0:    rc = '0';        break;
  33. >       case XK_KP_1:    rc = '1';        break;
  34. >       case XK_KP_2:    rc = '2';        break;
  35. >       case XK_KP_3:    rc = '3';        break;
  36. >       case XK_KP_4:    rc = '4';        break;
  37. >       case XK_KP_5:    rc = '5';        break;
  38. >       case XK_KP_6:    rc = '6';        break;
  39. >       case XK_KP_7:    rc = '7';        break;
  40. >       case XK_KP_8:    rc = '8';        break;
  41. > 
  42. 388c419
  43. <         olineptrs[i] = (unsigned int *) &image->data[i*X_width];
  44. ---
  45. >         olineptrs[i] = (unsigned int *) &image->data[i*X_width*sizeof(pixel_t)];
  46. 393a425
  47. > #if (LD_PIXEL_DEPTH == 3)
  48. 416a449,481
  49. > #elif (LD_PIXEL_DEPTH == 4)
  50. >         do
  51. >         {
  52. >         fouripixels = *ilineptr++;
  53. >         twoopixels = (fouripixels & 0xffff0000); twoopixels |= (twoopixels >> 16);
  54. >         twomoreopixels = (fouripixels & 0xffff); twomoreopixels |= (twomoreopixels << 16);
  55. > #ifdef __BIG_ENDIAN__
  56. >         *olineptrs[0]++ = twoopixels;
  57. >         *olineptrs[1]++ = twoopixels;
  58. >         *olineptrs[0]++ = twomoreopixels;
  59. >         *olineptrs[1]++ = twomoreopixels;
  60. > #else
  61. >         *olineptrs[0]++ = twomoreopixels;
  62. >         *olineptrs[1]++ = twomoreopixels;
  63. >         *olineptrs[0]++ = twoopixels;
  64. >         *olineptrs[1]++ = twoopixels;
  65. > #endif
  66. >         } while (x-=2);
  67. >         olineptrs[0] += X_width/2;
  68. >         olineptrs[1] += X_width/2;
  69. > #else
  70. >         do
  71. >         {
  72. >         fouripixels = *ilineptr++;
  73. >         *olineptrs[0]++ = fouripixels;
  74. >         *olineptrs[0]++ = fouripixels;
  75. >         *olineptrs[1]++ = fouripixels;
  76. >         *olineptrs[1]++ = fouripixels;
  77. >         }
  78. >         while (x--);
  79. >         olineptrs[0] += X_width;
  80. >         olineptrs[1] += X_width;
  81. > #endif
  82. 430c495
  83. <         olineptrs[i] = (unsigned int *) &image->data[i*X_width];
  84. ---
  85. >         olineptrs[i] = (unsigned int *) &image->data[i*X_width*sizeof(pixel_t)];
  86. 435a501
  87. > #if (LD_PIXEL_DEPTH == 3)
  88. 472a539,587
  89. > #elif (LD_PIXEL_DEPTH == 4)
  90. >         do
  91. >         {
  92. >         fouripixels = *ilineptr++;
  93. > #ifdef __BIG_ENDIAN__
  94. >         fouropixels[0] = (fouripixels & 0xffff0000);
  95. >         fouropixels[0] |= (fouropixels[0] >> 16);
  96. >         fouropixels[1] = fouripixels;
  97. >         fouropixels[2] = (fouripixels & 0xffff);
  98. >         fouropixels[2] |= (fouropixels[2] << 16);
  99. > #else
  100. >         fouropixels[0] = (fouripixels & 0xffff);
  101. >         fouropixels[1] = fouropixels[0];
  102. >         fouropixels[0] |= (fouropixels[0] << 16);
  103. >         fouropixels[2] = (fouripixels & 0xffff0000);
  104. >         fouropixels[1] |= fouropixels[2];
  105. >         fouropixels[2] |= (fouropixels[2] >> 16);
  106. > #endif
  107. >         *olineptrs[0]++ = fouropixels[0];
  108. >         *olineptrs[0]++ = fouropixels[1];
  109. >         *olineptrs[0]++ = fouropixels[2];
  110. >         *olineptrs[1]++ = fouropixels[0];
  111. >         *olineptrs[1]++ = fouropixels[1];
  112. >         *olineptrs[1]++ = fouropixels[2];
  113. >         *olineptrs[2]++ = fouropixels[0];
  114. >         *olineptrs[2]++ = fouropixels[1];
  115. >         *olineptrs[2]++ = fouropixels[2];
  116. >         } while (x-=2);
  117. >         olineptrs[0] += X_width;
  118. >         olineptrs[1] += X_width;
  119. >         olineptrs[2] += X_width;
  120. > #else
  121. >         do
  122. >         {
  123. >         fouripixels = *ilineptr++;
  124. >         *olineptrs[0]++ = fouripixels;
  125. >         *olineptrs[0]++ = fouripixels;
  126. >         *olineptrs[0]++ = fouripixels;
  127. >         *olineptrs[1]++ = fouripixels;
  128. >         *olineptrs[1]++ = fouripixels;
  129. >         *olineptrs[1]++ = fouripixels;
  130. >         *olineptrs[2]++ = fouripixels;
  131. >         *olineptrs[2]++ = fouripixels;
  132. >         *olineptrs[2]++ = fouripixels;
  133. >         } while (x--);
  134. >         olineptrs[0] += 2*X_width;
  135. >         olineptrs[1] += 2*X_width;
  136. >         olineptrs[2] += 2*X_width;
  137. > #endif
  138. 527c642
  139. < void I_ReadScreen (byte* scr)
  140. ---
  141. > void I_ReadScreen (pixel_t* scr)
  142. 529c644
  143. <     memcpy (scr, screens[0], SCREENWIDTH*SCREENHEIGHT);
  144. ---
  145. >     memcpy (scr, screens[0], SCREENWIDTH*SCREENHEIGHT*sizeof(pixel_t));
  146. 579a695,748
  147. > 
  148. > 
  149. > #if (LD_PIXEL_DEPTH > 3)
  150. > 
  151. > void I_TranslatePalette(byte *palette)
  152. > {
  153. >     unsigned char    gamma_palette[768];
  154. >     unsigned char*    pal;
  155. >     unsigned char*    gt;
  156. >     unsigned char*    invul;
  157. >     int            i, j;
  158. >     unsigned long*    gp;
  159. >     lighttable_t*    cmap;
  160. >     unsigned long    intensity;
  161. >     int            red, green, blue;
  162. > 
  163. >     gt = (unsigned char*)(gammatable[usegamma]); gp = (unsigned long*)gamma_palette;
  164. >     for (i=0; i<768/4; i++)
  165. >     {
  166. >     *gp++ =
  167. > #ifdef __BIG_ENDIAN__
  168. >     (gt[(unsigned char)(palette[0])] << 24) | (gt[(unsigned char)(palette[1])] << 16) |
  169. >     (gt[(unsigned char)(palette[2])] << 8)  | (gt[(unsigned char)(palette[3])]);
  170. > #else
  171. >     (gt[(unsigned char)(palette[0])]) | (gt[(unsigned char)(palette[1])] << 8) |
  172. >     (gt[(unsigned char)(palette[2])] << 16) | (gt[(unsigned char)(palette[3])] << 24);
  173. > #endif
  174. >     palette += 4;
  175. >     }
  176. > 
  177. >     cmap = translated_colourmaps;
  178. >     for (j=0; j<NUMCOLORMAPS; j++)
  179. >     {
  180. >     intensity = light_multipliers[j];
  181. >     for (i=0, pal=gamma_palette; i<256; i++, pal+=3)
  182. >     {
  183. >         red   = (intensity * pal[0]) >> 16;
  184. >         green = (intensity * pal[1]) >> 16;
  185. >         blue  = (intensity * pal[2]) >> 16;
  186. >         *cmap++ = BUILD_RGB_PIXEL(red, green, blue);
  187. >     }
  188. >     }
  189. > 
  190. >     invul = (unsigned char*)(colormaps + 32*256);
  191. >     for (i=0; i<256; i++)
  192. >     {
  193. >     pal = gamma_palette + 3*((unsigned char)(invul[i]));
  194. >     *cmap++ = BUILD_RGB_PIXEL(pal[0], pal[1], pal[2]);
  195. >     }
  196. > }
  197. > #endif
  198. > 
  199. > 
  200. > 
  201. 583a753
  202. > #if (LD_PIXEL_DEPTH == 3)
  203. 584a755,757
  204. > #else
  205. >     I_TranslatePalette(palette);
  206. > #endif
  207. 771,772c944,952
  208. <     if (!XMatchVisualInfo(X_display, X_screen, 8, PseudoColor, &X_visualinfo))
  209. <     I_Error("xdoom currently only supports 256-color PseudoColor screens");
  210. ---
  211. > #if (LD_PIXEL_DEPTH == 3)
  212. >     if (!XMatchVisualInfo(X_display, X_screen, USE_PIXEL_DEPTH, PseudoColor, &X_visualinfo))
  213. > #elif (LD_PIXEL_DEPTH == 4)
  214. >     if (!XMatchVisualInfo(X_display, X_screen, USE_PIXEL_DEPTH, TrueColor, &X_visualinfo))
  215. > #else
  216. >     if (!XMatchVisualInfo(X_display, X_screen, USE_PIXEL_DEPTH, TrueColor, &X_visualinfo))
  217. > #endif
  218. >     I_Error("Can't claim visual for pixel depth %d. Try another binary.", USE_PIXEL_DEPTH);
  219. > 
  220. 792a973
  221. > #if (LD_PIXEL_DEPTH == 3)
  222. 795a977,986
  223. >     attribs.colormap = X_cmap;
  224. > #else
  225. >     attribs.colormap = 0;
  226. > 
  227. >     /* Init the lighttable intensities */
  228. >     for (n=0; n<NUMCOLORMAPS; n++)
  229. >     {
  230. >     light_multipliers[n] = 0x10000 - (n * (0x10000 - 0x2000)) / (NUMCOLORMAPS - 1);
  231. >     }
  232. > #endif
  233. 805d995
  234. <     attribs.colormap = X_cmap;
  235. 814c1004
  236. <                     8, /* depth*/
  237. ---
  238. >                     USE_PIXEL_DEPTH, /* depth*/
  239. 861c1051
  240. <                     8,
  241. ---
  242. >                     USE_PIXEL_DEPTH,
  243. 900c1090
  244. <                     8,
  245. ---
  246. >                     USE_PIXEL_DEPTH,
  247. 903c1093
  248. <                     (char*)malloc(X_width * X_height),
  249. ---
  250. >                     (char*)malloc(X_width * X_height * sizeof(pixel_t)),
  251. 906c1096
  252. <                     X_width );
  253. ---
  254. >                     X_width * sizeof(pixel_t) );
  255. 911c1101
  256. <     screens[0] = (unsigned char *) (image->data);
  257. ---
  258. >     screens[0] = (pixel_t *) (image->data);
  259. 913c1103
  260. <     screens[0] = (unsigned char *) malloc (SCREENWIDTH * SCREENHEIGHT);
  261. ---
  262. >     screens[0] = (pixel_t *) malloc (SCREENWIDTH * SCREENHEIGHT * sizeof(pixel_t));
  263. 917a1108
  264. > #if (LD_PIXEL_DEPTH == 3)
  265. 1049a1241,1254
  266. > #else
  267. > 
  268. > void InitExpand(void) {;}
  269. > 
  270. > void InitExpand2(void) {;}
  271. > 
  272. > void
  273. > Expand4
  274. > ( unsigned*    lineptr,
  275. >   double*    xline )
  276. > {
  277. >     printf("-4 not supported!\n");
  278. > }
  279. > #endif
  280.