| Age | Commit message (Collapse) | Author |
|---|
|
Review #46
This also adds a feature where llpanelprimmediacontrols remembers
the object/face that you've zoomed in on, and only switches the
zoom/unzoom icon to "unzoom" if the object/face you are hovering over
is actually the object/face you are zoomed in on
|
|
Added an optional reset_camera parameter to LLPanelPrimMediaControls ::resetZoomLevel(). Default is true, but if false it prevents the reset from moving the camera, and just resets the internal state for zoom tracking.
Fixed zoom-related bugs in LLPanelPrimMediaControls::close() and LLPanelPrimMediaControls::onClickZoom().
Changed the zooming behavior in LLViewerMediaFocus to match the desired behavior.
|
|
This code seems to work on some objects and not on others. I suspect I'm not doing something quite right in LLVOVolume::getApproximateFaceNormal().
|
|
Media focus is still tracked separately from LLSelectMgr (which was a change made during a refactor a while ago), but LLViewerMediaFocus now keeps LLSelectMgr updated with the current media focus when it changes.
Added a special case for media focus to LLSelectMgr::deselectAllIfTooFar(), since it was making the focus ring not show up when media focus was on distant media.
|
|
to be closer to spec-compliant, per a design discussion this afternoon.
|
|
media impl the media controls are currently referencing (either focus or hover).
|
|
holding the media.
|
|
keyboard focus if the object had it in the first place.
|
|
Made LLViewerMediaFocus::update clear inworld media focus if LLViewerMediaFocus has lost keyboard focus to anything besides the media controls, or LLToolMgr::inBuildMode() returns true.
Also, never fade the media controls if they have keyboard focus (this fixes the media controls fading out while the user is trying to type an URL).
|
|
modifiers.
|
|
|
|
|
|
This change completely restructures the media controls XUI
so that it is now more flexible so as to implement mini vs.
standard controls. It also now allows for changes based
on artwork and design still as unyet delivered from 80/20,
as well as any feedback from Brian's user testing.
This is also step 1 of renaming the media "hud" to media "controls"
|
|
|
|
to most user events and using new scroll wheel event.
|
|
LLViewerMediaFocus now tracks two separate objects: the currently focused media object, and the media object that's currently being hovered over. It no longer stores smart pointers to either the LLViewerObject or the LLViewerMediaImpl -- it now looks up both by UUID every time they're needed, and fails gracefully if either goes away. This will prevent it from keeping objects from being deleted.
The poorly-understood "mouseOverFlag" has been expunged.
LLViewerMediaFocus no longer uses LLSelectMgr at all. The object to focus on is explicitly passed between LLViewerMediaFocus and LLPanelMediaHUD instead of going indirectly through the selection manager.
LLViewerMediaFocus also no longer interacts with the pick from LLToolPie -- the data it needs from the pick (the object and normal vector) is passed explicitly.
LLViewerMediaFocus::setCameraZoom and LLViewerMediaFocus::getBBoxAspectRatio now have no dependencies on the LLViewerMediaFocus object -- all the data they need is passed in when they're called by the LLPanelMediaHUD. I made them static member functions, but they could be moved to LLPanelMediaHUD or even made into file-scoped static functions. The only reason I didn't do either of those is that it seems like they belong with the LLViewerMediaFocus code as opposed to the HUD.
|
|
|
|
normal is vertical
Review #21
This attempts to tweak the target camera position slightly towards where the camera started from, so as to avoid the flip noted in this JIRA.
|
|
Escape key cancels zoom, zoom in closer
I also refactored the code a little to be able to
experiment with more zoom levels.
Review #13
|
|
the scrollEvent() API's x and y are not the same as
handleScrollWheel's x and y. The latter is the position of the mouse
at the time of the event. The former is the 'scroll amount' in x and
y, respectively. All we have for 'scroll amount' here is 'clicks', and
no mask.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
|
|
NOTE: Temporary fix that may break MOAP behavior. Needs to be reviewd and potentially designed.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
|
