Commit Graph

160 Commits

Author SHA1 Message Date
Shyotl
9f9a4cbaaf Brought over LLAvatarPropertiesProcessor, and updated relevant floaters to utilize it. (Mainly in the avatar properties floaters) 2012-02-11 04:07:34 -06:00
Shyotl
726dc02aaa Was looking up ascent colors in incorrect control group. 2012-02-03 14:11:10 -06:00
Shyotl
a690c970e6 RenderAutoMuteByteLimit and RenderAutoMuteSurfaceArea: Only 'grey' out visually blocked avatars on impostor pass. 2012-02-02 18:14:52 -06:00
Shyotl
b0ccec2b62 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git
Conflicts:
	indra/newview/llvoavatar.cpp
2012-02-01 03:10:46 -06:00
Shyotl
f6711e6b4f Dont alphamask the bodies of visually muted avatars. 2012-01-30 03:52:16 -06:00
Shyotl
e327e7a15e Converted some frequent setting lookups to LLCachedControl 2012-01-30 03:49:52 -06:00
Shyotl
a0c549534f Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory). 2012-01-29 17:10:04 -06:00
Siana Gearz
ef696d895d Avoid tag detection spam from radar on every object update 2012-01-28 22:00:21 +01:00
Siana Gearz
26858c026a Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2012-01-28 03:25:36 +01:00
Siana Gearz
6e57791397 Use NaCL nametag everywhere, even in radar 2012-01-28 03:00:42 +01: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
Siana Gearz
7fec659979 Update RLVa to 1.4.0-compatible 2012-01-25 21:11:33 +01:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Shyotl
1cc33caaa3 Pulled llinventorymodel apart into llinventorymodel, llinventoryobserver and llinventoryfunctions 2012-01-12 18:57:10 -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
50e750d2e9 RLV locked status of wearables now displayed in inventory panel. 2011-10-09 16:46:52 -05:00
Shyotl
9194d5bfcd Mesh-related updates. In particular, cleanupAttachedMesh wasn't called! 2011-10-08 03:07:32 -05:00
Shyotl
d9d3ff0057 Disable updateTextures entirely for non-visible avatars (culled ones still need updating tho.) 2011-10-08 03:06:41 -05:00
Shyotl
418d80197e LLVOAvatar::getFullname() now using LLCacheName::buildFullName 2011-10-08 02:57:30 -05:00
Shyotl
02c2283e11 Cleanup. Mostly harmless. A few gAgentAvatarps changed to isAgentAvatarValid(), which is the only 'change' in behavior. Everything else is insignifigant syntax touchup and shuffling of inlines from headers to cpp files. 2011-10-08 02:53:03 -05:00
Shyotl
07165f014f ERenderName enum had elements swap around. Doesn't match our saved settings (driven by preferences floater), so reverting and commenting. 2011-10-04 00:34:52 -05:00
Shyotl
cd86b3a69b Refactoring.
-New LLWearableType class, uses LLDictionary for typeindex<->typename<->assettype<->typelabel conversions.
-LLAvatarDefines cleaned up. Uses LLDictionary for Mesh, TE, Baked lookups/conversions.
-LLAgentWearables TEWearable stuff removed. Use LLAvatarDefines.
-LLWearable WearableType conversions yanked. Use LLWearableType.
-LLVOAvatar TEWEarable stuff removed. Use LLAvatarDefines.
-EWearableType now LLWearableType::EType
-LLWearable::getID() renamed to LLWearable::getAssetID()
VOAvatar cleanup.
-Removed redundant TEWearable functions.
-Some code migrated to F32 LLVOAvatar::calcMorphAmount(). No functional change.
-LLVOAvatar::removeMissingBakedTextures virtual. Implementation moved to VOAvatarSelf
2011-10-03 15:00:43 -05:00
Shyotl
74dc875a27 Beginning to pull LLVOAvatarSelf out from LLVOAvatar. 2011-10-02 02:51:10 -05:00
Shyotl
d917bf6b06 LLAPRFile cleaned up 2011-09-20 21:39:27 -05:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
2011-09-09 16:53:12 -05:00
Shyotl
7b2aa741aa LLGestureManager renamed to LLGestureMgr. Also, derived from LLSingleton. 2011-09-03 06:46:47 -05:00
Aleric Inglewood
dfa10281ea LLFrameTimer review and resulting changes.
This makes the class API a bit more sane, although
only a bit, because I had to leave it working with
possibly new code merged in from LL: the API can't
really change. I also removed some unused code.

