Move the texture object to the screen directory for the sake of library dependencies

diff --git a/simgear/misc/Makefile.am b/simgear/misc/Makefile.am
index a3616de3faf49921be6a1602ccd674a1f02a3e70..6f4e38280d54af1c7b2a1fbbe91054d287d34e17 100644 (file)
--- a/simgear/misc/Makefile.am
+++ b/simgear/misc/Makefile.am
@@ -2,9 +2,6 @@ includedir = @includedir@/misc
 
 lib_LIBRARIES = libsgmisc.a
 
-noinst_HEADERS = \
-       colours.h
-
 include_HEADERS = \
         commands.hxx \
         exception.hxx \

diff --git a/simgear/misc/colours.h b/simgear/misc/colours.h
deleted file mode 100644 (file)
index ba3b891..0000000
--- a/simgear/misc/colours.h
+++ /dev/null
@@ -1,289 +0,0 @@
-// colours.h -- This header file contains colour definitions in the
-//              same way as MS FS5 does
-//
-// Contributed by "Christian Mayer" <Vader@t-online.de>, started April 1999.
-//
-// Copyright (C) 1998  Christian Mayer - Vader@t-online.de
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// $Id$
-
-
-#ifndef COLOURS_H
-#define COLOURS_H
-
-unsigned char msfs_colour[256][3]=
-{
-       {  0,   0,   0},
-       {  8,   8,   8},
-       { 16,  16,  16},
-       { 24,  24,  24},
-       { 32,  32,  32},
-       { 40,  40,  40},
-       { 48,  48,  48},
-       { 56,  56,  56},
-       { 65,  65,  65},
-       { 73,  73,  73},
-       { 81,  81,  81},
-       { 89,  89,  89},
-       { 97,  97,  97},
-       {105, 105, 105},
-       {113, 113, 113},
-       {121, 121, 121},
-       {130, 130, 130},
-       {138, 138, 138},
-       {146, 146, 146},
-       {154, 154, 154},
-       {162, 162, 162},
-       {170, 170, 170},
-       {178, 178, 178},
-       {186, 186, 186},
-       {195, 195, 195},
-       {203, 203, 203},
-       {211, 211, 211},
-       {219, 219, 219},
-       {227, 227, 227},
-       {235, 235, 235},
-       {247, 247, 247},
-       {255, 255, 255},
-       { 21,   5,   5}, 
-       { 42,  10,  10},
-       { 63,  15,  15},
-       { 84,  20,  20},
-       {105,  25,  25},
-       {126,  30,  30},
-       {147,  35,  35},
-       {168,  40,  40},
-       {189,  45,  45},
-       {210,  50,  50},
-       {231,  55,  55},
-       {252,  60,  60},
-       {  5,  21,   5},
-       { 10,  42,  10},
-       { 15,  63,  15},
-       { 20,  84,  20},
-       { 25, 105,  25},
-       { 30, 126,  30},
-       { 35, 147,  35},
-       { 40, 168,  40},
-       { 45, 189,  45},
-       { 50, 210,  50},
-       { 55, 231,  55},
-       { 60, 252,  60},
-       {  0,   7,  23},
-       {  0,  15,  40},
-       {  0,  23,  58},
-       {  0,  40,  84},
-       {  0,  64, 104},
-       {  0,  71, 122},
-       {  0,  87, 143},
-       {  0,  99, 156},
-       {  0, 112, 179},
-       {  0, 128, 199},
-       {  0, 143, 215},
-       {  0, 153, 230},
-       { 28,  14,   0},
-       { 56,  28,   0},
-       { 84,  42,   0},
-       {112,  56,   0},
-       {140,  70,   0},
-       {168,  84,   0},
-       {196,  98,   0},
-       {224, 112,   0},
-       {252, 126,   0},
-       { 28,  28,   0},
-       { 56,  56,   0},
-       { 84,  84,   0},
-       {112, 112,   0},
-       {140, 140,   0},
-       {168, 168,   0},
-       {196, 196,   0},
-       {224, 224,   0},
-       {252, 252,   0},
-       { 25,  21,  16},
-       { 50,  42,  32},
-       { 75,  63,  48},
-       {100,  84,  64},
-       {125, 105,  80},
-       {150, 126,  96},
-       {175, 147, 112},
-       {200, 168, 128},
-       {225, 189, 144},
-       { 28,  11,   7},
-       { 56,  22,  14},
-       { 84,  33,  21},
-       {112,  44,  28},
-       {140,  55,  35},
-       {168,  66,  42},
-       {196,  77,  49},
-       {224,  88,  56},
-       {252,  99,  63},
-       { 17,  22,   9},
-       { 34,  44,  18},
-       { 51,  66,  27},
-       { 68,  88,  36},
-       { 85, 110,  45},
-       {102, 132,  54},
-       {119, 154,  63},
-       {136, 176,  72},
-       {153, 198,  81},
-       {  0,  58, 104},
-       {  0,  87, 112},
-       { 43, 112, 128},
-       {255,   0,   0},
-       { 64, 255,  64},
-       {  0,   0, 192},
-       {  0, 105, 105},
-       {255, 128,   0},
-       {255, 255,   0},
-       { 81,  81,  81},
-       {121, 121, 121},
-       {146, 146, 146},
-       {170, 170, 170},
-       {195, 195, 195},
-       {227, 227, 227},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {  0,   0,   0},
-       {192, 192, 255},
-       {200, 200, 255},
-       {208, 208, 255},
-       {216, 216, 255},
-       {224, 224, 255},
-       {232, 232, 255},
-       {240, 240, 255},
-       {248, 248, 255},
-       {255, 255, 255},
-       {255, 255, 255},
-       {255, 255, 255},
-       {255, 255, 255},
-       {255, 255, 255},
-       {255, 255, 255},
-       {255, 255, 255},
-       {255, 255, 255},
-       { 16,  72,  16},
-       { 32,  80,  32},
-       { 48,  88,  48},
-       { 64,  96,  64},
-       { 80, 104,  80},
-       { 96, 112,  96},
-       {112, 120, 112},
-       {120, 124, 120},
-       {128, 128, 128},
-       {128, 128, 128},
-       {128, 128, 128},
-       {128, 128, 128},
-       {128, 128, 128},
-       {128, 128, 128},
-       {128, 128, 128},
-       {128, 128, 128},
-       { 33, 140, 189},
-       { 57, 132, 165},
-       {189,  66,  66},
-       {156,  66,  66},
-       {132,  74,  74},
-       { 33,  82, 107},
-       {214,  90,  82},
-       {189,  90,  82},
-       {165,  90,  82},
-       {123,  57,  49},
-       { 99,  57,  49},
-       {107,  74,  66},
-       {123,  90,  82},
-       {181,  90,  66},
-       { 74,  49,  41},
-       {189, 115,  90},
-       {140,  90,  49},
-       { 33,  49,  74},
-       {181, 115,  49},
-       { 99,  66,  33},
-       {165, 115,  66},
-       { 49,  41,  33},
-       {165, 140, 115},
-       {189, 165, 140},
-       { 57,  99, 123},
-       {181, 107,  24},
-       {206, 123,  33},
-       {156,  99,  33},
-       {148, 107,  49},
-       {107,  82,  49},
-       { 33,  33,  57},
-       { 33, 115, 165},
-       {214, 214,  33},
-       {173, 173,  33},
-       {198, 198,  41},
-       {140, 140,  33},
-       {115, 115,  33},
-       {189, 189,  57},
-       {156, 156,  49},
-       {173, 173,  57},
-       {123, 123,  49},
-       {123, 123,  66},
-       { 74,  74,  49},
-       {123, 123,  90},
-       { 41,  41,  33},
-       { 90,  99,  57},
-       {107, 115,  74},
-       {123, 148,  82},
-       {140, 173,  99},
-       {132, 156,  99},
-       { 49,  66,  41},
-       { 99, 165,  90},
-       { 74, 214,  74},
-       { 57, 140,  57},
-       { 74, 181,  74},
-       { 90, 198,  90},
-       { 57, 123,  57},
-       { 49,  99,  49},
-       { 90, 165,  90},
-       { 82, 148,  82},
-       { 74,  99,  74},
-       { 57, 115, 132},
-       { 33,  99, 123},
-       { 74, 115, 132}
-};
-
-
-#endif

