Commit Graph

73 Commits (618bb404fcac4e2b489e5ce3e8bbedd0202a4f2c)

Author SHA1 Message Date
simon 3e6698073c Merge viewer-release and become version 3.7.12 2014-07-07 14:49:45 -07:00
Ricky Curtice 98720c3cec Merge 2014-06-05 06:31:30 -07:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Ricky Curtice befc0efde9 STORM-1920 / STORM-2013: Fixed uniform scaling highlighting at half values.
Re-utilized the technique Richard put in the corner drag code.
2014-03-04 20:59:48 -08:00
Ricky Curtice fe2801fc63 STORM-2017: Added translatable help text to rotation.
I chose the camera’s up vector to place the help text as it provided a consistent location on the screen for the user to see the text pop up.

While doing this I realized that the calls to hud_render_utf8text utilized a condition that was guaranteed to be false based on a surrounding if-statement, and so could trivially be replaced with a constant.
Also cleaned out a compiler warning about unused private member variables in llmaniptranslate.  I don’t like warnings and useless code. :P
2014-03-03 21:50:12 -08:00
Jonathan Yap 840e1da8aa STORM-2017 Untranslatable text appears when scaling, or moving objects 2014-03-03 14:08:26 -05:00
Ricky Curtice 3e09cdefff Fixed compile-time errors. My bad.
Serves me right for not waiting through the compile!
2014-03-02 22:06:24 -08:00
Ricky Curtice 2db27d09c1 Better code documentation. 2014-03-02 16:48:25 -08:00
Ricky Curtice bd41d696de STORM-1920: Corrected bug where snap values would highlight that weren’t supposed to be highlighting. Did some more cleanup and documentation.
Also corrected a bug in Richard’s patch that resulted in the object scaling up when the mouse went the opposite direction from the scale.  The issue is that the vector length is an absolute value.  To allow for "negative" results to be found and discarded, I instead used a dot product with a parallel unit vector to get the signed magnitude - or, if you prefer, the mono-dimensional vector.

This bug only surfaced once the code made to actually work as intended in regards to the highlighting.  Turns out that if the snapped value was at 2, any axis that was showing values would highlight its "2" text - and the same for all other values.
To fix this, I used a simple enum and repurposed the property that tracked whether or not the cursor was in a snap regime.  Now it not only tracks whether or not the cursor is in a snap regime, but which one it is in.  This allowed the highlight render code to be able to differentiate which row was supposed to highlight and which did not.

A couple more duplicated math operations were reduced by rearranging the order of some variable definitions.  If at all possible, only do division once.  The result is much cleaner and easier to read code.
Several deprecated vector functions were updated to match their new versions.  If you are going to mark something deprecated, why not just take the time to go through and find all uses and clean it up!?
faceToUnitVector() was cleaned up to use the single-output design, matching cornerToUnitVector().
A mess of trailing whitespace was cleaned out.
Many more LLManipScale private variables are now documented - though I only documented those I understood fully while reading where they were created and how they were used.
2014-03-02 16:28:38 -08:00
Ricky Curtice 871bae45ba STORM-1920: From Richard, fix for scale sliding when mouse goes in the opposite direction of the scale.
I had discovered a set of bugs in the fix he sent me involving when the user decided to move the mouse in the opposite direction.  This fixes the bug where the scale would start sliding around.
2014-03-02 15:49:17 -08:00
Ricky Curtice e8a2d3b73b Merge 2014-03-02 15:42:18 -08:00
Ricky Curtice e0a015920d STORM-1920: Richard fixed and optimized a ton more math.
From Richard: There are a bunch of things I changed...mainly I eliminated all the grid_offset nonsense and instead simply calculate the tick index for the current drag position and use that to generate a snapped position as needed.  I still use approx_equal because I want grid numbers to light up even when they aren't the axis you are currently snapping to.
2014-03-02 14:33:57 -08:00
Richard Linden 0b9eeb02ab MAINT-2059 FIX Corner scaling doesn't highlight distance text
much cleanup of vector math
also made Stretch Both Sides checkbox clickable via label
2014-02-24 18:36:13 -08:00
Ricky Curtice 12dc73c74d Simple variable cleanup.
There was a lot of repeated division that was obscuring meaning, along with a variable that was always identical to another preexisting variable.  This last was probably an archaism, and was just due for removal.
2014-02-22 22:12:34 -08:00
Ricky Curtice 9f4031edff STORM-1920: Documented the meaning of some of the variables involved, built simplest change to solve issue.
The highlighting code assumed that the axis of the scaling movement was aligned with the scale tick marks - e.g. one of the cardinal directions with respect to the OBB of the selection.  This was and is NOT true when dragging from the corner, aka scaling more than one axis at a time.  The solution was to calculate the measured distance by projecting the snapped distance along the snap direction onto the axis of the relevant snap guide.  This gives the correct values, and is nice and clean - both in the change involved, and in the values returned.

