-
Notifications
You must be signed in to change notification settings - Fork 764
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
reduce unnecessary #include dependency chains
for example, elements no longer include Client.h or Graphics.h, and interface stuff won't include Window.h or Graphics.h unless requested
- Loading branch information
Showing
71 changed files
with
307 additions
and
270 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
#ifndef ICONS_H | ||
#define ICONS_H | ||
|
||
//Icon names, see Graphics::draw_icon | ||
enum Icon | ||
{ | ||
NoIcon = 0, | ||
IconOpen, | ||
IconReload, | ||
IconSave, | ||
IconVoteUp, | ||
IconVoteDown, | ||
IconTag, | ||
IconNew, | ||
IconLogin, | ||
IconRenderSettings, | ||
IconSimulationSettings, | ||
IconPause, | ||
IconVoteSort, | ||
IconDateSort, | ||
IconMyOwn, | ||
IconFavourite, | ||
IconSearch, | ||
IconDelete, | ||
IconAdd, | ||
IconReport, | ||
IconUsername, | ||
IconPassword, | ||
IconClose, | ||
IconEffect, | ||
IconFire, | ||
IconGlow, | ||
IconBlur, | ||
IconBlob, | ||
IconBasic, | ||
IconAltAir, | ||
IconPressure, | ||
IconVelocity, | ||
IconWarp, | ||
IconPersistant, | ||
IconHeat, | ||
IconLife, | ||
IconGradient | ||
}; | ||
|
||
#endif // ICONS_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
#ifndef PIXEL_H | ||
#define PIXEL_H | ||
|
||
#define PIXELCHANNELS 3 | ||
#ifdef PIX16 | ||
#define PIXELSIZE 2 | ||
#define PIXPACK(x) ((((x)>>8)&0xF800)|(((x)>>5)&0x07E0)|(((x)>>3)&0x001F)) //16bit RGB in 16bit int: ???? | ||
#define PIXRGB(r,g,b) ((((r)<<8)&0xF800)|(((g)<<3)&0x07E0)|(((b)>>3)&0x001F)) | ||
#define PIXR(x) (((x)>>8)&0xF8) | ||
#define PIXG(x) (((x)>>3)&0xFC) | ||
#define PIXB(x) (((x)<<3)&0xF8) | ||
#else | ||
#define PIXELSIZE 4 | ||
#ifdef PIX32BGRA | ||
#define PIXPACK(x) ((((x)>>16)&0x0000FF)|((x)&0x00FF00)|(((x)<<16)&0xFF0000)) //24bit BGR in 32bit int: 00BBGGRR | ||
#define PIXRGB(r,g,b) (((b)<<16)|((g)<<8)|((r)))// (((b)<<16)|((g)<<8)|(r)) | ||
#define PIXR(x) ((x)&0xFF) | ||
#define PIXG(x) (((x)>>8)&0xFF) | ||
#define PIXB(x) ((x)>>16) | ||
#else | ||
#ifdef PIX32BGRA | ||
#define PIXPACK(x) ((((x)>>8)&0x0000FF00)|(((x)<<8)&0x00FF0000)|(((x)<<24)&0xFF000000)) //32bit BGRA in 32bit int: BBGGRRAA | ||
#define PIXRGB(r,g,b) (((b)<<24)|((g)<<16)|((r)<<8)) | ||
#define PIXR(x) (((x)>>8)&0xFF) | ||
#define PIXG(x) (((x)>>16)&0xFF) | ||
#define PIXB(x) (((x)>>24)&0xFF) | ||
#elif defined(PIX32OGL) | ||
#undef PIXELCHANNELS | ||
#define PIXELCHANNELS 4 | ||
#define PIXPACK(x) (0xFF000000|((x)&0xFFFFFF)) //32bit ARGB in 32bit int: AARRGGBB | ||
#define PIXRGB(r,g,b) (0xFF000000|((r)<<16)|((g)<<8)|((b))) | ||
#define PIXRGBA(r,g,b,a) (((a)<<24)|((r)<<16)|((g)<<8)|((b))) | ||
#define PIXA(x) (((x)>>24)&0xFF) | ||
#define PIXR(x) (((x)>>16)&0xFF) | ||
#define PIXG(x) (((x)>>8)&0xFF) | ||
#define PIXB(x) ((x)&0xFF) | ||
#else | ||
#define PIXPACK(x) (x) //24bit RGB in 32bit int: 00RRGGBB. | ||
#define PIXRGB(r,g,b) (((r)<<16)|((g)<<8)|(b)) | ||
#define PIXR(x) (((x)>>16)&0xFF) | ||
#define PIXG(x) (((x)>>8)&0xFF) | ||
#define PIXB(x) ((x)&0xFF) | ||
#endif | ||
#endif | ||
#endif | ||
|
||
#ifdef PIX16 | ||
typedef unsigned short pixel; | ||
#else | ||
typedef unsigned int pixel; | ||
#endif | ||
|
||
#endif // PIXEL_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.