diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2004-03-23 01:02:18 +0300 |
commit | 00291b5cf4a0f16ddca425b74ed30e8ac35d40e2 (patch) | |
tree | 952bb1c2f6fd8c2f34b950597ed0fa73a4ea7594 /source/blender/include | |
parent | 5b90aafbd6815e29343f8e9aba9e3e20f85b3cc0 (diff) |
[GameEngine] Commit all Kester's changes made to the gameengine to restore 2.25 like physics.
[SCons] Build with Solid as default when enabling the gameengine in the build process
[SCons] Build solid and qhull from the extern directory and link statically against them
That was about it.
There are a few things that needs double checking:
* Makefiles
* Projectfiles
* All the other systems than Linux and Windows on which the build (with scons) has been successfully tested.
Diffstat (limited to 'source/blender/include')
-rw-r--r-- | source/blender/include/BIF_resources.h | 70 | ||||
-rw-r--r-- | source/blender/include/butspace.h | 51 | ||||
-rw-r--r-- | source/blender/include/mydevice.h | 2 |
3 files changed, 121 insertions, 2 deletions
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h index 8900df470ca..2fa361a985e 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -258,8 +258,72 @@ typedef enum { #define BIFNICONIDS (BIFICONID_LAST-BIFICONID_FIRST + 1) } BIFIconID; +typedef enum { +#define BIFCOLORSHADE_FIRST (COLORSHADE_DARK) + COLORSHADE_DARK, + COLORSHADE_GREY, + COLORSHADE_MEDIUM, + COLORSHADE_HILITE, + COLORSHADE_LIGHT, + COLORSHADE_WHITE, +#define BIFCOLORSHADE_LAST (COLORSHADE_WHITE) +#define BIFNCOLORSHADES (BIFCOLORSHADE_LAST-BIFCOLORSHADE_FIRST + 1) +} BIFColorShade; + +typedef enum { +#define BIFCOLORID_FIRST (BUTGREY) + BUTGREY = 0, + BUTGREEN, + BUTBLUE, + BUTSALMON, + MIDGREY, + BUTPURPLE, + BUTYELLOW, + REDALERT, + BUTRUST, + BUTWHITE, + BUTDBLUE, + BUTPINK, + BUTDPINK, + BUTMACTIVE, -/* ---------- theme ----------- */ + BUTIPO, + BUTAUDIO, + BUTCAMERA, + BUTRANDOM, + BUTEDITOBJECT, + BUTPROPERTY, + BUTSCENE, + BUTMOTION, + BUTMESSAGE, + BUTACTION, + BUTCD, + BUTGAME, + BUTVISIBILITY, + BUTYUCK, + BUTSEASICK, + BUTCHOKE, + BUTIMPERIAL, + + BUTTEXTCOLOR, + BUTTEXTPRESSED, + BUTSBACKGROUND, + + VIEWPORTBACKCOLOR, + VIEWPORTGRIDCOLOR, + VIEWPORTACTIVECOLOR, + VIEWPORTSELECTEDCOLOR, + VIEWPORTUNSELCOLOR, + + EDITVERTSEL, + EDITVERTUNSEL, + EDITEDGESEL, + EDITEDGEUNSEL, + +#define BIFCOLORID_LAST (EDITEDGEUNSEL) +#define BIFNCOLORIDS (BIFCOLORID_LAST-BIFCOLORID_FIRST + 1) + +} BIFColorID; enum { TH_AUTO, /* for buttons, to signal automatic color assignment */ @@ -355,6 +419,8 @@ void BIF_InitTheme(void); void BIF_SetTheme(struct ScrArea *sa); void BIF_resources_init (void); void BIF_resources_free (void); +void BIF_colors_init (void); +void BIF_load_ui_colors (void); // icon API @@ -368,4 +434,6 @@ char *BIF_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid); char *BIF_ThemeColorsPup(int spacetype); +void BIF_def_color (BIFColorID colorid, unsigned char r, unsigned char g, unsigned char b); + #endif /* BIF_ICONS_H */ diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h index 63dcd0376c9..a2e153ef519 100644 --- a/source/blender/include/butspace.h +++ b/source/blender/include/butspace.h @@ -74,6 +74,9 @@ extern void do_mballbuts(unsigned short event); extern void do_latticebuts(unsigned short event); extern void do_fpaintbuts(unsigned short event); +/* dont like it here , rather make a BIF_Buttons_Editing.h or so BM*/ +extern int Buttons_Editing_GetFaceShadows(); + /* shading */ extern void material_panels(void); extern void do_matbuts(unsigned short event); @@ -97,6 +100,9 @@ extern void do_scriptbuts(unsigned short event); /* ipowindow */ extern void do_ipobuts(unsigned short event); // drawipo.c (bad! ton) +/* uvautocalculation */ +void do_uvautocalculationbuts(unsigned short event); +void get_uvautocalculationsettings(float *radius,float *cubesize, int *mapdir, int *mapalign); /* butspace.c */ void test_meshpoin_but(char *name, struct ID **idpp); void test_obpoin_but(char *name, struct ID **idpp); @@ -337,6 +343,14 @@ enum { #define B_VERTEXSMOOTH 2080 #define B_MAKESTICKY 2082 #define B_MAKEVERTCOL 2083 +#define B_CHROMADEPTH 2084 +#define B_ISDEFLECTOR 2085 +#define B_PDEFDAMPING 2086 +#define B_GRAVITY 2087 +#define B_GRAVSTRENGTH 2088 +#define B_GRAVPOWER 2089 +#define B_PDEFRDAMP 2090 +#define B_PDEFPERM 2091 /* *********************** */ #define B_CURVEBUTS 2200 @@ -416,6 +430,12 @@ enum { #define B_SOUNDACT_BROWSE 2712 +#define B_SETSECTOR 2713 +#define B_SETPROP 2714 +#define B_SETACTOR 2715 +#define B_SETMAINACTOR 2716 +#define B_SETDYNA 2717 + /* *********************** */ #define B_FPAINTBUTS 2900 @@ -508,8 +528,37 @@ enum { B_CONSTRAINT_ADD_LOCLIKE, B_CONSTRAINT_ADD_ACTION, B_CONSTRAINT_ADD_LOCKTRACK, - B_CONSTRAINT_ADD_FOLLOWPATH + B_CONSTRAINT_ADD_FOLLOWPATH, + B_CONSTRAINT_ADD_DISTANCELIMIT }; + +/*+++ BM */ +/* *********************** */ +#define B_UVAUTOCALCBUTS 3400 +enum { + B_UVAUTO_REDRAW = 3301, + B_UVAUTO_SPHERE, + B_UVAUTO_CYLINDER, + B_UVAUTO_CYLRADIUS, + B_UVAUTO_WINDOW, + B_UVAUTO_CUBE, + B_UVAUTO_CUBESIZE, + B_UVAUTO_STD1, + B_UVAUTO_STD2, + B_UVAUTO_STD4, + B_UVAUTO_STD8, + B_UVAUTO_BOUNDS1, + B_UVAUTO_BOUNDS2, + B_UVAUTO_BOUNDS4, + B_UVAUTO_BOUNDS8, + B_UVAUTO_TOP, + B_UVAUTO_FACE, + B_UVAUTO_OBJECT, + B_UVAUTO_ALIGNX, + B_UVAUTO_ALIGNY +}; +/* *********************** */ +/*--- BM */ /* *********************** */ diff --git a/source/blender/include/mydevice.h b/source/blender/include/mydevice.h index aad025fa759..6b8c2d305a0 100644 --- a/source/blender/include/mydevice.h +++ b/source/blender/include/mydevice.h @@ -217,6 +217,7 @@ #define REDRAWBUTSSCRIPT 0x401A #define REDRAWBUTSLOGIC 0x401B #define REDRAWBUTSSHADING 0x401C +#define REDRAWBUTSGAME 0x401D #define REDRAWINFO 0x4021 #define RENDERPREVIEW 0x4022 @@ -234,6 +235,7 @@ #define REDRAWTEXT 0x402E #define REDRAWSOUND 0x402F #define REDRAWACTION 0x4030 +#define REDRAWBUTSCONSTRAINT 0x4034 #define REDRAWNLA 0x4031 #define REDRAWSCRIPT 0x4032 |