ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 10:46:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'opensim:master' into master

Browse Source
This commit is contained in:
Adil El Farissi
2024-06-13 22:21:39 +00:00
committed by GitHub
parent 6ab23c8d6b ed455616f7
commit 3bcc96e42d
25 changed files with 377 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Capabilities/Caps.cs
View File

@@ -126,7 +126,8 @@ namespace OpenSim.Framework.Capabilities
WLEnv = 0x200,
AdvEnv = 0x400,
PBR = 0x800,
ViewerBenefits = 0x1000
ViewerBenefits = 0x1000,
TPBR = 0x2000
}
public CapsFlags Flags { get; set;}

16
OpenSim/Data/MySQL/MySQLSimulationData.cs
View File

@@ -901,7 +901,8 @@ namespace OpenSim.Data.MySQL
"covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
"sunvectorz, loaded_creation_datetime, " +
"loaded_creation_id, map_tile_ID, block_search, casino, " +
"TelehubObject, parcel_tile_ID, cacheID) " +
"TelehubObject, parcel_tile_ID, cacheID, " +
"TerrainPBR1, TerrainPBR2, TerrainPBR3, TerrainPBR4)" +
"values (?RegionUUID, ?BlockTerraform, " +
"?BlockFly, ?AllowDamage, ?RestrictPushing, " +
"?AllowLandResell, ?AllowLandJoinDivide, " +
@@ -918,7 +919,8 @@ namespace OpenSim.Data.MySQL
"?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
"?loaded_creation_datetime, ?loaded_creation_id, " +
"?map_tile_ID, ?block_search, ?casino, " +
"?TelehubObject, ?parcel_tile_ID, ?cacheID)";
"?TelehubObject, ?parcel_tile_ID, ?cacheID, " +
"?TerrainPBR1, ?TerrainPBR2, ?TerrainPBR3, ?TerrainPBR4)";
FillRegionSettingsCommand(cmd, rs);
ExecuteNonQuery(cmd);
@@ -1298,6 +1300,11 @@ namespace OpenSim.Data.MySQL
if (row["cacheID"] is not DBNull)
newSettings.CacheID = DBGuid.FromDB(row["cacheID"]);
newSettings.TerrainPBR1 = DBGuid.FromDB(row["TerrainPBR1"]);
newSettings.TerrainPBR2 = DBGuid.FromDB(row["TerrainPBR2"]);
newSettings.TerrainPBR3 = DBGuid.FromDB(row["TerrainPBR3"]);
newSettings.TerrainPBR4 = DBGuid.FromDB(row["TerrainPBR4"]);
return newSettings;
}
@@ -1700,6 +1707,11 @@ namespace OpenSim.Data.MySQL
cmd.Parameters.AddWithValue("parcel_tile_ID", settings.ParcelImageID.ToString());
cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject.ToString());
cmd.Parameters.AddWithValue("cacheID", settings.CacheID.ToString());
cmd.Parameters.AddWithValue("TerrainPBR1", settings.TerrainPBR1.ToString());
cmd.Parameters.AddWithValue("TerrainPBR2", settings.TerrainPBR2.ToString());
cmd.Parameters.AddWithValue("TerrainPBR3", settings.TerrainPBR3.ToString());
cmd.Parameters.AddWithValue("TerrainPBR4", settings.TerrainPBR4.ToString());
}
/// <summary>

8
OpenSim/Data/MySQL/Resources/RegionStore.migrations
View File