However, while the fundamental misunderstanding in the code has been cleaned up by this change, the tick_val variable has so much jitter in the bottom end that the is_approx_equal function doesn’t come true > 98% of the time.  This is the next problem to solve.
2014-02-18 23:20:46 -08:00
Ricky Curtice a060dcfff7 STORM-1920: Math cleanup from Richard Linden. 2014-02-18 23:03:13 -08:00
Richard Linden a347267cf1 cleaned up llmanipscale logic for readability...no change in functionality 2014-02-13 15:35:21 -08:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Todd Stinson 5d0d76572e PATH-450: Correcting boolean logic that was resulting in the scale manipulator malfunctioning for non-permanent objects. 2012-04-03 13:59:04 -07:00
Todd Stinson c1a5d6a36b PATH-450: Disabling the movement and shape manipulation widgets when editing an item in a linked set. 2012-03-30 15:42:43 -07:00
Todd Stinson 378ae8ce65 PATH-199: Enforcing permanent objects in frozen state to not move. 2012-03-13 15:33:15 -07:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Roxie Linden 37a3b0d753 Remove ObjectAdd cap, no longer needed 2011-06-09 14:30:53 -07:00
Dave Parks f1784209d5 merge 2011-06-07 14:42:54 -05:00
Roxie Linden 31e850d048 transplant fix for SH-1467
viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not
2011-05-27 11:50:39 -07:00
Loren Shih 74da6623dc SH-1668 FIXED Cubes can be scaled to 64^3 2011-05-26 16:48:15 -04:00
Dave Parks a4e49310a5 STORM-1210 fsqrtf cleanup 2011-05-02 18:01:27 -05:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Ricky Curtice 9bac314ba0 Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review. 2011-03-12 23:39:10 -08:00
Ricky Curtice d4d292258e Squared all dist_vec() based comparisons and other dist_vec() operations where sensible.
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-03-10 22:07:06 -08:00
leyla_linden 095a321eb6 SH-1045
Mesh Viewer temporarily allows object scaling larger than 10m, then moves the object
2011-02-24 15:01:14 -08:00
leyla_linden f41f7cb607 SH-512 [REGRESSION] Linden trees scale up to 200m on Mesh regions
SH-943 10 meters maximum Prim/Mesh size in latest Mesh Viewers
2011-02-16 15:24:11 -08:00
prep linden 7662e5d4ac SH-512: Inworld scale weights use previous maximum (10) 2011-02-01 14:59:05 -05:00
leyla_linden fefc37e92f SH-808 making sure the 10m vs. 64m scale limit switch happens for both the spinner and the manipulation tools etc. 2011-01-28 16:39:02 -08:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Tofu Linden df2f9e7823 CID-361
Checker: UNINIT_CTOR
Function: LLToolGrab::LLToolGrab(LLToolComposite *)
File: /indra/newview/lltoolgrab.cpp

plus followup to previous fix...
2010-01-28 11:26:50 -08:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
James Cook 06fd32edf6 EXT-677 Build tool arrows work again with UI size != 1.0
Must use scaled (virtual) pixels in some computations
Will review with Richard
2009-11-10 12:04:35 -08:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00