Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
This commit is contained in:
Siana Gearz
373
indra/newview/app_settings/lsl_functions_os.xml
Normal file
373
indra/newview/app_settings/lsl_functions_os.xml
Normal file
@@ -0,0 +1,373 @@
|
||||
<?xml version="1.0"?>
|
||||
<llsd>
|
||||
<map>
|
||||
<!-- REGARDING NON SL-LSL FUNCTIONS (OSSL, aaFunctions, botFunctions) -->
|
||||
<!-- These additions should be posted underneath the llFunctions -->
|
||||
<!-- These functions pertain to OpenSimulator and are in no part applicable to SecondLife by Linden Labs -->
|
||||
<!-- The Current State of these functions are in flux and development is ongoing. Not all the functions are presently -->
|
||||
<!-- fully documented and therefore the description may be incomplete and require further attention. -->
|
||||
<!-- OpenSim & Aurora-Sim are written in C# and not CPP therefore some values for example "double = float" etc. are different. -->
|
||||
|
||||
<!-- OSSL corrections and syntax additions added + set initially in same order as found in IOSSL_Api.cs of Aurora-Sim & OpenSim Source -->
|
||||
<!-- updates added @ end of each subsection for update timeline maint. -->
|
||||
<!-- Updates by WhiteStar Magic -->
|
||||
|
||||
<!-- OSSL Functions COMMON to OpenSim & Aurora-Sim -->
|
||||
<key>osSetDynamicTextureURL</key>
|
||||
<map/>
|
||||
<key>osSetDynamicTextureURLBlend</key>
|
||||
<map/>
|
||||
<key>osSetDynamicTextureURLBlendFace</key>
|
||||
<map/>
|
||||
<key>osSetDynamicTextureData</key>
|
||||
<map/>
|
||||
<key>osSetDynamicTextureDataBlend</key>
|
||||
<map/>
|
||||
<key>osSetDynamicTextureDataBlendFace</key>
|
||||
<map/>
|
||||
<key>osGetTerrainHeight</key>
|
||||
<map/>
|
||||
<key>osSetTerrainHeight</key>
|
||||
<map/>
|
||||
<key>osTerrainFlush</key>
|
||||
<map/>
|
||||
<key>osRegionRestart</key>
|
||||
<map/>
|
||||
<key>osRegionNotice</key>
|
||||
<map/>
|
||||
<key>osConsoleCommand</key>
|
||||
<map/>
|
||||
<key>osSetParcelMediaURL</key>
|
||||
<map/>
|
||||
<key>osSetPrimFloatOnWater</key>
|
||||
<map/>
|
||||
<key>osSetParcelSIPAddress</key>
|
||||
<map/>
|
||||
<key>osGetAgentIP</key>
|
||||
<map/>
|
||||
<key>osGetAgents</key>
|
||||
<map/>
|
||||
<key>osTeleportAgent</key>
|
||||
<map/>
|
||||
<key>osTeleportOwner</key>
|
||||
<map/>
|
||||
<key>osAvatarPlayAnimation</key>
|
||||
<map/>
|
||||
<key>osAvatarStopAnimation</key>
|
||||
<map/>
|
||||
<key>osForceAttachToAvatar</key>
|
||||
<map/>
|
||||
<key>osForceDetachFromAvatar</key>
|
||||
<map/>
|
||||
<key>osMovePen</key>
|
||||
<map/>
|
||||
<key>osDrawLine</key>
|
||||
<map/>
|
||||
<key>osDrawText</key>
|
||||
<map/>
|
||||
<key>osDrawEllipse</key>
|
||||
<map/>
|
||||
<key>osDrawRectangle</key>
|
||||
<map/>
|
||||
<key>osDrawFilledRectangle</key>
|
||||
<map/>
|
||||
<key>osDrawPolygon</key>
|
||||
<map/>
|
||||
<key>osDrawFilledPolygon</key>
|
||||
<map/>
|
||||
<key>osSetFontSize</key>
|
||||
<map/>
|
||||
<key>osSetFontName</key>
|
||||
<map/>
|
||||
<key>osSetPenSize</key>
|
||||
<map/>
|
||||
<key>osSetPenColor</key>
|
||||
<map/>
|
||||
<key>osSetPenCap</key>
|
||||
<map/>
|
||||
<key>osDrawImage</key>
|
||||
<map/>
|
||||
<key>osGetDrawStringSize</key>
|
||||
<map/>
|
||||
<key>osList2Double</key>
|
||||
<map/>
|
||||
<key>osSetRegionWaterHeight</key>
|
||||
<map/>
|
||||
<key>osSetRegionSunSettings</key>
|
||||
<map/>
|
||||
<key>osSetEstateSunSettings</key>
|
||||
<map/>
|
||||
<key>osGetCurrentSunHour</key>
|
||||
<map/>
|
||||
<key>osGetSunParam</key>
|
||||
<map/>
|
||||
<key>osSetSunParam</key>
|
||||
<map/>
|
||||
<key>osWindActiveModelPluginName</key>
|
||||
<map/>
|
||||
<key>osSetWindParam</key>
|
||||
<map/>
|
||||
<key>osGetWindParam</key>
|
||||
<map/>
|
||||
<key>osParcelJoin</key>
|
||||
<map/>
|
||||
<key>osParcelSubdivide</key>
|
||||
<map/>
|
||||
<key>osSetParcelDetails</key>
|
||||
<map/>
|
||||
<key>osGetScriptEngineName</key>
|
||||
<map/>
|
||||
<key>osGetSimulatorVersion</key>
|
||||
<map/>
|
||||
<key>osParseJSON</key>
|
||||
<map/>
|
||||
<key>osParseJSONNew</key>
|
||||
<map/>
|
||||
<key>osMessageObject</key>
|
||||
<map/>
|
||||
<key>osMakeNotecard</key>
|
||||
<map/>
|
||||
<key>osGetNotecardLine</key>
|
||||
<map/>
|
||||
<key>osGetNotecard</key>
|
||||
<map/>
|
||||
<key>osGetNumberOfNotecardLines</key>
|
||||
<map/>
|
||||
<key>osAvatarName2Key</key>
|
||||
<map/>
|
||||
<key>osKey2Name</key>
|
||||
<map/>
|
||||
<key>osGetGridNick</key>
|
||||
<map/>
|
||||
<key>osGetGridName</key>
|
||||
<map/>
|
||||
<key>osGetGridLoginURI</key>
|
||||
<map/>
|
||||
<key>osGetGridHomeURI</key>
|
||||
<map/>
|
||||
<key>osGetGridGatekeeperURI</key>
|
||||
<map/>
|
||||
<key>osGetGridCustom</key>
|
||||
<map/>
|
||||
<key>osFormatString</key>
|
||||
<map/>
|
||||
<key>osMatchString</key>
|
||||
<map/>
|
||||
<key>osReplaceString</key>
|
||||
<map/>
|
||||
<key>osLoadedCreationDate</key>
|
||||
<map/>
|
||||
<key>osLoadedCreationTime</key>
|
||||
<map/>
|
||||
<key>osLoadedCreationID</key>
|
||||
<map/>
|
||||
<key>osGetLinkPrimitiveParams</key>
|
||||
<map/>
|
||||
<key>osGetMapTexture</key>
|
||||
<map/>
|
||||
<key>osGetRegionMapTexture</key>
|
||||
<map/>
|
||||
<key>osGetRegionStats</key>
|
||||
<map/>
|
||||
<key>osGetSimulatorMemory</key>
|
||||
<map/>
|
||||
<key>osKickAvatar</key>
|
||||
<map/>
|
||||
<key>osSetSpeed</key>
|
||||
<map/>
|
||||
<key>osCauseDamage</key>
|
||||
<map/>
|
||||
<key>osCauseHealing</key>
|
||||
<map/>
|
||||
<key>osGetPrimitiveParams</key>
|
||||
<map/>
|
||||
<key>osSetPrimitiveParams</key>
|
||||
<map/>
|
||||
<key>osSetProjectionParams</key>
|
||||
<map/>
|
||||
<key>osGetAvatarList</key>
|
||||
<map/>
|
||||
<key>osUnixTimeToTimestamp</key>
|
||||
<map/>
|
||||
<key>osGetInventoryDesc</key>
|
||||
<map/>
|
||||
<key>osInviteToGroup</key>
|
||||
<map/>
|
||||
<key>osEjectFromGroup</key>
|
||||
<map/>
|
||||
<key>osSetTerrainTexture</key>
|
||||
<map/>
|
||||
<key>osSetTerrainTextureHeight</key>
|
||||
<map/>
|
||||
|
||||
<!-- OSSL Functions OpenSim Unique -->
|
||||
<key>osSetStateEvents</key>
|
||||
<map/>
|
||||
<key>osIsNpc</key>
|
||||
<map/>
|
||||
<key>osNpcCreate</key>
|
||||
<map/>
|
||||
<key>osNpcSaveAppearance</key>
|
||||
<map/>
|
||||
<key>osNpcLoadAppearance</key>
|
||||
<map/>
|
||||
<key>osNpcGetPos</key>
|
||||
<map/>
|
||||
<key>osNpcMoveTo</key>
|
||||
<map/>
|
||||
<key>osNpcMoveToTarget</key>
|
||||
<map/>
|
||||
<key>osNpcGetOwner</key>
|
||||
<map/>
|
||||
<key>osNpcGetRot</key>
|
||||
<map/>
|
||||
<key>osNpcSetRot</key>
|
||||
<map/>
|
||||
<key>osNpcStopMoveToTarget</key>
|
||||
<map/>
|
||||
<key>osNpcSay</key>
|
||||
<map/>
|
||||
<key>osNpcSay</key>
|
||||
<map/>
|
||||
<key>osNpcSit</key>
|
||||
<map/>
|
||||
<key>osNpcStand</key>
|
||||
<map/>
|
||||
<key>osNpcRemove</key>
|
||||
<map/>
|
||||
<key>osNpcPlayAnimation</key>
|
||||
<map/>
|
||||
<key>osNpcStopAnimation</key>
|
||||
<map/>
|
||||
<key>osOwnerSaveAppearance</key>
|
||||
<map/>
|
||||
<key>osAgentSaveAppearance</key>
|
||||
<map/>
|
||||
<key>osNpcShout</key>
|
||||
<map/>
|
||||
<key>osNpcWhisper</key>
|
||||
<map/>
|
||||
|
||||
<!-- OSSL Functions Aurora-Sim Unique -->
|
||||
<key>osReturnObject</key>
|
||||
<map/>
|
||||
<key>osReturnObjects</key>
|
||||
<map/>
|
||||
<key>osShutDown</key>
|
||||
<map/>
|
||||
<key>osAddAgentToGroup</key>
|
||||
<map/>
|
||||
<key>osRezObject</key>
|
||||
<map/>
|
||||
|
||||
<!-- LightShare functions (Careminster Variant) -->
|
||||
<key>cmSetWindlightScene</key>
|
||||
<map/>
|
||||
<key>cmSetWindlightSceneTargeted</key>
|
||||
<map/>
|
||||
<key>cmGetWindlightScene</key>
|
||||
<map/>
|
||||
<!-- LightShare functions - alternate versions (os & aa variant) -->
|
||||
<key>lsSetWindlightScene</key>
|
||||
<map/>
|
||||
<key>lsSetWindlightSceneTargeted</key>
|
||||
<map/>
|
||||
<key>lsGetWindlightScene</key>
|
||||
<map/>
|
||||
|
||||
<!-- aaFunctions Aurora-Sim ONLY -->
|
||||
<key>aaSetCloudDensity</key>
|
||||
<map/>
|
||||
<key>aaUpdateDatabase</key>
|
||||
<map/>
|
||||
<key>aaQueryDatabase</key>
|
||||
<map/>
|
||||
<key>aaDeserializeXMLValues</key>
|
||||
<map/>
|
||||
<key>aaDeserializeXMLKeys</key>
|
||||
<map/>
|
||||
<key>aaSetConeOfSilence</key>
|
||||
<map/>
|
||||
<key>aaSerializeXML</key>
|
||||
<map/>
|
||||
<key>aaGetTeam</key>
|
||||
<map/>
|
||||
<key>aaGetHealth</key>
|
||||
<map/>
|
||||
<key>aaJoinCombat</key>
|
||||
<map/>
|
||||
<key>aaLeaveCombat</key>
|
||||
<map/>
|
||||
<key>aaJoinCombatTeam</key>
|
||||
<map/>
|
||||
<key>aaRequestCombatPermission</key>
|
||||
<map/>
|
||||
<key>aaThawAvatar</key>
|
||||
<map/>
|
||||
<key>aaFreezeAvatar</key>
|
||||
<map/>
|
||||
<key>aaGetTeamMembers</key>
|
||||
<map/>
|
||||
<key>aaGetLastOwner</key>
|
||||
<map/>
|
||||
<key>aaSayDistance</key>
|
||||
<map/>
|
||||
<key>aaSayTo</key>
|
||||
<map/>
|
||||
<key>aaGetWalkDisabled</key>
|
||||
<map/>
|
||||
<key>aaSetWalkDisabled</key>
|
||||
<map/>
|
||||
<key>aaGetFlyDisabled</key>
|
||||
<map/>
|
||||
<key>aaSetFlyDisabled</key>
|
||||
<map/>
|
||||
<key>aaAvatarFullName2Key</key>
|
||||
<map/>
|
||||
<key>aaRaiseError</key>
|
||||
<map/>
|
||||
<key>aaGetText</key>
|
||||
<map/>
|
||||
<key>aaGetTextColor</key>
|
||||
<map/>
|
||||
<key>aaSetEnv</key>
|
||||
<map/>
|
||||
<key>aaGetIsInfiniteRegion</key>
|
||||
<map/>
|
||||
<!-- botFunctions Aurora-Sim ONLY -->
|
||||
<key>botGetWaitingTime</key>
|
||||
<map/>
|
||||
<key>botSetMap</key>
|
||||
<map/>
|
||||
<key>botCreateBot</key>
|
||||
<map/>
|
||||
<key>botRemoveBot</key>
|
||||
<map/>
|
||||
<key>botPauseMovement</key>
|
||||
<map/>
|
||||
<key>botResumeMovement</key>
|
||||
<map/>
|
||||
<key>botFollowAvatar</key>
|
||||
<map/>
|
||||
<key>botStopFollowAvatar</key>
|
||||
<map/>
|
||||
<key>botSendChatMessage</key>
|
||||
<map/>
|
||||
<key>botSendIM</key>
|
||||
<map/>
|
||||
<key>botSetShouldFly</key>
|
||||
<map/>
|
||||
<key>botSitObject</key>
|
||||
<map/>
|
||||
<key>botStandUp</key>
|
||||
<map/>
|
||||
<key>botTouchObject</key>
|
||||
<map/>
|
||||
<key>botAddTag</key>
|
||||
<map/>
|
||||
<key>botGetBotsWithTag</key>
|
||||
<map/>
|
||||
<key>botRemoveBotsWithTag</key>
|
||||
<map/>
|
||||
</map>
|
||||
</llsd>
|
||||
1014
indra/newview/app_settings/lsl_functions_sl.xml
Normal file
1014
indra/newview/app_settings/lsl_functions_sl.xml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -973,6 +973,17 @@
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AntiSpamGroupFeeInvites</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>When true, dialogs from group invites that require an entry fee will be blocked.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>AntiSpamGroupNotices</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
/**
|
||||
* @file colorFilterF.glsl
|
||||
*
|
||||
* Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
|
||||
* $License$
|
||||
*/
|
||||
|
||||
#extension GL_ARB_texture_rectangle : enable
|
||||
|
||||
#ifdef DEFINE_GL_FRAGCOLOR
|
||||
out vec4 frag_color;
|
||||
#else
|
||||
#define frag_color gl_FragColor
|
||||
#endif
|
||||
|
||||
uniform sampler2DRect tex0;
|
||||
uniform sampler2DRect tex1;
|
||||
uniform mat4 inv_proj;
|
||||
uniform mat4 prev_proj;
|
||||
uniform vec2 screen_res;
|
||||
uniform int blur_strength;
|
||||
|
||||
VARYING vec2 vary_texcoord0;
|
||||
|
||||
#define SAMPLE_COUNT 10
|
||||
|
||||
vec4 getPosition(vec2 pos_screen, out vec4 ndc)
|
||||
{
|
||||
float depth = texture2DRect(tex1, pos_screen.xy).r;
|
||||
vec2 sc = pos_screen.xy*2.0;
|
||||
sc /= screen_res;
|
||||
sc -= vec2(1.0,1.0);
|
||||
ndc = vec4(sc.x, sc.y, 2.0*depth-1.0, 1.0);
|
||||
vec4 pos = inv_proj * ndc;
|
||||
pos /= pos.w;
|
||||
pos.w = 1.0;
|
||||
return pos;
|
||||
}
|
||||
|
||||
void main(void)
|
||||
{
|
||||
vec4 ndc;
|
||||
vec4 pos = getPosition(vary_texcoord0,ndc);
|
||||
vec4 prev_pos = prev_proj * pos;
|
||||
prev_pos/=prev_pos.w;
|
||||
prev_pos.w = 1.0;
|
||||
vec2 vel = ((ndc.xy-prev_pos.xy) * .5) * screen_res * .001 * blur_strength;
|
||||
vec3 color = texture2DRect(tex0, vary_texcoord0.st).rgb;
|
||||
vec2 texcoord = vary_texcoord0 + vel;
|
||||
for(int i = 1; i < SAMPLE_COUNT; ++i, texcoord += vel)
|
||||
{
|
||||
color += texture2DRect(tex0, texcoord.st).rgb;
|
||||
}
|
||||
frag_color = vec4(color / SAMPLE_COUNT, 1.0);
|
||||
}
|
||||
@@ -175,6 +175,8 @@
|
||||
<key>enable_gauss_blur</key>
|
||||
<boolean>0</boolean>
|
||||
<key>enable_posterize</key>
|
||||
<boolean>0</boolean>
|
||||
<key>enable_motionblur</key>
|
||||
<boolean>0</boolean>
|
||||
<key>gauss_blur_passes</key>
|
||||
<integer>2</integer>
|
||||
@@ -190,6 +192,8 @@
|
||||
<real>1</real>
|
||||
<key>posterize_layers</key>
|
||||
<real>10</real>
|
||||
<key>blur_strength</key>
|
||||
<real>10</real>
|
||||
</map>
|
||||
</map>
|
||||
</llsd>
|
||||
Reference in New Issue
Block a user