@@ -558,4 +558,12 @@ COMMIT;
:VERSION 65 #----- add linkset data binary storage column
BEGIN;
ALTER TABLE `prims` ADD COLUMN `lnkstBinData` blob default NULL;
COMMIT;
:VERSION 66 #----- add PBR Terrain storage column
BEGIN;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` varchar(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` varchar(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` varchar(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` varchar(36) NOT NULL;
COMMIT;

107
OpenSim/Data/PGSQL/PGSQLSimulationData.cs
View File

@@ -957,7 +957,8 @@ namespace OpenSim.Data.PGSQL
,block_show_in_search = :block_show_in_search ,agent_limit = :agent_limit ,object_bonus = :object_bonus ,maturity = :maturity
,disable_scripts = :disable_scripts ,disable_collisions = :disable_collisions ,disable_physics = :disable_physics
,terrain_texture_1 = :terrain_texture_1 ,terrain_texture_2 = :terrain_texture_2 ,terrain_texture_3 = :terrain_texture_3
,terrain_texture_4 = :terrain_texture_4 ,elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw
,terrain_texture_4 = :terrain_texture_4 , TerrainPBR1 = :TerrainPBR1, TerrainPBR2 = :TerrainPBR2, TerrainPBR3 = :TerrainPBR3
,TerrainPBR4 = :TerrainPBR4, elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw
,elevation_1_ne = :elevation_1_ne ,elevation_2_ne = :elevation_2_ne ,elevation_1_se = :elevation_1_se ,elevation_2_se = :elevation_2_se
,elevation_1_sw = :elevation_1_sw ,elevation_2_sw = :elevation_2_sw ,water_height = :water_height ,terrain_raise_limit = :terrain_raise_limit
,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position
@@ -1080,6 +1081,12 @@ namespace OpenSim.Data.PGSQL
if (!(row["cacheID"] is DBNull))
newSettings.CacheID = new UUID((Guid)row["cacheID"]);
newSettings.TerrainPBR1 = new UUID((Guid)row["TerrainPBR1"]);
newSettings.TerrainPBR2 = new UUID((Guid)row["TerrainPBR2"]);
newSettings.TerrainPBR3 = new UUID((Guid)row["TerrainPBR3"]);
newSettings.TerrainPBR4 = new UUID((Guid)row["TerrainPBR4"]);
return newSettings;
}
@@ -1552,53 +1559,57 @@ namespace OpenSim.Data.PGSQL
/// <returns></returns>
private NpgsqlParameter[] CreateRegionSettingParameters(RegionSettings settings)
{
List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
parameters.Add(_Database.CreateParameter("regionUUID", settings.RegionUUID));
parameters.Add(_Database.CreateParameter("block_terraform", settings.BlockTerraform));
parameters.Add(_Database.CreateParameter("block_fly", settings.BlockFly));
parameters.Add(_Database.CreateParameter("allow_damage", settings.AllowDamage));
parameters.Add(_Database.CreateParameter("restrict_pushing", settings.RestrictPushing));
parameters.Add(_Database.CreateParameter("allow_land_resell", settings.AllowLandResell));
parameters.Add(_Database.CreateParameter("allow_land_join_divide", settings.AllowLandJoinDivide));
parameters.Add(_Database.CreateParameter("block_show_in_search", settings.BlockShowInSearch));
parameters.Add(_Database.CreateParameter("agent_limit", settings.AgentLimit));
parameters.Add(_Database.CreateParameter("object_bonus", settings.ObjectBonus));
parameters.Add(_Database.CreateParameter("maturity", settings.Maturity));
parameters.Add(_Database.CreateParameter("disable_scripts", settings.DisableScripts));
parameters.Add(_Database.CreateParameter("disable_collisions", settings.DisableCollisions));
parameters.Add(_Database.CreateParameter("disable_physics", settings.DisablePhysics));
parameters.Add(_Database.CreateParameter("terrain_texture_1", settings.TerrainTexture1));
parameters.Add(_Database.CreateParameter("terrain_texture_2", settings.TerrainTexture2));
parameters.Add(_Database.CreateParameter("terrain_texture_3", settings.TerrainTexture3));
parameters.Add(_Database.CreateParameter("terrain_texture_4", settings.TerrainTexture4));
parameters.Add(_Database.CreateParameter("elevation_1_nw", settings.Elevation1NW));
parameters.Add(_Database.CreateParameter("elevation_2_nw", settings.Elevation2NW));
parameters.Add(_Database.CreateParameter("elevation_1_ne", settings.Elevation1NE));
parameters.Add(_Database.CreateParameter("elevation_2_ne", settings.Elevation2NE));
parameters.Add(_Database.CreateParameter("elevation_1_se", settings.Elevation1SE));
parameters.Add(_Database.CreateParameter("elevation_2_se", settings.Elevation2SE));
parameters.Add(_Database.CreateParameter("elevation_1_sw", settings.Elevation1SW));
parameters.Add(_Database.CreateParameter("elevation_2_sw", settings.Elevation2SW));
parameters.Add(_Database.CreateParameter("water_height", settings.WaterHeight));
parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit));
parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit));
parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun));
parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox));
parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun));
parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition));
parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X));
parameters.Add(_Database.CreateParameter("sunvectory", settings.SunVector.Y));
parameters.Add(_Database.CreateParameter("sunvectorz", settings.SunVector.Z));
parameters.Add(_Database.CreateParameter("covenant", settings.Covenant));
parameters.Add(_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime));
parameters.Add(_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime));
parameters.Add(_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID));
parameters.Add(_Database.CreateParameter("TerrainImageID", settings.TerrainImageID));
parameters.Add(_Database.CreateParameter("ParcelImageID", settings.ParcelImageID));
parameters.Add(_Database.CreateParameter("TelehubObject", settings.TelehubObject));
parameters.Add(_Database.CreateParameter("cacheID", settings.CacheID));
List<NpgsqlParameter> parameters =
[
_Database.CreateParameter("regionUUID", settings.RegionUUID),
_Database.CreateParameter("block_terraform", settings.BlockTerraform),
_Database.CreateParameter("block_fly", settings.BlockFly),
_Database.CreateParameter("allow_damage", settings.AllowDamage),
_Database.CreateParameter("restrict_pushing", settings.RestrictPushing),
_Database.CreateParameter("allow_land_resell", settings.AllowLandResell),
_Database.CreateParameter("allow_land_join_divide", settings.AllowLandJoinDivide),
_Database.CreateParameter("block_show_in_search", settings.BlockShowInSearch),
_Database.CreateParameter("agent_limit", settings.AgentLimit),
_Database.CreateParameter("object_bonus", settings.ObjectBonus),
_Database.CreateParameter("maturity", settings.Maturity),
_Database.CreateParameter("disable_scripts", settings.DisableScripts),
_Database.CreateParameter("disable_collisions", settings.DisableCollisions),
_Database.CreateParameter("disable_physics", settings.DisablePhysics),
_Database.CreateParameter("terrain_texture_1", settings.TerrainTexture1),
_Database.CreateParameter("terrain_texture_2", settings.TerrainTexture2),
_Database.CreateParameter("terrain_texture_3", settings.TerrainTexture3),
_Database.CreateParameter("terrain_texture_4", settings.TerrainTexture4),
_Database.CreateParameter("elevation_1_nw", settings.Elevation1NW),
_Database.CreateParameter("elevation_2_nw", settings.Elevation2NW),
_Database.CreateParameter("elevation_1_ne", settings.Elevation1NE),
_Database.CreateParameter("elevation_2_ne", settings.Elevation2NE),
_Database.CreateParameter("elevation_1_se", settings.Elevation1SE),
_Database.CreateParameter("elevation_2_se", settings.Elevation2SE),
_Database.CreateParameter("elevation_1_sw", settings.Elevation1SW),
_Database.CreateParameter("elevation_2_sw", settings.Elevation2SW),
_Database.CreateParameter("water_height", settings.WaterHeight),
_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit),
_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit),
_Database.CreateParameter("use_estate_sun", settings.UseEstateSun),
_Database.CreateParameter("Sandbox", settings.Sandbox),
_Database.CreateParameter("fixed_sun", settings.FixedSun),
_Database.CreateParameter("sun_position", settings.SunPosition),
_Database.CreateParameter("sunvectorx", settings.SunVector.X),
_Database.CreateParameter("sunvectory", settings.SunVector.Y),
_Database.CreateParameter("sunvectorz", settings.SunVector.Z),
_Database.CreateParameter("covenant", settings.Covenant),
_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime),
_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime),
_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID),
_Database.CreateParameter("TerrainImageID", settings.TerrainImageID),
_Database.CreateParameter("ParcelImageID", settings.ParcelImageID),
_Database.CreateParameter("TelehubObject", settings.TelehubObject),
_Database.CreateParameter("cacheID", settings.CacheID),
_Database.CreateParameter("TerrainPBR1", settings.TerrainPBR1),
_Database.CreateParameter("TerrainPBR2", settings.TerrainPBR2),
_Database.CreateParameter("TerrainPBR3", settings.TerrainPBR3),
_Database.CreateParameter("TerrainPBR4", settings.TerrainPBR4),
];
return parameters.ToArray();
}

