Commit Graph

186 Commits

Author SHA1 Message Date
Latif Khalifa
bde1ce7577 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-07-31 01:53:58 +02:00
Shyotl
8e40d6b52c Added some missing drawpool determination logic pertaining to face materials. 2013-07-29 19:39:59 -05:00
Shyotl
44909af372 Removed CLEAR_INVISIBLE drawable flag. 2013-07-29 19:32:15 -05:00
Shyotl
45b85070f3 A bit of harmless cleanup, null checking, nan checking. Removed sphericalProjection and cylindricalProjection from llface (broken/dead). 2013-07-29 19:23:30 -05:00
Aleric Inglewood
1475832617 Crash fix in LLPipeline::renderDeferredLighting 2013-07-26 17:32:03 +02:00
Lirusaito
d4bed6382c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-23 02:25:15 -04:00
Aleric Inglewood
e59cefa0cc Bug fix of LLPipeline::setRenderDebugFeatureControl
This commit has no effect on how the viewer behaves currently.
2013-06-07 16:19:46 +02: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
Shyotl
182b15aee5 Forgot to put changes to pipeline.cpp into the previous vbo commit. Oh well. 2013-05-16 01:59:15 -05:00
Shyotl
be29088103 Bad merge introduced superfluous drawable clearstate call. 2013-05-15 22:47:56 -05:00
Shyotl
e8ce35ebf8 Merge branch 'master' into UICleanup
Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp
2013-05-03 21:41:51 -05:00
Shyotl
532fc68657 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2013-05-03 15:36:05 -05:00
Shyotl
ef9fbe2193 Attempt to speed up agent idle update by optimizing wearable/visualparam related lookups/iterations a bit more.
Generalized several templates in llstl.h in order to support more containers.
Removed several instances of is_in_map/getWearableCount being followed immediately by another lookup with the same key. find is more efficient, as we get an iterator to use instead of a simple boolean.
2013-04-24 17:52:17 -05:00
Latif Khalifa
e0077b6941 Merge remote-tracking branch 'lirusaito/master'
Conflicts:
	indra/newview/llviewermessage.cpp
	indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
	indra/newview/skins/default/xui/fr/panel_preferences_general.xml
2013-04-23 12:17:08 +02:00
Shyotl
c9f93a82ce Improved the logic in LLPipeline::updateDrawableGeom a bit. 2013-04-20 01:02:40 -05:00
Shyotl
7863484f10 Less prim peekaboo antics. 2013-04-18 17:25:27 -05:00
Shyotl
733b8e75ac Less prim peekaboo antics. 2013-04-18 23:44:25 +02:00
Shyotl
d1e86e66d8 Less prim peekaboo antics. 2013-04-17 22:32:53 -05:00
Lirusaito
8c49716eae Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
Conflicts:
	indra/newview/llviewerwindow.cpp - Also two compile fixes.
2013-04-10 13:26:48 -04:00
Lirusaito
fd9f8fa71f Cleanup and Synchronization (pre-merge wrap-up commit) 2013-04-10 09:14:16 -04:00
Shyotl
b07ab02f54 Added blendfunc checks when RenderDebugGL is TRUE. 2013-03-30 01:26:07 -05:00
Shyotl
1965224912 Stabbed some blendfunc state issues. This fixes some ui flicker which popped up recently (perhaps after merging, or I just never noticed it before then) 2013-03-30 00:57:49 -05:00
Lirusaito
c2b3322594 Pathfinding UI: Hide Capsule doesn't seem to work without havok 2013-03-20 08:30:36 -04:00
Lirusaito
78e1804381 Add Pathfinding UI from v3
Added libpathing to LLPHYSICSEXTENSIONS_INCLUDE_DIRS
llviewermenu updated a bit to be closer to v-d/rlva. Best viewed without space changes.
Updated llresmgr.cpp from v-d to "handle special case of input value being zero"
pipeline update: hideObject, restoreHiddenObject, hideDrawable, and unhideDrawable added.

Thanks to Henri Beauchamp for some UI code touchups, thanks to Zi Ree for Rebake notification.
Thanks to Mobius Ryba and Ansariel Hiller for the V1-style pathfinding icons.

