Merov Linden
8dae4bc222
Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors
2014-05-06 18:21:04 -07:00
Merov Linden
6bf3cb875c
ACME-1195 : WIP : Lazy evaluate intermediate images in snapshot preview so perf is better in common cases, allow thumbnail to be computed from grabed frame (for SL Share), thumbnail display still buggy in SL Share
2014-01-28 10:19:57 -08:00
Merov Linden
4b2e69d8e0
ACME-1236 : Clean up llimage after refactoring so there's no difference with viewer-release
2014-01-15 10:27:49 -08:00
Merov Linden
7cc64a09a3
ACME-1236 : Refactor filters and vignette into llimagefilter, add example filters to llimage_libtest
2014-01-14 21:01:51 -08:00
Merov Linden
0c7cab771c
ACME-1236 : Add lines as a new type of vignette and Brightscan as an example
2014-01-09 21:58:30 -08:00
Merov Linden
3161d822ab
ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed for consistency)
2014-01-08 15:41:42 -08:00
Merov Linden
c2a974f155
ACME-1236 : WIP : Introduced screenFilter, simple creative screening filter
2014-01-07 22:10:23 -08:00
Merov Linden
3cbd0dfd84
ACME-1236 : WIP : Make each color correct filter use a per channel alpha argument, tweak Instagram-like test filters for discussion
2014-01-06 14:46:52 -08:00
Merov Linden
90cbda6db0
ACME-1236 : WIP : Add 2 new color correction filters. Add a la Instagram composite filters for testing in llimage_libtest
2014-01-03 17:31:04 -08:00
Merov Linden
35e30759c8
ACME-1236 : WIP : Added a min value to vignette
2014-01-03 15:44:29 -08:00
Merov Linden
1b5fb66292
ACME-1236 : WIP : Added the vignette mode. Can be applied to colorCorrect and color Transform. Added new -v argument to llimage_libtest
2014-01-03 14:19:29 -08:00
Merov Linden
d28b92744e
ACME-1236 : WIP : added all the color correction filters: colorize, linarize, equalize, contrast, brightness
2014-01-02 16:14:38 -08:00
Merov Linden
205a4e3dc6
ACME-1236 : WIP : add filterGamma, computeHistograms, colorCorrect, implemented filter gamma to llimage_libtest for testing
2014-01-01 19:42:10 -08:00
Merov Linden
9dca514c0b
ACME-1236 : WIP : add filterRotate to rotate hue, add rotate as a valid argument to --filter in llimage_libtest
2014-01-01 17:58:52 -08:00
Merov Linden
08a798bb1d
ACME-1236 : WIP : Implement saturation/desaturation transform filter, add it to llimage_libtest for testing
2013-12-30 20:33:33 -08:00
Merov Linden
7372afaae4
ACME-1236 : WIP : Implement colorTransform filter, grayscale and sepia using it, add parameter to llimage_libtest to use filters
2013-12-20 13:49:20 -08:00
Merov Linden
6578144b7e
ACME-1236 : WIP : Added Gray Scale as an experimental filter in Flickr. Lots of ugly hacks for now
2013-12-18 15:55:13 -08:00
Richard Linden
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
Xiaohong Bao
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
Richard Linden
075a7bcc98
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
Richard Linden
8208a40412
BUILDFIX: reverted changes that attempted to automate mem track
...
stat definition as they don't work on gcc/clang
2013-07-01 18:50:51 -07:00
Richard Linden
04bdc8ba83
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
...
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
simon
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
Oz Linden
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
simon
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Richard Linden
f07b9c2c69
renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
...
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08:00
Nyx Linden
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Richard Linden
cbff0e7ab8
SH-3468 WIP add memory tracking base class
...
attempted fix for gcc compile errors
can't use typeid() on a class that doesn't have a method
defined in a translation unit
fix is to force classes deriving from LLMemTrackable to
use their own static member named sMemStat
2013-01-04 13:48:35 -08:00
Xiaohong Bao
d3b9f446a6
fix for MAINT-2147: crash in LLTextureCache::writeToFastCache on OSX
2013-01-03 22:37:44 -07:00
Don Kjer
802e738b77
Fix for alpha blending using gl fixed-functions not matching shader implementation
2012-12-18 23:40:31 +00:00
Richard Linden
1f56e57008
SH-3468 WIP add memory tracking base class
...
created memory tracking trace type
instrumented a few classes with memory tracking
2012-12-18 00:58:26 -08:00
Richard Linden
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
simon@Simon-PC.lindenlab.com
7f0d6e0377
Pull back viewer-development with latest beta merges
2012-10-16 09:58:31 -07:00
Oz Linden
e7a5dc7cda
pull back changes from 3.4.1-beta8
2012-10-16 09:36:15 -04:00
Dave Parks
c97730988e
MAINT-1721 Fix for crash when clicking "back" button after editing appearance.
...
Reviewed by VoidPointer
2012-10-15 15:59:41 -05:00
Richard Linden
371b66a6ef
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2012-09-06 11:47:48 -07:00
simon@Simon-PC.lindenlab.com
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
Dave Parks
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
Xiaohong Bao
0d80aced24
for SH-3073: implement a fast cache system for texture fetching
2012-06-12 17:01:48 -06:00
Merov Linden
c410a4e332
SH-3080 : Implement the TextureReverseByteRange setting so we can play with that parameter
2012-04-12 20:19:56 -07:00
Merov Linden
91094d92a7
SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well.
2012-04-05 22:05:00 -07:00
Merov Linden
782981866a
SH-3060 : New byte range implementation. Intermediate (not working) state.
2012-04-04 18:58:34 -07:00
Merov Linden
c6511d9c85
SH-3075 : Fix encoding for reversible images and small textures
2012-04-04 15:59:52 -07:00
Merov Linden
df09fd8e8b
SH-3060 : Preliminary implementation of the new byte range computation, implement setting to turn it on or off
2012-04-02 19:05:32 -07:00
Merov Linden
fe7a4d0183
SH-3047 : Add a load_size argument to llimage_libtest and allow partial image file to be loaded.
2012-03-15 14:07:54 -07:00
Merov Linden
bc6f669ff4
SH-3047 : Read the number of levels from the j2c image header instead of relying on hacked computation based on width / height.
2012-03-15 13:01:14 -07:00
Xiaohong Bao
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
Xiaohong Bao
b594d3b04d
add debug mode to track the memory allocation/deallocation.
2011-05-10 21:02:20 -06:00