8
OpenSim/Data/PGSQL/Resources/RegionStore.migrations
View File

@@ -1259,3 +1259,11 @@ COMMIT;
BEGIN;
ALTER TABLE "public"."prims" ADD COLUMN "lnkstBinData" bytea NULL;
COMMIT;
:VERSION 54 #----- add pbr terrain storage
BEGIN;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR1" uuid NOT NULL;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR2" uuid NOT NULL;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR3" uuid NOT NULL;
ALTER TABLE regionsettings ADD COLUMN "TerrainPBR4" uuid NOT NULL;
COMMIT;

9
OpenSim/Data/SQLite/Resources/RegionStore.migrations
View File

@@ -410,3 +410,12 @@ COMMIT;
BEGIN;
ALTER TABLE `prims` ADD COLUMN `lnkstBinData` blob default NULL;
COMMIT;
:VERSION 42 #----- add pbr terrain storage
BEGIN;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` char(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` char(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` char(36) NOT NULL;
ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` char(36) NOT NULL;
COMMIT;

15
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@@ -1438,6 +1438,10 @@ namespace OpenSim.Data.SQLite
createCol(regionsettings, "terrain_texture_2", typeof(String));
createCol(regionsettings, "terrain_texture_3", typeof(String));
createCol(regionsettings, "terrain_texture_4", typeof(String));
createCol(regionsettings, "TerrainPBR1", typeof(String));
createCol(regionsettings, "TerrainPBR2", typeof(String));
createCol(regionsettings, "TerrainPBR3", typeof(String));
createCol(regionsettings, "TerrainPBR4", typeof(String));
createCol(regionsettings, "elevation_1_nw", typeof(Double));
createCol(regionsettings, "elevation_2_nw", typeof(Double));
createCol(regionsettings, "elevation_1_ne", typeof(Double));
@@ -2010,6 +2014,11 @@ namespace OpenSim.Data.SQLite
if (row["cacheID"] is not System.DBNull)
newSettings.CacheID = new UUID((String)row["cacheID"]);
newSettings.TerrainPBR1 = new UUID((String)row["TerrainPBR1"]);
newSettings.TerrainPBR2 = new UUID((String)row["TerrainPBR2"]);
newSettings.TerrainPBR3 = new UUID((String)row["TerrainPBR3"]);
newSettings.TerrainPBR4 = new UUID((String)row["TerrainPBR4"]);
return newSettings;
}
@@ -2370,6 +2379,12 @@ namespace OpenSim.Data.SQLite
row["block_search"] = settings.GodBlockSearch;
row["casino"] = settings.Casino;
row["cacheID"] = settings.CacheID;
row["TerrainPBR1"] = settings.TerrainPBR1.ToString();
row["TerrainPBR2"] = settings.TerrainPBR2.ToString();
row["TerrainPBR3"] = settings.TerrainPBR3.ToString();
row["TerrainPBR4"] = settings.TerrainPBR4.ToString();
}
/// <summary>

