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
948ebe5213
All your codebase are belong to us.
2014-08-22 00:15:09 -04:00
Shyotl
061178ad82
Migrated gl matrix stack to LLMatrix4a
2014-06-22 03:34:51 -05:00
Shyotl
24ca32f9f7
Replace gluProjectf/gluUnprojectf with own versions. Also changed gGLModelView/gGLProjection and other related matrices to LLMatrix4a.
2014-06-06 01:59:04 -05:00
Shyotl
3db9c6a9ff
Try mask-based object shader configuration, instead of a bazillion hard-coded shader globals. Should be a bit more consistent. (non-deferred only, for now)
...
Also abuse discard in alpha shaders, instead of processing invisible fragments.
2014-05-14 03:30:02 -05:00
Shyotl
07a261a259
A little bit of cleanup.
2014-03-27 22:04:30 -05:00
Shyotl
af8f8bb040
Mats.
2013-11-02 01:20:05 -05:00
Shyotl
574022ed2c
Made a few more fullbright face types occlude any glow behind them.
2013-10-26 18:01:36 -05:00
Shyotl
8441bc80a4
Use LLStaticHashedString for faster uniform lookup.
2013-10-26 16:26:46 -05:00
Shyotl
f25eb07fab
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -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
1083d7e0ef
Added LLGLTexture. Virtually completely virtual for now. Also added LLTextureManagerBridge, although not yet utilized.
2012-12-22 23:58:42 -06:00
Shyotl
413a8111c0
PASS_INVISI_SHINY never issued. Commented out some unused code.
2012-10-21 17:16:22 -05:00
Shyotl
767fe92de5
Invisprims in deferred now bind the correct shader when being drawn. (Fixes vbo attrib errors)
2012-09-14 02:45:22 +02:00
Shyotl
b101bb0001
MAINT-646: Faster traversal of render batch lists. https://bitbucket.org/davep/viewer-development/changeset/38b7779af5f9
2012-07-17 23:38:34 -05:00
Siana Gearz
70438fa06f
Catching up with Lindies part 3
2012-03-26 15:01:53 +02:00
Siana Gearz
60ded2ad14
Initial invisiprim support in deferred
2012-02-17 05:52:41 +01:00
Shyotl
f7b2139e81
Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)
2012-02-09 14:26:21 -06:00
Shyotl
fc65380f2a
Added auto avatar muting(appearance only) based on avatar complexity (disabled by default). Added several missing debug views.
2012-01-27 02:36:26 -06:00
Shyotl
6374f012de
new fasttimers, including ui.
2012-01-23 18:30:54 -06:00
Shyotl
ffb285c6ff
Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.
...
-Nametag bubble visbility is oddly inconsistent. May vanish with future planned UI merges...
-VBOs are PAINFULLY slow on ATI hardware. This repos self-compiled davep/shining-fixes branch, so I'll leave the ball in LL's court for now regarding that.
2011-12-09 14:02:29 -06:00
Shyotl
83e8a9076b
Several gl calls now wrapped via LLRender (gGL) as prep for future changes:
...
glMatrixMode -> gGL.matrixMode
..GL_MODELVIEW -> LLRender::MM_MODELVIEW
..GL_POJECTION -> LLRender::MM_PROJECTION
..GL_TEXTURE -> LLRender::MM_TEXTURE
glMultMatrix -> gGL.multMatrix
glLoadMatrixf -> gGL.loadMatrix
glPushMatrix -> gGL.pushMatrix
glPopMatrix -> gGL.popMatrix
glLoadIdentity -> gGL.loadIdentity
glRotatef -> gGL.rotatef
glTransformf -> gGL.transformf
glOrtho -> gGL.ortho
glColor3f -> gGL.diffuseColor3f
glColor3fv -> gGL.diffuseColor3fv
glColor4f -> gGL.diffuseColor4f
glColor4fv -> gGL.diffuseColor4fv
glColor4ubv -> gGL.diffuseColor4ubv
glLightModelfv(GL_LIGHT_MODEL_AMBIENT -> gGL.
2011-11-21 15:55:44 -06:00
Shyotl
53f5957b92
Animated faces with bumpmapping now behave as expected.
2011-10-21 15:03:46 -05:00
Shyotl
22385c44c8
Make legacy renderpath a bit more strict.
2011-10-20 13:30:29 -05:00
Shyotl
40261d3472
Invalid texunit was still bound after bumpmapping finished
2011-10-20 13:26:08 -05:00
Shyotl
d7370d23d2
Hopefully fixed bumpmaps not loading at full resolution. (SH-1069, but ll has tried to fix this a good 20 times previously, so...)
2011-09-02 07:00:10 -05:00
Shyotl
174c1800cc
llgl/llglext updated. TODO: repackage glext from ll's viewer-development branch so this will compile. (I manually extracted glext-68-windows-20110406.tar.bz2 in my build environment just for now.)
2011-08-27 04:49:51 -05:00
Shyotl
ca328aec72
Replaced some opengl fixed functions with shaders. Temporary ShyotlUseLegacyRenderPath setting to debug if this change actually improves framerate at all (setting not tied to callbacks. Have to toggle shaders to have stuff pick up the setting change)
2011-08-10 03:53:49 -05:00
Shyotl
9bda97786f
Batch indexing/no-fixed-function WIP.
2011-08-09 01:11:05 -05:00
Shyotl
a6e29b5c5e
Initilization guards added to llviewertexturelist.
2011-06-16 22:45:10 -05:00
Shyotl
4663b605ef
Added fullbright shiny underwater shader.
2011-05-18 17:00:44 -05:00
Shyotl
80db7f58c7
Added pass_post_bump for fullbright bump faces.
2011-04-25 18:18:36 -05:00
Shyotl
e756140e1d
Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
...
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
unknown
3b0bfc40bc
-LLCached[COA]Control can now be static const. Use for readonly access.
...
-const'd all readonly LLCached[COA]Controls to prevent altering by mistake.
-added get() accessor to LLCached[COA]Controls to return cached type explicitly without manual casts.
-added missing operators to LLCachedCOAControl
-Converted a few more settings to LLCached[COA]Control
-Fixed LLColor4U -> LLSD -> LLColor4 problems in LLCachedControl
Ascent functionality fixes:
-Tag coloring pulled out of getClientInfo(Redundant. idleUpdateNameTag already handled it)
--Tag and color substituted at render-time. Simple boolean logic. Neglible perf penalty.
-Fixed llinfos spam if AscentShowSelfTagColor = false
-Client tag updated less superfluously
2010-10-12 00:44:16 -05:00
unknown
fe9a3d2ba2
Converted frequently occuring setting lookups to LLCachedControl
...
Added LLObjectList::getAvatar(LLUUID) for type-safe and quicker lookup
Added F32 overload to LLSD because using F64 needlessly is silly.
(And its lack of F32 overload caused issues with LLCachedControl<F32>)
2010-10-07 21:36:13 -05:00
Beeks
5ce4286fd7
f
2010-08-22 15:14:30 -04:00
phr0z3nt04st
09b75b8ddd
Fixed img crash stupid bump maps :S
2010-08-15 22:19:21 -05:00
Hazim Gazov
7a86d01598
Imported existing code
2010-04-02 02:48:44 -03:00