Ansariel
eb06fba767
Merge bento-box
2016-11-30 21:03:16 +01:00
Brad Payne (Vir Linden)
93db7eacbd
SL-540 - fix for regression in handling of out-of-range joint indices in skin weights
2016-11-30 14:03:54 -05:00
Ansariel
e87cf2fcc8
Transplant MAINT-6913 to simple avatar shaders
2016-11-21 10:50:51 +01:00
Ansariel
3fed6c743a
Merge Firestorm LGPL
2016-11-11 16:04:29 +01:00
Ansariel
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
Brad Payne (Vir Linden)
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05:00
Ansariel
c2b428e334
Fix LL impostor hacking:
...
* Don't render shadows for impostors
* Show muted avatars as impostors (fix if RenderAvatarMaxNonImpostors = 0 = no limit)
* No detailed attachment updates for muted avatars if using no impostors
* Properly calculate update interval for muted avatars if using no impostors
Changed LLVOAvatar::isImpostor() so it also returns if an avatar is an impostor
in case RenderAvatarMaxNonImpostors = 0 = LLVOAvatar::sUseImpostors = FALSE is set,
so we can get rid of some
"isImpostor() || ((LLVOAvatar::AV_DO_NOT_RENDER == getVisualMuteSettings() || isInMuteList()) && !needsImpostorUpdate())"
and replace it with
"isImpostor() && !needsImpostorUpdate()"
This additional check would be necessary to render an avatar as impostor in case
it should never be rendered or it is muted, but LLVOAvatar::sUseImpostors is FALSE.
The check for !needsImpostorUpdate() is still needed to fail the condition in case
an impostor needs an update. For impostor updates, LLPipeline::generateImpostor()
will temporarily set LLVOAvatar::sUseImpostors = FALSE, so the rendering pipeline
doesn't skip parts needed to create a silhouette of the avatar. In that case,
needsImpostorUpdate() will return TRUE.
2016-11-08 16:49:05 +01:00
Ansariel
a0c253bb78
Merge bento-box
2016-10-19 00:16:24 +02:00
Brad Payne (Vir Linden)
8230a9937f
MAINT-6841 - removed the joint remapping code, since it was designed to support a feature we no longer have. This also incidentally fixes any bugs caused by the joint remapping code.
2016-10-18 16:05:35 -04:00
Nicky
03b6cb6e8e
Bring back a SSE2 version to calculate the matrix for vertex skinning (FSSkinningUtil::getPerVertexSkinMatrixSSE)
2016-10-05 18:03:23 +02:00
Nicky
e2c9245b9c
Normalize line endings.
2016-09-18 02:41:37 +02:00
Nicky
44ab8b8f4b
Merge with firestorm-lgpl.
2016-09-17 19:35:49 +02:00
Nicky
24308dc929
The sheer amount of calls into LLVOAvatar::getJoint get very costly in complex scenes. This is due to a string being used as index. Change the index to U32 for faster access.
2016-09-16 21:46:39 +02:00
Ansariel
fee815a45d
Merge bento-box
2016-08-25 11:29:06 +02:00
Brad Payne (Vir Linden)
278825191b
TEST - non-SSE code path for matrix ops used in mesh skinning.
2016-08-23 15:08:14 -04:00
Ansariel
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
Brad Payne (Vir Linden)
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
Ansariel
732f199cef
Merge Firestorm LGPL
2016-05-18 22:00:02 +02:00
Ansariel
1c31eacbac
Merge Firestorm LGPL
2016-05-18 20:35:30 +02:00
Ansariel
167373ceea
FIRE-12456: Just drop a warning instead of erroring aka crash out - can't be worse than instant crash
2016-05-10 10:46:17 +02:00
Ansariel
8d123edb56
Merge Firestorm LGPL
2016-05-09 14:15:08 +02:00
Ansariel
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
Oz Linden
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
Ansariel
32b93b9d28
Merge Firestorm LGPL
2016-05-02 14:16:41 +02:00
Ansariel
2313b4ac42
FIRE-18207: Color avatar hitboxes in the same color as on minimap
2016-04-23 22:41:58 +02:00
Ansariel
607625a1b5
Merge viewer-quickgraphics
2016-04-23 12:26:49 +02:00
Ansariel
ac4e61cb8d
Undo fix for materials being applied to simple imposters to make room for LL's fix
2016-04-22 01:08:03 +02:00
ruslantproductengine
7f077a5e3a
MAINT-6326 [QuickGraphics-RC] Blingposter avatars are all full bright white when basic shaders are disabled.
2016-04-21 22:09:40 +03:00
ruslantproductengine
503dc6ee65
MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on jellybaby avatars when ALM is enabled
...
FIXED
- remove global identifier for the black texture
- add black texture 2x2x3 localy on apllication startup
- add special flag to LLViewerFetchedTexture for protect from removing
2016-04-21 12:47:49 +03:00
Ansariel
59956afb12
Merge viewer-quickgraphics
2016-03-22 23:27:45 +01:00
Oz Linden
ded162be60
fix merge error for specular rendering on impostors
2016-03-22 16:30:59 -04:00
Ansariel
fa26809eab
Build fix and don't assume a certain texture exists on the dataserver - this might not be true for other grids
2016-03-18 12:46:18 +01:00
Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
Ansariel
8b64639eb2
Partially undo MAINT-5700: Draw imposter for muted avatars - has always been the case
2016-03-05 01:30:44 +01:00
Ansariel
5d325f4007
Merge viewer-quickgraphics
2016-03-05 00:37:52 +01:00
ruslantproductengine
0ffc4f2667
MAINT-5700 [QuickGraphics-RC] Blocked avatars should always be derendered
2016-03-02 18:35:43 +02:00
Ansariel
847c09ab8c
Merge viewer-quickgraphics
2016-02-26 13:13:17 +01:00
ruslantproductengine
d4cb7f450d
MAINT-5022 [QuickGraphics] Materials should not be applied to simple imposters
...
Fixe based on that texture with assetd id: "3b39cc01-c2d1-e194-1181-e4404978b20c"
will exist on data server.
2016-02-19 18:03:34 +02:00
Ansariel
75079a22a4
Merge Firestorm LGPL tip
2016-01-13 12:47:29 +01:00
Ansariel
a3165bb043
Merge Firestorm LGPL tip
2016-01-13 11:27:12 +01:00
Nicky
4ffd74e025
Remove leapmotion, it's outdated and unsupported.
2016-01-06 13:59:08 +01:00
Ansariel
be6ce75a96
Merge bento-box
2015-12-17 11:47:42 +01:00
Brad Payne (Vir Linden)
7b410df303
SL-124 WIP - cleanup of comments and test code before going to project viewer.
2015-11-25 15:07:26 -05:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden)
d365aa10f1
SL-234 WIP - moved LLSkinningUtil funcs to separate class/files. Remap weights where needed. Warn that related debug settings require restart to take effect.
2015-10-21 16:47:03 -04:00
Brad Payne (Vir Linden)
6c6a95478e
SL-234 WIP - remap skin weights to match included-joint logic
2015-10-19 16:32:49 -04:00
Brad Payne (Vir Linden)
58992e2cb4
SL-234 WIP - Track which joints are part of base skeleton, remap non-base ones when not being rendered.
2015-10-16 15:05:29 -04:00
Ansariel
83862ed91a
Merge Firestorm tip
2015-10-15 11:02:30 +02:00
Oz Linden
69ff937e47
merge changes for 3.8.5-release
2015-10-13 08:43:03 -04:00