2
OpenSim/Framework/Constants.cs
View File

@@ -59,7 +59,7 @@ namespace OpenSim.Framework
public const float MinWaterHeight = 0;
public const float MaxWaterHeight = 8000f;
public const int MaxTextureResolution = 1024;
public const int MaxTextureResolution = 2048;
public static readonly string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f"; //plywood
public static readonly UUID DefaultTextureID = new UUID(DefaultTexture);

14
OpenSim/Framework/IClientAPI.cs
View File

@@ -598,6 +598,18 @@ namespace OpenSim.Framework
public int Price;
}
[Flags]
public enum ViewerFlags:uint
{
SentSeeds = 0x1000,
ObjectAnim = 0x2000,
WLEnv = 0x4000,
AdvEnv = 0x8000,
PBR = 0x10000,
TPBR = 0x20000,
SentTPBR = 0x40000,
}
/// <summary>
/// Specifies the fields that have been changed when sending a prim or
/// avatar update
@@ -671,6 +683,8 @@ namespace OpenSim.Framework
ulong ActiveGroupPowers { get; set;}
ViewerFlags ViewerFlags { get;}
Dictionary<UUID, ulong> GetGroupPowers();
void SetGroupPowers(Dictionary<UUID, ulong> powers);

67
OpenSim/Framework/RegionSettings.cs
View File