diff --git a/simgear/screen/Makefile.am b/simgear/screen/Makefile.am
index 5e8fe44b930c6ab743c5828f6662882de7e11811..20ccf0433438d3200eb807be8eb514ea7cb1740a 100644 (file)
--- a/simgear/screen/Makefile.am
+++ b/simgear/screen/Makefile.am
@@ -12,6 +12,9 @@ IMAGE_SERVER_INCL =
 IMAGE_SERVER_SRCS = 
 endif
 
+noinst_HEADERS = \
+        colours.h
+
 include_HEADERS = \
        texture.hxx \
        $(IMAGE_SERVER_INCL) \

diff --git a/simgear/screen/colours.h b/simgear/screen/colours.h
new file mode 100644 (file)
index 0000000..ba3b891
--- /dev/null
+++ b/simgear/screen/colours.h
@@ -0,0 +1,289 @@
+// colours.h -- This header file contains colour definitions in the
+//              same way as MS FS5 does
+//
+// Contributed by "Christian Mayer" <Vader@t-online.de>, started April 1999.
+//
+// Copyright (C) 1998  Christian Mayer - Vader@t-online.de
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+// $Id$
+
+
+#ifndef COLOURS_H
+#define COLOURS_H
+
+unsigned char msfs_colour[256][3]=
+{
+       {  0,   0,   0},
+       {  8,   8,   8},
+       { 16,  16,  16},
+       { 24,  24,  24},
+       { 32,  32,  32},
+       { 40,  40,  40},
+       { 48,  48,  48},
+       { 56,  56,  56},
+       { 65,  65,  65},
+       { 73,  73,  73},
+       { 81,  81,  81},
+       { 89,  89,  89},
+       { 97,  97,  97},
+       {105, 105, 105},
+       {113, 113, 113},
+       {121, 121, 121},
+       {130, 130, 130},
+       {138, 138, 138},
+       {146, 146, 146},
+       {154, 154, 154},
+       {162, 162, 162},
+       {170, 170, 170},
+       {178, 178, 178},
+       {186, 186, 186},
+       {195, 195, 195},
+       {203, 203, 203},
+       {211, 211, 211},
+       {219, 219, 219},
+       {227, 227, 227},
+       {235, 235, 235},
+       {247, 247, 247},
+       {255, 255, 255},
+       { 21,   5,   5}, 
+       { 42,  10,  10},
+       { 63,  15,  15},
+       { 84,  20,  20},
+       {105,  25,  25},
+       {126,  30,  30},
+       {147,  35,  35},
+       {168,  40,  40},
+       {189,  45,  45},
+       {210,  50,  50},
+       {231,  55,  55},
+       {252,  60,  60},
+       {  5,  21,   5},
+       { 10,  42,  10},
+       { 15,  63,  15},
+       { 20,  84,  20},
+       { 25, 105,  25},
+       { 30, 126,  30},
+       { 35, 147,  35},
+       { 40, 168,  40},
+       { 45, 189,  45},
+       { 50, 210,  50},
+       { 55, 231,  55},
+       { 60, 252,  60},
+       {  0,   7,  23},
+       {  0,  15,  40},
+       {  0,  23,  58},
+       {  0,  40,  84},
+       {  0,  64, 104},
+       {  0,  71, 122},
+       {  0,  87, 143},
+       {  0,  99, 156},
+       {  0, 112, 179},
+       {  0, 128, 199},
+       {  0, 143, 215},
+       {  0, 153, 230},
+       { 28,  14,   0},
+       { 56,  28,   0},
+       { 84,  42,   0},
+       {112,  56,   0},
+       {140,  70,   0},
+       {168,  84,   0},
+       {196,  98,   0},
+       {224, 112,   0},
+       {252, 126,   0},
+       { 28,  28,   0},
+       { 56,  56,   0},
+       { 84,  84,   0},
+       {112, 112,   0},
+       {140, 140,   0},
+       {168, 168,   0},
+       {196, 196,   0},
+       {224, 224,   0},
+       {252, 252,   0},
+       { 25,  21,  16},
+       { 50,  42,  32},
+       { 75,  63,  48},
+       {100,  84,  64},
+       {125, 105,  80},
+       {150, 126,  96},
+       {175, 147, 112},
+       {200, 168, 128},
+       {225, 189, 144},
+       { 28,  11,   7},
+       { 56,  22,  14},
+       { 84,  33,  21},
+       {112,  44,  28},
+       {140,  55,  35},
+       {168,  66,  42},
+       {196,  77,  49},
+       {224,  88,  56},
+       {252,  99,  63},
+       { 17,  22,   9},
+       { 34,  44,  18},
+       { 51,  66,  27},
+       { 68,  88,  36},
+       { 85, 110,  45},
+       {102, 132,  54},
+       {119, 154,  63},
+       {136, 176,  72},
+       {153, 198,  81},
+       {  0,  58, 104},
+       {  0,  87, 112},
+       { 43, 112, 128},
+       {255,   0,   0},
+       { 64, 255,  64},
+       {  0,   0, 192},
+       {  0, 105, 105},
+       {255, 128,   0},
+       {255, 255,   0},
+       { 81,  81,  81},
+       {121, 121, 121},
+       {146, 146, 146},
+       {170, 170, 170},
+       {195, 195, 195},
+       {227, 227, 227},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {  0,   0,   0},
+       {192, 192, 255},
+       {200, 200, 255},
+       {208, 208, 255},
+       {216, 216, 255},
+       {224, 224, 255},
+       {232, 232, 255},
+       {240, 240, 255},
+       {248, 248, 255},
+       {255, 255, 255},
+       {255, 255, 255},
+       {255, 255, 255},
+       {255, 255, 255},
+       {255, 255, 255},
+       {255, 255, 255},
+       {255, 255, 255},
+       {255, 255, 255},
+       { 16,  72,  16},
+       { 32,  80,  32},
+       { 48,  88,  48},
+       { 64,  96,  64},
+       { 80, 104,  80},
+       { 96, 112,  96},
+       {112, 120, 112},
+       {120, 124, 120},
+       {128, 128, 128},
+       {128, 128, 128},
+       {128, 128, 128},
+       {128, 128, 128},
+       {128, 128, 128},
+       {128, 128, 128},
+       {128, 128, 128},
+       {128, 128, 128},
+       { 33, 140, 189},
+       { 57, 132, 165},
+       {189,  66,  66},
+       {156,  66,  66},
+       {132,  74,  74},
+       { 33,  82, 107},
+       {214,  90,  82},
+       {189,  90,  82},
+       {165,  90,  82},
+       {123,  57,  49},
+       { 99,  57,  49},
+       {107,  74,  66},
+       {123,  90,  82},
+       {181,  90,  66},
+       { 74,  49,  41},
+       {189, 115,  90},
+       {140,  90,  49},
+       { 33,  49,  74},
+       {181, 115,  49},
+       { 99,  66,  33},
+       {165, 115,  66},
+       { 49,  41,  33},
+       {165, 140, 115},
+       {189, 165, 140},
+       { 57,  99, 123},
+       {181, 107,  24},
+       {206, 123,  33},
+       {156,  99,  33},
+       {148, 107,  49},
+       {107,  82,  49},
+       { 33,  33,  57},
+       { 33, 115, 165},
+       {214, 214,  33},
+       {173, 173,  33},
+       {198, 198,  41},
+       {140, 140,  33},
+       {115, 115,  33},
+       {189, 189,  57},
+       {156, 156,  49},
+       {173, 173,  57},
+       {123, 123,  49},
+       {123, 123,  66},
+       { 74,  74,  49},
+       {123, 123,  90},
+       { 41,  41,  33},
+       { 90,  99,  57},
+       {107, 115,  74},
+       {123, 148,  82},
+       {140, 173,  99},
+       {132, 156,  99},
+       { 49,  66,  41},
+       { 99, 165,  90},
+       { 74, 214,  74},
+       { 57, 140,  57},
+       { 74, 181,  74},
+       { 90, 198,  90},
+       { 57, 123,  57},
+       { 49,  99,  49},
+       { 90, 165,  90},
+       { 82, 148,  82},
+       { 74,  99,  74},
+       { 57, 115, 132},
+       { 33,  99, 123},
+       { 74, 115, 132}
+};
+
+
+#endif