Changeset 39

Show
Ignore:
Timestamp:
12/09/06 17:39:14 (2 years ago)
Author:
baxissimo
Message:

made compatible with DMD 0.177 and the removal of implicit array to ptr casts.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/luigi/font.d

    r7 r39  
    461461/* The font characters mapping: */ 
    462462static const GLubyte*[256] Helvetica12_Character_Map = [ 
    463     Helvetica12_Character_032, Helvetica12_Character_032, 
    464     Helvetica12_Character_032, Helvetica12_Character_032, 
    465     Helvetica12_Character_032, Helvetica12_Character_032, 
    466     Helvetica12_Character_032, Helvetica12_Character_032, 
    467     Helvetica12_Character_032, Helvetica12_Character_032, 
    468     Helvetica12_Character_032, Helvetica12_Character_032, 
    469     Helvetica12_Character_032, Helvetica12_Character_032, 
    470     Helvetica12_Character_032, Helvetica12_Character_032, 
    471     Helvetica12_Character_032, Helvetica12_Character_032, 
    472     Helvetica12_Character_032, Helvetica12_Character_032, 
    473     Helvetica12_Character_032, Helvetica12_Character_032, 
    474     Helvetica12_Character_032, Helvetica12_Character_032, 
    475     Helvetica12_Character_032, Helvetica12_Character_032, 
    476     Helvetica12_Character_032, Helvetica12_Character_032, 
    477     Helvetica12_Character_032, Helvetica12_Character_032, 
    478     Helvetica12_Character_032, Helvetica12_Character_032, 
    479     Helvetica12_Character_032, Helvetica12_Character_033, 
    480     Helvetica12_Character_034, Helvetica12_Character_035, 
    481     Helvetica12_Character_036, Helvetica12_Character_037, 
    482     Helvetica12_Character_038, Helvetica12_Character_039, 
    483     Helvetica12_Character_040, Helvetica12_Character_041, 
    484     Helvetica12_Character_042, Helvetica12_Character_043, 
    485     Helvetica12_Character_044, Helvetica12_Character_045, 
    486     Helvetica12_Character_046, Helvetica12_Character_047, 
    487     Helvetica12_Character_048, Helvetica12_Character_049, 
    488     Helvetica12_Character_050, Helvetica12_Character_051, 
    489     Helvetica12_Character_052, Helvetica12_Character_053, 
    490     Helvetica12_Character_054, Helvetica12_Character_055, 
    491     Helvetica12_Character_056, Helvetica12_Character_057, 
    492     Helvetica12_Character_058, Helvetica12_Character_059, 
    493     Helvetica12_Character_060, Helvetica12_Character_061, 
    494     Helvetica12_Character_062, Helvetica12_Character_063, 
    495     Helvetica12_Character_064, Helvetica12_Character_065, 
    496     Helvetica12_Character_066, Helvetica12_Character_067, 
    497     Helvetica12_Character_068, Helvetica12_Character_069, 
    498     Helvetica12_Character_070, Helvetica12_Character_071, 
    499     Helvetica12_Character_072, Helvetica12_Character_073, 
    500     Helvetica12_Character_074, Helvetica12_Character_075, 
    501     Helvetica12_Character_076, Helvetica12_Character_077, 
    502     Helvetica12_Character_078, Helvetica12_Character_079, 
    503     Helvetica12_Character_080, Helvetica12_Character_081, 
    504     Helvetica12_Character_082, Helvetica12_Character_083, 
    505     Helvetica12_Character_084, Helvetica12_Character_085, 
    506     Helvetica12_Character_086, Helvetica12_Character_087, 
    507     Helvetica12_Character_088, Helvetica12_Character_089, 
    508     Helvetica12_Character_090, Helvetica12_Character_091, 
    509     Helvetica12_Character_092, Helvetica12_Character_093, 
    510     Helvetica12_Character_094, Helvetica12_Character_095, 
    511     Helvetica12_Character_096, Helvetica12_Character_097, 
    512     Helvetica12_Character_098, Helvetica12_Character_099, 
    513     Helvetica12_Character_100, Helvetica12_Character_101, 
    514     Helvetica12_Character_102, Helvetica12_Character_103, 
    515     Helvetica12_Character_104, Helvetica12_Character_105, 
    516     Helvetica12_Character_106, Helvetica12_Character_107, 
    517     Helvetica12_Character_108, Helvetica12_Character_109, 
    518     Helvetica12_Character_110, Helvetica12_Character_111, 
    519     Helvetica12_Character_112, Helvetica12_Character_113, 
    520     Helvetica12_Character_114, Helvetica12_Character_115, 
    521     Helvetica12_Character_116, Helvetica12_Character_117, 
    522     Helvetica12_Character_118, Helvetica12_Character_119, 
    523     Helvetica12_Character_120, Helvetica12_Character_121, 
    524     Helvetica12_Character_122, Helvetica12_Character_123, 
    525     Helvetica12_Character_124, Helvetica12_Character_125, 
    526     Helvetica12_Character_126, Helvetica12_Character_032, 
    527     Helvetica12_Character_032, Helvetica12_Character_032, 
    528     Helvetica12_Character_032, Helvetica12_Character_032, 
    529     Helvetica12_Character_032, Helvetica12_Character_032, 
    530     Helvetica12_Character_032, Helvetica12_Character_032, 
    531     Helvetica12_Character_032, Helvetica12_Character_032, 
    532     Helvetica12_Character_032, Helvetica12_Character_032, 
    533     Helvetica12_Character_032, Helvetica12_Character_032, 
    534     Helvetica12_Character_032, Helvetica12_Character_032, 
    535     Helvetica12_Character_032, Helvetica12_Character_032, 
    536     Helvetica12_Character_032, Helvetica12_Character_032, 
    537     Helvetica12_Character_032, Helvetica12_Character_032, 
    538     Helvetica12_Character_032, Helvetica12_Character_032, 
    539     Helvetica12_Character_032, Helvetica12_Character_032, 
    540     Helvetica12_Character_032, Helvetica12_Character_032, 
    541     Helvetica12_Character_032, Helvetica12_Character_032, 
    542     Helvetica12_Character_032, Helvetica12_Character_032, 
    543     Helvetica12_Character_160, Helvetica12_Character_161, 
    544     Helvetica12_Character_162, Helvetica12_Character_163, 
    545     Helvetica12_Character_164, Helvetica12_Character_165, 
    546     Helvetica12_Character_166, Helvetica12_Character_167, 
    547     Helvetica12_Character_168, Helvetica12_Character_169, 
    548     Helvetica12_Character_170, Helvetica12_Character_171, 
    549     Helvetica12_Character_172, Helvetica12_Character_173, 
    550     Helvetica12_Character_174, Helvetica12_Character_175, 
    551     Helvetica12_Character_176, Helvetica12_Character_177, 
    552     Helvetica12_Character_178, Helvetica12_Character_179, 
    553     Helvetica12_Character_180, Helvetica12_Character_181, 
    554     Helvetica12_Character_182, Helvetica12_Character_183, 
    555     Helvetica12_Character_184, Helvetica12_Character_185, 
    556     Helvetica12_Character_186, Helvetica12_Character_187, 
    557     Helvetica12_Character_188, Helvetica12_Character_189, 
    558     Helvetica12_Character_190, Helvetica12_Character_191, 
    559     Helvetica12_Character_192, Helvetica12_Character_193, 
    560     Helvetica12_Character_194, Helvetica12_Character_195, 
    561     Helvetica12_Character_196, Helvetica12_Character_197, 
    562     Helvetica12_Character_198, Helvetica12_Character_199, 
    563     Helvetica12_Character_200, Helvetica12_Character_201, 
    564     Helvetica12_Character_202, Helvetica12_Character_203, 
    565     Helvetica12_Character_204, Helvetica12_Character_205, 
    566     Helvetica12_Character_206, Helvetica12_Character_207, 
    567     Helvetica12_Character_208, Helvetica12_Character_209, 
    568     Helvetica12_Character_210, Helvetica12_Character_211, 
    569     Helvetica12_Character_212, Helvetica12_Character_213, 
    570     Helvetica12_Character_214, Helvetica12_Character_215, 
    571     Helvetica12_Character_216, Helvetica12_Character_217, 
    572     Helvetica12_Character_218, Helvetica12_Character_219, 
    573     Helvetica12_Character_220, Helvetica12_Character_221, 
    574     Helvetica12_Character_222, Helvetica12_Character_223, 
    575     Helvetica12_Character_224, Helvetica12_Character_225, 
    576     Helvetica12_Character_226, Helvetica12_Character_227, 
    577     Helvetica12_Character_228, Helvetica12_Character_229, 
    578     Helvetica12_Character_230, Helvetica12_Character_231, 
    579     Helvetica12_Character_232, Helvetica12_Character_233, 
    580     Helvetica12_Character_234, Helvetica12_Character_235, 
    581     Helvetica12_Character_236, Helvetica12_Character_237, 
    582     Helvetica12_Character_238, Helvetica12_Character_239, 
    583     Helvetica12_Character_240, Helvetica12_Character_241, 
    584     Helvetica12_Character_242, Helvetica12_Character_243, 
    585     Helvetica12_Character_244, Helvetica12_Character_245, 
    586     Helvetica12_Character_246, Helvetica12_Character_247, 
    587     Helvetica12_Character_248, Helvetica12_Character_249, 
    588     Helvetica12_Character_250, Helvetica12_Character_251, 
    589     Helvetica12_Character_252, Helvetica12_Character_253, 
    590     Helvetica12_Character_254, Helvetica12_Character_255 
     463    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     464    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     465    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     466    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     467    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     468    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     469    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     470    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     471    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     472    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     473    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     474    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     475    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     476    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     477    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     478    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     479    Helvetica12_Character_032.ptr, Helvetica12_Character_033.ptr, 
     480    Helvetica12_Character_034.ptr, Helvetica12_Character_035.ptr, 
     481    Helvetica12_Character_036.ptr, Helvetica12_Character_037.ptr, 
     482    Helvetica12_Character_038.ptr, Helvetica12_Character_039.ptr, 
     483    Helvetica12_Character_040.ptr, Helvetica12_Character_041.ptr, 
     484    Helvetica12_Character_042.ptr, Helvetica12_Character_043.ptr, 
     485    Helvetica12_Character_044.ptr, Helvetica12_Character_045.ptr, 
     486    Helvetica12_Character_046.ptr, Helvetica12_Character_047.ptr, 
     487    Helvetica12_Character_048.ptr, Helvetica12_Character_049.ptr, 
     488    Helvetica12_Character_050.ptr, Helvetica12_Character_051.ptr, 
     489    Helvetica12_Character_052.ptr, Helvetica12_Character_053.ptr, 
     490    Helvetica12_Character_054.ptr, Helvetica12_Character_055.ptr, 
     491    Helvetica12_Character_056.ptr, Helvetica12_Character_057.ptr, 
     492    Helvetica12_Character_058.ptr, Helvetica12_Character_059.ptr, 
     493    Helvetica12_Character_060.ptr, Helvetica12_Character_061.ptr, 
     494    Helvetica12_Character_062.ptr, Helvetica12_Character_063.ptr, 
     495    Helvetica12_Character_064.ptr, Helvetica12_Character_065.ptr, 
     496    Helvetica12_Character_066.ptr, Helvetica12_Character_067.ptr, 
     497    Helvetica12_Character_068.ptr, Helvetica12_Character_069.ptr, 
     498    Helvetica12_Character_070.ptr, Helvetica12_Character_071.ptr, 
     499    Helvetica12_Character_072.ptr, Helvetica12_Character_073.ptr, 
     500    Helvetica12_Character_074.ptr, Helvetica12_Character_075.ptr, 
     501    Helvetica12_Character_076.ptr, Helvetica12_Character_077.ptr, 
     502    Helvetica12_Character_078.ptr, Helvetica12_Character_079.ptr, 
     503    Helvetica12_Character_080.ptr, Helvetica12_Character_081.ptr, 
     504    Helvetica12_Character_082.ptr, Helvetica12_Character_083.ptr, 
     505    Helvetica12_Character_084.ptr, Helvetica12_Character_085.ptr, 
     506    Helvetica12_Character_086.ptr, Helvetica12_Character_087.ptr, 
     507    Helvetica12_Character_088.ptr, Helvetica12_Character_089.ptr, 
     508    Helvetica12_Character_090.ptr, Helvetica12_Character_091.ptr, 
     509    Helvetica12_Character_092.ptr, Helvetica12_Character_093.ptr, 
     510    Helvetica12_Character_094.ptr, Helvetica12_Character_095.ptr, 
     511    Helvetica12_Character_096.ptr, Helvetica12_Character_097.ptr, 
     512    Helvetica12_Character_098.ptr, Helvetica12_Character_099.ptr, 
     513    Helvetica12_Character_100.ptr, Helvetica12_Character_101.ptr, 
     514    Helvetica12_Character_102.ptr, Helvetica12_Character_103.ptr, 
     515    Helvetica12_Character_104.ptr, Helvetica12_Character_105.ptr, 
     516    Helvetica12_Character_106.ptr, Helvetica12_Character_107.ptr, 
     517    Helvetica12_Character_108.ptr, Helvetica12_Character_109.ptr, 
     518    Helvetica12_Character_110.ptr, Helvetica12_Character_111.ptr, 
     519    Helvetica12_Character_112.ptr, Helvetica12_Character_113.ptr, 
     520    Helvetica12_Character_114.ptr, Helvetica12_Character_115.ptr, 
     521    Helvetica12_Character_116.ptr, Helvetica12_Character_117.ptr, 
     522    Helvetica12_Character_118.ptr, Helvetica12_Character_119.ptr, 
     523    Helvetica12_Character_120.ptr, Helvetica12_Character_121.ptr, 
     524    Helvetica12_Character_122.ptr, Helvetica12_Character_123.ptr, 
     525    Helvetica12_Character_124.ptr, Helvetica12_Character_125.ptr, 
     526    Helvetica12_Character_126.ptr, Helvetica12_Character_032.ptr, 
     527    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     528    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     529    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     530    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     531    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     532    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     533    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     534    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     535    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     536    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     537    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     538    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     539    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     540    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     541    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     542    Helvetica12_Character_032.ptr, Helvetica12_Character_032.ptr, 
     543    Helvetica12_Character_160.ptr, Helvetica12_Character_161.ptr, 
     544    Helvetica12_Character_162.ptr, Helvetica12_Character_163.ptr, 
     545    Helvetica12_Character_164.ptr, Helvetica12_Character_165.ptr, 
     546    Helvetica12_Character_166.ptr, Helvetica12_Character_167.ptr, 
     547    Helvetica12_Character_168.ptr, Helvetica12_Character_169.ptr, 
     548    Helvetica12_Character_170.ptr, Helvetica12_Character_171.ptr, 
     549    Helvetica12_Character_172.ptr, Helvetica12_Character_173.ptr, 
     550    Helvetica12_Character_174.ptr, Helvetica12_Character_175.ptr, 
     551    Helvetica12_Character_176.ptr, Helvetica12_Character_177.ptr, 
     552    Helvetica12_Character_178.ptr, Helvetica12_Character_179.ptr, 
     553    Helvetica12_Character_180.ptr, Helvetica12_Character_181.ptr, 
     554    Helvetica12_Character_182.ptr, Helvetica12_Character_183.ptr, 
     555    Helvetica12_Character_184.ptr, Helvetica12_Character_185.ptr, 
     556    Helvetica12_Character_186.ptr, Helvetica12_Character_187.ptr, 
     557    Helvetica12_Character_188.ptr, Helvetica12_Character_189.ptr, 
     558    Helvetica12_Character_190.ptr, Helvetica12_Character_191.ptr, 
     559    Helvetica12_Character_192.ptr, Helvetica12_Character_193.ptr, 
     560    Helvetica12_Character_194.ptr, Helvetica12_Character_195.ptr, 
     561    Helvetica12_Character_196.ptr, Helvetica12_Character_197.ptr, 
     562    Helvetica12_Character_198.ptr, Helvetica12_Character_199.ptr, 
     563    Helvetica12_Character_200.ptr, Helvetica12_Character_201.ptr, 
     564    Helvetica12_Character_202.ptr, Helvetica12_Character_203.ptr, 
     565    Helvetica12_Character_204.ptr, Helvetica12_Character_205.ptr, 
     566    Helvetica12_Character_206.ptr, Helvetica12_Character_207.ptr, 
     567    Helvetica12_Character_208.ptr, Helvetica12_Character_209.ptr, 
     568    Helvetica12_Character_210.ptr, Helvetica12_Character_211.ptr, 
     569    Helvetica12_Character_212.ptr, Helvetica12_Character_213.ptr, 
     570    Helvetica12_Character_214.ptr, Helvetica12_Character_215.ptr, 
     571    Helvetica12_Character_216.ptr, Helvetica12_Character_217.ptr, 
     572    Helvetica12_Character_218.ptr, Helvetica12_Character_219.ptr, 
     573    Helvetica12_Character_220.ptr, Helvetica12_Character_221.ptr, 
     574    Helvetica12_Character_222.ptr, Helvetica12_Character_223.ptr, 
     575    Helvetica12_Character_224.ptr, Helvetica12_Character_225.ptr, 
     576    Helvetica12_Character_226.ptr, Helvetica12_Character_227.ptr, 
     577    Helvetica12_Character_228.ptr, Helvetica12_Character_229.ptr, 
     578    Helvetica12_Character_230.ptr, Helvetica12_Character_231.ptr, 
     579    Helvetica12_Character_232.ptr, Helvetica12_Character_233.ptr, 
     580    Helvetica12_Character_234.ptr, Helvetica12_Character_235.ptr, 
     581    Helvetica12_Character_236.ptr, Helvetica12_Character_237.ptr, 
     582    Helvetica12_Character_238.ptr, Helvetica12_Character_239.ptr, 
     583    Helvetica12_Character_240.ptr, Helvetica12_Character_241.ptr, 
     584    Helvetica12_Character_242.ptr, Helvetica12_Character_243.ptr, 
     585    Helvetica12_Character_244.ptr, Helvetica12_Character_245.ptr, 
     586    Helvetica12_Character_246.ptr, Helvetica12_Character_247.ptr, 
     587    Helvetica12_Character_248.ptr, Helvetica12_Character_249.ptr, 
     588    Helvetica12_Character_250.ptr, Helvetica12_Character_251.ptr, 
     589    Helvetica12_Character_252.ptr, Helvetica12_Character_253.ptr, 
     590    Helvetica12_Character_254.ptr, Helvetica12_Character_255.ptr 
    591591]; 
    592592 
    …… 
    615615    xorig: 0, 
    616616    yorig: 4, 
    617     characters: Helvetica12_Character_Map  
     617    characters: Helvetica12_Character_Map.ptr 
    618618}; 

  • trunk/luigi/themes/bitmaps.d

    r26 r39  
    5858// These must be in the same order as the GLUI_STDBITMAP enums from glui.h! 
    5959ubyte*[21] bitmap_arrays = [ 
    60     img_checkbox_off, 
    61     img_checkbox_on, 
    62     img_radiobutton_off, 
    63     img_radiobutton_on, 
    64     img_uparrow, 
    65     img_downarrow, 
    66     img_leftarrow, 
    67     img_rightarrow, 
    68     img_spinup_off, 
    69     img_spinup_on, 
    70     img_spindown_off, 
    71     img_spindown_on, 
    72     img_checkbox_off_dis, 
    73     img_checkbox_on_dis, 
    74     img_radiobutton_off_dis, 
    75     img_radiobutton_on_dis, 
    76     img_spinup_dis, 
    77     img_spindown_dis, 
    78     img_listbox_up, 
    79     img_listbox_down, 
    80     img_listbox_up_dis, 
     60    img_checkbox_off.ptr, 
     61    img_checkbox_on.ptr, 
     62    img_radiobutton_off.ptr, 
     63    img_radiobutton_on.ptr, 
     64    img_uparrow.ptr, 
     65    img_downarrow.ptr, 
     66    img_leftarrow.ptr, 
     67    img_rightarrow.ptr, 
     68    img_spinup_off.ptr, 
     69    img_spinup_on.ptr, 
     70    img_spindown_off.ptr, 
     71    img_spindown_on.ptr, 
     72    img_checkbox_off_dis.ptr, 
     73    img_checkbox_on_dis.ptr, 
     74    img_radiobutton_off_dis.ptr, 
     75    img_radiobutton_on_dis.ptr, 
     76    img_spinup_dis.ptr, 
     77    img_spindown_dis.ptr, 
     78    img_listbox_up.ptr, 
     79    img_listbox_down.ptr, 
     80    img_listbox_up_dis.ptr, 
    8181]; 
    8282 
    …… 
    107107            glRasterPos2f(0.5f + p.x, 0.5f + p.y + height); 
    108108            glDrawPixels(  
    109                 width, height, format, GL_UNSIGNED_BYTE, pixels); 
     109                width, height, format, GL_UNSIGNED_BYTE, pixels.ptr); 
    110110        } 
    111111    } 

  • trunk/luigi/themes/dxut.d

    r37 r39  
    13241324 
    13251325    // Verify the file is a true .dds file 
    1326     uint nread = fread( filecode, 1, 4, pFile ); 
     1326    uint nread = fread( filecode.ptr, 1, 4, pFile ); 
    13271327    assert(nread == 4); 
    13281328 
    …… 
    14271427    pDDSdata.pixels.length = bufferSize; 
    14281428 
    1429     fread( pDDSdata.pixels, 1, bufferSize, pFile ); 
     1429    fread( pDDSdata.pixels.ptr, 1, bufferSize, pFile ); 
    14301430    // need to do an endian swap on pixels for big-endian systems? 
    14311431