@@ -116,6 +116,12 @@ namespace OpenSim.Framework
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_3 = new("179cdabd-398a-9b6b-1391-4dc333ba321f");
public static readonly UUID DEFAULT_TERRAIN_TEXTURE_4 = new("beb169c7-11ea-fff2-efe5-0f24dc881df2");
public static readonly UUID DEFAULT_TERRAIN_PBR_1 = new("b8d3965a-ad78-bf43-699b-bff8eca6c975");
public static readonly UUID DEFAULT_TERRAIN_PBR_2 = new("abb783e6-3e93-26c0-248a-247666855da3");
public static readonly UUID DEFAULT_TERRAIN_PBR_3 = new("179cdabd-398a-9b6b-1391-4dc333ba321f");
public static readonly UUID DEFAULT_TERRAIN_PBR_4 = new("beb169c7-11ea-fff2-efe5-0f24dc881df2");
public void Save()
{
OnSave?.Invoke(this);
@@ -226,13 +232,7 @@ namespace OpenSim.Framework
public UUID TerrainTexture1
{
get { return m_TerrainTexture1; }
set
{
if (value.IsZero())
m_TerrainTexture1 = DEFAULT_TERRAIN_TEXTURE_1;
else
m_TerrainTexture1 = value;
}
set { m_TerrainTexture1 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_1 : value; }
}
private UUID m_TerrainTexture2 = UUID.Zero;
@@ -240,13 +240,7 @@ namespace OpenSim.Framework
public UUID TerrainTexture2
{
get { return m_TerrainTexture2; }
set
{
if (value.IsZero())
m_TerrainTexture2 = DEFAULT_TERRAIN_TEXTURE_2;
else
m_TerrainTexture2 = value;
}
set { m_TerrainTexture2 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_2 : value; }
}
private UUID m_TerrainTexture3 = UUID.Zero;
@@ -254,13 +248,7 @@ namespace OpenSim.Framework
public UUID TerrainTexture3
{
get { return m_TerrainTexture3; }
set
{
if (value.IsZero())
m_TerrainTexture3 = DEFAULT_TERRAIN_TEXTURE_3;
else
m_TerrainTexture3 = value;
}
set { m_TerrainTexture3 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_3 : value; }
}
private UUID m_TerrainTexture4 = UUID.Zero;
@@ -268,15 +256,38 @@ namespace OpenSim.Framework
public UUID TerrainTexture4
{
get { return m_TerrainTexture4; }
set
{
if (value.IsZero())
m_TerrainTexture4 = DEFAULT_TERRAIN_TEXTURE_4;
else
m_TerrainTexture4 = value;
}
set { m_TerrainTexture4 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_4 : value; }
}
private UUID m_TerrainPBR1 = UUID.Zero;
public UUID TerrainPBR1
{
get { return m_TerrainPBR1; }
set { m_TerrainPBR1 = value.IsZero() ? DEFAULT_TERRAIN_PBR_1 : value; }
}
private UUID m_TerrainPBR2 = UUID.Zero;
public UUID TerrainPBR2
{
get { return m_TerrainPBR2; }
set { m_TerrainPBR2 = value.IsZero() ? DEFAULT_TERRAIN_PBR_2 : value; }
}
private UUID m_TerrainPBR3 = UUID.Zero;
public UUID TerrainPBR3
{
get { return m_TerrainPBR3; }
set { m_TerrainPBR3 = value.IsZero() ? DEFAULT_TERRAIN_PBR_3 : value; }
}
private UUID m_TerrainPBR4 = UUID.Zero;
public UUID TerrainPBR4
{
get { return m_TerrainPBR4; }
set { m_TerrainPBR4 = value.IsZero() ? DEFAULT_TERRAIN_PBR_4 : value; }
}
private double m_Elevation1NW = 10;
public double Elevation1NW
{

16
OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs vendored
View File

@@ -140,6 +140,18 @@ namespace OpenSim.Framework.Serialization.External
case "Texture4":
settings.TerrainTexture4 = UUID.Parse(xtr.ReadElementContentAsString());
break;
case "PBR1":
settings.TerrainPBR1 = UUID.Parse(xtr.ReadElementContentAsString());
break;
case "PBR2":
settings.TerrainPBR2 = UUID.Parse(xtr.ReadElementContentAsString());
break;
case "PBR3":
settings.TerrainPBR3 = UUID.Parse(xtr.ReadElementContentAsString());
break;
case "PBR4":
settings.TerrainPBR3 = UUID.Parse(xtr.ReadElementContentAsString());
break;
case "ElevationLowSW":
settings.Elevation1SW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
break;
@@ -301,6 +313,10 @@ namespace OpenSim.Framework.Serialization.External
xtw.WriteElementString("Texture2", settings.TerrainTexture2.ToString());
xtw.WriteElementString("Texture3", settings.TerrainTexture3.ToString());
xtw.WriteElementString("Texture4", settings.TerrainTexture4.ToString());
xtw.WriteElementString("PBR1", settings.TerrainPBR1.ToString());
xtw.WriteElementString("PBR2", settings.TerrainPBR2.ToString());
xtw.WriteElementString("PBR3", settings.TerrainPBR3.ToString());
xtw.WriteElementString("PBR4", settings.TerrainPBR4.ToString());
xtw.WriteElementString("ElevationLowSW", settings.Elevation1SW.ToString());
xtw.WriteElementString("ElevationLowNW", settings.Elevation1NW.ToString());
xtw.WriteElementString("ElevationLowSE", settings.Elevation1SE.ToString());

16
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@@ -350,9 +350,21 @@ namespace OpenSim.Region.ClientStack.Linden
{
case "SEED":
continue;
case "ViewerBenefits": // this may need a proper cap but not currently
case "ViewerBenefits":
m_HostCapsObj.Flags |= Caps.CapsFlags.ViewerBenefits;
continue;
case "VTPBR":
if (m_Scene.RegionInfo.RegionSizeX == Constants.RegionSize &&
m_Scene.RegionInfo.RegionSizeY == Constants.RegionSize )
{
m_HostCapsObj.Flags |= Caps.CapsFlags.PBR | Caps.CapsFlags.TPBR;
}
else
m_HostCapsObj.Flags |= Caps.CapsFlags.PBR;
continue;
case "VETPBR":
m_HostCapsObj.Flags |= Caps.CapsFlags.PBR | Caps.CapsFlags.TPBR;
continue;
case "ObjectAnimation":
m_HostCapsObj.Flags |= Caps.CapsFlags.ObjectAnim;
break;
@@ -370,7 +382,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
validCaps.Add(cstr);
}
osUTF8 sb = LLSDxmlEncode2.Start();
LLSDxmlEncode2.AddMap(sb);
m_HostCapsObj.GetCapsDetailsLLSDxml(validCaps, sb);

30
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@@ -158,11 +158,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_features["MeshUploadEnabled"] = true;
m_features["MeshXferEnabled"] = true;
/*
m_features["MirrorsEnabled"] = false;
m_features["PBRMaterialSwatchEnabled"] = false;
m_features["PBRTerrainEnabled"] = false;
*/
m_features["MirrorsEnabled"] = true;
m_features["PhysicsMaterialsEnabled"] = true;
@@ -196,7 +192,7 @@ namespace OpenSim.Region.ClientStack.Linden
new SimpleStreamHandler("/" + UUID.Random(),
delegate (IOSHttpRequest request, IOSHttpResponse response)
{
HandleSimulatorFeaturesRequest(request, response, agentID);
HandleSimulatorFeaturesRequest(request, response, caps);
}));
if (m_doScriptSyntax && !m_scriptSyntaxID.IsZero() && m_scriptSyntaxXML != null)
@@ -276,7 +272,7 @@ namespace OpenSim.Region.ClientStack.Linden
return (OSDMap)copy;
}
private void HandleSimulatorFeaturesRequest(IOSHttpRequest request, IOSHttpResponse response, UUID agentID)
private void HandleSimulatorFeaturesRequest(IOSHttpRequest request, IOSHttpResponse response, Caps caps)
{
// m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");
@@ -286,24 +282,20 @@ namespace OpenSim.Region.ClientStack.Linden
return;
}
/*
ScenePresence sp = m_scene.GetScenePresence(agentID);
if (sp == null)
{
response.StatusCode = (int)HttpStatusCode.ServiceUnavailable;
response.AddHeader("Retry-After", "5");
return;
}
*/
OSDMap copy = DeepCopy();
if ((caps.Flags & Caps.CapsFlags.TPBR) != 0)
{
copy["PBRMaterialSwatchEnabled"] = true;
copy["PBRTerrainEnabled"] = true;
}
// Let's add the agentID to the destination guide, if it is expecting that.
if(copy.TryGetValue("OpenSimExtras", out OSD oe))
{
if(((OSDMap)oe).TryGetValue("destination-guide-url", out OSD dgl))
{
((OSDMap)oe)["destination-guide-url"] = Replace(dgl.AsString(), "[USERID]", agentID.ToString());
((OSDMap)oe)["destination-guide-url"] = Replace(dgl.AsString(), "[USERID]", caps.AgentID.ToString());
}
}
@@ -312,7 +304,7 @@ namespace OpenSim.Region.ClientStack.Linden
foreach(SimulatorFeaturesRequestDelegate sd in OnSimulatorFeaturesRequest.GetInvocationList())
try
{
sd?.Invoke(agentID, ref copy);
sd?.Invoke(caps.AgentID, ref copy);
}
catch { }
}

