X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fitem%2Fslider.qc;h=2e89bb68ee21e7356dcc906653a73c9a35b385c1;hp=4654425431199bb1913b0c4ee54fefeac866f7db;hb=109c5785a22fb4336ac5e91d5f1fa91678582164;hpb=1217fce596f1b9769ffb6f479e3abbd4f77af5ef

diff --git a/qcsrc/menu/item/slider.qc b/qcsrc/menu/item/slider.qc
index 465442543..2e89bb68e 100644
--- a/qcsrc/menu/item/slider.qc
+++ b/qcsrc/menu/item/slider.qc
@@ -1,303 +1,264 @@
-// Note:
-//   to use this, you FIRST call configureSliderVisuals, then configureSliderValues
-#ifndef ITEM_SLIDER_H
-#define ITEM_SLIDER_H
-#include "label.qc"
-CLASS(Slider, Label)
-	METHOD(Slider, resizeNotify, void(entity, vector, vector, vector, vector));
-	METHOD(Slider, configureSliderVisuals, void(entity, float, float, float, string));
-	METHOD(Slider, configureSliderValues, void(entity, float, float, float, float, float, float));
-	METHOD(Slider, draw, void(entity));
-	METHOD(Slider, keyDown, float(entity, float, float, float));
-	METHOD(Slider, keyUp, float(entity, float, float, float));
-	METHOD(Slider, mousePress, float(entity, vector));
-	METHOD(Slider, mouseDrag, float(entity, vector));
-	METHOD(Slider, mouseRelease, float(entity, vector));
-	METHOD(Slider, valueToText, string(entity, float));
-	METHOD(Slider, toString, string(entity));
-	METHOD(Slider, setValue, void(entity, float));
-	METHOD(Slider, setSliderValue, void(entity, float));
-	METHOD(Slider, showNotify, void(entity));
-	ATTRIB(Slider, src, string, string_null)
-	ATTRIB(Slider, focusable, float, 1)
-	ATTRIB(Slider, allowFocusSound, float, 1)
-	ATTRIB(Slider, value, float, 0)
-	ATTRIB(Slider, animated, float, 1)
-	ATTRIB(Slider, sliderValue, float, 0)
-	ATTRIB(Slider, valueMin, float, 0)
-	ATTRIB(Slider, valueMax, float, 0)
-	ATTRIB(Slider, valueStep, float, 0)
-	ATTRIB(Slider, valueDigits, float, 0)
-	ATTRIB(Slider, valueKeyStep, float, 0)
-	ATTRIB(Slider, valuePageStep, float, 0)
-	ATTRIB(Slider, valueDisplayMultiplier, float, 1.0)
-	ATTRIB(Slider, textSpace, float, 0)
-	ATTRIB(Slider, controlWidth, float, 0)
-	ATTRIB(Slider, pressed, float, 0)
-	ATTRIB(Slider, pressOffset, float, 0)
-	ATTRIB(Slider, previousValue, float, 0)
-	ATTRIB(Slider, tolerance, vector, '0 0 0')
-	ATTRIB(Slider, disabled, float, 0)
-	ATTRIB(Slider, color, vector, '1 1 1')
-	ATTRIB(Slider, color2, vector, '1 1 1')
-	ATTRIB(Slider, colorD, vector, '1 1 1')
-	ATTRIB(Slider, colorC, vector, '1 1 1')
-	ATTRIB(Slider, colorF, vector, '1 1 1')
-	ATTRIB(Slider, disabledAlpha, float, 0.3)
-ENDCLASS(Slider)
-#endif
+#include "slider.qh"
 
