From bf1c1947d752e1f4d18d77b3190691d8244bc91f Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Mon, 25 Jun 2012 14:28:21 -0700 Subject: [PATCH] PATH-743: Updating the cursors for path testing mode to final designs. --- indra/llcommon/llcursortypes.cpp | 2 ++ indra/llcommon/llcursortypes.h | 2 ++ indra/llwindow/llwindowwin32.cpp | 2 ++ indra/newview/CMakeLists.txt | 2 ++ indra/newview/llpathfindingpathtool.cpp | 22 ++++++++++++++---- indra/newview/res/lltoolpathfinding.cur | Bin 4286 -> 2238 bytes .../newview/res/lltoolpathfindingpathend.cur | Bin 4286 -> 2238 bytes .../res/lltoolpathfindingpathendadd.cur | Bin 0 -> 2238 bytes .../res/lltoolpathfindingpathstart.cur | Bin 4286 -> 2238 bytes .../res/lltoolpathfindingpathstartadd.cur | Bin 0 -> 2238 bytes indra/newview/res/viewerRes.rc | 4 +++- 11 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 indra/newview/res/lltoolpathfindingpathendadd.cur create mode 100644 indra/newview/res/lltoolpathfindingpathstartadd.cur diff --git a/indra/llcommon/llcursortypes.cpp b/indra/llcommon/llcursortypes.cpp index c0676f8c13..ec60097195 100644 --- a/indra/llcommon/llcursortypes.cpp +++ b/indra/llcommon/llcursortypes.cpp @@ -71,7 +71,9 @@ ECursorType getCursorFromString(const std::string& cursor_string) cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN; cursor_string_table["UI_CURSOR_TOOLPATHFINDING"] = UI_CURSOR_TOOLPATHFINDING; cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHSTART"] = UI_CURSOR_TOOLPATHFINDING_PATH_START; + cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHSTARTADD"] = UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD; cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHEND"] = UI_CURSOR_TOOLPATHFINDING_PATH_END; + cursor_string_table["UI_CURSOR_TOOLPATHFINDINGPATHENDADD"] = UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD; cursor_string_table["UI_CURSOR_TOOLNO"] = UI_CURSOR_TOOLNO; } diff --git a/indra/llcommon/llcursortypes.h b/indra/llcommon/llcursortypes.h index f47a328f77..cb6d6636a0 100644 --- a/indra/llcommon/llcursortypes.h +++ b/indra/llcommon/llcursortypes.h @@ -67,7 +67,9 @@ enum ECursorType { UI_CURSOR_TOOLOPEN, UI_CURSOR_TOOLPATHFINDING, UI_CURSOR_TOOLPATHFINDING_PATH_START, + UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD, UI_CURSOR_TOOLPATHFINDING_PATH_END, + UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD, UI_CURSOR_TOOLNO, UI_CURSOR_COUNT // Number of elements in this enum (NOT a cursor) }; diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 5f637bc6f1..be0f8bc7af 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -1699,8 +1699,10 @@ void LLWindowWin32::initCursors() mCursor[ UI_CURSOR_TOOLBUY ] = LoadCursor(module, TEXT("TOOLBUY")); mCursor[ UI_CURSOR_TOOLOPEN ] = LoadCursor(module, TEXT("TOOLOPEN")); mCursor[ UI_CURSOR_TOOLPATHFINDING ] = LoadCursor(module, TEXT("TOOLPATHFINDING")); + mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHSTARTADD")); mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_START ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHSTART")); mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_END ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHEND")); + mCursor[ UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD ] = LoadCursor(module, TEXT("TOOLPATHFINDINGPATHENDADD")); mCursor[ UI_CURSOR_TOOLNO ] = LoadCursor(module, TEXT("TOOLNO")); // Color cursors diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 6358464fb0..ac0b0c0351 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1342,7 +1342,9 @@ if (WINDOWS) res/lltoolpan.cur res/lltoolpathfinding.cur res/lltoolpathfindingpathend.cur + res/lltoolpathfindingpathendadd.cur res/lltoolpathfindingpathstart.cur + res/lltoolpathfindingpathstartadd.cur res/lltoolpipette.cur res/lltoolrotate.cur res/lltoolscale.cur diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp index 82426920d8..fde2257777 100644 --- a/indra/newview/llpathfindingpathtool.cpp +++ b/indra/newview/llpathfindingpathtool.cpp @@ -72,11 +72,11 @@ BOOL LLPathfindingPathTool::handleMouseDown(S32 pX, S32 pY, MASK pMask) { if (isPointAModKeys(pMask)) { - gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START); + gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD); } else if (isPointBModKeys(pMask)) { - gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END); + gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD); } computeFinalPoints(pX, pY, pMask); mIsLeftMouseButtonHeld = true; @@ -169,11 +169,25 @@ BOOL LLPathfindingPathTool::handleHover(S32 pX, S32 pY, MASK pMask) { if (isPointAModKeys(pMask)) { - gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START); + if (mIsLeftMouseButtonHeld) + { + gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START_ADD); + } + else + { + gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_START); + } } else if (isPointBModKeys(pMask)) { - gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END); + if (mIsLeftMouseButtonHeld) + { + gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END_ADD); + } + else + { + gViewerWindow->setCursor(UI_CURSOR_TOOLPATHFINDING_PATH_END); + } } computeTempPoints(pX, pY, pMask); returnVal = TRUE; diff --git a/indra/newview/res/lltoolpathfinding.cur b/indra/newview/res/lltoolpathfinding.cur index 40c5a40905c8a270e2692688cce66dc81ff6673a..2aba2daa45a671f069ed52348822f53219d73755 100644 GIT binary patch literal 2238 zcmc)LJ4_T&6b9gbg&2GU9fOZ(Ay^O-*DTXu#lup?WXHw_R#K?lOhSy{M!^ zoe*tw$5*NNNYrXGYGDXSh*GG9;|nDcfB#vQon6>PIxo4qGxwhF+;eAU2VfausI3Lo z>hF3LumQk!bq%3aJq8V`bysG;WsLufL07esG9waP>aLyC% zAmKeE{1GDS!Ze!`z)txVc}u=S{*-*L{3ZDz`8)EDIfa)~xM*gk*JNXatpXH|te4<|4->vPpYx|wre!sSVL)(7> z@TCF1F~KnleD8oCT`=&#DL-F-qDEeq&Tf!zmftV0T)|2CE(7c{!K)T{%K;y`%ISfV ze&j3U^=#V9DM=X{ZSu$DPs{hqUz5Kh|3Lnkyw-F_N?_9??jW$00cL1lQV3=_%_7{phT_-+wX4)N0^raj`fA3eWYcwdEYv<0nrsQ4@lo;Nb@Gz^GZiTH3R-$J}FLD6*i`Pi&1=X0}V zrWeO^v*qw?h2>`dv2qsYR>*I4?qF`^x$}A7g{ey|pB>8umAZ1_RL3l$}#P;%&;lZN1C~_$$`X650hAYVKn7UrC-8jqP z$`IR&Govy53X}-^40np z?i3uOzs15FkiJMfkpu>j$fH8R@lGTnvKJ{2B1OkV|>ah*V0D2j+@7N=jrz HPPFj^8@elO diff --git a/indra/newview/res/lltoolpathfindingpathend.cur b/indra/newview/res/lltoolpathfindingpathend.cur index df8d56d205fed56059e5fe17bce77e9d5e22cec2..e951a6956ba90a7fd4739479e48d3a54b570ebc3 100644 GIT binary patch literal 2238 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 literal 0 HcmV?d00001 diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 0b469c8d81..df75f3f697 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -124,7 +124,9 @@ TOOLOPEN CURSOR "toolopen.cur" TOOLSIT CURSOR "toolsit.cur" TOOLPATHFINDING CURSOR "lltoolpathfinding.cur" TOOLPATHFINDINGPATHSTART CURSOR "lltoolpathfindingpathstart.cur" -TOOLPATHFINDINGPATHEND CURSOR "lltoolpathfindingpathend.cur" +TOOLPATHFINDINGPATHSTARTADD CURSOR "lltoolpathfindingpathstartadd.cur" +TOOLPATHFINDINGPATHEND CURSOR "lltoolpathfindingpathend.cur" +TOOLPATHFINDINGPATHENDADD CURSOR "lltoolpathfindingpathendadd.cur" TOOLNO CURSOR "llno.cur" /////////////////////////////////////////////////////////////////////////////