Note: When opening from pie menu object selection is lost, unless the floater is already open..
This provides a more reliable reproduction of the bug we've been having with inspect.
2013-03-08 03:17:11 -05:00
Drake Arconis
b800320a49 Remove LLMemType and related files 2013-03-04 12:02:01 -05:00
Shyotl
fd21197d2a Wedged high-res non-tiled deferred snapshot logic into LLViewerWindow::rawRawSnapshot 2013-02-25 12:59:17 -06:00
Shyotl
c92c68dee2 A few more preview-related changes. 2013-02-12 15:07:07 -06:00
Shyotl
1069d5dec4 Draw trees before sky. Z-cull may be beneficial. Also, was incorrectly setting alphawrite off for deferred wlsky pass. 2013-02-01 17:16:01 -06:00
Shyotl
26de17f2de Avoid occasional DoF-related crash upon region disconnection. 2013-01-30 22:04:57 -06:00
Shyotl
e622e03d2a Bulk of server-baking impelmentation and a bit of cleanup. 2013-01-13 02:37:12 -06:00
Shyotl
3750123e43 Obsessive excessive clearing of glow rendertargets, as they still occasionally act weird. 2012-12-19 19:08:10 -06:00
Shyotl
806abb1985 Reduce required number of glow rendertargets by 1... 2012-12-10 01:31:57 -06:00
Shyotl
6b05022530 Applied Tofu Linden's SSAO improvements. e189d55a7b 2012-12-08 16:51:38 -06:00
Shyotl
ce3511f7ea Misc changes via v3 merge. Nothing big. 2012-12-03 15:03:52 -06:00
Shyotl
794dbacea3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
2012-11-29 11:54:41 -06:00
Shyotl
6b473c6edc Avoid clearing hud object rebuild states when teleporting. 2012-11-18 02:42:33 -06:00
Shyotl
3ec1dbf51c Updated spatial partition and octrees to use std::vector. Also, added diagnostic spew to octrees. 2012-11-04 21:48:17 -06:00
Shyotl
b57f7cdc79 Fixed various specular/glow effects bleeding through fullbright objects in deferred. 2012-10-24 03:19:53 -05:00
Shyotl
02f214d8a7 Clear object rebuild queues upon teleport. 2012-10-22 15:25:02 -05:00
Shyotl
5b4b9fd169 Durr, missed a line when adding attached light muting. Clobbered when diffing. Incrementing in a for loop is kinda important! Our handling in this function differes from LL in the firstplace because they are performing iteration on an iterator that can be invalid after the erase. 2012-10-22 03:17:33 -05:00
Shyotl
9ef10b1663 Muting an avatar now also removes their attached lights. Also cleaned up light update code(no change in behavior) 2012-10-22 03:07:07 -05:00
Shyotl
ed4997168b LLViewerObject::idleUpdate now returns void. Texture animations/flexis now have their own update queues. 2012-10-22 02:50:04 -05:00
Shyotl
b73f4dd8e4 Catch up with viewer-beta. Primarily sim transition alterations to reduce frame hitching, and some optimization in LLViewerObjectList (std::set -> std::vector and and some allocation tweakage). 2012-10-20 17:02:43 -05:00
Shyotl
e8ec81bf04 Experimentation with normalpacking and component precision. 2012-10-14 04:00:02 -05:00
Lirusaito
fb713226a0 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2012-10-12 13:50:56 -04:00
Shyotl
88482a2431 An extra rendertarget is needed when fxaa dof are used in conjunction. mDeferredScreens color attachment was being used for both input and output when doing DoF combine, which is undefined behavior. Using mDeferredScreen for this works as it's no longer needed after lighting has been applied. 2012-09-26 20:45:47 -05:00
Lirusaito
cb0c13a1a1 Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2012-09-23 10:25:22 -04:00
Shyotl
9bb9292a41 Attempt to catch octree node manipulation while iterating over said nodes 2012-09-19 15:34:25 -05:00
Drake Arconis
f50d23a0d4 Fast Timers brought up to linden equiv 2012-09-14 00:30:52 -04:00
Shyotl
fefb40bda2 MAINT-675: Fix for DoF focal point being incorrect when alt-zooming on terrain. http://hg.secondlife.com/viewer-development/changeset/4e362886866692fa904a88adcf3e11b7518802f3 2012-09-02 08:47:20 +02:00