Shyotl
283f5298d5
Missed a line. This assert should only be evaluated when running in deferred.
2015-06-03 12:46:37 -05:00
Shyotl
d140d28af9
Tangent vecs aren't needed for non-deferred bump pas. Omit unless deferred is enabled.
2015-06-01 16:53:29 -05:00
Shyotl
d4a56c6d94
Toss attachments into their own bridge that sets their type to TYPE_AVATAR, and use generic bridge for plain old 'active' volumes. Resolves issue where non-attached ACTIVE flagged linksets would be included in the avatar render type, and thus would vanish when such type was disabled.
2015-05-22 16:14:57 -05:00
Shyotl
690f3614c1
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
...
Conflicts:
indra/llrender/llpostprocess.cpp
2015-05-16 02:53:19 -05:00
Shyotl
966c5aa409
Remove redundant methods of checking if shaders are enabled. Just use LLGLSLShader::sNoFixedFunction.
2015-05-16 02:31:06 -05:00
Inusaito Sayori
72080e79e9
Sync llcommon with Alchemy a bit.
...
llmath::llround->ll_round
LL_ICC->LL_INTELC
Add llpredicate
Add LL_CPP11 macro
Remove llhash
Update llinitparam, llsd and all relatives of it.
2015-03-20 22:04:04 -04:00
Drake Arconis
5059d5e2da
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer
2014-08-30 14:29:32 -04:00
Shyotl
315618a18b
Fixed materials specularmap + glossiness=0 combination.
2014-08-23 01:34:25 -05:00
Drake Arconis
948ebe5213
All your codebase are belong to us.
2014-08-22 00:15:09 -04:00
Shyotl
e975e389df
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
...
Conflicts:
indra/newview/llnetmap.cpp
2014-08-05 18:17:13 -05:00
Inusaito Sayori
5191baa659
Merge branch 'master' of https://bitbucket.org/Shyotl/singularityviewer-internal
...
Conflicts:
indra/newview/llnetmap.cpp - Thankies Shyotl~
2014-07-21 23:31:59 -04:00
Shyotl
39810ed516
Removed several unused variables from LLPipeline
2014-07-03 02:34:10 -05:00
Shyotl
061178ad82
Migrated gl matrix stack to LLMatrix4a
2014-06-22 03:34:51 -05:00
Inusaito Sayori
f63de0d0cc
Feature Request: Make Inspect button a toggler~
2014-06-05 23:54:15 -04:00
Inusaito Sayori
fb69220b95
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
2014-05-27 12:57:45 -04:00
Shyotl
c4cb9de44b
Merge branch 'master' of git@github.com:singularity-viewer/SingularityViewer.git
2014-05-17 16:30:21 -05:00
Shyotl
fdcf2eda5a
Decouple vbo validation from LLDrawInfo. Such required vbo's to be initialized before drawinfo creation/modification, which is no longer the case with llvovolume. ('RenderDelayVBUpdate'[although removed in Singu] also fails the same assumption.)
2014-05-15 18:44:10 -05:00
Shyotl
5805fe636a
Determine if to stuff shiny data into alpha component a bit differently. Cuts out a lot of crazy logic and lets us choose based off of target renderpass.
2014-05-14 03:38:16 -05:00
Inusaito Sayori
fd29dd9508
Spaces to Tabs for Last commit
2014-05-09 22:19:52 -04:00
Bob Shaffer II
5080ebf88f
reverting some changes to llvovolume that seems to break animated textures
...
Signed-off-by: Siana Gearz <siana.sg@live.de >
2014-05-10 03:13:15 +02:00
Shyotl
7158a3c83d
Fixed an annoying showstopper regarding rigged attachment vertex corruption. Rigged meshes have can have poor weighting, causing potential div-by-zero issues.
2014-05-08 15:11:12 -05:00
Shyotl
dfb465a11b
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git
2014-03-29 02:13:26 -05:00
Shyotl
9ed2dc755c
Always set materials mask if deferred for materials/alpha pools. Fixes potential crash in LLDrawPoolAlpha::renderAlpha
2014-03-28 17:14:57 -05:00
Latif Khalifa
e12548ab8c
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2014-03-28 08:45:40 +01:00
Shyotl
5988f6cf88
Updated rigged mesh face batch/pool handling.
...
Fixed issue with fullbright and glow occlusion.
RenderTransparentWater toggling should work more gracefully.
Fixed some bugs in general drawpool classification for faces. Bump pool was superceding more than it should have.
2014-03-27 21:27:40 -05:00
Inusaito Sayori
cc0b5e660d
Touch missed spots for picking rigged mesh
2014-03-18 18:38:30 -04:00
Shyotl
bb0f17ae6f
Fix poor batching with mac/ancient drivers. Also, some minor tweaks to sorting algorithm.
2014-02-21 02:24:42 -06:00
Shyotl
1c48aa8f97
Added missing can_batch_texture check. Fixes unbatchable faces occasionally getting batched with the last batchable face batch. This was mostly noticeable with animated faces.
2014-02-19 22:35:43 -06:00
Shyotl
bdc0ad2b8f
Experimental volume face batching changes (Cursory testing shows: +~10% larger mean batch size).
...
-Drive pass selection by face pools. Doing such removes a fair bit of redundant (and often buggy) code.
-Ignore irrelivant batch breakers depending on pass/pool type.
-Face sorting algorithm modified to potentially allow larger batches.
-Removed a few unused/broken things (bake_sunlight/no_materials)
-Fullbright handling should hopefully be a little more consistent.
-Prevent fullbright faces from being placed in 'simple' pool. (They are already simple-er)
Fixed attribute error that popped up with bump faces when batching was disabled.
2014-02-18 11:43:50 -06:00
Shyotl
033880c8f9
Kill some vertex attribute / shader attribute inconsistencies. (Issue 1287, 1281) Also hopefully improved face edit overlay behavior when editing normal/specular texture/scale/offset/rotation.
2013-12-24 20:15:29 -06:00
Shyotl
af8f8bb040
Mats.
2013-11-02 01:20:05 -05:00
Shyotl
6474568125
Call updateLOD when geom enters rigged state.
2013-10-26 19:09:43 -05:00
Latif Khalifa
d98402b13f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvotree.h
2013-10-10 00:03:36 +02:00
Shyotl
f25eb07fab
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -05:00
Apelsin
47b59d146b
LLVOVolume::getApproximateFaceNormal bug fix
2013-08-02 01:11:48 -07:00
Shyotl
1c0d86a383
Fix issue displaying material faces with a shine value applied when performing deferred rendering. Also attempt to fix rigged material faces when performing deferred rendering (Todo: test rigged mesh material+(shiny|alpha|alphamask|fullbright) combinations)
2013-07-30 03:01:09 -05:00
Shyotl
94ab22f6d6
Cursory materials alphamask parameter support (and only alpha mask)
2013-07-12 16:41:36 -05:00
Shyotl
e4da971026
Hooked up underlying material fetching mechanism and added material-related structures. Not integrated into rendering pipeline.
2013-07-12 13:56:31 -05:00
Shyotl
ef3e918558
Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!
2013-05-31 05:33:41 -05:00
Lirusaito
417dcb4e49
Frosting touchups
...
Cleaned up flaws in LLUUID
- Removed deprecated LLUUID::toString(char*) and LLUUID::toCompressedString(char*)
Cleaned up some comments
2013-05-11 23:14:16 -04:00
Drake Arconis
5cf556fa09
And now it actually compiles...
2013-03-04 18:05:21 -05:00
Drake Arconis
6e72ec2e12
Fix rigged mesh stack smashing
2013-03-04 16:13:58 -05:00
Drake Arconis
b800320a49
Remove LLMemType and related files
2013-03-04 12:02:01 -05:00
Shyotl
76f3dc9e19
Massive sunshine/viewer-dev catchup. Further implemented serverside baking and added/updated metrics feedback.
2013-02-19 01:50:46 -06:00
Shyotl
c799f9f7eb
Avoid sculpt discard-level 5 spam.
2013-02-12 14:46:31 -06:00
Shyotl
1083d7e0ef
Added LLGLTexture. Virtually completely virtual for now. Also added LLTextureManagerBridge, although not yet utilized.
2012-12-22 23:58:42 -06:00
Shyotl
ce3511f7ea
Misc changes via v3 merge. Nothing big.
2012-12-03 15:03:52 -06:00
Shyotl
71deb8925e
Added some nullchecks, removed some dead code, and cleaned up a few small things.
2012-11-04 21:16:53 -06:00
Shyotl
c901a7136f
I freaking swear LL breaks hud attachment lighting in some way every few months. *Grumble*
2012-10-23 17:24:08 -05:00
Shyotl
5c45979783
Resolve issue with sculpties loading with incorrect discard levels.
2012-10-22 15:26:53 -05:00