-#ifdef IMPLEMENTATION
-void Slider_setValue(entity me, float val)
-{
-	if (me.animated) {
-		anim.removeObjAnim(anim, me);
-		makeHostedEasing(me, Slider_setSliderValue, easingQuadInOut, 1, me.sliderValue, val);
-	} else {
-		me.setSliderValue(me, val);
-	}
-	me.value = val;
-}
-void Slider_setSliderValue(entity me, float val)
-{
-	me.sliderValue = val;
-}
-string Slider_toString(entity me)
-{
-	return sprintf("%d (%s)", me.value, me.valueToText(me, me.value));
-}
-void Slider_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
-{
-	SUPER(Slider).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
-	me.controlWidth = absSize.y / absSize.x;
-}
-string Slider_valueToText(entity me, float val)
-{
-	if(almost_in_bounds(me.valueMin, val, me.valueMax))
-		return ftos_decimals(val * me.valueDisplayMultiplier, me.valueDigits);
-	return "";
-}
-void Slider_configureSliderVisuals(entity me, float sz, float theAlign, float theTextSpace, string gfx)
-{
-	SUPER(Slider).configureLabel(me, string_null, sz, theAlign);
-	me.textSpace = theTextSpace;
-	me.keepspaceLeft = (theTextSpace == 0) ? 0 : (1 - theTextSpace);
-	me.src = gfx;
-}
-void Slider_configureSliderValues(entity me, float theValueMin, float theValue, float theValueMax, float theValueStep, float theValueKeyStep, float theValuePageStep)
-{
-	me.value = theValue;
-	me.sliderValue = theValue;
-	me.valueStep = theValueStep;
-	me.valueMin = theValueMin;
-	me.valueMax = theValueMax;
-	me.valueKeyStep = theValueKeyStep;
-	me.valuePageStep = theValuePageStep;
-	me.valueDigits = 3;
-	if(fabs(floor(me.valueStep * 100 + 0.5) - (me.valueStep * 100)) < 0.01) // about a whole number of 100ths
-		me.valueDigits = 2;
-	if(fabs(floor(me.valueStep * 10 + 0.5) - (me.valueStep * 10)) < 0.01) // about a whole number of 10ths
-		me.valueDigits = 1;
-	if(fabs(floor(me.valueStep * 1 + 0.5) - (me.valueStep * 1)) < 0.01) // about a whole number
-		me.valueDigits = 0;
-}
-float Slider_keyDown(entity me, float key, float ascii, float shift)
-{
-	float inRange;
-	if(me.disabled)
-		return 0;
-	inRange = (almost_in_bounds(me.valueMin, me.value, me.valueMax));
-	if(key == K_LEFTARROW || key == K_KP_LEFTARROW || key == K_MWHEELDOWN)
+#include "../anim/easing.qh"
+#include "../anim/animhost.qh"
+
+.entity applyButton;
+
+	void Slider_setValue_allowAnim(entity me, float val, bool allowAnim)
 	{
-		if(inRange)
-			me.setValue(me, median(me.valueMin, me.value - me.valueKeyStep, me.valueMax));
+		if (allowAnim && me.animated)
+		{
+			float t = 0.5;
+			if (!me.sliderAnim) me.sliderAnim = makeHostedEasing(me, Slider_setSliderValue, easingQuadOut, t, me.sliderValue, val);
+			else me.sliderAnim.update(me.sliderAnim, t, me.sliderValue, val);
+		}
 		else
-			me.setValue(me, me.valueMax);
-		return 1;
+		{
+			me.setSliderValue(me, val);
+		}
+		me.value = val;
 	}
-	if(key == K_RIGHTARROW || key == K_KP_RIGHTARROW || key == K_MWHEELUP)
+	void Slider_setValue_noAnim(entity me, float val)
 	{
-		if(inRange)
-			me.setValue(me, median(me.valueMin, me.value + me.valueKeyStep, me.valueMax));
-		else
-			me.setValue(me, me.valueMin);
-		return 1;
+		Slider_setValue_allowAnim(me, val, false);
 	}
-	if(key == K_PGDN || key == K_KP_PGDN)
+	void Slider_setValue(entity me, float val)
 	{
-		if(inRange)
-			me.setValue(me, median(me.valueMin, me.value - me.valuePageStep, me.valueMax));
-		else
-			me.setValue(me, me.valueMax);
-		return 1;
+		Slider_setValue_allowAnim(me, val, true);
 	}
-	if(key == K_PGUP || key == K_KP_PGUP)
+	void Slider_setSliderValue(entity me, float val)
 	{
-		if(inRange)
-			me.setValue(me, median(me.valueMin, me.value + me.valuePageStep, me.valueMax));
-		else
-			me.setValue(me, me.valueMin);
-		return 1;
+		me.sliderValue = val;
 	}
-	if(key == K_HOME || key == K_KP_HOME)
+	string Slider_toString(entity me)
 	{
-		me.setValue(me, me.valueMin);
-		return 1;
+		return sprintf("%d (%s)", me.value, me.valueToText(me, me.value));
 	}
-	if(key == K_END || key == K_KP_END)
+	void Slider_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 	{
-		me.setValue(me, me.valueMax);
-		return 1;
+		SUPER(Slider).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
+		me.controlWidth = absSize.x == 0 ? 0 : (absSize.y / absSize.x);
 	}
-	// TODO more keys (NOTE also add them to Slider_keyUp)
-	return 0;
-}
-float Slider_keyUp(entity me, float key, float ascii, float shift)
-{
-	if(me.disabled)
-		return 0;
-	switch(key)
+	string Slider_valueToText(entity me, float val)
 	{
-		case K_LEFTARROW:
-		case K_KP_LEFTARROW:
-		case K_RIGHTARROW:
-		case K_KP_RIGHTARROW:
-		case K_PGUP:
-		case K_KP_PGUP:
-		case K_PGDN:
-		case K_KP_PGDN:
-		case K_HOME:
-		case K_KP_HOME:
-		case K_END:
-		case K_KP_END:
-			m_play_click_sound(MENU_SOUND_SLIDE);
+		if (almost_in_bounds(me.valueMin, val, me.valueMax)) return ftos_decimals(val * me.valueDisplayMultiplier, me.valueDigits);
+		return "";
 	}
-	return 0;
-}
-float Slider_mouseDrag(entity me, vector pos)
-{
-	float hit;
-	float v, animed;
-	if(me.disabled)
-		return 0;
-
-	anim.removeObjAnim(anim, me);
-	animed = me.animated;
-	me.animated = false;
-
-	if(me.pressed)
+	void Slider_configureSliderVisuals(entity me, float sz, float theAlign, float theTextSpace, string gfx)
 	{
-		hit = 1;
-		if(pos.x < 0 - me.tolerance.x) hit = 0;
-		if(pos.y < 0 - me.tolerance.y) hit = 0;
-		if(pos.x >= 1 - me.textSpace + me.tolerance.x) hit = 0;
-		if(pos.y >= 1 + me.tolerance.y) hit = 0;
-		if(hit)
-		{
-			v = median(0, (pos.x - me.pressOffset - 0.5 * me.controlWidth) / (1 - me.textSpace - me.controlWidth), 1) * (me.valueMax - me.valueMin) + me.valueMin;
-			if(me.valueStep)
-				v = floor(0.5 + v / me.valueStep) * me.valueStep;
-			me.setValue(me, v);
-		}
-		else
-			me.setValue(me, me.previousValue);
+		SUPER(Slider).configureLabel(me, string_null, sz, theAlign);
+		me.textSpace = theTextSpace;
+		me.keepspaceLeft = (theTextSpace == 0) ? 0 : (1 - theTextSpace);
+		me.src = gfx;
 	}
-
-	me.animated = animed;
-
-	return 1;
-}
-float Slider_mousePress(entity me, vector pos)
-{
-	float controlCenter;
-	if(me.disabled)
-		return 0;
-	if(pos.x < 0) return 0;
-	if(pos.y < 0) return 0;
-	if(pos.x >= 1 - me.textSpace) return 0;
-	if(pos.y >= 1) return 0;
-	controlCenter = (me.value - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth) + 0.5 * me.controlWidth;
-	if(fabs(pos.x - controlCenter) <= 0.5 * me.controlWidth)
+	void Slider_configureSliderValues(entity me, float theValueMin, float theValue, float theValueMax, float theValueStep, float theValueKeyStep, float theValuePageStep)
 	{
-		me.pressed = 1;
-		me.pressOffset = pos.x - controlCenter;
-		me.previousValue = me.value;
-		//me.mouseDrag(me, pos);
+		me.value = theValue;
+		me.sliderValue = theValue;
+		me.valueStep = theValueStep;
+		me.valueMin = theValueMin;
+		me.valueMax = theValueMax;
+		me.valueKeyStep = theValueKeyStep;
+		me.valuePageStep = theValuePageStep;
+		me.valueDigits = 3;
+		if (fabs(floor(me.valueStep * 100 + 0.5) - (me.valueStep * 100)) < 0.01) // about a whole number of 100ths
+			me.valueDigits = 2;
+		if (fabs(floor(me.valueStep * 10 + 0.5) - (me.valueStep * 10)) < 0.01)   // about a whole number of 10ths
+			me.valueDigits = 1;
+		if (fabs(floor(me.valueStep * 1 + 0.5) - (me.valueStep * 1)) < 0.01)     // about a whole number
+			me.valueDigits = 0;
 	}
-	else
+	float Slider_keyDown(entity me, float key, float ascii, float shift)
 	{
-		float clickValue, pageValue, inRange;
-		clickValue = median(0, (pos.x - me.pressOffset - 0.5 * me.controlWidth) / (1 - me.textSpace - me.controlWidth), 1) * (me.valueMax - me.valueMin) + me.valueMin;
+		float inRange;
+		float ret_value = 0;
+		if (me.disabled) return 0;
 		inRange = (almost_in_bounds(me.valueMin, me.value, me.valueMax));
-		if(pos.x < controlCenter)
+		if (key == K_LEFTARROW || key == K_KP_LEFTARROW || key == K_MWHEELDOWN)
 		{
-			pageValue = me.value - me.valuePageStep;
-			if(me.valueStep)
-				clickValue = floor(clickValue / me.valueStep) * me.valueStep;
-			pageValue = max(pageValue, clickValue);
-			if(inRange)
-				me.setValue(me, median(me.valueMin, pageValue, me.valueMax));
-			else
-				me.setValue(me, me.valueMax);
+			if (inRange) me.setValue(me, median(me.valueMin, me.value - me.valueKeyStep, me.valueMax));
+			else me.setValue(me, me.valueMax);
+			ret_value = 1;
 		}
-		else
+		if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW || key == K_MWHEELUP)
+		{
+			if (inRange) me.setValue(me, median(me.valueMin, me.value + me.valueKeyStep, me.valueMax));
+			else me.setValue(me, me.valueMin);
+			ret_value = 1;
+		}
+		if (key == K_PGDN || key == K_KP_PGDN)
+		{
+			if (inRange) me.setValue(me, median(me.valueMin, me.value - me.valuePageStep, me.valueMax));
+			else me.setValue(me, me.valueMax);
+			ret_value = 1;
+		}
+		if (key == K_PGUP || key == K_KP_PGUP)
+		{
+			if (inRange) me.setValue(me, median(me.valueMin, me.value + me.valuePageStep, me.valueMax));
+			else me.setValue(me, me.valueMin);
+			ret_value = 1;
+		}
+		if (key == K_HOME || key == K_KP_HOME)
 		{
-			pageValue = me.value + me.valuePageStep;
-			if(me.valueStep)
-				clickValue = ceil(clickValue / me.valueStep) * me.valueStep;
-			pageValue = min(pageValue, clickValue);
-			if(inRange)
-				me.setValue(me, median(me.valueMin, pageValue, me.valueMax));
+			me.setValue(me, me.valueMin);
+			ret_value = 1;
+		}
+		if (key == K_END || key == K_KP_END)
+		{
+			me.setValue(me, me.valueMax);
+			ret_value = 1;
+		}
+		if(ret_value == 1)
+		{
+			if(me.applyButton)
+				me.applyButton.disabled = false;
+			return 1;
+		}
+		// TODO more keys (NOTE also add them to Slider_keyUp)
+		return 0;
+	}
+	float Slider_keyUp(entity me, float key, float ascii, float shift)
+	{
+		if (me.disabled) return 0;
+		switch (key)
+		{
+			case K_LEFTARROW:
+			case K_KP_LEFTARROW:
+			case K_RIGHTARROW:
+			case K_KP_RIGHTARROW:
+			case K_PGUP:
+			case K_KP_PGUP:
+			case K_PGDN:
+			case K_KP_PGDN:
+			case K_HOME:
+			case K_KP_HOME:
+			case K_END:
+			case K_KP_END:
+				m_play_click_sound(MENU_SOUND_SLIDE);
+		}
+		return 0;
+	}
+	float Slider_mouseDrag(entity me, vector pos)
+	{
+		float hit;
+		float v;
+		if (me.disabled) return 0;
+
+		if (me.pressed)
+		{
+			hit = 1;
+			if (pos.x < 0 - me.tolerance.x) hit = 0;
+			if (pos.y < 0 - me.tolerance.y) hit = 0;
+			if (pos.x >= 1 - me.textSpace + me.tolerance.x) hit = 0;
+			if (pos.y >= 1 + me.tolerance.y) hit = 0;
+			if (hit)
+			{
+				// handle dragging
+				me.pressed = 2;
+
+				v = median(0, (pos.x - me.pressOffset - 0.5 * me.controlWidth) / (1 - me.textSpace - me.controlWidth), 1) * (me.valueMax - me.valueMin) + me.valueMin;
+				if (me.valueStep) v = floor(0.5 + v / me.valueStep) * me.valueStep;
+				me.setValue_noAnim(me, v);
+				if(me.applyButton)
+				if(me.previousValue != me.value)
+					me.applyButton.disabled = false;
+			}
 			else
-				me.setValue(me, me.valueMax);
+			{
+				me.setValue(me, me.previousValue);
+			}
 		}
-		if(pageValue == clickValue)
+
+		return 1;
+	}
+	float Slider_mousePress(entity me, vector pos)
+	{
+		float controlCenter;
+		if (me.disabled) return 0;
+		if (pos.x < 0) return 0;
+		if (pos.y < 0) return 0;
+		if (pos.x >= 1 - me.textSpace) return 0;
+		if (pos.y >= 1) return 0;
+		controlCenter = (me.value - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth) + 0.5 * me.controlWidth;
+		if (fabs(pos.x - controlCenter) <= 0.5 * me.controlWidth)
 		{
-			controlCenter = (me.value - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth) + 0.5 * me.controlWidth;
 			me.pressed = 1;
 			me.pressOffset = pos.x - controlCenter;
 			me.previousValue = me.value;
-			//me.mouseDrag(me, pos);
+			// me.mouseDrag(me, pos);
+		}
+		else
+		{
+			float clickValue, pageValue, inRange;
+			clickValue = median(0, (pos.x - me.pressOffset - 0.5 * me.controlWidth) / (1 - me.textSpace - me.controlWidth), 1) * (me.valueMax - me.valueMin) + me.valueMin;
+			inRange = (almost_in_bounds(me.valueMin, me.value, me.valueMax));
+			if (pos.x < controlCenter)
+			{
+				pageValue = me.value - me.valuePageStep;
+				if (me.valueStep) clickValue = floor(clickValue / me.valueStep) * me.valueStep;
+				pageValue = max(pageValue, clickValue);
+			}
+			else
+			{
+				pageValue = me.value + me.valuePageStep;
+				if (me.valueStep) clickValue = ceil(clickValue / me.valueStep) * me.valueStep;
+				pageValue = min(pageValue, clickValue);
+			}
+			if (inRange) me.setValue(me, median(me.valueMin, pageValue, me.valueMax));
+			else me.setValue(me, me.valueMax);
+			if(me.applyButton)
+				me.applyButton.disabled = false;
+			if (pageValue == clickValue)
+			{
+				controlCenter = (me.value - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth) + 0.5 * me.controlWidth;
+				me.pressed = 1;
+				me.pressOffset = pos.x - controlCenter;
+				me.previousValue = me.value;
+				// me.mouseDrag(me, pos);
+			}
 		}
+		return 1;
 	}
