Commit Graph

355 Commits

Author SHA1 Message Date
Lirusaito
cd02bbd1cb Fix mixed iterators
Thanks Aru
2019-03-06 16:10:31 -05:00
Lirusaito
58ba9e3617 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2019-03-02 19:01:49 -05:00
Lirusaito
f4a22ef857 Patch AIXML to work now for import
Not bothering with export at the moment

AIXML"Stream" wasn't even using its stream in its constructor...
Someone clearly hadn't been using ACTUAL C++ for longer than C++'s existence like was claimed
...but then, that's literally impossible, so what could we expect...
And dear lord please stop throwing in constructors...
There are so many better ways to do this...
This use of throwing is why people dislike goto
It's hard to follow flow control that would be better done another way...
One day I'll fix it so it is, until then meh.

Rips out AIFile, since nothing is actually using it anymore and GPL code needs purged.
2019-02-25 12:46:41 -05:00
Lirusaito
50f9fbd728 Fix automatic bridge detach
Thanks Aru
2019-02-17 12:54:16 -05:00
Lirusaito
b61cba8e01 Clean up and optimize the AO
Added the feature of selecting an animation from combo boxes and it playing automatically if it should be at this moment.

Now for the stuff only developers will understand:
FloaterAO is now a FloaterSingleton, because it should've been behaving that way all along.
Refactors a lot, simplifies a lot, best view without space changes.
Reduces a lot of redundant blocks.
Creates some functions to make things like AOStates easier to get
AOStates are now an enum instead of a bunch of const ints.
Cleaned up includes.
NULL -> nullptr, virtual->override, BOOL->bool, for->foreach
Removed struct_tokens,  it was redundant and actually just took up space.
No longer set all the children invisible, their parent does a good job of that.
Relate ComboBoxes to their states, so that we can easily get a setting and do a whole bunch of things with a lot less code.
Remove unused parameters and functions and variables
Remove unused boolean returns from functions.
Don't clear combo boxes just because one id is null.
2019-01-11 06:17:58 -05:00
Lirusaito
47797f4cec First pass at Swimming AO 2019-01-09 23:08:23 -05:00
Shyotl
736696ac36 Track glEnable states via static refs instead of map lookups.
Sync light state, bound shader, and various gl context states similarly to render matrices.
Texture handles now refcounted, as multiple viewer textures could ref the same handle (cubemaps do this)
Clean up gl extension loading a bit. Not necessary, but only look for ARB variants if not included in current core version. Removed unused extensions.
Use core shader api if supported, else use ARB. (FN signatures are identical. Just doing some pointer substitution to ARB if not core.)
Attempt at improving VBO update batching. Subdata updates better batched to gether per-frame.
There's probably other stuff I forgot that is in this changeset, too.

Todo: Fix lightstate assertion when toggling fullscreen with shaders off.
2018-11-19 00:37:48 -06:00
Lirusaito
e199a1a1d6 Make sure we're updating the VisualComplexity whenever we should be (sync w/ upstream) 2017-05-13 10:29:03 -04:00
Shyotl
1230748ef5 Alchemy llcharacter and llcommon merge pass. 2017-03-31 02:08:03 -05:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Shyotl
4a9ff22eeb I was critically damp once. It was okay. 2017-03-14 01:44:26 -05:00
Shyotl
693781a014 Remove all QUADS usage. Replaced with TRIANGLES and TRIANGLE_STRIP. May do another pass and replace un-textured TRIANGLE_STRIPs with TRIANGLES to reduce flush calls. 2017-02-11 02:03:06 -06:00
Shyotl
34fd992fb9 Un-break rigged normals when software skinning. 2017-01-12 23:48:23 -06:00
Shyotl
f62fded4bd Use avatar-relative transforms when skinning via software, and translate to world coordinates after. 2017-01-12 23:47:58 -06:00
Shyotl
aa7c5e652c Removed some C++14-only syntax. 2017-01-12 23:45:42 -06:00
Shyotl
98516a2a22 Bento hell and back, and back to hell, and back. 2017-01-11 03:55:36 -06:00
Lirusaito
f33429f1bb Buncha pointless sync and cleanup 2016-05-27 12:17:30 -04:00
Lirusaito
39b3f58e13 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
# Conflicts:
#	indra/newview/llvoavatar.cpp
Also Reverted reversion of removal of before() wrapper in llstl.h
2016-05-02 15:15:06 -04:00
Shyotl
f26a5e9d62 Added FTType to texture fetch methods. Baked texture fetch now uses dynamic retry policy. 2016-05-01 19:44:06 -05:00
Shyotl
55b5f60b68 V3 mesh, texture, and hover merge. 2016-04-26 13:36:39 -05:00
Lirusaito
56bc3ae67a Oh gawd this is gonna conflict with Shyotl..
but you people wanted Render Weight for some reason... so here it is...
Now we'll send it to the server, rejoice.
2016-04-12 20:02:25 -04:00
Shyotl
691a5395ca llmessage merge and further LLUnit usage. 2016-04-07 20:17:30 -05:00
Shyotl
0841479ccc llcommon merge. Added LLUnits. 2016-04-06 01:31:20 -05:00
Drake Arconis
e545281387 Disable aixml* and comment out related classes for later fixing 2016-01-17 23:32:58 -05:00
Shyotl
3f3ead0988 Merge branch 'master' into AISv3-WIP
Conflicts:
	indra/newview/llinventorybridge.cpp