56
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -341,8 +341,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private readonly Prioritizer m_prioritizer;
private bool m_disableFacelights;
// needs optimization
private HashSet<SceneObjectGroup> GroupsInView = new();
private HashSet<SceneObjectGroup> GroupsInView = [];
#pragma warning disable 0414
private bool m_VelocityInterpolate;
#pragma warning restore 0414
@@ -350,6 +349,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private bool m_SupportObjectAnimations;
private bool m_SupportPBR;
public bool SupportTerrainPBR { get; private set; }
public ViewerFlags ViewerFlags { get; private set; }
/// <value>
/// Maintain a record of all the objects killed. This allows us to stop an update being sent from the
@@ -877,6 +878,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void SendRegionHandshake()
{
GetViewerCaps(); // make sure this is up to date
RegionInfo regionInfo = m_scene.RegionInfo;
RegionSettings regionSettings = regionInfo.RegionSettings;
EstateSettings es = regionInfo.EstateSettings;
@@ -915,14 +918,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// this seem now obsolete, sending zero uuids
// we should send the basic low resolution default ?
zc.AddZeros(16 * 4);
//TerrainDetail0
zc.AddUUID(regionSettings.TerrainTexture1);
//TerrainDetail1
zc.AddUUID(regionSettings.TerrainTexture2);
//TerrainDetail2
zc.AddUUID(regionSettings.TerrainTexture3);
//TerrainDetail3
zc.AddUUID(regionSettings.TerrainTexture4);
if(SupportTerrainPBR)
{
//TerrainDetail0
zc.AddUUID(regionSettings.TerrainPBR1);
//TerrainDetail1
zc.AddUUID(regionSettings.TerrainPBR2);
//TerrainDetail2
zc.AddUUID(regionSettings.TerrainPBR3);
//TerrainDetail3
zc.AddUUID(regionSettings.TerrainPBR4);
ViewerFlags |= ViewerFlags.SentTPBR;
}
else
{
//TerrainDetail0
zc.AddUUID(regionSettings.TerrainTexture1);
//TerrainDetail1
zc.AddUUID(regionSettings.TerrainTexture2);
//TerrainDetail2
zc.AddUUID(regionSettings.TerrainTexture3);
//TerrainDetail3
zc.AddUUID(regionSettings.TerrainTexture4);
}
//TerrainStartHeight00
zc.AddFloat((float)regionSettings.Elevation1SW);
//TerrainStartHeight01
@@ -13435,21 +13453,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if(cap != null)
{
if((cap.Flags & Caps.CapsFlags.SentSeeds) != 0)
ret |= 0x1000;
ret |= (uint)ViewerFlags.SentSeeds;
if ((cap.Flags & Caps.CapsFlags.ObjectAnim) != 0)
{
m_SupportObjectAnimations = true;
ret |= 0x2000;
ret |= (uint)ViewerFlags.ObjectAnim;
}
if ((cap.Flags & Caps.CapsFlags.WLEnv) != 0)
ret |= 0x4000;
ret |= (uint)ViewerFlags.WLEnv;
if ((cap.Flags & Caps.CapsFlags.AdvEnv) != 0)
ret |= 0x8000;
ret |= (uint)ViewerFlags.AdvEnv;
if ((cap.Flags & Caps.CapsFlags.PBR) != 0)
{
ret |= (uint)ViewerFlags.PBR;
m_SupportPBR = true;
}
if ((cap.Flags & Caps.CapsFlags.TPBR) != 0)
{
ret |= (uint)ViewerFlags.TPBR;
SupportTerrainPBR = true;
}
}
}
ViewerFlags = (ViewerFlags)ret;
return ret;
}
}

