r3091 - in trunk/data: gfx/menu/default gfx/menu/xaw qcsrc/menu-div0test qcsrc/menu-div0test/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Jan 3 03:20:51 EST 2008
Author: div0
Date: 2008-01-03 03:20:40 -0500 (Thu, 03 Jan 2008)
New Revision: 3091
Modified:
trunk/data/gfx/menu/default/skinvalues.txt
trunk/data/gfx/menu/xaw/cursor.tga
trunk/data/gfx/menu/xaw/skinvalues.txt
trunk/data/qcsrc/menu-div0test/draw.qc
trunk/data/qcsrc/menu-div0test/draw.qh
trunk/data/qcsrc/menu-div0test/menu.qc
trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
trunk/data/qcsrc/menu-div0test/skin-customizables.inc
Log:
customizable mouse pointer and hotspot
Modified: trunk/data/gfx/menu/default/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/default/skinvalues.txt 2008-01-03 01:06:41 UTC (rev 3090)
+++ trunk/data/gfx/menu/default/skinvalues.txt 2008-01-03 08:20:40 UTC (rev 3091)
@@ -1,5 +1,6 @@
ALPHAS_MAINMENU '0.6 0.8 0.9'
ALPHA_DISABLED 0.2
+ALPHA_BEHIND 0.3
COLOR_BUTTON_C '1 1 1'
COLOR_BUTTON_D '1 1 1'
COLOR_BUTTON_F '1 1 1'
@@ -43,3 +44,6 @@
TOLERANCE_SLIDER '0.2 2 0'
WIDTH_SCROLLBAR 16
WIDTH_SLIDERTEXT 0.333333333333
+SIZE_CURSOR '32 32 0'
+OFFSET_CURSOR '0 0 0'
+ALPHA_CURSOR_INTRO 0
Modified: trunk/data/gfx/menu/xaw/cursor.tga
===================================================================
(Binary files differ)
Modified: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt 2008-01-03 01:06:41 UTC (rev 3090)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt 2008-01-03 08:20:40 UTC (rev 3091)
@@ -1,5 +1,6 @@
ALPHAS_MAINMENU '1 1 1'
ALPHA_DISABLED 0.2
+ALPHA_BEHIND 1
COLOR_BUTTON_C '1 1 1'
COLOR_BUTTON_D '1 1 1'
COLOR_BUTTON_F '1 1 1'
@@ -43,3 +44,6 @@
TOLERANCE_SLIDER '0.2 2 0'
WIDTH_SCROLLBAR 16
WIDTH_SLIDERTEXT 0.333333333333
+SIZE_CURSOR '32 32 0'
+OFFSET_CURSOR '0.5 0.5 0'
+ALPHA_CURSOR_INTRO 1
Modified: trunk/data/qcsrc/menu-div0test/draw.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/draw.qc 2008-01-03 01:06:41 UTC (rev 3090)
+++ trunk/data/qcsrc/menu-div0test/draw.qc 2008-01-03 08:20:40 UTC (rev 3091)
@@ -1,5 +1,7 @@
float drawfont;
string draw_mousepointer;
+vector draw_mousepointer_offset;
+vector draw_mousepointer_size;
string draw_UseSkinFor(string pic)
{
@@ -9,14 +11,16 @@
return strcat(draw_currentSkin, "/", pic);
}
-void draw_setMousePointer(string pic)
+void draw_setMousePointer(string pic, vector theSize, vector theOffset)
{
draw_mousepointer = strzone(draw_UseSkinFor(pic));
+ draw_mousepointer_size = theSize;
+ draw_mousepointer_offset = eX * (theOffset_x * theSize_x) + eY * (theOffset_y * theSize_y);
}
void draw_drawMousePointer(vector where)
{
- drawpic(boxToGlobal(where, draw_shift, draw_scale), draw_mousepointer, '32 32 0', '1 1 1', draw_alpha, 0);
+ drawpic(boxToGlobal(where, draw_shift, draw_scale) - draw_mousepointer_offset, draw_mousepointer, draw_mousepointer_size, '1 1 1', draw_alpha, 0);
}
void draw_reset()
Modified: trunk/data/qcsrc/menu-div0test/draw.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/draw.qh 2008-01-03 01:06:41 UTC (rev 3090)
+++ trunk/data/qcsrc/menu-div0test/draw.qh 2008-01-03 08:20:40 UTC (rev 3091)
@@ -3,7 +3,7 @@
float draw_alpha;
void draw_reset();
-void draw_setMousePointer(string pic);
+void draw_setMousePointer(string pic, vector theSize, vector theOffset);
void draw_drawMousePointer(vector where);
void draw_PreloadPicture(string pic);
Modified: trunk/data/qcsrc/menu-div0test/menu.qc
===================================================================
--- trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-03 01:06:41 UTC (rev 3090)
+++ trunk/data/qcsrc/menu-div0test/menu.qc 2008-01-03 08:20:40 UTC (rev 3091)
@@ -54,13 +54,14 @@
Skin_ApplySetting(argv(0), argv(1));
fclose(fh);
- draw_setMousePointer("cursor");
+ draw_setMousePointer("cursor", SKINSIZE_CURSOR, SKINOFFSET_CURSOR);
main = spawnMainWindow(); main.configureMainWindow(main);
draw_reset();
main.resizeNotify(main, draw_shift, draw_scale, draw_shift, draw_scale);
main.focused = 1;
menuShiftState = 0;
+ menuMousePos = '0.5 0.5 0';
if(Menu_Active)
m_display(); // delayed menu display
@@ -195,7 +196,7 @@
draw_reset();
- if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER)))
+ if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER)) && menuLogoAlpha > 0)
{
vector sz;
vector isz;
@@ -216,6 +217,12 @@
isz_y = isz_x * (sz_y / sz_x) * (draw_scale_x / draw_scale_y);
}
draw_Picture('0.5 0.5 0' - 0.5 * isz, SKINGFX_BACKGROUND, isz, '1 1 1', bound(0, menuLogoAlpha, 1));
+ if(menuAlpha <= 0 && SKINALPHA_CURSOR_INTRO > 0)
+ {
+ draw_alpha = SKINALPHA_CURSOR_INTRO * bound(0, menuLogoAlpha, 1);
+ draw_drawMousePointer(menuMousePos);
+ draw_alpha = 1;
+ }
}
if(menuAlpha <= 0)
@@ -244,6 +251,7 @@
}
}
main.draw(main);
+ draw_alpha = max(draw_alpha, SKINALPHA_CURSOR_INTRO * bound(0, menuLogoAlpha, 1));
draw_drawMousePointer(menuMousePos);
frametime = 0;
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2008-01-03 01:06:41 UTC (rev 3090)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c 2008-01-03 08:20:40 UTC (rev 3091)
@@ -4,6 +4,7 @@
ATTRIB(MainWindow, mutatorsDialog, entity, NULL)
ATTRIB(MainWindow, mapInfoDialog, entity, NULL)
ATTRIB(MainWindow, userbindEditDialog, entity, NULL)
+ ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
ENDCLASS(MainWindow)
#endif
Modified: trunk/data/qcsrc/menu-div0test/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin-customizables.inc 2008-01-03 01:06:41 UTC (rev 3090)
+++ trunk/data/qcsrc/menu-div0test/skin-customizables.inc 2008-01-03 08:20:40 UTC (rev 3091)
@@ -66,6 +66,7 @@
SKINVECTOR(COLOR_MAPLIST_AUTHOR, '0.4 0.4 0.7');
SKINFLOAT(ALPHA_DISABLED, 0.2);
+ SKINFLOAT(ALPHA_BEHIND, 0.5);
SKINSTRING(GFX_CHARMAP, "charmap");
SKINSTRING(GFX_CHARMAP_SELECTED, "charmapbutton");
@@ -73,4 +74,8 @@
SKINSTRING(GFX_BACKGROUND, "background");
SKINVECTOR(ALPHAS_MAINMENU, '0.6 0.8 0.9');
+
+ SKINVECTOR(SIZE_CURSOR, '32 32 0');
+ SKINVECTOR(OFFSET_CURSOR, '0 0 0');
+ SKINFLOAT(ALPHA_CURSOR_INTRO, 0);
SKINEND
More information about the nexuiz-commits
mailing list