ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/Frodo4/Src/Display.cpp
(Generate patch)

Comparing Frodo4/Src/Display.cpp (file contents):
Revision 1.2 by cebix, 2003-07-01T17:51:17Z vs.
Revision 1.5 by cebix, 2004-01-16T20:18:58Z

# Line 1 | Line 1
1   /*
2   *  Display.cpp - C64 graphics display, emulator window handling
3   *
4 < *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
4 > *  Frodo (C) 1994-1997,2002-2004 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 34 | Line 34 | enum {
34   };
35  
36  
37 < #undef USE_THEORETICAL_COLORS
37 > #define USE_PEPTO_COLORS 1
38  
39 < #ifdef USE_THEORETICAL_COLORS
39 > #ifdef USE_PEPTO_COLORS
40  
41 < // C64 color palette (theoretical values)
41 > // C64 color palette
42 > // Values based on measurements by Philip "Pepto" Timmermann <pepto@pepto.de>
43 > // (see http://www.pepto.de/projects/colorvic/)
44   const uint8 palette_red[16] = {
45 <        0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x80, 0xff, 0x40, 0x80, 0x80, 0x80, 0xc0
45 >        0x00, 0xff, 0x86, 0x4c, 0x88, 0x35, 0x20, 0xcf, 0x88, 0x40, 0xcb, 0x34, 0x68, 0x8b, 0x68, 0xa1
46   };
47  
48   const uint8 palette_green[16] = {
49 <        0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x80, 0x40, 0x80, 0x40, 0x80, 0xff, 0x80, 0xc0
49 >        0x00, 0xff, 0x19, 0xc1, 0x17, 0xac, 0x07, 0xf2, 0x3e, 0x2a, 0x55, 0x34, 0x68, 0xff, 0x4a, 0xa1
50   };
51  
52   const uint8 palette_blue[16] = {
53 <        0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x80, 0xff, 0xc0
53 >        0x00, 0xff, 0x01, 0xe3, 0xbd, 0x0a, 0xc0, 0x2d, 0x00, 0x00, 0x37, 0x34, 0x68, 0x59, 0xff, 0xa1
54   };
55  
56   #else
57  
58 < // C64 color palette (more realistic looking colors)
58 > // C64 color palette (traditional Frodo colors)
59   const uint8 palette_red[16] = {
60          0x00, 0xff, 0x99, 0x00, 0xcc, 0x44, 0x11, 0xff, 0xaa, 0x66, 0xff, 0x40, 0x80, 0x66, 0x77, 0xc0
61   };
62  
63   const uint8 palette_green[16] = {
64 <        0x00, 0xff, 0x00, 0xff, 0x00, 0xcc, 0x00, 0xff, 0x55, 0x33, 0x66, 0x40, 0x80, 0xff, 0x77, 0xc0
64 >        0x00, 0xff, 0x00, 0xff, 0x00, 0xcc, 0x00, 0xdd, 0x55, 0x33, 0x66, 0x40, 0x80, 0xff, 0x77, 0xc0
65   };
66  
67   const uint8 palette_blue[16] = {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines