X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fandroid%2Ffg_internal_android.h;h=5504b44d14788560d1aa85703287b28daa9694e6;hb=cd0898cee3e8d093c4edbafd87aa66661cdbce46;hp=0feaad61f3d6b5a5483b836dc1d4c7b7aa631b1d;hpb=06ec540147001021c3b4f02fc70e7a7dd1d93d89;p=freeglut diff --git a/src/android/fg_internal_android.h b/src/android/fg_internal_android.h index 0feaad6..5504b44 100644 --- a/src/android/fg_internal_android.h +++ b/src/android/fg_internal_android.h @@ -32,7 +32,7 @@ #include "egl/fg_internal_egl.h" /* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */ -/* The structure used by display initialization in freeglut_init.c */ +/* The structure used by display initialization in fg_init.c */ typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay; struct android_app; struct tagSFG_PlatformDisplay @@ -68,7 +68,7 @@ struct touchscreen { /* -- JOYSTICK-SPECIFIC STRUCTURES AND TYPES ------------------------------- */ /* - * Initial defines from "js.h" starting around line 33 with the existing "freeglut_joystick.c" + * Initial defines from "js.h" starting around line 33 with the existing "fg_joystick.c" * interspersed */ @@ -106,8 +106,15 @@ struct tagSFG_PlatformJoystick typedef struct tagSFG_PlatformWindowState SFG_PlatformWindowState; struct tagSFG_PlatformWindowState { - int32_t LastHeight; - int32_t LastWidth; + char unused; }; +/* Menu font and color definitions */ +#define FREEGLUT_MENU_FONT NULL + +#define FREEGLUT_MENU_PEN_FORE_COLORS {0.0f, 0.0f, 0.0f, 1.0f} +#define FREEGLUT_MENU_PEN_BACK_COLORS {0.70f, 0.70f, 0.70f, 1.0f} +#define FREEGLUT_MENU_PEN_HFORE_COLORS {0.0f, 0.0f, 0.0f, 1.0f} +#define FREEGLUT_MENU_PEN_HBACK_COLORS {1.0f, 1.0f, 1.0f, 1.0f} + #endif /* FREEGLUT_INTERNAL_ANDROID_H */