While reviewing how LLFrameTimer worked however,
I did find a few instances where things where broken:

* sFrameDeltaTime wasn't correctly updated (more
  than once per frame and therefore erratic). This
  only influenced scrolling speed, but still.
* While dragging an inventory item, the scroll
  arrows of a tab container didn't work
  (LLTabContainer::handleDragAndDrop).
* Map zoom interpolation was broken (it interpolated
  between A and B, but used the already updated
  interpolation for A the next frame...
  (added mCurZoomValInterpolationStart).
2011-08-18 19:30:43 +02:00
Shyotl
f551294e66 Alphamasking migrated to shaders instead of using fixed-function. Very early code. Hasn't even made it into viewer-development yet. 2011-08-12 19:20:11 -05:00
Shyotl
c9860f7b66 Massive deferred update...
Plus renamed setupViewport to setup[2|3]DViewport.
Migrated mWindowRect to mWindowRectRaw, mVirtualWindowRect to mWindowRectScaled.
Slowly updating getwindow/getworldview calls to new v2 variants as I run across them.
Cleaned up ascent-related code in llmanip.cpp.
Impostor update tweaks.
Edgepatch water occlusion changes. (no patch flickering on edges of screen while moving camera)
2011-08-11 03:16:17 -05:00
Shyotl
04ea6a967e Removed dead code related to 'RenderForSelect'. 2011-08-09 02:11:10 -05:00
Siana Gearz
aa469d860f Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future 2011-08-01 19:56:33 +02:00
Shyotl
0bd444de5f A few more rigging related things added in. Also fixed vertex weights 2011-08-01 03:53:25 -05:00
Shyotl
b258b71e07 Flipped the MESH_ENABLED switch. Added missing components and updated stuff to be closer to mesh-development head. 2011-07-30 20:30:07 -05:00
Shyotl
1e92e734d8 Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable. 2011-07-23 03:26:30 -05:00
Shyotl
179193d173 Some minor cleanup. Bringing stuff in-line with current to ensure it all works before mesh is actually plugged in. 2011-07-23 03:24:10 -05:00
Siana Gearz
f30c284063 Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
Conflicts:
	indra/llvfs/lldiriterator.cpp
	indra/newview/app_settings/settings.xml
	indra/newview/llviewerregion.cpp
2011-07-21 00:20:06 +02:00
Shyotl
a994df7265 A majority of vectorization done. Note that it's INCOMPLETE. LLVolumeFace and LLVertexBuffer haven't been updated, so it's very dirty(and buggy) at those transitions. Compiles on windoze. 2011-07-20 06:07:13 -05:00
Shyotl
35e0b9b6ff Data-alignment. SSE intrinsics. 2011-07-19 21:35:35 -05:00
Shyotl
6ad9367c24 Trying out new LLCachedControl implementation. 2011-07-16 23:36:56 -05:00
Shyotl
7e0ee6bb71 Shiny new name cache. 2011-07-15 00:21:38 -05:00
Siana Gearz
379f4c63ec Zeus has been begging for this 2011-07-11 12:05:53 +02:00
mightymarc
74d42ec740 Added a few lines at beginning, to define strnlen for Macs or else building will result in the following : "error:'strnlen' was not declared in this scope". Was able to successfully compile the latest version on a Mac after adding this. 2011-06-18 15:32:29 +02:00
Aleric Inglewood
a8d71f2550 Merge remote-tracking branch 'origin/master' 2011-06-14 16:02:43 +02:00
Siana Gearz
42f60042eb Idle timer tag update fix, by phr0z3nt04st 2011-06-14 14:13:43 +02:00
Shyotl
c57b97c8df LLAgentWearables Transition (1/1) 2011-06-09 01:35:49 -05:00
Shyotl
a07e399801 LLAgentCamera transition (1/2) 2011-06-07 21:35:10 -05:00
Shyotl
77f09744ab Merge branch 'AlericMaster' into V2Renderer
Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp
2011-05-20 12:56:23 -05:00
Shyotl
62e3aa10c1 Reasonably safe changes.
Using accessor for vertexbuffer in LLFace
Extra occlusion query lookup in llgl (unused)
Const changes.
2011-05-18 14:35:27 -05:00
Aleric Inglewood
10af185abc Add Advanced --> Character --> Meshes and morphs...
Allows to save the .llm of all mesh objects, and
all morphs of each as .obj (Wavefront OBJ File),
for import in, for example, blender.

You can also load .obj files, but of course they
will only affect what you see locally.
2011-05-16 19:03:48 +02:00