6
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
View File

@@ -1164,6 +1164,12 @@ namespace OpenSim.Region.CoreModules.Asset
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainTexture2, (sbyte)AssetType.Texture);
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainTexture3, (sbyte)AssetType.Texture);
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainTexture4, (sbyte)AssetType.Texture);
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR1, (sbyte)AssetType.Texture);
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR2, (sbyte)AssetType.Texture);
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR3, (sbyte)AssetType.Texture);
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR4, (sbyte)AssetType.Texture);
gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainImageID, (sbyte)AssetType.Texture);
s.RegionEnvironment?.GatherAssets(gatheredids);

4
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -1119,6 +1119,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
currentRegionSettings.TerrainTexture2 = loadedRegionSettings.TerrainTexture2;
currentRegionSettings.TerrainTexture3 = loadedRegionSettings.TerrainTexture3;
currentRegionSettings.TerrainTexture4 = loadedRegionSettings.TerrainTexture4;
currentRegionSettings.TerrainPBR1 = loadedRegionSettings.TerrainPBR1;
currentRegionSettings.TerrainPBR2 = loadedRegionSettings.TerrainPBR2;
currentRegionSettings.TerrainPBR3 = loadedRegionSettings.TerrainPBR3;
currentRegionSettings.TerrainPBR4 = loadedRegionSettings.TerrainPBR4;
currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun;
currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight;
currentRegionSettings.TelehubObject = loadedRegionSettings.TelehubObject;

14
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
View File

@@ -320,7 +320,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
if(scene.RegionEnvironment != null)
if (regionSettings.TerrainPBR1 != RegionSettings.DEFAULT_TERRAIN_PBR_1)
assetUuids[regionSettings.TerrainPBR1] = (sbyte)AssetType.Texture; // it can be both tex or material
if (regionSettings.TerrainPBR2 != RegionSettings.DEFAULT_TERRAIN_PBR_2)
assetUuids[regionSettings.TerrainPBR2] = (sbyte)AssetType.Texture;
if (regionSettings.TerrainPBR3 != RegionSettings.DEFAULT_TERRAIN_PBR_3)
assetUuids[regionSettings.TerrainPBR3] = (sbyte)AssetType.Texture;
if (regionSettings.TerrainPBR4 != RegionSettings.DEFAULT_TERRAIN_PBR_4)
assetUuids[regionSettings.TerrainPBR4] = (sbyte)AssetType.Texture;
if (scene.RegionEnvironment != null)
scene.RegionEnvironment.GatherAssets(assetUuids);
List<ILandObject> landObjects = scene.LandChannel.AllParcels();

45
OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
View File

