| author | rubidium |
| Tue, 20 May 2008 22:05:25 +0000 | |
| branch | 0.6 |
| changeset 10659 | 2d983c15a049 |
| parent 8623 | 652df321c912 |
| child 10394 | 2e5433ef4d10 |
| permissions | -rw-r--r-- |
|
8617
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
1 |
/* $Id$ */ |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
2 |
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
3 |
/** @file geometry_type.hpp All geometry types in OpenTTD. */ |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
4 |
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
5 |
#ifndef GEOMETRY_TYPE_HPP |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
6 |
#define GEOMETRY_TYPE_HPP |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
7 |
|
|
8622
b917f0b0dd6b
(svn r11687) -Codechange: move some defines to a better place
skidd13
parents:
8617
diff
changeset
|
8 |
#if defined(__AMIGA__) |
|
b917f0b0dd6b
(svn r11687) -Codechange: move some defines to a better place
skidd13
parents:
8617
diff
changeset
|
9 |
/* AmigaOS already has a Point declared */ |
|
b917f0b0dd6b
(svn r11687) -Codechange: move some defines to a better place
skidd13
parents:
8617
diff
changeset
|
10 |
#define Point OTTD_Point |
|
b917f0b0dd6b
(svn r11687) -Codechange: move some defines to a better place
skidd13
parents:
8617
diff
changeset
|
11 |
#endif /* __AMIGA__ */ |
|
b917f0b0dd6b
(svn r11687) -Codechange: move some defines to a better place
skidd13
parents:
8617
diff
changeset
|
12 |
|
|
8623
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
8622
diff
changeset
|
13 |
#if defined(__APPLE__) |
|
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
8622
diff
changeset
|
14 |
/* Mac OS X already has both Rect and Point declared */ |
|
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
8622
diff
changeset
|
15 |
#define Rect OTTD_Rect |
|
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
8622
diff
changeset
|
16 |
#define Point OTTD_Point |
|
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
8622
diff
changeset
|
17 |
#endif /* __APPLE__ */ |
|
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
8622
diff
changeset
|
18 |
|
|
652df321c912
(svn r11688) -Fix [FS#1581]: Compilation was broken on OS X again.
egladil
parents:
8622
diff
changeset
|
19 |
|
|
8617
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
20 |
struct Point {
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
21 |
int x; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
22 |
int y; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
23 |
}; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
24 |
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
25 |
struct Dimension {
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
26 |
int width; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
27 |
int height; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
28 |
}; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
29 |
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
30 |
struct Rect {
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
31 |
int left; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
32 |
int top; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
33 |
int right; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
34 |
int bottom; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
35 |
}; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
36 |
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
37 |
struct PointDimension {
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
38 |
int x; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
39 |
int y; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
40 |
int width; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
41 |
int height; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
42 |
}; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
43 |
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
44 |
struct Pair {
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
45 |
int a; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
46 |
int b; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
47 |
}; |
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
48 |
|
|
931e0970d509
(svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents:
diff
changeset
|
49 |
#endif /* GEOMETRY_TYPE_HPP */ |