-	return 1;
-}
-float Slider_mouseRelease(entity me, vector pos)
-{
-	me.pressed = 0;
-	if(me.disabled)
-		return 0;
-	m_play_click_sound(MENU_SOUND_SLIDE);
-	return 1;
-}
-void Slider_showNotify(entity me)
-{
-	me.focusable = !me.disabled;
-}
-void Slider_draw(entity me)
-{
-	float controlLeft;
-	float save;
-	me.focusable = !me.disabled;
-	save = draw_alpha;
-	if(me.disabled)
-		draw_alpha *= me.disabledAlpha;
-	draw_ButtonPicture('0 0 0', strcat(me.src, "_s"), eX * (1 - me.textSpace) + eY, me.color2, 1);
-	if(almost_in_bounds(me.valueMin, me.sliderValue, me.valueMax))
+	float Slider_mouseRelease(entity me, vector pos)
 	{
-		controlLeft = (me.sliderValue - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth);
-		if(me.disabled)
-			draw_Picture(eX * controlLeft, strcat(me.src, "_d"), eX * me.controlWidth + eY, me.colorD, 1);
-		else if(me.pressed)
-			draw_Picture(eX * controlLeft, strcat(me.src, "_c"), eX * me.controlWidth + eY, me.colorC, 1);
-		else if(me.focused)
-			draw_Picture(eX * controlLeft, strcat(me.src, "_f"), eX * me.controlWidth + eY, me.colorF, 1);
-		else
-			draw_Picture(eX * controlLeft, strcat(me.src, "_n"), eX * me.controlWidth + eY, me.color, 1);
+		me.pressed = 0;
+		if (me.disabled) return 0;
+		m_play_click_sound(MENU_SOUND_SLIDE);
+		return 1;
+	}
+	void Slider_showNotify(entity me)
+	{
+		me.focusable = !me.disabled;
+	}
+	void Slider_draw(entity me)
+	{
+		float controlLeft;
+		float save;
+		me.focusable = !me.disabled;
+		save = draw_alpha;
+		if (me.disabled) draw_alpha *= me.disabledAlpha;
+		draw_ButtonPicture('0 0 0', strcat(me.src, "_s"), eX * (1 - me.textSpace) + eY, me.color2, 1);
+		if (me.valueMax > me.valueMin) // valid?
+		if (almost_in_bounds(me.valueMin, me.sliderValue, me.valueMax))
+		{
+			controlLeft = (me.sliderValue - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth);
+			if (me.disabled) draw_Picture(eX * controlLeft, strcat(me.src, "_d"), eX * me.controlWidth + eY, me.colorD, 1);
+			else if (me.pressed) draw_Picture(eX * controlLeft, strcat(me.src, "_c"), eX * me.controlWidth + eY, me.colorC, 1);
+			else if (me.focused) draw_Picture(eX * controlLeft, strcat(me.src, "_f"), eX * me.controlWidth + eY, me.colorF, 1);
+			else draw_Picture(eX * controlLeft, strcat(me.src, "_n"), eX * me.controlWidth + eY, me.color, 1);
+		}
+
+		if (me.sliderAnim)
+			if (me.sliderAnim.isFinished(me.sliderAnim))
+			{
+				anim.removeObjAnim(anim, me);
+				me.sliderAnim = NULL;
+			}
+
+		if (me.valueMax > me.valueMin) // valid?
+			me.setText(me, me.valueToText(me, me.value));
+		draw_alpha = save;
+		SUPER(Slider).draw(me);
+		me.text = string_null;  // TEMPSTRING!
 	}
-	me.setText(me, me.valueToText(me, me.value));
-	draw_alpha = save;
-	SUPER(Slider).draw(me);
-	me.text = string_null; // TEMPSTRING!
-}
-#endif