Commit Graph
100 Commits
Author SHA1 Message Date
Glenn Maynard dca00042c2 fix segfault when unbound keys are pressed 2006-01-27 08:15:46 +00:00
Glenn Maynard d522ac5146 better assert 2006-01-27 02:00:47 +00:00
Glenn Maynard 322f713e89 cleanup 2006-01-27 00:59:42 +00:00
Glenn Maynard 89a1e0c79e cleanup 2006-01-27 00:58:20 +00:00
Glenn Maynard 9b6d31b8e9 cleanup 2006-01-26 06:21:57 +00:00
Glenn Maynard 88f525bbca converge keyboard mappings on this screen to one place
allow changing the global offset while in a course
2006-01-26 06:12:25 +00:00
Glenn Maynard 73afc606b5 reverse comment 2006-01-26 05:55:19 +00:00
Glenn Maynard 77937ea410 cleanup 2006-01-26 05:53:29 +00:00
Glenn Maynard 17ac1647fd cleanup 2006-01-25 09:42:26 +00:00
Glenn Maynard 5ea602e4a2 hack to fix RowType_Exit in NAV_THREE_KEY_MENU 2006-01-25 09:38:58 +00:00
Glenn Maynard 15ede4e845 fix m_iVertSpacing in copy 2006-01-25 09:32:24 +00:00
Glenn Maynard b62dd12a09 update 2006-01-25 06:26:38 +00:00
Glenn Maynard e8c45e19c6 simplify 2006-01-25 06:25:11 +00:00
Glenn Maynard f85136f2a8 fix up and simplify prepared screen logic 2006-01-25 06:24:22 +00:00
Glenn Maynard 0f113604b4 cleanup 2006-01-25 06:23:06 +00:00
Glenn Maynard 8afaed1ce0 cleanup 2006-01-25 06:19:29 +00:00
Glenn Maynard 09f84e916a compile fix 2006-01-25 05:54:32 +00:00
Glenn Maynard 21bc8586cd split out ScreenManager::ActivatePreparedScreenAndBackground (no real logic change) 2006-01-25 05:49:49 +00:00
Glenn Maynard 89b64ca257 do PushLoadedScreen earlier 2006-01-25 05:47:22 +00:00
Glenn Maynard a4c8b8d91d cleanup (remove old transition note) 2006-01-25 05:38:14 +00:00
Glenn Maynard 82f56ff696 Tween.cpp:29: warning: ‘struct TweenLinear’ has virtual functions but non-virtual destructor 2006-01-25 05:14:06 +00:00
Glenn Maynard 70f9566313 bind ConcurrentlyPrepareScreen 2006-01-25 05:10:40 +00:00
Glenn Maynard 27b6663832 fix HDC leak of 2 HDCs per LoadWin32Surface call
(this may be a permanent resource leak in Win98)
2006-01-24 21:32:43 +00:00
Glenn Maynard 1a070c7a0c fix comment 2006-01-24 21:15:35 +00:00
Glenn Maynard 477c0dfac9 commenting out DECLARE_ONE lines alone didn't always work, since
gameplay lines and debug lines would get mixed up; g_Mappings had
to be adjusted too
2006-01-24 06:34:53 +00:00
Glenn Maynard 588f6e413d holdForSlow, holdForFast 2006-01-24 06:18:09 +00:00
Glenn Maynard c0761375cf cleanup 2006-01-24 06:09:25 +00:00
Glenn Maynard e363fa64e9 cleanup 2006-01-24 05:07:30 +00:00
Glenn Maynard cc952be781 fix ActorParam::Release 2006-01-24 04:56:29 +00:00
Glenn Maynard 7e47dd8dce do sticky slow/halt without actually pressing keys 2006-01-24 04:44:15 +00:00
Glenn Maynard c466fba954 cleanup 2006-01-24 04:41:47 +00:00
Glenn Maynard b45b377fa4 revert SubscriptionManager. It makes the line order nondeterministic. 2006-01-24 04:18:05 +00:00
Glenn Maynard 3461ff8901 do `, tab support in ScreenDebugOverlay 2006-01-24 04:10:21 +00:00
Glenn Maynard a48406b097 use SubscriptionManager 2006-01-24 04:06:05 +00:00
Glenn Maynard 477260c83e add Get() 2006-01-24 04:04:20 +00:00
Glenn Maynard 86aebecbdb namespace 2006-01-24 03:53:17 +00:00
Glenn Maynard 8ce8c3f1cc typo 2006-01-24 03:46:57 +00:00
Glenn Maynard ea3365391b ActorFrame:propagatecommand 2006-01-24 02:10:50 +00:00
Glenn Maynard 244e79fc78 Exit Editor 2006-01-24 01:36:51 +00:00
Glenn Maynard 2a94c0bd8d "exit" is ambiguous, and gets confused with the normal "Exit" row,
which has no text
2006-01-24 01:35:38 +00:00
Glenn Maynard 7e6d70e6b1 space out more (don't want to metric-ize this just now) 2006-01-24 01:13:15 +00:00
Glenn Maynard a40813dec0 add vertspacing 2006-01-24 01:12:54 +00:00
Glenn Maynard 4dfd0d1d7c simplify 2006-01-24 01:04:53 +00:00
Glenn Maynard 39bf48696a cleanup 2006-01-24 01:02:21 +00:00
Glenn Maynard 63368f99da cleanup 2006-01-24 01:00:49 +00:00
Glenn Maynard 6fecb35dfa simplify 2006-01-24 00:24:15 +00:00
Glenn Maynard aec1385061 Actor:smooth 2006-01-23 06:54:23 +00:00
Glenn Maynard 3da3825e20 remove TWEEN_SMOOTH. Use Bezier. 2006-01-23 06:53:11 +00:00
Glenn Maynard b9f4fb36be update 2006-01-23 05:50:22 +00:00
Glenn Maynard 27327ff6c3 ease, bouncebegin, bounceend 2006-01-23 05:49:22 +00:00
Glenn Maynard a62788fb9f Split out tween weighting functions. Add tweening from 1d and 2d
bezier curves.

The "bouncebegin" and "bounceend" tweens are now implemented in Lua,
using 2D beziers which approximate the old behavior very closely.
Added "ease" tween, which works like Flash's.

Custom tweens can be used, passing in a table of 4 values for a
1D bezier, or 8 values for 2D.

   tween,.5,TweenBezier,{ 0, p1, p2, 1 }
   tween,.5,TweenBezier,{ 0, 0, x1, y1, x2, y2, 1, 1 }

As with all tweens, the first parameter is the duration.

The 1D bezier { a, b, c, d } is equivalent to the 2D bezier
{ 0, a, 1/3, b, 2/3, c, 1, d }, but a 1D bezier is more efficient.
2006-01-23 05:48:40 +00:00
Glenn Maynard 9190f037d4 Very few places use BounceBegin and BounceEnd in code. I want these
tween types to only be used in commands, not in code.  If anyone
is strongly attached to these tweens being BounceBegin, the complete
fix is to update this code so it uses ON_COMMAND/OFF_COMMAND.  (GroupList
is probably going to be removed, anyway, since music wheel sections
make it obsolete.)
2006-01-23 05:13:52 +00:00
Glenn Maynard 9e53044d00 remove Actor:: qualifier 2006-01-23 04:42:12 +00:00
Glenn Maynard 6e03ec1998 use lerp() 2006-01-23 03:37:25 +00:00
Glenn Maynard 075ada3a71 cleanup 2006-01-23 03:03:01 +00:00
Glenn Maynard f9361c9036 interp -> lerp ("interp" doesn't imply linear) 2006-01-21 07:26:20 +00:00
Glenn Maynard 996477feae rename ReloadMetricsAndUpdateLua -> ReloadScreenDimensions 2006-01-21 01:15:09 +00:00
Glenn Maynard 5f7d26addd move DisplayAspectRatio 2006-01-20 22:44:28 +00:00
Glenn Maynard 58c79217df cleanup 2006-01-20 22:16:10 +00:00
Glenn Maynard 3bf20452b9 don't use debug CRTs 2006-01-20 19:43:41 +00:00
Glenn Maynard a62f9d62f2 cleanup 2006-01-20 08:54:46 +00:00
Glenn Maynard 409bc25090 simplify, use GetNextScreen 2006-01-20 06:41:15 +00:00
Glenn Maynard f1f76f4c75 unused 2006-01-20 06:35:51 +00:00
Glenn Maynard f3d3100d36 cleanup 2006-01-20 06:30:13 +00:00
Glenn Maynard a0d32887b4 unused 2006-01-20 06:27:06 +00:00
Glenn Maynard 02bae15b84 add interp() 2006-01-20 06:21:07 +00:00
Glenn Maynard e39f1499e2 cleanup 2006-01-20 06:07:37 +00:00
Glenn Maynard aeee577a35 cleanup 2006-01-20 05:14:31 +00:00
Glenn Maynard b11705de07 When we get D3DERR_DEVICENOTRESET, we should go back to the mode
we were in when we lost the device, not do a complete mode search
from scratch.  This fixes a dependency on the behavior of storing
the last successful mode change back into PREFSMAN.  (This is
D3D's equivalent to the WM_ACTIVATE -> ChangeDisplaySettings code
in GraphicsWindow.)
2006-01-20 00:16:26 +00:00
Glenn Maynard 626427c00c clear g_TexResourceToPaletteIndex in SetD3DParams 2006-01-19 23:59:17 +00:00
Glenn Maynard fbdfd26ae1 split out SetPresentParametersFromVideoModeParams to make
RageDisplay_D3D::TryVideoMode clearer
2006-01-19 23:57:40 +00:00
Glenn Maynard 7e5975597f cleanup 2006-01-19 22:40:06 +00:00
Glenn Maynard 466bfb054c cleanup 2006-01-19 22:38:30 +00:00
Glenn Maynard 8d427e7a65 simplify 2006-01-19 08:58:40 +00:00
Glenn Maynard 80532a1ef8 typo 2006-01-19 07:59:59 +00:00
Glenn Maynard 235e9d622b use GetChoiceInRowWithFocus instead of m_iChoiceInRowWithFocus directly 2006-01-19 07:47:31 +00:00
Glenn Maynard 4e7e062d4e when LAYOUT_SHOW_ONE_IN_ROW, m_Underline will only have one entry anyway 2006-01-19 07:43:47 +00:00
Glenn Maynard 91a52982e4 simplify 2006-01-19 07:32:42 +00:00
Glenn Maynard 5a3356e94e fix inactive underlines showing 2006-01-19 06:02:52 +00:00
Glenn Maynard 078017317c fix NAV_TOGGLE_FIVE_KEY focus navigation 2006-01-19 04:32:31 +00:00
Glenn Maynard b52e776f36 remove def param; use m_Def 2006-01-19 03:43:29 +00:00
Glenn Maynard bc138aa563 def is always m_Def 2006-01-19 03:36:06 +00:00
Glenn Maynard 55958c952d err 2006-01-19 03:21:57 +00:00
Glenn Maynard 7e261bb44b merge code paths 2006-01-19 01:56:40 +00:00
Glenn Maynard f3545a331d use the more standard AfterImportOptions code path, not PositionUnderlines
directly
2006-01-19 01:54:25 +00:00
Glenn Maynard 544733b287 don't have to import both players at once, so AfterImportOptions takes pn 2006-01-19 01:52:18 +00:00
Glenn Maynard 7e005dfbb9 simplify 2006-01-19 01:27:02 +00:00
Glenn Maynard e87e8d77e4 update m_textTitle when choices change, eg. on load and reload--don't need to do it on import 2006-01-19 01:25:09 +00:00
Glenn Maynard 8da0e94aa2 UpdateText is used when the focus changes, so call it from
SetChoiceInRowWithFocus.
2006-01-19 01:23:14 +00:00
Glenn Maynard 10106ba600 remove redundant SetChoiceInRowWithFocus call 2006-01-19 01:17:07 +00:00
Glenn Maynard 054cfa98d8 use pn 2006-01-19 01:15:12 +00:00
Glenn Maynard 41f8a34c9f fewer code paths to set m_iChoiceInRowWithFocus 2006-01-19 01:14:59 +00:00
Glenn Maynard 8bcf6e8b12 fewer code paths to set m_iChoiceInRowWithFocus 2006-01-19 01:14:31 +00:00
Glenn Maynard 74bf033fe7 comment 2006-01-19 01:11:23 +00:00
Glenn Maynard b158147319 pull pn loop out of UpdateText 2006-01-19 01:01:13 +00:00
Glenn Maynard 24cd1d3242 pull pn loop out of UpdateText 2006-01-19 01:00:13 +00:00
Glenn Maynard b98fa213b5 only used in one place (makes it hard to see exactly where PositionUnderlines itself is used) 2006-01-19 00:42:50 +00:00
Glenn Maynard 0b1ca16baf underline position depends on the focus (in LAYOUT_SHOW_ONE_IN_ROW), so set it after ResetFocusFromSelection 2006-01-19 00:33:48 +00:00
Glenn Maynard f3c94e55c6 cleanup 2006-01-19 00:31:05 +00:00
Glenn Maynard 49b5375af8 Split out ResetFocusFromSelection.
Don't reset m_iChoiceInRowWithFocus in ResetFocusFromSelection
for SELECT_MULTIPLE or SELECT_NONE.  That's done by ChoicesChanged.
2006-01-19 00:29:22 +00:00