2015-06-27 01:30:28 -05:00
Shyotl
a380161283 Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045 2015-06-26 20:59:31 -05:00
Shyotl
9f10d9510d Initial AISv3 merge. New HTTP messages not plugged in yet. 2015-06-25 20:16:30 -05:00
Inusaito Sayori
8f2c92d198 Fix warnings. 2015-06-19 17:28:09 -04:00
Inusaito Sayori
b11511b7b9 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
2015-06-19 05:42:49 -04:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Inusaito Sayori
a0fb5cdaa7 [RLVa] Hide avatar-render-specific ui for people who are out of camavdist
Hides lookat lines, nametags, and overhead voice indicators for hidden avs.
While this isn't necessarily according to spec, this keeps the ui from looking out of place with no avatar to show with it

View without space changes? Meh, doesn't matter so much.
2015-06-04 12:21:49 -04:00
Inusaito Sayori
2d6a400967 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2015-06-02 04:45:31 -04:00
Inusaito Sayori
a9fd9e6f2a [RLVa] Cleanup for the last commits
camAvDist, camMax and camMin are now combined into:
-camPole: returns the saved pole of the highest degree
-updatePole: updates the saved pole to the highest degree when the related exception is changed
Poles are now cached in a map called m_Poles in the RlvHandler.
2015-05-26 07:50:21 -04:00
Inusaito Sayori
c42e501f6f [RLVa] @camavdist 2015-05-26 02:49:23 -04: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
Inusaito Sayori
4f8cbb8c06 [RLV] 2.9: @shownametags
This hides name tags and names whenever possible, except from chat.. when not possible, falls back on anonyms

Changed: Radar no longer hidess based on @shownames, that's silly.. now radar hides names when @shownames
Radar will alert when @shownames restricted, but not when @shownametags restricted
Radar will not offer menu when @shownames or @shownametags restricted, and the IM and Profile buttons will disable.

Hopefully fixed broken RLVa logic in llfloaterobjectiminfo.cpp
Fix slightly broken RLVa logic code in llpanelpermissions.cpp
Changed: Range Finder now disallowed when minimap disabled, show loc restriction doesn't change it anymore.
Fix broken hiding of names when offering teleports; rlv_shownames param doesn't seem to always pass, work around those situations...
^-This causes some false positives, I suppose, if you offer teleport from friends list to someone in the region, but better safe than sorry.
2015-05-22 16:53:32 -04: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
8943439629 Remove dupilicate perlin noise impl, and update the remaining one. 2015-05-16 02:30:32 -05:00
Inusaito Sayori
398014b118 Port Hover Height from Alchemy, it's in quicksettings~
Lots and lots of other sync~
Also has a command /hover
Added /resync command from Alchemy.
2015-03-25 08:04:24 -04: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
Inusaito Sayori
0367711e93 Fix ascent tag coloring borkage, woops. 2015-03-18 02:10:05 -04:00
Lirusaito
be6ad2a919 Add Mouselook IFF from Alchemy!
Also Assorted Code Cleanup and sync with Alchemy
Debug Settings are AlchemyMouselookIFF and AlchemyMouselookIFFRange
Look to see if an avatar is in a nearby region always when checking if they're an estate owner.
2015-03-13 22:16:07 -04:00
Shyotl
d2468d9f04 Fix issue with rigged normals when not using hardware skinning. 2015-02-25 20:53:14 -06:00
Shyotl
b865b92a6a Merge branch 'FMODStudio'
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
2015-01-26 17:15:46 -06:00
Shyotl
2132978c41 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2015-01-26 15:26:02 -06:00
Inusaito Sayori
0e48a2196f Update/Modernize LLAvatarName and LLAvatarNameCache and _EVERYTHING_ they touch
Fairly certain this adds the feature in which the user may click the online notification to open a chat with the user coming online.

Translators may want to look at the xml changes of this change to see what to update

Removes old LegacyMultiAttachmentSupport patch
Moves LLAvatarName-centric functions into LLAvatarName from elsewhere.
Adds boost::signals2::connections to name polling places.
Removes more old icky static callbacks
Merge from Alchemy, credit where due~
Update notifications.xml to have a bunch of the tags from upstream to ease diffing
2014-12-16 17:55:23 -05:00
Shyotl
c2abbaedc8 Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio 2014-11-22 22:20:32 -06:00
Shyotl
f8927a8a11 Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio
Conflicts:
	indra/llcommon/llsingleton.h
2014-11-22 22:19:44 -06:00
Shyotl
7054a2a6d2 Added some fasttimers to LLVOAvatar::idleUpdate 2014-11-22 22:04:18 -06:00
Drake Arconis
eb96dee176 Murrrrge 2014-09-10 01:03:04 -04:00