Changeset 2177 for trunk/tools


Ignore:
Timestamp:
Dec 23, 2012, 7:52:34 PM (8 years ago)
Author:
rez
Message:

NEERCS: changed copper base color to do not disturb sam white terminal :)

Location:
trunk/tools/neercs
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/neercs/term/term.cpp

    r2176 r2177  
    205205    caca_clear_canvas(m_caca);
    206206
    207     caca_set_color_argb(m_caca, 0xfff, bg_color);
     207    caca_set_color_argb(m_caca, 0x0f0, bg_color);
    208208    for(int i = 0; i < h; i++)
    209209    {
  • trunk/tools/neercs/video/copper.lolfx

    r2160 r2177  
    3939    color.z = float(int(color.z * 8.0) * 32) / 256.0;
    4040
    41     // XXX: copper disabled because it's not very nice, lol
    42     //gl_FragColor = vec4((source == mask_color) ? color : source, 1.0);
    43     gl_FragColor = vec4(source, 1.0);
     41    gl_FragColor = vec4((source == mask_color) ? color : source, 1.0);
    4442}
  • trunk/tools/neercs/video/render.cpp

    r2092 r2177  
    4554550,
    456456    0.75f,0.25f,0.42f,4.0f,   // copper_copper
    457     4.0f,4.0f,4.0f,           // copper_mask_color
     457    0.0f,4.0f,0.0f,           // copper_mask_color
    458458    0,
    4594590,
     
    5125120,
    513513    0.75f,0.25f,0.42f,4.0f,   // copper_copper
    514     4.0f,4.0f,4.0f,           // copper_mask_color
     514    0.0f,4.0f,0.0f,           // copper_mask_color
    515515    0,
    5165160,
     
    5695690,
    570570    0.75f,0.25f,0.42f,4.0f,   // copper_copper
    571     4.0f,4.0f,4.0f,           // copper_mask_color
     571    0.0f,4.0f,0.0f,           // copper_mask_color
    572572    0,
    5735730,
     
    6266260,
    627627    0.75f,0.25f,0.42f,4.0f,   // copper_copper
    628     4.0f,4.0f,4.0f,           // copper_mask_color
     628    0.0f,4.0f,0.0f,           // copper_mask_color
    629629    0,
    6306300,
     
    6836830,
    684684    0.75f,0.25f,0.42f,4.0f,   // copper_copper
    685     4.0f,4.0f,4.0f,           // copper_mask_color
     685    0.0f,4.0f,0.0f,           // copper_mask_color
    686686    0,
    6876870,
Note: See TracChangeset for help on using the changeset viewer.