@@ -68,6 +68,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
" that coordinate.",
consoleSetTerrainTexture);
m_module.Scene.AddCommand("Regions", m_module, "set terrain pbr",
"set terrain pbr <number> <uuid> [<x>] [<y>]",
"Sets the pbr <number> to <uuid>, if <x> or <y> are specified, it will only " +
"set it on regions with a matching coordinate. Specify -1 in <x> or <y> to wildcard" +
" that coordinate.",
consoleSetTerrainPBR);
m_module.Scene.AddCommand("Regions", m_module, "set terrain heights",
"set terrain heights <corner> <min> <max> [<x>] [<y>]",
"Sets the terrain texture heights on corner #<corner> to <min>/<max>, if <x> or <y> are specified, it will only " +
@@ -127,6 +134,44 @@ namespace OpenSim.Region.CoreModules.World.Estate
}
}
}
protected void consoleSetTerrainPBR(string module, string[] args)
{
string num = args[3];
string uuid = args[4];
int x = (args.Length > 5 ? int.Parse(args[5]) : -1);
int y = (args.Length > 6 ? int.Parse(args[6]) : -1);
if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x)
{
if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y)
{
int corner = int.Parse(num);
UUID texture = UUID.Parse(uuid);
m_log.Debug($"[ESTATEMODULE]: Setting terrain PBR asset for {m_module.Scene.RegionInfo.RegionName} to {texture}");
switch (corner)
{
case 0:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR1 = texture;
break;
case 1:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR2 = texture;
break;
case 2:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR3 = texture;
break;
case 3:
m_module.Scene.RegionInfo.RegionSettings.TerrainPBR4 = texture;
break;
}
m_module.Scene.RegionInfo.RegionSettings.Save();
m_module.TriggerRegionInfoChange();
m_module.sendRegionHandshakeToAll();
}
}
}
protected void consoleSetWaterHeight(string module, string[] args)
{
string heightstring = args[3];

53
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@@ -541,22 +541,45 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (texture.IsZero())
return;
switch (level)
if((remoteClient.ViewerFlags & ViewerFlags.TPBR) != 0)
{
case 0:
Scene.RegionInfo.RegionSettings.TerrainTexture1 = texture;
break;
case 1:
Scene.RegionInfo.RegionSettings.TerrainTexture2 = texture;
break;
case 2:
Scene.RegionInfo.RegionSettings.TerrainTexture3 = texture;
break;
case 3:
Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
break;
default:
return;
switch (level)
{
case 0:
Scene.RegionInfo.RegionSettings.TerrainPBR1 = texture;
break;
case 1:
Scene.RegionInfo.RegionSettings.TerrainPBR2 = texture;
break;
case 2:
Scene.RegionInfo.RegionSettings.TerrainPBR3 = texture;
break;
case 3:
Scene.RegionInfo.RegionSettings.TerrainPBR4 = texture;
break;
default:
return;
}
}
else
{
switch (level)
{
case 0:
Scene.RegionInfo.RegionSettings.TerrainTexture1 = texture;
break;
case 1:
Scene.RegionInfo.RegionSettings.TerrainTexture2 = texture;
break;
case 2:
Scene.RegionInfo.RegionSettings.TerrainTexture3 = texture;
break;
case 3:
Scene.RegionInfo.RegionSettings.TerrainTexture4 = texture;
break;
default:
return;
}
}
Scene.RegionInfo.RegionSettings.Save();

9
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -856,6 +856,15 @@ namespace OpenSim.Region.Framework.Scenes
updatedTerrainTextures = true;
}
if (rs.TerrainPBR1.IsZero())
rs.TerrainPBR1 = RegionSettings.DEFAULT_TERRAIN_PBR_1;
if (rs.TerrainPBR2.IsZero())
rs.TerrainPBR2 = RegionSettings.DEFAULT_TERRAIN_PBR_2;
if (rs.TerrainPBR3.IsZero())
rs.TerrainPBR3 = RegionSettings.DEFAULT_TERRAIN_PBR_3;
if (rs.TerrainPBR4.IsZero())
rs.TerrainPBR4 = RegionSettings.DEFAULT_TERRAIN_PBR_4;
if (updatedTerrainTextures)
rs.Save();

6
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -3998,7 +3998,7 @@ namespace OpenSim.Region.Framework.Scenes
return;
uint flags = ControllingClient.GetViewerCaps();
if ((flags & 0x1000) == 0) // wait for seeds sending
if ((flags & (uint)ViewerFlags.SentSeeds) == 0) // wait for seeds sending
return;
// give some extra time to make sure viewers did process seeds
@@ -4058,6 +4058,10 @@ namespace OpenSim.Region.Framework.Scenes
m_agentTransfer?.CloseOldChildAgents(this);
}
uint flags = ControllingClient.GetViewerCaps();
if ((flags & (uint)(ViewerFlags.TPBR | ViewerFlags.SentTPBR)) == (uint)ViewerFlags.TPBR)
ControllingClient.SendRegionHandshake();
m_log.DebugFormat("[SCENE PRESENCE({0})]: SendInitialData for {1}", m_scene.RegionInfo.RegionName, UUID);
if (m_teleportFlags <= 0)
{

1
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@@ -57,6 +57,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
private UUID m_agentID = UUID.Random();
public ISceneAgent SceneAgent { get; set; }
public ViewerFlags ViewerFlags { get; private set; } = 0;
public int PingTimeMS { get { return 0; } }

2
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@@ -57,6 +57,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
/// </summary>
public event ChatToNPC OnChatToNPC;
public ViewerFlags ViewerFlags { get; private set; }
/// <summary>
/// Fired when the NPC receives an instant message.
/// </summary>

1
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -6629,6 +6629,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Vector osTemperature2sRGB(LSL_Float dtemp)
{
//aproximate fit to http://www.vendian.org/mncharity/dir3/blackbody/ 10degree D65 tables
float temp = (float)dtemp.value;
if (temp <= 1000f)
return new LSL_Vector(1.0, 0.0401, 0);

4
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@@ -731,8 +731,8 @@ namespace OpenSim.Services.LLLoginService
else
{
position = pinfo.LastPosition;
position.X = Util.Clamp(position.X, 0.5f, region.RegionSizeX - 0.5f);
position.Y = Util.Clamp(position.Y, 0.5f, region.RegionSizeY - 0.5f);
position.X = Math.Clamp(position.X, 0.5f, region.RegionSizeX - 0.5f);
position.Y = Math.Clamp(position.Y, 0.5f, region.RegionSizeY - 0.5f);
lookAt = pinfo.LastLookAt;
}